添加异常抛出到日志

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

@@ -123,19 +123,14 @@ public class DeliveredApi {
                                     }
                                     deliveredInfoEntity.setWaybillNumber((String) list2.get(0));
                                     deliveredInfoEntity.setFileId(deliveredImportDicEntity.getId());
-                                    if ("妥投".equals(list2.get(2)+"")){
+                                    deliveredInfoEntity.setFileId(deliveredImportDicEntity.getId());
+                                    if ("妥投".equals(list2.get(2).toString())){
                                         deliveredInfoEntity.setDealState((long)1);
-                                        success++;
                                     }else {
-                                        failed++;
                                         deliveredInfoEntity.setDealState((long)0);
                                     }
-
                                     entityList.add(deliveredInfoEntity);
-
                                 }
-                                map.put("success",success);
-                                map.put("failed",failed);
                                 deliveredService.saveDeliveredInfoList(entityList);
 
                             } catch (Exception e) {

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

@@ -429,7 +429,7 @@ public class ReceiptApi {
     /**
      * 查询分局名称
      *
-     * @param policeCode 派出所代码
+     * @param qrCode 派出所代码
      * @return
      */
         @RequestMapping("queryPoliceName")
@@ -445,6 +445,9 @@ public class ReceiptApi {
             }
             return policeName;
         }
+    public List<Map<String, Object>> queryPoliceName(@RequestParam("qrCode") String qrCode) {
+        return receiptService.queryPoliceName(qrCode);
+    }
 
     /**
      * 查询公安网数据

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

@@ -178,11 +178,9 @@ public interface ReceiptMapper {
             "WHERE  ACCEPT_NO=#{groupNo}")
     public Map<String,Object> selectCountTimeT(@Param("groupNo") String groupNo);
 
-    @Select("select police_name \n" +
-            "from (select DISTINCT substr(#{policeCode},5,2)||'000' POLICE_CODE \n" +
-            "    from POLICE_DIC where substr(#{policeCode},5,2) =substr(POLICE_DIC.POLICE_CODE,5,2) ) p1 \n" +
-            "left join POLICE_DIC on substr(p1.POLICE_CODE,0,2) = substr(POLICE_DIC.POLICE_CODE,5,2) \n" +
-            "order by POLICE_DIC.POLICE_CODE")
+    @Select("select POLICE_dic.POLICE_NAME from PROD_GROUP_RELATION_T@PRODYD_LINK \n" +
+            "left join POLICE_dic on substr(POLICE_dic.POLICE_CODE,0,8) = substr(PROD_GROUP_RELATION_T.UPLOAD_UNIT_NO,0,8)\n" +
+            "where group_no = #{policeCode} ")
     public List<Map<String,Object>> queryPoliceName(@Param("policeCode") String policeCode);
 
     @Select("select \n" +
@@ -228,7 +226,7 @@ public interface ReceiptMapper {
             "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 RECEIPT_LIST.id in (${string})  order by  RECEIPT_LIST.QR_CODE  ")
-    public List<Map<String,Object>> selectReceiptDate(@Param("string") String string,@Param("type") long type);
+    public List<Map<String,Object>> selectReceiptDate(@Param("string") String string);
 
     @Select("select DETAIL_RECEIPT_LIST.* , GAJG_DM.GAJG_MC from DETAIL_RECEIPT_LIST  LEFT JOIN GAJG_DM ON GAJG_DM.GAJG_DM =DETAIL_RECEIPT_LIST.POLICE_CODE  where ACCEPT_NO=#{acceptNo} or card_id=#{acceptNo}")
     public DetailReceiptListEntity selectDetailByAcceptNo(@Param("acceptNo") String acceptNo);
@@ -240,11 +238,10 @@ public interface ReceiptMapper {
     /**
      * 更新交接单是否已打印
      * @param string  查询派出所代码
-     * @param type   制证类型
      * @return
      */
-    @Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where  RECEIPT_LIST.id in (${string}) and CARD_TYPE_ID=${type} and receipt_date is null")
-    public boolean updateReceiptDate(@Param("string") String string,@Param("type") long type);
+    @Update("update RECEIPT_LIST set IS_PRINT = 1,RECEIPT_DATE = sysdate where  RECEIPT_LIST.id in (${string})  and receipt_date is null")
+    public boolean updateReceiptDate(@Param("string") String string);
 
     @Select("select sum(RECEIPT_LIST.FINISH_COUNT) FINISH_COUNT,to_char(CHECK_DATE,'yyyyMMdd') CHECK_DATE from RECEIPT_LIST \n" +
             "\n" +
@@ -272,6 +269,4 @@ public interface ReceiptMapper {
             "where to_char(DOWNLOAD_DATE,'yyyyMMdd') BETWEEN #{startDate} and #{endDate}")
     public List<Map<String, Object>> selectPoliceDataByDownLoadDate(@Param("startDate") String startDate,@Param("endDate") String endDate);
 
-
-
 }

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

@@ -247,7 +247,9 @@ public interface TaskListMapper {
             "from group_no left join task on group_no.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 (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 and FAILED_CARD.state != FAILED_CARD.INITIATOR  and accept_no  not in (select accept_no from special_card )  group by accept_no ) fc on substr(fc.accept_no,0,8) = group_no.group_no \n" +
+            "left join (select accept_no, nvl(count(*),0) faileCount from FAILED_CARD where FAILED_CARD.state <4 " +
+            "and FAILED_CARD.state != FAILED_CARD.INITIATOR  and accept_no  not in (select accept_no from special_card )  group by accept_no ) fc " +
+            "on substr(fc.accept_no,0,8) = group_no.group_no \n" +
             "where task.TASK_STATE_ID = #{process} and task.work_group = #{workGroup} order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common4(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
 
@@ -447,7 +449,8 @@ public interface TaskListMapper {
             "left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12)\n" +
             " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = group_no.GROUP_NO " +
             "where task.TASK_STATE_ID = #{process} and task.work_group=#{workGroup}\n" +
-            "and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
+//            "and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) " +
+            "group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
             "nvl(fc.faileCount,0),police_dic.police_code,police_dic.police_name,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common2(@Param("process") long process,@Param("process2") long process2,@Param("workGroup") long workGroup);
@@ -482,7 +485,8 @@ public interface TaskListMapper {
             "left join PROD_GROUP_RELATION_T@PRODYD_LINK on PROD_GROUP_T.group_no = PROD_GROUP_RELATION_T.group_no\n" +
             "left join police_dic on police_dic.police_code = substr(PROD_GROUP_RELATION_T.ORIGINAL_NO,0,12) \n" +
             "left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = group_no.GROUP_NO \n" +
-            "where task.TASK_STATE_ID = #{process} and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) \n" +
+            "where task.TASK_STATE_ID = #{process} " +
+//            "and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) \n" +
             "group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
             "nvl(fc.faileCount,0), police_dic.police_code, police_dic.police_name, nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0), fc.faileCount \n" +
@@ -512,7 +516,8 @@ public interface TaskListMapper {
 //            "left join GAJG_DM on GAJG_DM.GAJG_DM = substr(prod_card_t.upload_no,0,9)\n" +
             " left join RECEIPT_LIST on RECEIPT_LIST.QR_CODE = group_no.GROUP_NO " +
             "where task.TASK_STATE_ID = #{process}\n" +
-            "and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
+//            "and prod_trace_t.ACCEPT_NO NOT IN (select SPECIAL_CARD.ACCEPT_NO from SPECIAL_CARD) " +
+            "group by task.submit_date, task.task_id, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, group_no.VALID_COUNT, group_no.INVALID_COUNT, group_no.SPECIAL_CARD_COUNT, group_no.GROUP_NO, \n" +
             "nvl(fc.faileCount,0),'000000000','000000000',nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0),task.work_group order by group_no.GROUP_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_common3(@Param("process") long process,@Param("process2") long process2);
@@ -1549,12 +1554,13 @@ public interface TaskListMapper {
 
     /**
      * 查询重做返回登记证件
-     * @param date 查询登记时间
+     * @param startDate 查询登记起始时间
+     * @param endDate 查询登记结束时间
      * @return
      */
     @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') = #{date} order by task.task_id")
-    public List<Map<String, Object>> selectRedoTask(@Param("date")String date);
+            " 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);
 
     /**
      * 删除重做返回任务单

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

@@ -41,7 +41,7 @@ public interface ReceiptService {
 
 //    public boolean updateFinishCount(String GROUP_NO,int count);
 
-    public List<Map<String,Object>> queryPoliceName(String policeCode);
+    public List<Map<String,Object>> queryPoliceName(String qrCode);
 
     //特证查询是否生成交接单
     public List<Map<String, Object>> selectCountById(String id,String beginDate,String expireDate);

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

@@ -106,7 +106,7 @@ public interface TaskListService {
 
     public boolean updateFailedCardWorkGroup(List<String> list, String workGroup);
 
-    public List<Map<String,Object>> selectRedoTask(String date);
+    public List<Map<String,Object>> selectRedoTask(String startDate,String endDate);
 
     public boolean deleteRedoTask(long taskId);
 

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

@@ -25,8 +25,6 @@ public class DeliveredServiceImpl implements DeliveredService {
     @Autowired
     private DeliveredFailedInfoMapper deliveredFailedInfoMapper;
     @Autowired
-    private DeliveredFailedReasonMapper deliveredFailedReasonMapper;
-    @Autowired
     private DeliveredImportDicMapper deliveredImportDicMapper;
     @Autowired
     private DeliveredInfoMapper deliveredInfoMapper;

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

@@ -175,7 +175,7 @@ public class ReceiptServiceImpl implements ReceiptService {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
 
         //更改交接单已打印状态
-        List<Map<String, Object>> mapList = receiptMapper.selectReceiptDate( str, typeCode);
+        List<Map<String, Object>> mapList = receiptMapper.selectReceiptDate( str);
         Map<String,Object> map = new HashMap<>();
        if (mapList.size()>0){
            if ("null".equals(mapList.get(0).get("RECEIPT_DATE")+"")){
@@ -190,7 +190,7 @@ public class ReceiptServiceImpl implements ReceiptService {
 
            map.put("list",mapList);
            map.put("total",total);
-           boolean b = receiptMapper.updateReceiptDate( str, typeCode);
+           boolean b = receiptMapper.updateReceiptDate(str);
        }
         return map;
     }
@@ -231,8 +231,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public List<Map<String, Object>> queryPoliceName(String policeCode) {
-        List<Map<String, Object>> mapList = receiptMapper.queryPoliceName(policeCode);
+    public List<Map<String, Object>> queryPoliceName(String qrCode) {
+        List<Map<String, Object>> mapList = receiptMapper.queryPoliceName(qrCode.substring(0,8));
         List<Map<String,Object>> maps = new ArrayList<>();
         if (mapList.size()>0){
             maps.add(mapList.get(0));

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

@@ -731,55 +731,61 @@ public class TaskListServiceImpl implements TaskListService {
         }
         List<Map<String, Object>> list = new ArrayList<>();
         int failedCount = 0;
-        int pu = 0;
+        int yi = 0;
         int kuai = 0;
-        int jun = 0;
-        int you = 0;
+        int gangao = 0;
+        int tai = 0;
         for (String date : dateMap.keySet()) {
             Map<String, Object> datemap = new LinkedHashMap<>();
             datemap.put("date", date);
-            datemap.put("pu", 0);
-            datemap.put("you", 0);
             datemap.put("kuai", 0);
-            datemap.put("jun", 0);
+            datemap.put("yi", 0);
+            datemap.put("gangao", 0);
+            datemap.put("tai", 0);
             datemap.put("fei", 0);
             List<Map<String, Object>> dateList = (List<Map<String, Object>>) dateMap.get(date);
             if (dateList != null) {
                 for (Map<String, Object> map : dateList) {
                     datemap.put("fei", (map.get("FAILED_COUNT") == null ? 0 : ((BigDecimal) map.get("FAILED_COUNT")).longValue()));
-                    if ("0".equals(map.get("CARD_TYPE_ID") + "")) {
+                    if ("7".equals(map.get("CARD_TYPE_ID") + "")) {
                         long valid_count = ((BigDecimal) map.get("VALID_COUNT")).longValue();
-                        pu += valid_count;
-                        datemap.put("pu", valid_count);
+                        tai += valid_count;
+                        datemap.put("tai", valid_count);
                     } else if ("1".equals(map.get("CARD_TYPE_ID") + "")) {
                         long valid_count = ((BigDecimal) map.get("VALID_COUNT")).longValue();
                         kuai += valid_count;
                         datemap.put("kuai", valid_count);
-                    } else if ("6".equals(map.get("CARD_TYPE_ID") + "")) {
+                    } else if ("5".equals(map.get("CARD_TYPE_ID") + "")) {
                         long valid_count = ((BigDecimal) map.get("VALID_COUNT")).longValue();
-                        jun += valid_count;
-                        datemap.put("jun", valid_count);
+                        gangao += valid_count;
+                        datemap.put("gangao", valid_count);
 
-                    } else if ("9".equals(map.get("CARD_TYPE_ID") + "")) {
+                    } else if ("8".equals(map.get("CARD_TYPE_ID") + "")) {
                         long valid_count = ((BigDecimal) map.get("VALID_COUNT")).longValue();
-                        you += valid_count;
-                        datemap.put("you", valid_count);
+                        yi += valid_count;
+                        datemap.put("yi", valid_count);
                     } else {
 
                     }
                 }
             }
             failedCount += Integer.valueOf(datemap.get("fei") + "");
+            int totalCount =0;
+            for (String str :datemap.keySet()){
+                totalCount+=Integer.valueOf(datemap.get(str)+"");
+            }
+            datemap.put("total", totalCount);
             list.add(datemap);
 
         }
         Map<String, Object> datemap = new LinkedHashMap<>();
         datemap.put("date", "合计");
-        datemap.put("pu", pu);
-        datemap.put("you", you);
+        datemap.put("yi", yi);
+        datemap.put("gangao", gangao);
         datemap.put("kuai", kuai);
-        datemap.put("jun", jun);
+        datemap.put("tai", tai);
         datemap.put("fei", failedCount);
+        datemap.put("total", yi+gangao+kuai+tai+failedCount);
         list.add(datemap);
         return list;
     }
@@ -1072,8 +1078,8 @@ public class TaskListServiceImpl implements TaskListService {
     }
 
     @Override
-    public List<Map<String, Object>> selectRedoTask(String date) {
-        return taskListMapper.selectRedoTask(date);
+    public List<Map<String, Object>> selectRedoTask(String startDate,String endDate) {
+        return taskListMapper.selectRedoTask(startDate, endDate);
     }
 
     @Override

src/main/java/com/yxproject/start/utils/ExportExcel.java

@@ -92,7 +92,7 @@ public  class ExportExcel {
             cell = row.createCell(6);         //设定值
             cell.setCellValue("null".equals(mapList.get(i).get("SIGN_GOVT")+"")?"":mapList.get(i).get("SIGN_GOVT")+"");
             cell = row.createCell(7);         //设定值
-            cell.setCellValue("null".equals(mapList.get(i).get("SIGN_GOVT")+"")?"":mapList.get(i).get("SIGN_GOVT")+"");
+            cell.setCellValue("null".equals(mapList.get(i).get("WAYBILL_NUMBER")+"")?"":mapList.get(i).get("WAYBILL_NUMBER")+"");
             cell = row.createCell(8);         //设定值
             cell.setCellValue("null".equals(mapList.get(i).get("CARD_TYPE_ID")+"")?"":mapList.get(i).get("CARD_TYPE_ID")+"");
             cell = row.createCell(9);         //设定值

src/main/resources/application.yml

@@ -4,7 +4,7 @@ server:
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin
+    url: jdbc:oracle:thin:@192.168.10.208:1521:yingxin
     username: yingxin
     password: yingxin
   servlet:

src/test/java/com/yxproject/start/test.java

-package com.yxproject.start;
-
-import com.yxproject.start.api.SelectApi;
-
-public class test {
-    public static void main(String[] args){
-        SelectApi selectApi = new SelectApi();
-        selectApi.selectByCard("20190305001");
-    }
-}
+//package com.yxproject.start;
+//
+//import com.yxproject.start.api.SelectApi;
+//
+//public class test {
+//    public static void main(String[] args){
+//        SelectApi selectApi = new SelectApi();
+//        selectApi.selectByCard("20190305001");
+//    }
+//}