异地证添加邮寄证

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

@@ -257,6 +257,7 @@ public class DeliveredApi {
      * @return 返回值
      */
 //    @RequiresPermissions("userInfo.add")//权限管理;
+    @RequestMapping("queryDeliveredFailedByRegisterDate")
     @Transactional(rollbackFor = Exception.class)
     public List<Map<String, Object>> queryDeliveredFailedByRegisterDate(@RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate,@RequestParam("cardId") String cardId, HttpServletRequest requ) {
         String remoteAddr = requ.getRemoteAddr();
@@ -436,7 +437,7 @@ public class DeliveredApi {
             jsonarray = JSONArray.fromObject(jsonStr);
             for (int i = 0; i < jsonarray.size(); i++) {
                 JSONObject jsonObject = (JSONObject) jsonarray.get(i);
-                String waybillNumber = jsonObject.getString("backWaybillNumber");
+                String waybillNumber = jsonObject.getString("waybillNumber");
                 String cardId = jsonObject.getString("cardId");
                 List<Map<String, Object>> list = deliveredService.selectDeliverDataByWaybillNumber(waybillNumber,cardId);
                 if (list.size()>0){

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

@@ -114,7 +114,7 @@ public interface DeliveredInfoMapper {
     public List<Map<String,Object>> selectDeliverData(@Param("date")String date);
 
     @Select("select * from DETAIL_RECEIPT_LIST left join  PERSON_POST on PERSON_POST.ID_CARD = DETAIL_RECEIPT_LIST.CARD_ID  " +
-            "where PERSON_POST.BACK_WAYBILL_NUMBER = #{waybillNumber} and DETAIL_RECEIPT_LIST.CARD_ID = #{cardId} ")
+            "where PERSON_POST.WAYBILL_NUMBER = #{waybillNumber} and DETAIL_RECEIPT_LIST.CARD_ID = #{cardId} ")
     public List<Map<String, Object>> selectDeliverDataByWaybillNumber(@Param("waybillNumber")String waybillNumber,@Param("cardId")String cardId);
 
     @Select("select DELIVERED_FAILED_INFO.*,DELIVERED_FAILED_REASON.REASON from DELIVERED_FAILED_INFO\n" +

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

@@ -28,16 +28,13 @@ public interface FailedCardMapper {
      * @param cardId
      * @return
      */
-    @Select("SELECT PROD_CARD_T.NAME,\n" +
-            "PROD_CARD_T.SEX_NO,\n" +
-            "PROD_CARD_T.ID_NO,\n" +
-            "SPECIAL_CARD.SPECIAL_TYPE, " +
-            "FAILED_CARD_REASON_DIC.FAILED_CARD_REASON " +
-            ",PROD_CARD_T.ACCEPT_NO ACCEPT_NO ,PROD_CARD_T.begin_date " +
-            "FROM PRODYD_DBA.PROD_CARD_T@PRODYD_LINK\n" +
+    @Select("SELECT PROD_CARD_T.NAME,PROD_CARD_T.SEX_NO,PROD_CARD_T.ID_NO,\n" +
+            "SPECIAL_CARD.SPECIAL_TYPE, FAILED_CARD_REASON_DIC.FAILED_CARD_REASON," +
+            "PROD_CARD_T.ACCEPT_NO ACCEPT_NO ,PROD_CARD_T.begin_date " +
+            "FROM PRODYD_DBA.PROD_CARD_T@PRODYD_LINK\n " +
             "left join SPECIAL_CARD on PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO " +
             "left join failed_card on PROD_CARD_T.ACCEPT_NO = failed_card.ACCEPT_NO " +
-            " left join FAILED_CARD_REASON_DIC on failed_card.FAILED_CARD_REASON_ID =FAILED_CARD_REASON_DIC.FAILED_CARD_REASON_ID" +
+            " left join FAILED_CARD_REASON_DIC on failed_card.FAILED_CARD_REASON_ID =FAILED_CARD_REASON_DIC.FAILED_CARD_REASON_ID " +
             " WHERE PROD_CARD_T.ID_NO=#{cardId} OR PROD_CARD_T.ACCEPT_NO=#{cardId}")
     public List<Map<String, Object>> selectInfoByCardId(@Param("cardId") String cardId);
 

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

@@ -28,7 +28,7 @@ public interface ReceiptMapper {
     public List<Map<String,Object>> selectGroupNoById(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
 
     //根据组号查询普通证交接单信息
-    @Select("selectsubStr(prod_card_t.accept_no,0,8) group_no,prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO as GAJG_DM,\n" +
+    @Select("select subStr(prod_card_t.accept_no,0,8) group_no,prod_card_t.accept_no,DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO as GAJG_DM,\n" +
             "count(prod_card_t.accept_no) valid_count,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no   \n" +
             "from PRODYD_DBA.prod_card_t@PRODYD_LINK \n" +
             "left join group_no on group_no.group_no =subStr(prod_card_t.accept_no,0,8)\n" +
@@ -114,7 +114,7 @@ public interface ReceiptMapper {
     public int selectSpecialCardByAcceptNo(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
 
     //查询未复核交接单
-    @Select("SELECT RECEIPT_LIST.* ,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC FROM RECEIPT_LIST LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK ON RECEIPT_LIST.POLICE_CODE=subStr(DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO,0,9) where state=0 and check_name =#{name} \n")
+    @Select("SELECT RECEIPT_LIST.* ,DIC_UPLOAD_UNIT_T.UNIT_NAME GAJG_MC FROM RECEIPT_LIST LEFT JOIN PRODYD_DBA.DIC_UPLOAD_UNIT_T@PRODYD_LINK ON RECEIPT_LIST.POLICE_CODE=DIC_UPLOAD_UNIT_T.UPLOAD_UNIT_NO where state=0 and check_name =#{name} \n")
     public List<Map<String,Object>>selectReceiptListOfSpecialCard (@Param("name")String name);
 
     //根据身份证号查询普通证交接单
@@ -188,7 +188,7 @@ public interface ReceiptMapper {
             "prod_trace_t.CHECK_DATE as  checkDate,\n" +
             "prod_trace_t.ELECTRIC_WRITE_DATE as electricDate\n" +
             "from PRODYD_DBA.prod_trace_t@PRODYD_LINK " +
-            "WHERE  ACCEPT_NO=substr(#{acceptNo},0,10)")
+            "WHERE  ACCEPT_NO=substr(#{groupNo},0,10)")
     public Map<String,Object> selectTimes(@Param("groupNo") String groupNo);
 
     @Select("<script>" +

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

@@ -561,7 +561,7 @@ public interface TaskListMapper {
             " from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE " +
-            "left join PRODYD_DBA.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
+            "left join PROD_DBA_YD.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast(@Param("process") long process,@Param("process2") long process2);
@@ -578,7 +578,7 @@ public interface TaskListMapper {
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
             "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE\n" +
             "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE " +
-            "left join PRODYD_DBA.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
+            "left join PROD_DBA_YD.prod_card_t@PRODYD_LINK on SPECIAL_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
             "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR   group by task_id ) fc on fc.TASK_ID = task.TASK_ID\n" +
             "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast9(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
@@ -776,11 +776,11 @@ public interface TaskListMapper {
 //            "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID \n" +
 //            "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
 //            "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE \n" +
-//            "left join PRODYD_DBA.prod_trace_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO \n" +
+//            "left join PROD_DBA_YD.prod_trace_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO \n" +
 //            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
 //            "where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" +
 //            "group by task_id ) fc on fc.TASK_ID = task.TASK_ID \n" +
-//            "left join PRODYD_DBA.prod_card_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO \n" +
+//            "left join PROD_DBA_YD.prod_card_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO \n" +
 //            "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) \n" +
 //            "where SPECIAL_CARD.SPECIAL_TYPE =2 and task.TASK_STATE_ID =#{process} \n" +
 //            "group by task.submit_date, SPECIAL_CARD.task_id, '快证', '1', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,0 \n" +
@@ -879,7 +879,7 @@ public interface TaskListMapper {
 //            "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,FAILED_CARD.ACCEPT_NO group_No,\n" +
 //            "0 faileCount from FAILED_CARD left join task on FAILED_CARD.task_id= task.TASK_ID\n" +
 //            "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE " +
-//            "left join PRODYD_DBA.prod_card_t@PRODYD_LINK on FAILED_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
+//            "left join PROD_DBA_YD.prod_card_t@PRODYD_LINK on FAILED_CARD.ACCEPT_NO =prod_card_t.ACCEPT_NO\n" +
 //            "left join COUNTY_DIC  on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE\n" +
 //            "where FAILED_CARD.state = 0  and FAILED_CARD.state != FAILED_CARD.INITIATOR    order by FAILED_CARD.ACCEPT_NO")
 //    public List<Map<String,Object>> selectByCountyAtAuxiliary_failed_mu();
@@ -1165,11 +1165,11 @@ public interface TaskListMapper {
 //            "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID \n" +
 //            "left join CARD_TYPE_DIC on CARD_TYPE_DIC.CARD_TYPE_ID = task.CARD_TYPE \n" +
 //            "left join COUNTY_DIC on COUNTY_DIC.COUNTY_CODE = task.COUNTY_CODE \n" +
-//            "left join PRODYD_DBA.prod_trace_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO \n" +
+//            "left join PROD_DBA_YD.prod_trace_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO \n" +
 //            "left join (select task_id,nvl(count(*),0) faileCount from FAILED_CARD \n" +
 //            "where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR \n" +
 //            "group by task_id ) fc on fc.TASK_ID = task.TASK_ID \n" +
-//            "left join PRODYD_DBA.prod_card_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO \n" +
+//            "left join PROD_DBA_YD.prod_card_t@PRODYD_LINK on prod_trace_t.ACCEPT_NO =prod_card_t.ACCEPT_NO \n" +
 //            "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9) \n" +
 //            "where SPECIAL_CARD.SPECIAL_TYPE =1 and task.TASK_STATE_ID =#{process} \n" +
 //            "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,0 \n" +
@@ -1599,7 +1599,7 @@ public interface TaskListMapper {
      */
     @Select("select * from task left join group_no on task.task_id = group_no.task_id" +
             " left join TASK_STATE_DIC on task.TASK_STATE_ID=TASK_STATE_DIC.TASK_STATE_ID where card_type = 2 and to_char(submit_date,'yyyyMMdd') between #{startDate} and #{endDate} order by task.task_id")
-    public List<Map<String, Object>> selectRedoTask(String startDate,String endDate);
+    public List<Map<String, Object>> selectRedoTask(@Param("startDate")String startDate,@Param("endDate") String endDate);
 
     /**
      * 删除重做返回任务单