push

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

@@ -150,7 +150,7 @@ public class FailedCardApi {
                 if (result != 0 ) {
                     idMap = failedCardService.selectDataById(jsonObject.getString("cardId"));
                 } else {
-                    idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
+                    idMap = failedCardService.selectCountIdByCardId(formateAcceptNo(jsonObject.getString("cardId")));
                 }
                 int initiator = 5;
                 failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"), idMap.get("WORK_GROUP").toString(), name);

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

@@ -13,7 +13,7 @@ import java.util.Map;
 @Mapper
 public interface DataAuditingMapper {
 
-    @Insert("insert into Data_Auditing (POLICE_SUBSTATION,VALID_COUNT,inVALID_COUNT,submit_date) values (#{policeSubstation},#{validCount},#{invalidCount},sysdate) ")
+    @Insert("insert into Data_Auditing (POLICE_SUBSTATION,VALID_COUNT,inVALID_COUNT,submit_date,TASK_ID) values (#{policeSubstation},#{validCount},#{invalidCount},sysdate,#{taskId}) ")
     @Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "ID")
     public boolean saveDataAuditingEntity(DataAuditingEntity dataAuditingEntity);
 

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

@@ -146,13 +146,13 @@ public interface SelectSerialNumberMapper {
             "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,police_name\n" +
+            "decode(ACC_CARD_T.EXPIRE_DATE,'00000000','长期',ACC_CARD_T.EXPIRE_DATE) EXPIRE_DATE,\n" +
+            "ACC_CARD_T.SIGN_GOVT,POLICE_NAME\n" +
             "FROM ACC_CARD_T@ACCUYD_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 GAJG_DM ON subStr(ACC_CARD_T.upload_no,0,9)= GAJG_DM.GAJG_DM\n" +
-            "left join ACC_GROUP_RELATION_T@ACCU_LINK ON SUBSTR(ACC_CARD_T.ACCEPT_NO,0,8) =ACC_GROUP_RELATION_T.GROUP_NO\n" +
+            "left join ACC_GROUP_RELATION_T@ACCUYD_LINK ON SUBSTR(ACC_CARD_T.ACCEPT_NO,0,8) =ACC_GROUP_RELATION_T.GROUP_NO\n" +
             "left join police_dic on ACC_GROUP_RELATION_T.UPLOAD_UNIT_NO = police_dic.POLICE_CODE " +
             "WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO  =#{id}")
     public List<Map<String,Object>> selectByAcceptNoOrCardIdFromACC(String id);
@@ -161,13 +161,13 @@ public interface SelectSerialNumberMapper {
             "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" +
+            "GAJG_DM.GAJG_MC AS GAJG1,PROD_CARD_T.BEGIN_DATE,decode(PROD_CARD_T.EXPIRE_DATE,'00000000','长期',PROD_CARD_T.EXPIRE_DATE) EXPIRE_DATE ,PROD_CARD_T.SIGN_GOVT\n" +
             ",police_NAME FROM PROD_CARD_T@PRODYD_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 GAJG_DM ON subStr(PROD_CARD_T.upload_no,0,9)= GAJG_DM.GAJG_DM\n" +
             "LEFT JOIN PROD_TRACE_T@PRODYD_LINK ON PROD_TRACE_T.ACCEPT_NO =PROD_CARD_T.ACCEPT_NO\n" +
-            "left join PROD_GROUP_RELATION_T@PROD_LINK ON SUBSTR(PROD_CARD_T.ACCEPT_NO,0,8) =PROD_GROUP_RELATION_T.GROUP_NO\n" +
+            "left join PROD_GROUP_RELATION_T@PRODYD_LINK ON SUBSTR(PROD_CARD_T.ACCEPT_NO,0,8) =PROD_GROUP_RELATION_T.GROUP_NO\n" +
             "left join police_dic on PROD_GROUP_RELATION_T.UPLOAD_UNIT_NO = police_dic.POLICE_CODE " +
             "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO  =#{id}")
     public List<Map<String,Object>> selectByAcceptNoOrCardIdFromPROD(String id);