修改单证详情查询

修改交接单流程

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

@@ -392,24 +392,24 @@ public class ReceiptApi {
     }
 
 
-    /**
-     * 生成交接单
-     *
-     * @param receiptId
-     * @return
-     */
-    @RequestMapping("updateReceiptDateByReceiptId")
-    public boolean updateReceiptDateByReceiptId(@RequestParam("receiptId") String receiptId, HttpServletRequest requ) {
-        String remoteAddr = requ.getRemoteAddr();
-        MDC.put("ip", remoteAddr);
-        try {
-            receiptService.updateReceiptDateByReceiptId(receiptId);
-        } catch (Exception e) {
-            logger.error("交接单ID:" + receiptId);
-            logger.error("Exception 生成交接单异常", e);
-        }
-        return true;
-    }
+//    /**
+//     * 生成交接单
+//     *
+//     * @param receiptId
+//     * @return
+//     */
+//    @RequestMapping("updateReceiptDateByReceiptId")
+//    public boolean updateReceiptDateByReceiptId(@RequestParam("receiptId") String receiptId, HttpServletRequest requ) {
+//        String remoteAddr = requ.getRemoteAddr();
+//        MDC.put("ip", remoteAddr);
+//        try {
+//            receiptService.updateReceiptDateByReceiptId(receiptId);
+//        } catch (Exception e) {
+//            logger.error("交接单ID:" + receiptId);
+//            logger.error("Exception 生成交接单异常", e);
+//        }
+//        return true;
+//    }
 
     /**
      * 查询交接单

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

@@ -47,11 +47,11 @@ public interface ReceiptMapper {
 
     //生成交接单
     @Insert("<script>" +
-            " INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,CHECK_NAME,CHECK_date" +
+            " INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,CHECK_NAME" +
             "<if test ='oldCardTypeId !=null'> " +
             ",OLD_CARD_TYPE_ID" +
             "</if> " +
-            ")VALUES(#{qrCode},#{policeCode},#{finishCount},#{state},#{cardTypeId},#{checkName},sysdate" +
+            ")VALUES(#{qrCode},#{policeCode},#{finishCount},#{state},#{cardTypeId},#{checkName}" +
             "<if test ='oldCardTypeId !=null'> " +
             ",#{oldCardTypeId}" +
             "</if> " +
@@ -198,7 +198,7 @@ public interface ReceiptMapper {
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = decode(RECEIPT_LIST.Old_CARD_TYPE_ID,null,RECEIPT_LIST.CARD_TYPE_ID,RECEIPT_LIST.Old_CARD_TYPE_ID)\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = RECEIPT_LIST.POLICE_CODE\n" +
             "left join COUNTY_DIC on substr(RECEIPT_LIST.POLICE_CODE,0,6) = COUNTY_DIC.COUNTY_CODE" +
-            " where is_print =0 " +
+            " where is_print =0 and CHECK_DATE is not null " +
             "<if test ='startDate != null'> " +
             "and to_char(CHECK_DATE,'yyyyMMddhhmmss')  BETWEEN  ${startDate} and ${endDate}  " +
             "</if>" +

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

@@ -147,11 +147,13 @@ public interface SelectSerialNumberMapper {
             "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" +
+            "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 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);
 
@@ -160,11 +162,13 @@ public interface SelectSerialNumberMapper {
             "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@PRODYD_LINK\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 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);