搜索框更改

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

@@ -27,7 +27,6 @@ public class SelectApi {
     @RequestMapping(value = "selectByCard")
     public  Map<String,Object> selectByCard(@RequestParam("id") String id){
         Map<String,Object> resultMap = new HashMap<>();
-
         if (id.length() == 11) {
             List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByWorkOrderFromYX(id);
             List<Map<String, Object>> ACCdata = new ArrayList<>();
@@ -45,12 +44,21 @@ public class SelectApi {
             resultMap.put("PRODData", PRODData);
         } else if (id.length() == 10 || id.length() == 18) {
 
-            List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
+            //查询是否是特证，如果是，返回新的任务单信息
+
+            if (selectSerialNumberService.selectCount(id)==0){
+                List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
+                resultMap.put("workOrderDate", workOrderData);
+            }else {
+                List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
+                resultMap.put("workOrderDate", workOrderData);
+            }
             List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
             List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);
-            resultMap.put("workOrderDate", workOrderData);
+
             resultMap.put("ACCdata", ACCdata);
             resultMap.put("PRODData", PRODData);
+
         } else {
             return null;
         }

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

@@ -28,6 +28,34 @@ public interface SelectSerialNumberMapper {
             "WHERE GROUP_NO =#{id}")
     public List<Map<String,Object>> selectByGroupNo(String id);
 
+
+    /**
+     * 查询输入身份证号/受理号是否是特证
+     */
+    @Select("select count(*)from SPECIAL_CARD \n" +
+            "left join  prod_card_t@PROD_LINK ON SPECIAL_CARD.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" +
+            "where SPECIAL_CARD.ACCEPT_NO=#{id}  OR PROD_CARD_T.ID_NO=#{id}")
+    public int selectCount(String id);
+
+
+    @Select("select  DISTINCT TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,\n" +
+            "TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,\n" +
+            "TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
+            "from TASK\n" +
+            "LEFT JOIN SPECIAL_CARD ON SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
+            "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
+            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
+            "LEFT JOIN GROUP_NO ON TASK.TASK_ID=GROUP_NO.TASK_ID\n" +
+            "LEFT JOIN PROD_DBA.PROD_CARD_T ON subStr(PROD_CARD_T.ACCEPT_NO ,0,8)=GROUP_NO.GROUP_NO \n" +
+            "LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON.GMSFHM = PROD_DBA.PROD_CARD_T.ID_NO\n" +
+            "WHERE  SPECIAL_CARD.ACCEPT_NO=#{id} OR PROD_CARD_T.ID_NO=#{id}")
+    public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id);
+
+    /**
+     * 查询任务单信息
+     * @param id
+     * @return
+     */
     @Select("select  GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
             "from TASK\n" +
             "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +

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

@@ -16,6 +16,10 @@ public interface SelectSerialNumberService {
     List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id);
     /*根据身份证号或受理号查询制证库*/
     List<Map<String, Object>> selectByAcceptNoOrCardIdFromPROD(String id);
+    /*查询是否是特证*/
+    public int selectCount(String id);
+
+    public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id);
 
 }
 

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

@@ -44,4 +44,15 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{
         List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromPROD(id);
         return result;
     }
+
+    @Override
+    public int selectCount(String id) {
+        return  selectSerialNumberMapper.selectCount(id);
+    }
+
+    @Override
+    public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList2(String id) {
+        List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList2(id);
+        return result;
+    }
 }