搜索框

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

@@ -25,14 +25,14 @@ public interface SelectSerialNumberMapper {
             "WHERE GROUP_NO =#{id}")
     public Map<String,Object> selectByGroupNo(String id);
 
-    @Select("select GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.DOWNLOAD_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
+    @Select("select  GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,CARD_TYPE_DIC.CARD_TYPE,TASK.ISSUED_DATE,TASK.DOWNLOAD_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" +
             "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 ACC_CARD_T@ACCU_LINK ON  subStr(ACC_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO;\n" +
-            "LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON.GMSFHM=ACC_CARD_T@ACCU_LINK.ID_NO\n" +
-            "WHERE PREPRO_PERSON.GMSFHM =#{id} OR ACC_CARD_T.ACCEPT_NO=#{id}")
+            "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 PREPRO_PERSON.GMSFHM =#{id} OR PROD_CARD_T.ACCEPT_NO=#{id}")
     public Map<String,Object>selectByAcceptNoOrCardIdFromTaskList(String id);
 
     @Select("SELECT ACC_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,ACC_CARD_T.NAME,CARD_TYPE_DIC.CARD_TYPE,ACC_CARD_T.ID_NO,ACC_CARD_T.SEX_NO,\n" +
@@ -48,7 +48,7 @@ public interface SelectSerialNumberMapper {
 
     @Select("SELECT PROD_CARD_T.ACCEPT_NO,COUNTY_DIC.COUNTYNAME,PROD_CARD_T.NAME,CARD_TYPE_DIC.CARD_TYPE,PROD_CARD_T.ID_NO,PROD_CARD_T.SEX_NO,\n" +
             "GAJG_DM.GAJG_MC AS GAJG1,PROD_CARD_T.BEGIN_DATE,PROD_CARD_T.EXPIRE_DATE,PROD_CARD_T.SIGN_GOVT,\n" +
-            "PROD_TRACE_T.PHOTO_DATE,PROD_TRACE_T.EXPORT_DATE,PROD_TRACE_T.DOWNLOAD_DATE,PROD_TRACE_T.ELECTRIC_WRITE_DATE,PROD_TRACE_T.CHECK_DATE,PROD_TRACE_T.MOVE_DATE\n" +
+            "decode(PROD_TRACE_T.PHOTO_DATE,null,decode(PROD_TRACE_T.EXPORT_DATE,null,decode(PROD_TRACE_T.DOWNLOAD_DATE,null,decode(PROD_TRACE_T.ELECTRIC_WRITE_DATE,null,decode(PROD_TRACE_T.CHECK_DATE,null,decode(PROD_TRACE_T.MOVE_DATE,null,To_date('20190304','yyyyMMdd'),PROD_TRACE_T.MOVE_DATE),PROD_TRACE_T.CHECK_DATE),PROD_TRACE_T.ELECTRIC_WRITE_DATE),PROD_TRACE_T.DOWNLOAD_DATE),PROD_TRACE_T.EXPORT_DATE),PROD_TRACE_T.PHOTO_DATE)\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" +
@@ -56,7 +56,7 @@ public interface SelectSerialNumberMapper {
             "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \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 ='0231245603' OR PROD_CARD_T.ID_NO  ='0231245603';")
+            "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO  =#{id}")
     public Map<String,Object>selectByAcceptNoOrCardIdFromPROD(String id);
 
 }

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

@@ -36,31 +36,31 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{
     @Override
     public Map<String, Object> selectByAcceptNoOrCardIdFromACC(String id) {
         Map<String,Object> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromACC(id);
-        if (result.get("sex").equals("1")){
-            result.put("sex","男");
-        }else if(result.get("sex").equals("2")){
-            result.put("sex","女");
-        }else {
-            result.put("sex","未知");
-        }
+
+//        if (result.get("SEX_ID").equals("1")){
+//            result.put("sex","男");
+//        }else if(result.get("SEX_ID").equals("2")){
+//            result.put("sex","女");
+//        }else {
+//            result.put("sex","未知");
+//
+//    }
+        System.out.println("FromACC:"+result);
         return result;
     }
 
     @Override
     public Map<String, Object> selectByAcceptNoOrCardIdFromPROD(String id) {
         Map<String,Object> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromPROD(id);
-        if (result.get("sex").equals("1")){
-            result.put("sex","男");
-        }else if(result.get("sex").equals("2")){
-            result.put("sex","女");
-        }else {
-            result.put("sex","未知");
-
-    }
-        Object photoDate=result.get("");
-
+//        if (result.get("SEX_ID").equals("1")){
+//            result.put("sex","男");
+//        }else if(result.get("SEX_ID").equals("2")){
+//            result.put("sex","女");
+//        }else {
+//            result.put("sex","未知");
+//
+//    }
+        System.out.println("FromPROD:"+result);
         return result;
     }
-
-
 }