Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/yxproject/start/api/CardDetailedListApi.java

+package com.yxproject.start.api;
+
+import com.yxproject.start.entity.CardDetailedListEntity;
+import com.yxproject.start.service.CardDetailedListService;
+import net.sf.json.JSONObject;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   21:24
+ */
+@RestController
+@RequestMapping("cardDetailedList")
+public class CardDetailedListApi {
+    @Autowired
+    private CardDetailedListService cardDetailedListService;
+
+    /**
+     * 按条件查询身份证详单
+     * @param jsonStr
+     * @return
+     */
+    @RequestMapping("findCardDetailedList")
+    public List<CardDetailedListEntity> findCardDetailedList(String jsonStr){
+        JSONObject jsonObject = JSONObject.fromObject(jsonStr);
+        String applicantName = jsonObject.getString("applicantName");
+        String orderNumber = jsonObject.getString("orderNumber");
+        String state = jsonObject.getString("state");
+        String latticeMouthInformation = jsonObject.getString("latticeMouthInformation");
+        List<String> getToCounty = new ArrayList<>();
+        getToCounty.add(jsonObject.getString("getToCounty"));
+        String uploadDate = jsonObject.getString("uploadDate");
+        String firstIndex = jsonObject.getString("firstIndex");
+        String pageSize = jsonObject.getString("pageSize");
+        List<CardDetailedListEntity> list = new ArrayList<>();
+        //TODO
+//        List<CardDetailedListEntity> list = cardDetailedListService.findCardDetailedList(applicantName,orderNumber,state,latticeMouthInformation,getToCounty,uploadDate,firstIndex,pageSize);
+        return list;
+    }
+
+}

src/main/java/com/yxproject/start/api/ReceiptListApi.java

+package com.yxproject.start.api;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   21:39
+ */
+@RestController
+@RequestMapping("receiptList")
+public class ReceiptListApi {
+
+}

src/main/java/com/yxproject/start/mapper/CardDetailedListMapper.java

+package com.yxproject.start.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   21:27
+ */
+@Mapper
+public interface CardDetailedListMapper {
+}

src/main/java/com/yxproject/start/mapper/PersonPostMapper.java

 package com.yxproject.start.mapper;
 
-import com.sun.xml.internal.bind.v2.TODO;
 import com.yxproject.start.entity.PersonPostEntity;
 import org.apache.ibatis.annotations.*;
+
 import java.util.List;
 
 
@@ -32,10 +32,10 @@ public interface PersonPostMapper {
             " <when test='orderNumber!=null'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
             " <when test='state!=null'> and  PERSON_POST.STATE=#{state} </when>" +
             " <when test='latticeMouthInformation!=null'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
-            " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY =#{getToCounty} </when>" +
+            " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY  in ( #{getToCounty} ) </when>" +
             " <when test='uploadDate!=null'> and  FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>" +
             "PERSON_POST limit #{firstIndex},#{pageSize}")
-    public List<PersonPostEntity> findAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,List<String> getToCounty,@Param("uploadDate")String uploadDate,@Param("firstIndex")String firstIndex,@Param("pageSize")String pageSize);
+    public List<PersonPostEntity> findAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,@Param("getToCounty")String getToCounty,@Param("uploadDate")String uploadDate,@Param("firstIndex")String firstIndex,@Param("pageSize")String pageSize);
 
     @Delete("DELETE PERSON_POST " +
             "WHERE 1=1" +
@@ -43,7 +43,7 @@ public interface PersonPostMapper {
             " <when test='orderNumber!=null'> and  PERSON_POST.ORDER_NUMBER=#{orderNumber} </when>" +
             " <when test='state!=null'> and  PERSON_POST.STATE=#{state} </when>" +
             " <when test='latticeMouthInformation!=null'> and  PERSON_POST.LATTICE_MOUTH_INFORMATION=#{latticeMouthInformation} </when>" +
-            " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY =#{getToCounty} </when>" +
+            " <when test='getToCounty!=null'> and  PERSON_POST.GET_TO_COUNTY in ( #{getToCounty}) </when>" +
             " <when test='uploadDate!=null'> and  FILE_NAME_DIC.UPLOAD_DATE=#{uploadDate} </when>")
     public boolean deleteAllPersonalData(@Param("applicantName")String applicantName,@Param("orderNumber")String orderNumber,@Param("state")String state,@Param("latticeMouthInformation")String latticeMouthInformation,List<String> getToCounty ,@Param("uploadDate")String uploadDate);
 

src/main/java/com/yxproject/start/mapper/ReceiptListMapper.java

+package com.yxproject.start.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   21:41
+ */
+@Mapper
+public interface ReceiptListMapper {
+}

src/main/java/com/yxproject/start/service/CardDetailedListService.java

+package com.yxproject.start.service;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   21:28
+ */
+public interface CardDetailedListService {
+}

src/main/java/com/yxproject/start/service/ReceiptListService.java

+package com.yxproject.start.service;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   21:41
+ */
+public interface ReceiptListService {
+}

src/main/java/com/yxproject/start/service/impl/CardDetailedListServiceImpl.java

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.mapper.CardDetailedListMapper;
+import com.yxproject.start.service.CardDetailedListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   21:28
+ */
+@Service
+public class CardDetailedListServiceImpl implements CardDetailedListService {
+    @Autowired
+    private CardDetailedListMapper cardDetailedListMapper;
+}

src/main/java/com/yxproject/start/service/impl/PersonPostServiceImpl.java

@@ -43,7 +43,15 @@ public class PersonPostServiceImpl implements PersonPostService {
 
     @Override
     public List<PersonPostEntity> findPersonalData(String applicantName,String orderNumber,String state,String latticeMouthInformation,List<String> getToCounty,String uploadDate,String firstIndex,String pageSize){
-       List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,getToCounty,uploadDate,firstIndex,pageSize);
+        String str = null;
+        for (int i = 0;i<getToCounty.size();i++){
+            if (i==getToCounty.size()-1){
+                str+="'"+getToCounty.get(i);
+            }else {
+                str+="'"+getToCounty.get(i)+",";
+            }
+        }
+       List<PersonPostEntity> list = personPostMapper.findAllPersonalData(applicantName,orderNumber,state,latticeMouthInformation,str,uploadDate,firstIndex,pageSize);
         return list;
     }
 

src/main/java/com/yxproject/start/service/impl/ReceiptListServiceImpl.java

+package com.yxproject.start.service.impl;
+
+import com.yxproject.start.mapper.ReceiptListMapper;
+import com.yxproject.start.service.ReceiptListService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @auther zhangyusheng
+ * 2019/3/1   21:42
+ */
+@Service
+public class ReceiptListServiceImpl implements ReceiptListService {
+    @Autowired
+    private ReceiptListMapper receiptListMapper;
+}