添加查询身份证详单 通过身份证号

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

@@ -5,6 +5,7 @@ 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.ArrayList;
@@ -21,27 +22,17 @@ public class CardDetailedListApi {
     private CardDetailedListService cardDetailedListService;
 
     /**
-     * 按条件查询身份证详单
-     *
-     * @param jsonStr
+     * 查询身份证详单
+     *通过身份证号
+     * @param idCard 查询身份证详单
      * @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);
+    public List<CardDetailedListEntity> findCardDetailedList(@RequestParam("idCard") String idCard) {
+        List<CardDetailedListEntity> list = cardDetailedListService.findCardDetailedListByIdCard(idCard);
         return list;
     }
 
+
+
 }

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

@@ -25,9 +25,7 @@ public interface CardDetailedListMapper {
      *查询详单数据
      */
 
-    @Select("SELECT upload_no,subStr(UPLOAD_NO,0,9),ID_NO,NAME FROM PROD_CARD_T@PROD_LINK WHERE subStr(ACCEPT_NO,0,8) \n" +
-            "IN (SELECT GROUP_NO FROM GROUP_NO WHERE TASK_ID=#{taskId} \n" +
-            "AND (subStr(UPLOAD_NO,0,9)=#{gajgId}))  ")
-    public List<CardDetailedListEntity> selectCardDetailedListData(@Param("taskId")String taskId,@Param("gajgId")String gajgId);
+    @Select("select * from CARD_DETAILED_LIST where CARD_ID = #{idCard}")
+    public List<CardDetailedListEntity> findCardDetailedListByIdCard(@Param("idCard")String idCard);
 
 }

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

@@ -349,7 +349,7 @@ public interface TaskListMapper {
 // TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "CARD_TYPE_DIC.CARD_TYPE  ,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
-            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO,task.work_group from group_no left join task on group_no.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE" +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "where  1= 1 and to_char(CONCORA_CRUSH_DATE,'yyyyMMdd')= #{date}\n" +
@@ -368,7 +368,7 @@ public interface TaskListMapper {
             "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "CARD_TYPE_DIC.CARD_TYPE  ,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT,group_no.INVALID_COUNT,\n" +
-            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO from group_no left join task on group_no.task_id= task.TASK_ID\n" +
+            "group_no.SPECIAL_CARD_COUNT,group_no.GROUP_NO,task.work_group from group_no left join task on group_no.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE" +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
             "where  1= 1 and to_char(PUNCHING_DATE,'yyyyMMdd')= #{date}\n" +
@@ -625,7 +625,7 @@ public interface TaskListMapper {
             "task.CONCORA_CRUSH_NAME," +
 //            "TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             " '快证' CARD_TYPE ,\n" +
-            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "left join task on special_card.task_id= task.TASK_ID \n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE  " +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -641,7 +641,7 @@ public interface TaskListMapper {
     @Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
             "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
             "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME, '快证' CARD_TYPE ,\n" +
-            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            " '1' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "left join task on special_card.task_id= task.TASK_ID \n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE  " +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -920,7 +920,7 @@ public interface TaskListMapper {
             "task.CONCORA_CRUSH_NAME," +
 //            "TASK.PUNCHING_DATE,TASK.PUNCHING_NAME," +
             "'余证' CARD_TYPE ,\n" +
-            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "left join task on special_card.task_id= task.TASK_ID \n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
@@ -954,7 +954,7 @@ public interface TaskListMapper {
     @Select("select task.task_id,task.COUNTY_CODE,task.SUBMIT_DATE,task.SUBMIT_NAME,task.ISSUED_DATE,task.ISSUED_NAME,\n" +
             "task.PRINT_OUT_DATE,task.PRINT_OUT_NAME,task.POSITION_DATE,task.POSITION_NAME,task.CONCORA_CRUSH_DATE,\n" +
             "task.CONCORA_CRUSH_NAME,TASK.PUNCHING_DATE,TASK.PUNCHING_NAME,'余证' CARD_TYPE ,\n" +
-            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO from special_card \n" +
+            "'99' CARD_TYPE_ID,COUNTY_DIC.COUNTYNAME,  1 VALID_COUNT,0 INVALID_COUNT, 0 SPECIAL_CARD_COUNT,SPECIAL_CARD.ACCEPT_NO GROUP_NO,task.work_group from special_card \n" +
             "left join task on special_card.task_id= task.TASK_ID \n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
             " left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +

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

@@ -12,7 +12,7 @@ import java.util.List;
 public interface CardDetailedListService {
 
 
-    public List<CardDetailedListEntity> selectCardDetailedListData(String taskId, String gajgId);
+    public List<CardDetailedListEntity> findCardDetailedListByIdCard(String idCard);
 
     public boolean saveCardDetailedList(String uploadNo,String policeCode,String cardId,String name);
 

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

@@ -18,8 +18,8 @@ public class CardDetailedListServiceImpl implements CardDetailedListService {
     private CardDetailedListMapper cardDetailedListMapper;
 
     @Override
-    public List<CardDetailedListEntity> selectCardDetailedListData(String taskId, String gajgId) {
-        List<CardDetailedListEntity> list  = cardDetailedListMapper.selectCardDetailedListData(taskId,gajgId);
+    public List<CardDetailedListEntity> findCardDetailedListByIdCard(String idCard) {
+        List<CardDetailedListEntity> list  = cardDetailedListMapper.findCardDetailedListByIdCard(idCard);
         return list;
     }
 

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

@@ -117,7 +117,9 @@ public class TaskListServiceImpl implements TaskListService {
     @Transactional(rollbackFor = Exception.class)
     public boolean updateState2(List<String> failedlist,List<String> list, String process, String name, long printer) {
        if ("2".equals(process)){
-
+           for (String taskId : list) {
+               taskListMapper.updateState2(taskId, process, name, printer);
+           }
            for (String taskId : list) {
                taskListMapper.updateState2(taskId, (Long.valueOf(process)+2)+"", name, printer);
            }