导入绿包信息 返回导入失败的派出所名称

添加查询妥投失败确认接收的信息
修改二次确认妥投失败信息 添加身份证号确认

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

@@ -167,6 +167,7 @@ public class DeliveredApi {
         return true;
     }
 
+
     /**
      * 登记投递失败信息
      */
@@ -436,9 +437,9 @@ 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("waybillNumber");
-                //todo 查询投递失败的信息 方便二次确认
-                List<Map<String, Object>> list = deliveredService.selectDeliverDataByWaybillNumber(waybillNumber);
+                String waybillNumber = jsonObject.getString("backWaybillNumber");
+                String cardId = jsonObject.getString("cardId");
+                List<Map<String, Object>> list = deliveredService.selectDeliverDataByWaybillNumber(waybillNumber,cardId);
                 if (list.size()>0){
                     return true;
                 }else {
@@ -472,6 +473,26 @@ public class DeliveredApi {
         return mapList;
     }
 
+    /**
+     * 查询登记妥投失败已接收的信息
+     * @return 返回值
+     */
+    @RequestMapping("queryDeliveredFailedByReceiveDate")
+//    @RequiresPermissions("userInfo.add")//权限管理;
+    @Transactional(rollbackFor = Exception.class)
+    public List<Map<String, Object>> queryDeliveredFailedByReceiveDate( @RequestParam("startDate") String startDate,@RequestParam("endDate") String endDate,HttpServletRequest requ) {
+        String remoteAddr = requ.getRemoteAddr();
+        MDC.put("ip", remoteAddr);
+        List<Map<String, Object>> mapList = new ArrayList <>();
+        try {
+            mapList = deliveredService.selectDeliveredFailedByReceiveDate(replaceDate(startDate),replaceDate(endDate));
+        }catch (Exception e){
+            logger.error("查询登记妥投失败已接收的信息:"  );
+            logger.error("Exception 查询登记妥投失败已接收的信息", e);
+        }
+        return mapList;
+    }
+
 
     /**
      * 去除字符串中中线

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

@@ -56,13 +56,20 @@ public interface DeliveredInfoMapper {
             "where to_char(PRINT_DATE,'yyyyMMdd') in (${date}) and DELIVERED_INFO.DEAL_STATE =0")
     public List<Map<String,Object>> selectDeliverData(@Param("date")String date);
 
-    @Select("select * from PERSON_POST where WAYBILL_NUMBER = #{waybillNumber}")
-    public List<Map<String, Object>> selectDeliverDataByWaybillNumber(@Param("waybillNumber")String waybillNumber);
+    @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} ")
+    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" +
             "left join DELIVERED_FAILED_REASON on DELIVERED_FAILED_REASON.ID = DELIVERED_FAILED_INFO.BACK_REASON\n" +
             "where RECEIVE_DATE is null")
     public List<Map<String,Object>> selectDeliveredFailedNotReceive();
+
     @Update("update  DELIVERED_FAILED_INFO set RECEIVE_NAME =#{name},RECEIVE_DATE = sysdate where CARD_ID = #{cardID} and RECEIVE_DATE is null")
     public boolean updateDeliveredFailedInfo(@Param("cardID")String cardID, @Param("name")String name);
 
+    @Select("select DELIVERED_FAILED_INFO.*,DELIVERED_FAILED_REASON.REASON from DELIVERED_FAILED_INFO\n" +
+            "left join DELIVERED_FAILED_REASON on DELIVERED_FAILED_REASON.ID = DELIVERED_FAILED_INFO.BACK_REASON\n" +
+            "where  to_char(RECEIVE_DATE,'yyyyMMdd') between #{startDate} and #{endDate}")
+    public List<Map<String, Object>> selectDeliveredFailedByReceiveDate(@Param("startDate")String startDate,@Param("endDate")String endDate);
+
 }

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

@@ -1506,7 +1506,7 @@ public interface TaskListMapper {
             "where to_char(ISSUED_DATE,'yyyyMMdd') = to_char(sysdate,'yyyyMMdd'))")
     public List<Map<String,Object>> getPrintOutCount();
 
-    @Select("SELECT CARD_TYPE,CARD_TYPE_ID,SUM(valid_count) valid_count, failed_count,PRINT_OUT_DATE FROM (select CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT) valid_count ,\n" +
+    @Select("SELECT CARD_TYPE,CARD_TYPE_ID,SUM(valid_count) valid_count, failed_count,PRINT_OUT_DATE FROM (select GROUP_NO.GROUP_NO,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT) valid_count ,\n" +
             "failed_info.failed_count,to_char(PRINT_OUT_DATE,'yyyyMMdd') PRINT_OUT_DATE\n" +
             "from task \n" +
             "left join GROUP_NO  on task.TASK_ID = GROUP_NO.TASK_ID\n" +
@@ -1517,7 +1517,7 @@ public interface TaskListMapper {
             "          from FAILED_CARD GROUP BY to_char(PRINT_DATE,'yyyyMMdd')\n" +
             "          ) failed_info on failed_info.printDate = to_char(PRINT_OUT_DATE,'yyyyMMdd')\n" +
             "where to_char(PRINT_OUT_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate} \n" +
-            "group by task.task_id, task.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE, failed_info.failed_count, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
+            "group by task.task_id, GROUP_NO.GROUP_NO,task.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE, failed_info.failed_count, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
             "decode(group_no.valid_count,null,1,GROUP_NO.VALID_COUNT), to_char(PRINT_OUT_DATE,'yyyyMMdd')) \n" +
             "group by CARD_TYPE, CARD_TYPE_ID, failed_count, PRINT_OUT_DATE")
     public List<Map<String, Object>> selectFilmReport(@Param("startDate")String startDate,@Param("endDate") String endDate);

src/main/java/com/yxproject/start/service/DeliveredService.java

@@ -23,7 +23,8 @@ public interface DeliveredService {
     public boolean deleteDeliveredFailedById(long id);
     public List<DeliveredFailedReasonEntity> selectDeliveredFailedType();
     public List<Map<String,Object>> selectDeliverData(String stringList);
-    public List<Map<String,Object>> selectDeliverDataByWaybillNumber(String waybillNumber);
+    public List<Map<String,Object>> selectDeliverDataByWaybillNumber(String waybillNumber,String cardID);
     public List<Map<String,Object>> selectDeliveredFailedNotReceive();
     public boolean updateDeliveredFailedInfo(String cardID,String name);
+    public List<Map<String,Object>> selectDeliveredFailedByReceiveDate(String startDate,String endDate);
 }

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

@@ -96,8 +96,8 @@ public class DeliveredServiceImpl implements DeliveredService {
     }
 
     @Override
-    public List<Map<String, Object>> selectDeliverDataByWaybillNumber(String waybillNumber) {
-        List<Map<String, Object>> list = deliveredInfoMapper.selectDeliverDataByWaybillNumber(waybillNumber);
+    public List<Map<String, Object>> selectDeliverDataByWaybillNumber(String waybillNumber,String cardId) {
+        List<Map<String, Object>> list = deliveredInfoMapper.selectDeliverDataByWaybillNumber(waybillNumber,cardId);
         return list;
     }
 
@@ -110,4 +110,8 @@ public class DeliveredServiceImpl implements DeliveredService {
     public boolean updateDeliveredFailedInfo(String cardID, String name) {
         return deliveredInfoMapper.updateDeliveredFailedInfo(cardID,name);
     }
+    @Override
+    public List<Map<String, Object>> selectDeliveredFailedByReceiveDate(String startDate, String endDate) {
+        return deliveredInfoMapper.selectDeliveredFailedByReceiveDate(startDate, endDate);
+    }
 }