Merge remote-tracking branch 'origin/dev' into dev

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

@@ -58,6 +58,7 @@ public interface ReceiptMapper {
             ",#{oldCardTypeId}" +
             "</if> " +
             ") </script>")
+    @Options(useGeneratedKeys=true, keyProperty="id", keyColumn="ID")
     public boolean createReceiptList(ReceiptListEntity receiptListEntity);
 
 
@@ -93,7 +94,7 @@ public interface ReceiptMapper {
     //生成交接单详单
     @Insert("INSERT INTO DETAIL_RECEIPT_LIST (UPLOAD_NO,accept_no,name,card_id,POLICE_CODE,RECEIPT_ID)" +
             "VALUES(#{UPLOAD_NO},#{ACCEPT_NO},#{NAME},#{CARD_ID},#{GAJG_DM},#{RECEIPT_ID})")
-    public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")int RECEIPT_ID,@Param("SEX")String SEX);
+    public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")long RECEIPT_ID,@Param("SEX")String SEX);
 
 
 
@@ -161,11 +162,21 @@ public interface ReceiptMapper {
             "count(prod_trace_t.download_no)as download,\n" +
             "count(prod_trace_t.checker_no) as  checkerCount,\n" +
             "count(prod_trace_t.ELECTRIC_WRITER_NO)as electricCount\n" +
-            "from prod_trace_t@PROD_LINK \n" +
-            "WHERE subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}")
+            "from prod_trace_t@PROD_LINK " +
+            "WHERE (subStr(ACCEPT_NO,0,8) = #{groupNo} or ACCEPT_NO=#{groupNo}) and prod_trace_t.accept_no not in (select special_card.accept_no from special_card ) ")
     public Map<String,Object> selectCountTime(@Param("groupNo") String groupNo);
 
 
+
+    @Select("select \n" +
+            "count(prod_trace_t.download_no)as download,\n" +
+            "count(prod_trace_t.checker_no) as  checkerCount,\n" +
+            "count(prod_trace_t.ELECTRIC_WRITER_NO)as electricCount\n" +
+            "from prod_trace_t@PROD_LINK " +
+            "WHERE  ACCEPT_NO=#{groupNo}")
+    public Map<String,Object> selectCountTimeT(@Param("groupNo") String groupNo);
+
+
     @Select("select \n" +
             "prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" +
             "prod_trace_t.CHECK_DATE as  checkDate,\n" +

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

@@ -409,7 +409,7 @@ public interface TaskListMapper {
      * @param process 工序
      * @return
      */
-    @Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,\n" +
+    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,\n" +
             "sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,\n" +
             "task.submit_date, task.task_id,CARD_TYPE_DIC.CARD_TYPE,\n" +
             "CARD_TYPE_DIC.CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
@@ -427,7 +427,7 @@ public interface TaskListMapper {
             "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" +
             "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),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by group_no.GROUP_NO")
+            "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,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);
 
     /**
@@ -573,7 +573,7 @@ public interface TaskListMapper {
      * @param process 工序
      * @return
      */
-    @Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT,count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'快证' CARD_TYPE,'1' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
@@ -588,7 +588,7 @@ public interface TaskListMapper {
             "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, \n" +
             "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
-            "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by SPECIAL_CARD.ACCEPT_NO")
+            "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_fast2(@Param("process") long process,@Param("process2") long process2);
 
     /**
@@ -833,7 +833,7 @@ public interface TaskListMapper {
      * @param process 工序
      * @return
      */
-    @Select("select DISTINCT nvl(sum(RECEIPT_LIST.FINISH_COUNT),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
+    @Select("select DISTINCT nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) finish_COUNT, count(substr(prod_card_t.upload_no,0,9)) police_Count,substr(prod_card_t.upload_no,0,9)police_code ,GAJG_DM.GAJG_MC,sum(decode(prod_trace_t.ELECTRIC_WRITER_NO,null,0,1)) e_writer_count,task.submit_date, SPECIAL_CARD.task_id,'余证' CARD_TYPE,'99' CARD_TYPE_ID,COUNTY_DIC.COUNTY_CODE,\n" +
             "COUNTY_DIC.COUNTYNAME, 1 VALID_COUNT, 0 INVALID_COUNT,0 SPECIAL_CARD_COUNT,\n" +
             "SPECIAL_CARD.ACCEPT_NO group_No, nvl(fc.faileCount,0) faileCount\n" +
             "from SPECIAL_CARD left join task on SPECIAL_CARD.task_id= task.TASK_ID\n" +
@@ -848,7 +848,7 @@ public interface TaskListMapper {
             " where SPECIAL_CARD.SPECIAL_TYPE =2  and task.TASK_STATE_ID =#{process} " +
             "group by task.submit_date, SPECIAL_CARD.task_id, '余证', '99', COUNTY_DIC.COUNTY_CODE, \n" +
             "COUNTY_DIC.COUNTYNAME, 1, 0, 0, SPECIAL_CARD.ACCEPT_NO, \n" +
-            "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC order by SPECIAL_CARD.ACCEPT_NO")
+            "nvl(fc.faileCount,0),substr(prod_card_t.upload_no,0,9),GAJG_DM.GAJG_MC,nvl(DECODE(RECEIPT_LIST.STATE,1,RECEIPT_LIST.FINISH_COUNT,0),0) order by SPECIAL_CARD.ACCEPT_NO")
     public List<Map<String,Object>> selectByCountyAtAuxiliary_remaind2(@Param("process") long process,@Param("process2") long process2);
 
 

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

@@ -16,7 +16,7 @@ public interface ReceiptService {
 
     public Map<String,Object>selectDetailedData(String id);
 
-    public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")int RECEIPT_ID,@Param("SEX")String SEX);
+    public boolean createDetailedList(@Param("UPLOAD_NO")String UPLOAD_NO,@Param("ACCEPT_NO")String ACCEPT_NO,@Param("NAME")String NAME,@Param("CARD_ID")String CARD_ID,@Param("GAJG_DM")String GAJG_DM,@Param("RECEIPT_ID")long RECEIPT_ID,@Param("SEX")String SEX);
 
     public int selectSpecialCard(String GROUP_NO);
 
@@ -71,4 +71,6 @@ public interface ReceiptService {
 
     public String selectGroupNoById(String id);
 
+    public Map<String,Object> selectCountTimeT( String groupNo);
+
 }

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

@@ -33,7 +33,7 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public boolean createDetailedList(String UPLOAD_NO, String ACCEPT_NO, String NAME, String CARD_ID, String GAJG_DM, int RECEIPT_ID,String SEX) {
+    public boolean createDetailedList(String UPLOAD_NO, String ACCEPT_NO, String NAME, String CARD_ID, String GAJG_DM, long RECEIPT_ID,String SEX) {
         receiptMapper.createDetailedList(UPLOAD_NO,ACCEPT_NO,NAME,CARD_ID,GAJG_DM,RECEIPT_ID,SEX);
         return true;
     }
@@ -186,6 +186,12 @@ public class ReceiptServiceImpl implements ReceiptService {
         return mapList.get(0).get("GROUPNO").toString();
     }
 
+    @Override
+    public Map<String, Object> selectCountTimeT(String groupNo) {
+        Map<String, Object> resultMap = receiptMapper.selectCountTimeT(groupNo);
+        return resultMap;
+    }
+
     private List<Map<String, Object>> formateMap(List<Map<String, Object>> maplist) {
         Map<String, Object> typeMap = new LinkedHashMap<>();
         for (Map o : maplist) {

src/main/resources/static/views/cardProdPackage/cardProdPackage.html

@@ -58,9 +58,9 @@
                     <td>禁用:</td>
                     <td style="text-align: left;">
                          <select class="form-control select2" id="packageType">
-                                 <option value="">--请选择禁用状态--</option>
+                                 <option value="">全部</option>
                                  <option value="0">是</option>
-                                 <option value="1">否</option>
+                                 <option value="1" selected>否</option>
                            </select>
                     </td>
                     <td>制证包上传时间：</td>