push

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

@@ -228,7 +228,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 +240,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 +271,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);

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;
     }

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);         //设定值