搜索框更改

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

@@ -66,31 +66,33 @@ public interface SelectSerialNumberMapper {
             "WHERE PREPRO_PERSON.GMSFHM =#{id} OR PROD_CARD_T.ACCEPT_NO=#{id}")
     public List<Map<String,Object>> selectByAcceptNoOrCardIdFromTaskList(String id);
 
-    @Select("SELECT ACC_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,ACC_CARD_T.NAME,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,ACC_CARD_T.ID_NO,ACC_CARD_T.SEX_NO,\n" +
-            "GAJG_DM.GAJG_MC AS GAJG1,ACC_CARD_T.BEGIN_DATE,ACC_CARD_T.EXPIRE_DATE,ACC_CARD_T.SIGN_GOVT\n" +
+
+
+    @Select("SELECT ACC_CARD_T.ACCEPT_NO,\n" +
+            "COUNTY_DIC.COUNTYNAME,\n" +
+            "COUNTY_DIC.COUNTY_CODE,\n" +
+            "ACC_CARD_T.NAME,\n" +
+            "ACC_CARD_T.ID_NO,\n" +
+            "ACC_CARD_T.SEX_NO,\n" +
+            "GAJG_DM.GAJG_MC AS GAJG1,\n" +
+            "ACC_CARD_T.BEGIN_DATE,\n" +
+            "ACC_CARD_T.EXPIRE_DATE,\n" +
+            "ACC_CARD_T.SIGN_GOVT\n" +
             "FROM ACC_CARD_T@ACCU_LINK\n" +
             "LEFT JOIN COUNTY_DIC ON subStr(ACC_CARD_T.UPLOAD_NO,0,6)=COUNTY_DIC.COUNTY_CODE\n" +
             "LEFT JOIN GROUP_NO ON subStr(ACC_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO \n" +
-            "LEFT JOIN TASK ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
-            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
             "LEFT JOIN GAJG_DM ON subStr(ACC_CARD_T.upload_no,0,9)= GAJG_DM.GAJG_DM\n" +
             "WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO  =#{id}")
     public List<Map<String,Object>> selectByAcceptNoOrCardIdFromACC(String id);
 
-    //TODO 不能用decode，这样拿不到工位信息
-    //            "PROD_TRACE_T.PHOTO_DATE,\n" +
-    //            "PROD_TRACE_T.EXPORT_DATE,\n" +
-    //            "PROD_TRACE_T.DOWNLOAD_DATE,\n" +
-    //            "PROD_TRACE_T.ELECTRIC_WRITE_DATE,\n" +
-    //            "PROD_TRACE_T.CHECK_DATE,\n" +
-    //            "PROD_TRACE_T.MOVE_DATE\n" +
-    @Select("SELECT PROD_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,PROD_CARD_T.NAME,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,PROD_CARD_T.ID_NO,PROD_CARD_T.SEX_NO,\n" +
+    @Select("SELECT PROD_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,PROD_CARD_T.NAME,\n" +
+            "PROD_CARD_T.ID_NO,PROD_CARD_T.SEX_NO,\n" +
+            "decode(CHECK_DATE,  null,decode(ELECTRIC_WRITE_DATE, null,decode(DOWNLOAD_DATE, null,1,2,5)),6) state,\n" +
+            "decode(CHECK_DATE,  null,decode(ELECTRIC_WRITE_DATE, null,decode(DOWNLOAD_DATE, null,EXPORT_DATE,DOWNLOAD_DATE,ELECTRIC_WRITE_DATE)),CHECK_DATE) Last_date,\n" +
             "GAJG_DM.GAJG_MC AS GAJG1,PROD_CARD_T.BEGIN_DATE,PROD_CARD_T.EXPIRE_DATE,PROD_CARD_T.SIGN_GOVT\n" +
             "FROM PROD_CARD_T@PROD_LINK\n" +
             "LEFT JOIN COUNTY_DIC ON subStr(PROD_CARD_T.UPLOAD_NO,0,6)=COUNTY_DIC.COUNTY_CODE\n" +
-            "LEFT JOIN GROUP_NO ON subStr(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO \n" +
-            "LEFT JOIN TASK ON TASK.TASK_ID = GROUP_NO.TASK_ID\n" +
-            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
+            "LEFT JOIN GROUP_NO ON subStr(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO\n" +
             "LEFT JOIN GAJG_DM ON subStr(PROD_CARD_T.upload_no,0,9)= GAJG_DM.GAJG_DM\n" +
             "LEFT JOIN PROD_TRACE_T@PROD_LINK ON PROD_TRACE_T.ACCEPT_NO =PROD_CARD_T.ACCEPT_NO\n" +
             "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO  =#{id}")