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

# Conflicts:
#	src/main/resources/static/views/searchCard/searchCard.html
#	src/main/resources/static/views/task/taskListSorting.html

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

@@ -79,7 +79,7 @@ public class FailedCardApi {
             } else {
                  idMap = failedCardService.selectCountIdByCardId(jsonObject.getString("cardId"));
             }
-            int initiator = Integer.parseInt(jsonObject.getString("initiator")) - 2;
+            int initiator = Integer.parseInt(jsonObject.getString("initiator")) - 1;
             failedCardService.insertFailedCard(jsonObject.getString("failedCardReasonId"), idMap.get("ACCEPT_NO").toString(), idMap.get("TASK_ID").toString(), String.valueOf(initiator), jsonObject.getString("note"));
         }
         return true;

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

@@ -37,16 +37,16 @@ public class InfoManagementApi {
 
     /**
      * 查询制证信息数据条数
-     * @param beginFileName
-     * @param endFileName
-     * @param gajgMc
+     * @param beginFileId 开始包号
+     * @param endFileId 结束包号
+     * @param gajgMc 派出所代码
      * @param beginDate
      * @param endDate
      * @return
      */
     @RequestMapping("selectCount")
-    public long selectCount(@Param("beginFileName")String beginFileName, @Param("endFileName")String endFileName, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
-      long count=  infoManagementService.count(beginFileName,endFileName,gajgMc,replaceDate(beginDate),replaceDate(endDate));
+    public long selectCount(@Param("beginFileId")String beginFileId, @Param("endFileId")String endFileId, @Param("gajgMc") String gajgMc, @Param("beginDate")String beginDate, @Param("endDate")String endDate){
+      long count=  infoManagementService.count(beginFileId,endFileId,gajgMc,replaceDate(beginDate),replaceDate(endDate));
       return count;
     }
 

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

 package com.yxproject.start.api;
 
 import com.yxproject.start.entity.DetailReceiptListEntity;
+import com.yxproject.start.entity.ReceiptListEntity;
 import com.yxproject.start.service.ReceiptService;
 import net.sf.json.JSONArray;
 import org.apache.ibatis.annotations.Param;
@@ -42,14 +43,19 @@ public class ReceiptApi {
                 if (countAccept == 0) {
                     //查询特证交接单所需数据
                     Map<String, Object> resultDate = receiptService.selectReceiptListDate(id);
-                    String acceptNo = (String) resultDate.get("ACCEPT_NO");
-                    String GAJG_DM = (String) resultDate.get("GAJG_DM");
-                    int cardType = (int) resultDate.get("CARD_TYPE");
-                    int oldCardType = (int) resultDate.get("OLD_CARD_TYPE");
-                    int state = 0;
-                    int count = (int) resultDate.get("COUNT");
+                    ReceiptListEntity receiptListEntity = new ReceiptListEntity();
+                    receiptListEntity.setPoliceCode(resultDate.get("GAJG_DM").toString());
+                    receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal)resultDate.get("CARD_TYPE")+""));
+                    if ("null".equals(resultDate.get("OLD_CARD_TYPE")+"")){
+
+                    }else {
+                        receiptListEntity.setOldCardTypeId(Long.valueOf(resultDate.get("OLD_CARD_TYPE")+""));
+                    }
+                    receiptListEntity.setFinishCount(Long.valueOf(resultDate.get("VALID_COUNT").toString()));
+                    receiptListEntity.setQrCode(resultDate.get("GROUP_NO").toString());
+                    receiptListEntity.setState((long)0);
                     //生成特证交接单
-                    receiptService.createReceiptList(acceptNo, GAJG_DM, count, state,cardType,oldCardType);
+                    receiptService.createReceiptList(receiptListEntity);
 
                     //查询特证详单所需数据
                     Map<String, Object> detailedData = receiptService.selectDetailedData(id);
@@ -68,18 +74,23 @@ public class ReceiptApi {
             } else {
                 //查询交接单所需数据
                 Map<String, Object> receiptListDate = receiptService.selectReceiptListDate(id);
-                String groupNo = (String) receiptListDate.get("GROUP_NO");
-                String GAJG_DM = (String) receiptListDate.get("GAJG_DM");
-                int cardType = (int) receiptListDate.get("CARD_TYPE");
-                int oldCardType = (int) receiptListDate.get("OLD_CARD_TYPE");
-                int count = Integer.valueOf(receiptListDate.get("VALID_COUNT").toString());
-                int state = 0;
+                ReceiptListEntity receiptListEntity = new ReceiptListEntity();
+                receiptListEntity.setPoliceCode(receiptListDate.get("GAJG_DM").toString());
+                receiptListEntity.setCardTypeId(Long.valueOf((BigDecimal)receiptListDate.get("CARD_TYPE")+""));
+                if ("null".equals(receiptListDate.get("OLD_CARD_TYPE")+"")){
+
+                }else {
+                   receiptListEntity.setOldCardTypeId(Long.valueOf(receiptListDate.get("OLD_CARD_TYPE")+""));
+                }
+                receiptListEntity.setFinishCount(Long.valueOf(receiptListDate.get("VALID_COUNT").toString()));
+                receiptListEntity.setQrCode(receiptListDate.get("GROUP_NO").toString());
+                receiptListEntity.setState((long)0);
                 //查询这个组号是否生成了交接单
-                int countGroup = receiptService.selectByGroupNo(groupNo);
+                int countGroup = receiptService.selectByGroupNo(receiptListDate.get("GROUP_NO").toString());
                 //没有生成交接单
                 if (countGroup == 0) {
                     //生成交接单
-                    receiptService.createReceiptList(groupNo,GAJG_DM,count,state,cardType,oldCardType);
+                    receiptService.createReceiptList(receiptListEntity);
                     //查询这个身份证是否生成了详单
                     int receiptCount = receiptService.selectReceiptById(id);
                     //没有生成交接单详单
@@ -118,10 +129,10 @@ public class ReceiptApi {
                     }
                 }
                 //查询有几个特证
-                int specialCardCount = receiptService.selectSpecialCard(groupNo);
+                int specialCardCount = receiptService.selectSpecialCard(receiptListDate.get("GROUP_NO").toString());
                 //减去特证个数
-                int finishCount = receiptService.selectCount(groupNo) - specialCardCount;
-                receiptService.updateFinishCount(groupNo, finishCount);
+                int finishCount = receiptService.selectCount(receiptListDate.get("GROUP_NO").toString()) - specialCardCount;
+                receiptService.updateFinishCount(receiptListDate.get("GROUP_NO").toString(), finishCount);
             }
 
 

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

@@ -41,25 +41,20 @@ public class SelectApi {
             List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id);
             List<Map<String, Object>> ACCdata = new ArrayList<>();
             List<Map<String, Object>> PRODData = new ArrayList<>();
-
             resultMap.put("workOrderData", workOrderData);
             resultMap.put("ACCdata", ACCdata);
             resultMap.put("PRODData", PRODData);
         } else if (id.length() == 10 || id.length() == 18) {
 
             //查询是否是特证，如果是，返回新的任务单信息
-
-            List<Map<String, Object>> mapList = groupNoService.selectAcceptNo(id);
-            if (mapList.size()>0){
-                id = mapList.get(0).get("ACCEPT_NO").toString();
-            }
-            if (selectSerialNumberService.selectCount(id)==0){
-                List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
+            List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
+            if (workOrderData.size()!=0){
                 resultMap.put("workOrderData", workOrderData);
             }else {
-                List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
-                resultMap.put("workOrderData", workOrderData);
+                List<Map<String, Object>> workOrderData2 = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
+                resultMap.put("workOrderData", workOrderData2);
             }
+
             List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
             List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);
 

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

@@ -43,7 +43,7 @@ public interface FileNameDicMapper {
             "<if test='analysisState != -1 ' >" +
             " and STATE =#{analysisState}" +
             "</if>" +
-            "<if test='uploadDate !=null' >" +
+            "<if test='uploadDate !=\"\" ' >" +
             " and substr(UPLOAD_DATE,0,8) =#{uploadDate}" +
             "</if>" +
             "<if test='fileName != null ' >" +
@@ -65,7 +65,7 @@ public interface FileNameDicMapper {
             "<if test='analysisState != -1' >" +
             " and STATE =#{analysisState}" +
             "</if>" +
-            "<if test='uploadDate !=null' >" +
+            "<if test='uploadDate !=\"\"' >" +
             " and substr(UPLOAD_DATE,0,8) = #{uploadDate}" +
             "</if>" +
             "<if test='fileName != null ' >" +

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

@@ -18,10 +18,10 @@ public interface InfoManagementMapper {
             "FROM (select * from new_files \n" +
             "where 1=1\n" +
             "<if test='beginFileName != \"\" '>" +
-            "and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" +
+            "and (id  between #{beginFileName} and #{endFileName} )\n" +
             "</if>" +
             "<if test='gajgMc != \"\" '>" +
-            "and DWMC=#{gajgMc}\n" +
+            "and DWMC like #{gajgMc} \n" +
             "</if>" +
             "<if test='beginDate != \"\" '>" +
             "and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+
@@ -38,10 +38,10 @@ public interface InfoManagementMapper {
             "SELECT COUNT(*)  FROM NEW_FILES \n" +
             "where 1=1\n" +
             "<if test='beginFileName != \"\" '>" +
-            "and (NEW_FILE_NAME between(#{beginFileName})and (#{endFileName}))\n" +
+            "and (id between #{beginFileName})and  #{endFileName}))\n" +
             "</if>" +
             "<if test='gajgMc != \"\" '>" +
-            "and DWMC=#{gajgMc}\n" +
+            "and DWMC like #{gajgMc}\n" +
             "</if>" +
             "<if test='beginDate != \"\" '>" +
             "and (subStr(CREATE_DATE,0,8) between(#{beginDate})and(#{endDate}))"+

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

@@ -78,7 +78,7 @@ public interface LogMapper {
             "            FROM (SELECT NEW_FILE_NAME,CREATE_DATE,RECORD_NUMBER,DWDM,DWMC " +
             "            FROM NEW_FILES " +
             "            RIGHT JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID" +
-            "            where 1=1 " +
+            "            where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null " +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
@@ -89,7 +89,7 @@ public interface LogMapper {
             "            and substr(NEW_FILES.CREATE_DATE,0,8)=#{createDate}" +
             "            </if>" +
             "            <if test='cardId !=\"\"' >" +
-            "            and PREPRO_PERSON.GMSFHM=#{cardId} " +
+            "            and PREPRO_PERSON.GMSFHM=#{cardId} ORDER by CREATE_DATE " +
             "            </if>" +
             "            ) " +
             "            A" +
@@ -102,9 +102,7 @@ public interface LogMapper {
     public List<CountyDicEntity> getCountyListData();
 
     @Select("<script> " +
-            "SELECT COUNT(*)  FROM NEW_FILES \n" +
-            "LEFT JOIN  PREPRO_PERSON ON  NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID " +
-            "            where 1=1 " +
+            "SELECT COUNT(*) fileCount, PREPRO_PERSON.NEW_FILE_ID FROM NEW_FILES LEFT JOIN PREPRO_PERSON ON NEW_FILES.ID = PREPRO_PERSON.NEW_FILE_ID where 1=1 and PREPRO_PERSON.NEW_FILE_ID is not null  " +
             "            <if test='newFileName !=\"\"' >" +
             "            and NEW_FILES.NEW_FILE_NAME=#{newFileName} " +
             "            </if>" +
@@ -117,16 +115,17 @@ public interface LogMapper {
             "            <if test='cardId !=\"\"' >" +
             "            and PREPRO_PERSON.GMSFHM=#{cardId} " +
             "            </if>" +
+            " group by PREPRO_PERSON.NEW_FILE_ID" +
             "</script>")
-    public int selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
+    public List<Map<String,Object>> selectNewFileLogCount(@Param("newFileName") String newFileName, @Param("cardId") String cardId, @Param("createDate") String createDate, @Param("uploadCountyCode") String uploadCountyName);
 
 
     // TODO  解析日志总数
     @Select("<script> " +
-            "SELECT COUNT(*)  FROM FILES \n" +
-            "LEFT JOIN ANALYSIS ON ANALYSIS.FILE_ID =FILES.ID "+
+            "SELECT COUNT(*)  FROM ANALYSIS \n" +
+            "LEFT JOIN FILES ON ANALYSIS.FILE_ID =FILES.ID "+
             "LEFT JOIN FILE_NAME_DIC ON FILE_NAME_DIC.FILE_ID=ANALYSIS.FILE_DIC_ID " +
-            "where 1=1 " +
+            "where 1=1  " +
             "<if test='fileName !=\"\"' >" +
             "and FILES.SOURCE_FILE_NAME=#{fileName} " +
             "</if>" +

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

 package com.yxproject.start.mapper;
 
 import com.yxproject.start.entity.DetailReceiptListEntity;
+import com.yxproject.start.entity.ReceiptListEntity;
 import org.apache.ibatis.annotations.*;
 
 import java.util.Date;
@@ -27,8 +28,17 @@ public interface ReceiptMapper {
     public int selectByGroupNo(String groupNo);
 
     //生成交接单
-    @Insert("INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID,OLD_CARD_TYPE_ID)VALUES(#{GROUP_NO},#{GAJG_DM},#{count},#{state},#{cardType},#{oldCardType})")
-    public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO,@Param("GAJG_DM")String GAJG_DM,@Param("count")int count,@Param("state")int state,@Param("cardType")int cardType,@Param("oldCardType")int oldCardType);
+    @Insert("<script>" +
+            " INSERT INTO RECEIPT_LIST(QR_CODE,POLICE_CODE,FINISH_COUNT,STATE,CARD_TYPE_ID" +
+            "<if test ='oldCardTypeId !=null'> " +
+            ",OLD_CARD_TYPE_ID" +
+            "</if> " +
+            ")VALUES(#{qrCode},#{policeCode},#{finishCount},#{state},#{cardTypeId}" +
+            "<if test ='oldCardTypeId !=null'> " +
+            ",#{oldCardTypeId}" +
+            "</if> " +
+            ") </script>")
+    public boolean createReceiptList(ReceiptListEntity receiptListEntity);
 
 
 

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

@@ -60,7 +60,7 @@ public interface SelectSerialNumberMapper {
             "from TASK \n" +
             "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
             "LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID =  TASK.TASK_ID\n" +
-            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
+            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID  \n" +
             "WHERE GROUP_NO.GROUP_NO =#{id} \n" +
             "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
             "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
@@ -77,45 +77,66 @@ public interface SelectSerialNumberMapper {
     public int selectCount(String id);
 
 
-    @Select("select  DISTINCT " +
-            "TASK.TASK_ID," +
-            "COUNTY_DIC.COUNTYNAME," +
-            "COUNTY_DIC.COUNTY_CODE," +
-            "CARD_TYPE_DIC.CARD_TYPE," +
-            "CARD_TYPE_DIC.CARD_TYPE_ID," +
-            "TASK.ISSUED_DATE," +
-            "TASK.PRINT_OUT_DATE," +
-            "TASK.POSITION_DATE," +
-            "TASK.CONCORA_CRUSH_DATE, "+
-            "TASK.PUNCHING_DATE," +
-            "TASK.SORTING_DATE," +
-            "TASK.QUALITY_TEST_DATE\n" +
-            "from TASK\n" +
-            "LEFT JOIN SPECIAL_CARD ON SPECIAL_CARD.TASK_ID = TASK.TASK_ID\n" +
-            "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
-            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
-            "LEFT JOIN GROUP_NO ON TASK.TASK_ID=GROUP_NO.TASK_ID\n" +
-            "LEFT JOIN PROD_DBA.PROD_CARD_T ON subStr(PROD_CARD_T.ACCEPT_NO ,0,8)=GROUP_NO.GROUP_NO \n" +
-            "LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON.GMSFHM = PROD_DBA.PROD_CARD_T.ID_NO\n" +
-            "WHERE  SPECIAL_CARD.ACCEPT_NO=#{id} OR PROD_CARD_T.ID_NO=#{id}")
+    //查询制证库
+    @Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
+            "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
+            "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
+            "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n" +
+            "from TASK \n" +
+            "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
+            "LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
+            "LEFT JOIN PROD_CARD_T@PROD_LINK ON SUBSTR(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
+            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
+            "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} and  GROUP_NO.GROUP_NO is not null\n" +
+            "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
+            "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
+            "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
+            "UNION all \n" +
+            "select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
+            "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
+            "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
+            "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n" +
+            "from TASK \n" +
+            "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
+            "LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID =  TASK.TASK_ID\n" +
+            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
+            "LEFT JOIN PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ACCEPT_NO=SPECIAL_CARD.ACCEPT_NO "+
+            "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO=#{id} \n" +
+            "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
+            "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
+            "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE")
     public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id);
 
-    /**
-     * 查询任务单信息
-     * @param id
-     * @return
-     */
-    @Select("select  GROUP_NO.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,TASK.SUBMIT_DATE,TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.SORT_OUT_DATE,TASK.QUALITY_TEST_DATE,TASK.OUT_STORAGE_DATE\n" +
-            "from TASK\n" +
-            "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE\n" +
-            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID\n" +
-            "LEFT JOIN GROUP_NO ON TASK.TASK_ID=GROUP_NO.TASK_ID\n" +
-            "LEFT JOIN PROD_DBA.PROD_CARD_T ON subStr(PROD_CARD_T.ACCEPT_NO ,0,8)=GROUP_NO.GROUP_NO \n" +
-            "LEFT JOIN PREPRO_PERSON ON PREPRO_PERSON.GMSFHM = PROD_DBA.PROD_CARD_T.ID_NO\n" +
-            "WHERE PREPRO_PERSON.GMSFHM =#{id} OR PROD_CARD_T.ACCEPT_NO=#{id}")
-    public List<Map<String,Object>> selectByAcceptNoOrCardIdFromTaskList(String id);
-
 
+    //查询受理库
+    @Select("select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
+            "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
+            "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
+            "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,SUM(GROUP_NO.VALID_COUNT) valid_count\n" +
+            "from TASK \n" +
+            "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
+            "LEFT JOIN GROUP_NO ON GROUP_NO.TASK_ID = TASK.TASK_ID\n" +
+            "LEFT JOIN ACC_CARD_T@ACCU_LINK ON SUBSTR(ACC_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO "+
+            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
+            "WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO=#{id} and  GROUP_NO.GROUP_NO is not null\n" +
+            "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
+            "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
+            "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE\n" +
+            "UNION all \n" +
+            "select TASK.TASK_ID,COUNTY_DIC.COUNTYNAME,COUNTY_DIC.COUNTY_CODE,\n" +
+            "CARD_TYPE_DIC.CARD_TYPE,CARD_TYPE_DIC.CARD_TYPE_ID,TASK.ISSUED_DATE,\n" +
+            "TASK.PRINT_OUT_DATE,TASK.POSITION_DATE,TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE,\n" +
+            "TASK.SORTING_DATE,TASK.QUALITY_TEST_DATE,count(SPECIAL_CARD.ACCEPT_NO) valid_count\n" +
+            "from TASK \n" +
+            "LEFT JOIN COUNTY_DIC ON TASK.COUNTY_CODE =COUNTY_DIC.COUNTY_CODE \n" +
+            "LEFT JOIN SPECIAL_CARD on SPECIAL_CARD.TASK_ID =  TASK.TASK_ID\n" +
+            "LEFT JOIN CARD_TYPE_DIC ON TASK.CARD_TYPE = CARD_TYPE_DIC.CARD_TYPE_ID \n" +
+            "LEFT JOIN ACC_CARD_T@ACCU_LINK ON ACC_CARD_T.ACCEPT_NO=SPECIAL_CARD.ACCEPT_NO "+
+            "WHERE ACC_CARD_T.ACCEPT_NO =#{id} OR ACC_CARD_T.ID_NO=#{id} \n" +
+            "group by TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
+            "TASK.ISSUED_DATE, TASK.PRINT_OUT_DATE, TASK.POSITION_DATE, TASK.CONCORA_CRUSH_DATE, TASK.PUNCHING_DATE, \n" +
+            "TASK.SORTING_DATE, TASK.QUALITY_TEST_DATE")
+    public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList(String id);
 
     @Select("SELECT ACC_CARD_T.ACCEPT_NO,\n" +
             "COUNTY_DIC.COUNTYNAME,\n" +

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

 package com.yxproject.start.service;
 
 import com.yxproject.start.entity.DetailReceiptListEntity;
+import com.yxproject.start.entity.ReceiptListEntity;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
@@ -11,7 +12,7 @@ public interface ReceiptService {
 
     public Map<String,Object> selectReceiptListDate(String id);
 
-    public boolean createReceiptList(@Param("GROUP_NO")String GROUP_NO, @Param("GAJG_DM")String GAJG_DM, @Param("count")int count,@Param("state")int state,@Param("cardType")int cardType,@Param("oldCardType")int oldCardType);
+    public boolean createReceiptList(ReceiptListEntity receiptListEntity);
 
     public Map<String,Object>selectDetailedData(String id);
 

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

@@ -10,8 +10,6 @@ public interface SelectSerialNumberService {
     List<Map<String, Object>> selectByWorkOrderFromYX(String id);
     /*根据组号查询辅助库*/
     List<Map<String, Object>> selectByGroupNo(String id);
-    /*根据身份证号或受理号查询辅助库*/
-    List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id);
     /*根据身份证号或受理号查询受理库*/
     List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id);
     /*根据身份证号或受理号查询制证库*/
@@ -19,6 +17,8 @@ public interface SelectSerialNumberService {
     /*查询是否是特证*/
     public int selectCount(String id);
 
+    public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList(String id);
+
     public List<Map<String,Object>>selectByAcceptNoOrCardIdFromTaskList2(String id);
 
 }

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

@@ -15,16 +15,16 @@ public class InfoManagementServiceImpl implements InfoManagementService {
 
 
     @Override
-    public List<NewFilesEntity> selectInfoManagement(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate,long currPage,long pageSize) {
+    public List<NewFilesEntity> selectInfoManagement(String beginId, String endId, String gajgMc, String beginDate, String endDate,long currPage,long pageSize) {
 
-        List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginFileName, endFileName, gajgMc, beginDate, endDate,currPage * pageSize,(currPage - 1) * pageSize + 1);
+        List<NewFilesEntity> newFilesEntities = infoManagementMapper.selectInfoManagement(beginId, endId, "%"+gajgMc+"%", beginDate, endDate,currPage * pageSize,(currPage - 1) * pageSize + 1);
 
         return newFilesEntities;
     }
 
     @Override
-    public long count(String beginFileName, String endFileName, String gajgMc, String beginDate, String endDate) {
-       long  count= infoManagementMapper.count(beginFileName,endFileName,gajgMc,beginDate,endDate);
+    public long count(String beginId, String endId, String gajgMc, String beginDate, String endDate) {
+       long  count= infoManagementMapper.count(beginId,endId,"%"+gajgMc+"%",beginDate,endDate);
         return count;
     }
 

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

@@ -24,8 +24,11 @@ public class LogServiceImpl implements LogService {
 
     @Override
     public int selectNewFileLogCount(String newFileName, String cardId, String createDate, String uploadCountyCode) {
-        int count= logMapper.selectNewFileLogCount(newFileName,cardId,createDate,uploadCountyCode);
-        return count;
+        List<Map<String, Object>> mapList = logMapper.selectNewFileLogCount(newFileName, cardId, createDate, uploadCountyCode);
+        if (mapList.size()>0){
+            return Integer.valueOf(mapList.get(0).get("FILECOUNT")+"");
+        }
+        return 0;
     }
 
     @Override

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

 package com.yxproject.start.service.impl;
 
 import com.yxproject.start.entity.DetailReceiptListEntity;
+import com.yxproject.start.entity.ReceiptListEntity;
 import com.yxproject.start.mapper.ReceiptMapper;
 import com.yxproject.start.service.ReceiptService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +21,8 @@ public class ReceiptServiceImpl implements ReceiptService {
     }
 
     @Override
-    public boolean createReceiptList(String GROUP_NO, String GAJG_DM, int count,int state,int cardType,int oldCardType) {
-        receiptMapper.createReceiptList(GROUP_NO,GAJG_DM,count,state,cardType,oldCardType);
+    public boolean createReceiptList(ReceiptListEntity receiptListEntity) {
+        receiptMapper.createReceiptList(receiptListEntity);
         return true;
     }
 

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

@@ -26,11 +26,7 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{
         return result;
     }
 
-    @Override
-    public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id) {
-        List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList(id);
-        return result;
-    }
+
 
     @Override
     public List<Map<String, Object>> selectByAcceptNoOrCardIdFromACC(String id) {
@@ -50,6 +46,12 @@ public class SelectSerialNumberServiceImpl implements SelectSerialNumberService{
         return  selectSerialNumberMapper.selectCount(id);
     }
 
+    @Override
+    public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList(String id) {
+        List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList(id);
+        return result;
+    }
+
     @Override
     public List<Map<String, Object>> selectByAcceptNoOrCardIdFromTaskList2(String id) {
         List<Map<String, Object>> result = selectSerialNumberMapper.selectByAcceptNoOrCardIdFromTaskList2(id);

src/main/resources/static/js/app.js

@@ -162,20 +162,26 @@ angular.module('AvatarCheck', [
             console.log($rootScope.tab)
         }
 
+
         $scope.doSearch = function (searchInput) {
             $scope.msg="";
             $scope.alertMsg="";
-            var pattern = /^[0-9]*$/
-            if(angular.isUndefined(searchInput)||!pattern.test(searchInput)){
+            $scope.disabledAdd=false;
+            // var pattern = /^[0-9]*$/
+            if(angular.isUndefined(searchInput)){
                 $location.path("/searchCard");
                 $scope.msg = "请输入正确的受理号/身份证号/任务单编号";
             }else{
                 HttpService.searchCards(searchInput, function (data) {
                     if(data==''){
+                        $scope.searchResult={}
                         $scope.msg="";
                         $scope.alertMsg = "暂无数据";
                     }else{
                         $scope.searchResult = data;
+                        if($scope.searchResult.workOrderData[0].CARD_TYPE==1){
+                            $scope.disabledAdd=true;
+                        }
                         console.log($scope.searchResult,"searchResult")
                         console.log($scope.searchResult.workOrderData,"searchResult.workOrderData")
                         console.log($scope.searchResult.ACCdata,"searchResult.ACCdata")

src/main/resources/static/js/service.js

@@ -235,9 +235,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(state)){
                     state=-1;
                 }
-                if(date==''){
-                    date=$filter("date")(new Date(), "yyyy-MM-dd");
-                }
                 console.log(fileName,state,date)
                 $http({
                     method: 'GET',
@@ -258,9 +255,6 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                 if(angular.isUndefined(state)){
                     state=-1;
                 }
-                if(date==''){
-                    date=$filter("date")(new Date(), "yyyy-MM-dd");
-                }
                 console.log(fileName,state,currentPage,itemsPerPage,date)
                 $http({
                     method: 'GET',
@@ -293,13 +287,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            selectXmlDataCount:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) {
+            selectXmlDataCount:function (startId,endId,pcs_name,startDate,endDate,success) {
                 $http({
                     method: 'GET',
                     url: "../InfoManagementApi/selectCount"+urlTimeStamp(),
                     params:{
-                        beginFileName:startPackageNo,
-                        endFileName:endPackageNo,
+                        beginFileId:startId,
+                        endFileId:endId,
                         gajgMc:pcs_name,
                         beginDate:startDate,
                         endDate:endDate
@@ -319,13 +313,13 @@ angular.module('AvatarCheck.http', ['ngDialog', 'LocalStorageModule'])
                     success(response.data)
                 })
             },
-            deleteProdCards:function (startPackageNo,endPackageNo,pcs_name,startDate,endDate,success) {
+            deleteProdCards:function (startId,endId,pcs_name,startDate,endDate,success) {
                 $http({
                     method: 'GET',
                     url: "../InfoManagementApi/deleteInfo"+urlTimeStamp(),
                     params:{
-                        beginFileName:startPackageNo,
-                        endFileName:endPackageNo,
+                        beginFileName:startId,
+                        endFileName:endId,
                         gajgMc:pcs_name,
                         beginDate:startDate,
                         endDate:endDate

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

@@ -34,13 +34,13 @@
         <div class="box box-primary">
            <table class="table table-bordered" style="margin-bottom: 0;">
                <tr>
-                   <td>新包号:</td>
+                   <td>文件ID:</td>
                    <td>
-                       <input type="text" class="form-control"  ng-model="startPackageNo" placeholder="起始包号">
+                       <input type="text" class="form-control"  ng-model="startId" placeholder="起始ID">
                    </td>
                    <td>-</td>
                    <td>
-                       <input type="text" class="form-control"  ng-model="endPackageNo" placeholder="截至包号">
+                       <input type="text" class="form-control"  ng-model="endId" placeholder="截至ID">
 
                    </td>
                    <td>派出所名称：</td>
@@ -95,8 +95,8 @@
                         </tr>
                         </thead>
                         <tbody>
-                        <tr ng-repeat="item in xmlDatas">
-                            <td>{{$index+1}}</td>
+                        <tr ng-repeat="item in xmlDatas | orderBy:'id'">
+                            <td>{{item.id}}</td>
                             <td>{{item.dwdm}}</td>
                             <td>{{item.dwmc}}</td>
                             <td>{{item.recordNumber}}</td>

src/main/resources/static/views/cardProdUpdate/cardProdUpdate.js

@@ -13,6 +13,7 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
 
         $rootScope.hasOpen = false;
 
+        $scope.id ='id';
 
         $('.select2').select2();
         //Initialize Select2 Elements
@@ -54,11 +55,11 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
         $scope.doXmlQuery = function() {
             var startDate=$("#datepicker1").val();
             var endDate =$("#datepicker2").val();
-            if(angular.isUndefined($scope.startPackageNo)){
-                $scope.startPackageNo='';
+            if(angular.isUndefined($scope.startId)){
+                $scope.startId='';
             }
-            if(angular.isUndefined($scope.endPackageNo)){
-                $scope.endPackageNo='';
+            if(angular.isUndefined($scope.endId)){
+                $scope.endId='';
             }
             if(angular.isUndefined($scope.pcs_name)){
                 $scope.pcs_name='';
@@ -66,13 +67,13 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
             if((startDate!=''&&endDate=='')||(endDate!=''&&startDate=='')){
                 MessageService.showAlert("请选择起始日期和结束日期")
             }else{
-                console.log($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
-                HttpService.selectXmlDataCount($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,function(data){
+                console.log($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage)
+                HttpService.selectXmlDataCount($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,function(data){
                     $scope.paginationConf.totalItems=data;
                     console.log($scope.paginationConf.totalItems,"count")
                 })
 
-                HttpService.selectXmlData($scope.startPackageNo,$scope.endPackageNo,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
+                HttpService.selectXmlData($scope.startId,$scope.endId,$scope.pcs_name,startDate,endDate,$scope.paginationConf.currentPage,$scope.paginationConf.itemsPerPage,function (data) {
                     $scope.xmlDatas = data;
                     console.log($scope.xmlDatas)
                 })
@@ -87,14 +88,14 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
         $scope.deleteXml = function() {
             var startDate=$("#datepicker1").val();
             var endDate =$("#datepicker2").val();
-            var startPackageNo = $scope.startPackageNo;
-            var endPackageNo=$scope.endPackageNo;
+            var startId = $scope.startId;
+            var endId=$scope.endId;
             var pcs_name=$scope.pcs_name;
-            if(angular.isUndefined(startPackageNo)){
-                startPackageNo='';
+            if(angular.isUndefined(startId)){
+                startId='';
             }
-            if(angular.isUndefined(endPackageNo)){
-                endPackageNo='';
+            if(angular.isUndefined(endId)){
+                endId='';
             }
             if(angular.isUndefined(pcs_name)){
                 pcs_name='';
@@ -110,12 +111,12 @@ angular.module('AvatarCheck.cardProdUpdate', ['ngRoute', 'AvatarCheck.http'])
                     controller: ['$scope', function ($scope) {
                         $scope.startDate = startDate;
                         $scope.endDate = endDate;
-                        HttpService.selectXmlDataCount(startPackageNo,endPackageNo,pcs_name,startDate,endDate,function(data){
+                        HttpService.selectXmlDataCount(startId,endId,pcs_name,startDate,endDate,function(data){
                             $scope.total=data;
                             console.log($scope.total,"count")
                         })
                         $scope.confirmDelete = function () {
-                            HttpService.deleteProdCards(startPackageNo,endPackageNo,pcs_name,startDate,endDate, function (data) {
+                            HttpService.deleteProdCards(startId,endId,pcs_name,startDate,endDate, function (data) {
                                 if(data){
                                     MessageService.showAlert("删除成功");
                                     $scope.closeThisDialog();

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

@@ -90,8 +90,8 @@
                           </div>
                           <input type="text"
                                  class="form-control pull-right"
-                                 ng-model="choseDate"
                                  id="datepicker3"  readonly/>
+                          <span class="input-group-addon"><span class="glyphicon glyphicon-remove"></span></span>
                       </div>
                     </td>
                    <td>文件名称:</td>

src/main/resources/static/views/excelAndSearch/excelAndSearch.js

@@ -28,6 +28,7 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
             todayBtn: 1,
             autoclose: 1
         });
+
         $('#datepicker2').datetimepicker({
             minView: "month", //选择日期后，不会再跳转去选择时分秒
             language: 'zh-CN',
@@ -42,11 +43,13 @@ angular.module('AvatarCheck.excelAndSearch', ['ngRoute', 'AvatarCheck.http', 'tm
             todayBtn: 1,
             autoclose: 1
         });
+        //清除的代码
+        $(".glyphicon-remove").click(function(){
+            $($($(this).parent()).prev()).val("");
+        })
 
         $scope.choseDate = $filter("date")(new Date(), "yyyy-MM-dd");
 
-
-
         $scope.uploadExcel = function () {
             var fd = new FormData();
             var files = document.querySelector('input#id_file_photo_for_check').files;

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

@@ -38,7 +38,6 @@
                             <td>{{item.COUNTYNAME}}</td>
                             <td>{{item.CARD_TYPE}}</td>
                             <td>{{item.VALID_COUNT}}</td>
-                            <td>{{item.SUBMIT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.ISSUED_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.PRINT_OUT_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
                             <td>{{item.POSITION_DATE | date:'yyyy-MM-dd HH:mm:ss'}}</td>
@@ -94,8 +93,8 @@
                         </tbody>
                     </table>
                 </div>
-                <div style="text-align:right;padding: 10px;padding-top: 0;">
-                    <button class="btn btn-info" ng-click="addQuickCardAccu()">添加快证</button>
+                <div style="text-align:right;padding: 10px;padding-top: 0;" ng-if="loginData.roleList[0].process==1">
+                    <button class="btn btn-info" ng-disabled="disabledAdd" ng-click="addQuickCardAccu()">添加快证</button>
                     <button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
                 </div>
             </div>
@@ -145,8 +144,8 @@
                         </tbody>
                     </table>
                 </div>
-                <div style="text-align:right;padding: 10px;padding-top: 0;">
-                    <button class="btn btn-info" ng-click="addQuickCardProd()">添加快证</button>
+                <div style="text-align:right;padding: 10px;padding-top: 0;" ng-if="loginData.roleList[0].process==1">
+                    <button class="btn btn-info" ng-disabled="disabledAdd" ng-click="addQuickCardProd()">添加快证</button>
                     <button class="btn btn-danger" ng-click="giveBackCardAccu()">退证</button>
                 </div>
             </div>

src/main/resources/static/views/uploadExcelAndSearch/uploadExcelAndSearch.js

@@ -106,6 +106,9 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
             }else{
                 json.uploadDate = $("#datepicker").val();
             }
+            if($scope.paginationConf.currentPage==0){
+                $scope.paginationConf.currentPage=1
+            }
             json.firstIndex=$scope.paginationConf.currentPage;
             json.pageSize=$scope.paginationConf.itemsPerPage;
             return json;
@@ -120,8 +123,6 @@ angular.module('AvatarCheck.uploadExcelAndSearch', ['ngRoute', 'AvatarCheck.http
                 console.log(data)
             })
         }
-
-
         // 通过$watch currentPage和itemperPage 当他们一变化的时候，重新获取数据条目
         $scope.$watch('paginationConf.currentPage +paginationConf.itemsPerPage', $scope.doQuery);