添加删除废证详情

添加查询余证详情

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

@@ -42,7 +42,6 @@ import java.util.Map;
 public class DeliveredApi {
     @Autowired
     private DeliveredService deliveredService;
-
     @Autowired
     private DetailReceiptListService detailReceiptListService;
     @Autowired

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

@@ -54,7 +54,8 @@ public class FailedCardApi {
         JSONArray jsonarray = JSONArray.fromObject(jsonStr);
         List<Map<String, Object>> resultList = new ArrayList<>();
         for (Object o : jsonarray) {
-            Map<String, Object> resultMap = failedCardService.selectInfoByCardId(o.toString());
+            String acceptNo = o.toString().replace("e", "E").replace("g", "G").replace("l","L");
+            Map<String, Object> resultMap = failedCardService.selectInfoByCardId(acceptNo);
             if (resultMap == null) {
                 resultMap = new LinkedHashMap<>();
                 resultMap.put("ID_NO", o.toString());
@@ -79,6 +80,16 @@ public class FailedCardApi {
 
     }
 
+    /**
+     * 删除提交人上传的废证详情
+     * @param failedCardId 废证ID
+     * @return
+     */
+    @RequestMapping("deleteFailedCardInfo")
+    public boolean deleteFailedCardInfo(@RequestParam("failedCardId") String failedCardId) {
+        return failedCardService.deleteFailedCardInfo(failedCardId);
+
+    }
 
     /**
      * 添加废证
@@ -124,7 +135,7 @@ public class FailedCardApi {
         for (int i = 0; i < jsonarray.size(); i++) {
 
             /*查询生成任务单需要的数据*/
-            Map<String, Object> resultMap = failedCardService.selectTaskListDate((String) jsonarray.get(i));
+            Map<String, Object> resultMap = failedCardService.selectTaskListDate((jsonarray.get(i)+"").replace("e","E").replace("g","G"));
             String countyCode = resultMap.get("COUNTY_CODE").toString();
             Long cardType = Long.valueOf((BigDecimal) resultMap.get("CARD_TYPE") + "");
             String acceptNo = (String) resultMap.get("ACCEPT_NO");

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

@@ -34,7 +34,7 @@ public class SelectApi {
             resultMap.put("ACCdata", ACCdata);
             resultMap.put("PRODData", PRODData);
         } else if (id.length() == 8) {
-            List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id);
+            List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByGroupNo(id.replace("e","E").replace("g","G"));
             List<Map<String, Object>> ACCdata = new ArrayList<>();
             List<Map<String, Object>> PRODData = new ArrayList<>();
             resultMap.put("workOrderData", workOrderData);
@@ -43,16 +43,16 @@ public class SelectApi {
         } else if (id.length() == 10 || id.length() == 18) {
 
             //查询是否是特证，如果是，返回新的任务单信息
-            List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id);
+            List<Map<String, Object>> workOrderData = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList2(id.replace("e","E").replace("g","G"));
             if (workOrderData.size() != 0) {
                 resultMap.put("workOrderData", workOrderData);
             } else {
-                List<Map<String, Object>> workOrderData2 = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id);
+                List<Map<String, Object>> workOrderData2 = selectSerialNumberService.selectByAcceptNoOrCardIdFromTaskList(id.replace("e","E").replace("g","G"));
                 resultMap.put("workOrderData", workOrderData2);
             }
 
-            List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id);
-            List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id);
+            List<Map<String, Object>> ACCdata = selectSerialNumberService.selectByAcceptNoOrCardIdFromACC(id.replace("e","E").replace("g","G"));
+            List<Map<String, Object>> PRODData = selectSerialNumberService.selectByAcceptNoOrCardIdFromPROD(id.replace("e","E").replace("g","G"));
 
             resultMap.put("ACCdata", ACCdata);
             resultMap.put("PRODData", PRODData);

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

@@ -82,7 +82,6 @@ public class TaskListApi {
         JSONArray failedList = (JSONArray) jsonObject.get("failedList");
         String process = jsonObject.get("process").toString();
         String name = jsonObject.get("name").toString();
-//        String printer = jsonObject.get("printer").toString();
         List<String> list = (List<String>) jsonArray;
         return taskListService.updateState2(failedList, list, process, name);
     }
@@ -230,7 +229,6 @@ public class TaskListApi {
 
     /**
      * 生成任务单
-     * <p>
      * date 查询时间
      * name 提交人姓名
      * groupList 组号列表
@@ -252,9 +250,9 @@ public class TaskListApi {
                 String groupNo = "";
                 for (int i = 0; i < groupList.size(); i++) {
                     if (i != groupList.size() - 1) {
-                        groupNo = "" + groupNo + groupList.get(i) + ",";
+                        groupNo += "'" +  groupList.get(i) + "',";
                     } else {
-                        groupNo = "" + groupNo + groupList.get(i) + "";
+                        groupNo += "'" + groupList.get(i) + "'";
                     }
                 }
                 List<Map<String, Object>> objects = taskListService.selectGroupAtACCU(groupNo);
@@ -291,7 +289,7 @@ public class TaskListApi {
      */
     @RequestMapping("createFastTask")
     @Transactional
-    public Map<String, Object> createFastTask(@RequestBody String object, HttpServletResponse resp) {
+    public Map<String, Object> createFastTask(@RequestBody String object) {
         // 添加没有解析进去受理库情况
         JSONObject jsonObject = JSONObject.fromObject(object);
         String acceptNo = jsonObject.getString("acceptNo");
@@ -420,6 +418,19 @@ public class TaskListApi {
         return list;
     }
 
+    /**
+     * 查询提交人上传的余证详情
+     * @param date 提交日期
+     * @param name 提交人姓名
+     * @return
+     */
+    @RequestMapping("queryRemainderCardInfo")
+    public List<Map<String,Object>> queryRemainderCardInfo(@RequestParam("date") String date,@RequestParam("name") String name) {
+        List<Map<String,Object>> failedCardEntities = taskListService.selectRemainderCardInfo(replaceDate(date), name);
+        return failedCardEntities;
+
+    }
+
     /**
      * 查询已转出数量
      */

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

@@ -33,8 +33,8 @@ public interface CardDetailedListMapper {
      *查询详单数据
      */
     @Select("select DETAIL_RECEIPT_LIST.*,RECEIPT_LIST.state,PROD_TRACE_T.DOWNLOAD_DATE,PROD_TRACE_T.ELECTRIC_WRITE_DATE,PROD_TRACE_T.CHECK_DATE from DETAIL_RECEIPT_LIST \n" +
-            "left join PROD_CARD_T@PROD_LINK ON PROD_CARD_T.ID_NO=DETAIL_RECEIPT_LIST.CARD_ID\n" +
-            "LEFT JOIN PROD_TRACE_T@PROD_LINK ON PROD_TRACE_T.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" +
+            "left join PROD_CARD_T@PRODYD_LINK ON PROD_CARD_T.ID_NO=DETAIL_RECEIPT_LIST.CARD_ID\n" +
+            "LEFT JOIN PROD_TRACE_T@PRODYD_LINK ON PROD_TRACE_T.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" +
             "left join RECEIPT_LIST on RECEIPT_LIST.id = DETAIL_RECEIPT_LIST.RECEIPT_ID\n" +
             "where RECEIPT_ID in (select RECEIPT_ID from DETAIL_RECEIPT_LIST where CARD_ID =#{idCard} )")
     public List<Map<String,Object>> findAllCardDetailedListByIdCard(@Param("idCard")String idCard);

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

@@ -18,8 +18,8 @@ public interface DataAuditingMapper {
     public boolean saveDataAuditingEntity(DataAuditingEntity dataAuditingEntity);
 
 
-    @Select("select substr(UPLOAD_NO,0,9)  POLICE_SUBSTATION ,count(UPLOAD_NO) count from ACC_CARD_T@ACCU_LINK \n" +
-            "where ACCEPT_NO not in (select ACCEPT_NO from ACC_ERROR_INFO_T@ACCU_LINK) and substr(ACCEPT_NO,0,8) in (#{groupNo})\n" +
+    @Select("select substr(UPLOAD_NO,0,9)  POLICE_SUBSTATION ,count(UPLOAD_NO) count from ACC_CARD_T@ACCUYD_LINK \n" +
+            "where ACCEPT_NO not in (select ACCEPT_NO from ACC_ERROR_INFO_T@ACCUYD_LINK) and substr(ACCEPT_NO,0,8) in (#{groupNo})\n" +
             "group by substr(UPLOAD_NO,0,9)")
     public List<Map<String,Object>> selectDataAuditingEntity(@Param("groupNo")String groupNo);
 

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

@@ -30,7 +30,7 @@ public interface FailedCardMapper {
             "PROD_CARD_T.SEX_NO,\n" +
             "PROD_CARD_T.ID_NO,\n" +
             "SPECIAL_CARD.SPECIAL_TYPE\n "+
-            "FROM PROD_CARD_T@PROD_LINK\n" +
+            "FROM PROD_CARD_T@PRODYD_LINK\n" +
             "left join SPECIAL_CARD on PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO "+
             "WHERE PROD_CARD_T.ID_NO=#{cardId} OR PROD_CARD_T.ACCEPT_NO=#{cardId}")
     public Map<String,Object>selectInfoByCardId(@Param("cardId")String cardId);
@@ -50,7 +50,7 @@ public interface FailedCardMapper {
 
 
     @Select("SELECT PROD_CARD_T.ACCEPT_NO,GROUP_NO.TASK_ID ,task.work_group\n" +
-            "FROM PROD_CARD_T@PROD_LINK\n" +
+            "FROM PROD_CARD_T@PRODYD_LINK\n" +
             "LEFT JOIN GROUP_NO ON  GROUP_NO=subStr(PROD_CARD_T.ACCEPT_NO,0,8) " +
             "left join task on task.TASK_ID = group_no.TASK_ID\n" +
             "WHERE PROD_CARD_T.ID_NO=#{cardId} or PROD_CARD_T.ACCEPT_NO=#{cardId}")
@@ -59,7 +59,7 @@ public interface FailedCardMapper {
     /*余证*/
     @Update("update group_no \n" +
             "set group_no.SPECIAL_CARD_COUNT=group_no.SPECIAL_CARD_COUNT+1 \n" +
-            "where group_no.group_no=(select group_no from PROD_CARD_T@PROD_LINK \n" +
+            "where group_no.group_no=(select group_no from PROD_CARD_T@PRODYD_LINK \n" +
             "left join group_no on group_no.GROUP_NO=subStr(PROD_CARD_T.ACCEPT_NO,0,8)\n" +
             "where PROD_CARD_T.accept_no =#{acceptNo}) ")
     public boolean specialCardAdd(@Param("acceptNo")String acceptNo);
@@ -74,7 +74,7 @@ public interface FailedCardMapper {
 
 
     @Select("select prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE,task.CARD_TYPE\n" +
-            " ,task.work_group from prod_card_t@prod_link\n" +
+            " ,task.work_group from prod_card_t@PRODYD_LINK\n" +
             "left join group_no on subStr(prod_card_t.ACCEPT_NO,0,8)=group_no.group_no "+
             "left join task on group_no.task_id = task.task_id "+
             "where  prod_card_t.accept_no=#{acceptNo} or prod_card_t.ID_NO=#{acceptNo}")
@@ -98,7 +98,7 @@ public interface FailedCardMapper {
 
     @Select("select SPECIAL_CARD.SPECIAL_TYPE,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,6) as COUNTY_CODE ," +
             "SPECIAL_CARD.INITIATOR,PREPRO_PERSON.CARD_TYPE_ID\n" +
-            "from prod_card_t@prod_link\n" +
+            "from prod_card_t@PRODYD_LINK\n" +
             "left join SPECIAL_CARD on prod_card_t.accept_no = SPECIAL_CARD.accept_no\n" +
             "left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH=prod_card_t.UPLOAD_NO\n" +
             "where   prod_card_t.ID_NO=#{acceptNo}")
@@ -106,7 +106,7 @@ public interface FailedCardMapper {
 
 
 
-    @Select("select prod_group_t.valid_count,prod_group_t.invalid_count from prod_group_t@prod_link \n" +
+    @Select("select prod_group_t.valid_count,prod_group_t.invalid_count from prod_group_t@PRODYD_LINK \n" +
             "where group_no=#{groupNo}")
     public Map<String,Object> selectGroupDate(@Param("groupNo") String groupNo);
 
@@ -131,7 +131,7 @@ public interface FailedCardMapper {
      * 根据身份证号查询是否是特证
      */
     @Select("select SPECIAL_CARD_ID from special_card \n" +
-            "left join prod_card_t@PROD_LINK ON PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
+            "left join prod_card_t@PRODYD_LINK ON PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO\n" +
             " WHERE PROD_CARD_T.ID_NO = #{id} or PROD_CARD_T.ACCEPT_NO=#{id}")
     public String selectSpecialCard(String id);
 
@@ -139,7 +139,7 @@ public interface FailedCardMapper {
     /**
      * 根据特证表添加废证
      */
-    @Select("select SPECIAL_CARD.ACCEPT_NO,SPECIAL_CARD.TASK_ID,task.work_group FROM SPECIAL_CARD left join task on task.TASK_ID = special_card.TASK_ID LEFT JOIN prod_card_t@PROD_LINK ON PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO" +
+    @Select("select SPECIAL_CARD.ACCEPT_NO,SPECIAL_CARD.TASK_ID,task.work_group FROM SPECIAL_CARD left join task on task.TASK_ID = special_card.TASK_ID LEFT JOIN prod_card_t@PRODYD_LINK ON PROD_CARD_T.ACCEPT_NO = SPECIAL_CARD.ACCEPT_NO" +
             " WHERE PROD_CARD_T.ID_NO=#{id} or  PROD_CARD_T.ACCEPT_NO=#{id}")
     public Map<String,Object>selectDataById(String id);
 
@@ -152,9 +152,18 @@ public interface FailedCardMapper {
     @Select("select failed_card.FAILED_CARD_ID,FAILED_CARD_REASON_DIC.FAILED_CARD_REASON FAILED_CARD_REASON_ID,\n" +
             "failed_card.ACCEPT_NO,failed_card.TASK_ID,failed_card.POSITION_DATE,failed_card.FINISH_DATE,\n" +
             "failed_card.ALLOT_DATE,failed_card.PRINT_DATE,decode(STATE,0,'已提交',1,'打印',2,'预封装',4,'工作组',5,'分拣') STATE,failed_card.INITIATOR,failed_card.NOTE,\n" +
-            "failed_card.WORK_GROUP,failed_card.NAME,failed_card.SUBMIT_DATE\n" +
-            "from failed_card  \n" +
+            "failed_card.WORK_GROUP,failed_card.NAME,failed_card.SUBMIT_DATE,prod_card_t.id_no,prod_card_t.name card_name\n" +
+            "from failed_card  " +
+            "left join PROD_CARD_T@prodyd_link on failed_card.ACCEPT_NO = prod_card_t.ACCEPT_NO\n" +
             "left join FAILED_CARD_REASON_DIC on failed_card.FAILED_CARD_REASON_ID = FAILED_CARD_REASON_DIC.FAILED_CARD_REASON_ID where name = #{name} and to_char(submit_date,'yyyyMMdd') = #{date}")
     public List<Map<String,Object>> selectFailedCardInfo(@Param("date")String date, @Param("name")String name);
 
+
+    /**
+     * 删除废证详情
+     * @param failedCardId 废证ID
+     * @return
+     */
+    @Delete("delete from FAILED_CARD where FAILED_CARD_ID = #{failedCardId}")
+    public boolean deleteFailedCardInfo(long failedCardId);
 }

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

@@ -46,11 +46,11 @@ public interface GroupNoMapper {
      * @param groupNo 组号信息
      * @return
      */
-    @Select("select DISTINCT  decode(substr(ACC_GROUP_RELATION_T.ORIGINAL_NO,3,2),'99',6,substr(ACC_GROUP_RELATION_T.ORIGINAL_NO,21,1)) card_type_id, ACC_GROUP_T.group_no ,ACC_GROUP_T.valid_count,ACC_GROUP_T.invalid_count, '000000' county_code\n" +
-            "from ACC_CARD_T@ACCU_LINK \n" +
+    @Select("select DISTINCT  decode(substr(UPLOAD_NO,18,1),6,5,substr(UPLOAD_NO,18,1)) card_type_id, ACC_GROUP_T.group_no ,ACC_GROUP_T.valid_count,ACC_GROUP_T.invalid_count, '000000' county_code\n" +
+            "from ACC_CARD_T@ACCUYD_LINK \n" +
             "left join PREPRO_PERSON on PREPRO_PERSON.JMSFZSLH = acc_card_t.upload_no \n" +
-            "left join ACC_GROUP_T@ACCU_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no " +
-            " left join ACC_GROUP_RELATION_T@ACCU_LINK on ACC_GROUP_RELATION_T.group_no =ACC_GROUP_T.group_no\n" +
+            "left join ACC_GROUP_T@ACCUYD_LINK on substr(acc_card_t.accept_no,0,8) = ACC_GROUP_T.group_no " +
+            " left join ACC_GROUP_RELATION_T@ACCUYD_LINK on ACC_GROUP_RELATION_T.group_no =ACC_GROUP_T.group_no\n" +
             "left join CARD_TYPE_DIC on PREPRO_PERSON.card_type_id =  CARD_TYPE_DIC.CARD_TYPE_ID\n" +
 //            "left join county_dic on substr(PREPRO_PERSON.JMSFZSLH,0,6)=  county_dic.COUNTY_CODE\n" +
             "where " +
@@ -64,8 +64,8 @@ public interface GroupNoMapper {
      * @param idCard 证件信息
      * @return
      */
-    @Select("select ID_NO,ACCEPT_NO from ACC_CARD_T@ACCU_LINK WHERE ID_NO =#{idCard} OR ACCEPT_NO =#{idCard}\n" +
+    @Select("select ID_NO,ACCEPT_NO from ACC_CARD_T@ACCUYD_LINK WHERE ID_NO =#{idCard} OR ACCEPT_NO =#{idCard}\n" +
             "UNION ALL \n" +
-            "SELECT ID_NO,ACCEPT_NO FROM PROD_CARD_T@PROD_LINK WHERE ID_NO =#{idCard} OR ACCEPT_NO =#{idCard}")
+            "SELECT ID_NO,ACCEPT_NO FROM PROD_CARD_T@PRODYD_LINK WHERE ID_NO =#{idCard} OR ACCEPT_NO =#{idCard}")
     public List<Map<String,Object>> selectAcceptNo(String idCard);
 }

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

@@ -15,7 +15,7 @@ import java.util.List;
 public interface PoliceStationApplyReasonMapper {
 
     @Select("SELECT SUBSTR(B.UPLOAD_NO,0,9) police_station_code,B.DRAW_TYPE,count(b.UPLOAD_NO) apply_count from GROUP_NO a\n" +
-            "  LEFT JOIN  PROD_APPLY_INFO_T@prod_link b ON a.GROUP_NO=substr(b.ACCEPT_NO,0,8)\n" +
+            "  LEFT JOIN  PROD_APPLY_INFO_T@prodYD_LINK b ON a.GROUP_NO=substr(b.ACCEPT_NO,0,8)\n" +
             "WHERE TASK_ID=#{taskId} GROUP BY SUBSTR(B.UPLOAD_NO,0,9),B.DRAW_TYPE")
     public List<PoliceApplyCountDto> getPoliceStationApplyReason(@Param("taskId") String taskId);
 

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

@@ -164,8 +164,8 @@ public interface PreproPersonMapper {
      * @param acceptNo 受理组号
      * @return
      */
-    @Select("select UPLOAD_NO,ACCEPT_NO from ACC_CARD_T@ACCU_LINK WHERE ACCEPT_NO =#{acceptNo}\n" +
+    @Select("select UPLOAD_NO,ACCEPT_NO from ACC_CARD_T@ACCUYD_LINK WHERE ACCEPT_NO =#{acceptNo}\n" +
             "UNION all \n" +
-            "select UPLOAD_NO,ACCEPT_NO from PROD_CARD_T@PROD_LINK WHERE ACCEPT_NO =#{acceptNo}")
+            "select UPLOAD_NO,ACCEPT_NO from PROD_CARD_T@PRODYD_LINK WHERE ACCEPT_NO =#{acceptNo}")
     public List<Map<String, Object>> selectUploadNoByAcceptNo(String acceptNo);
 }
\ No newline at end of file

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

@@ -14,8 +14,8 @@ public interface ReceiptMapper {
     //根据身份证号查询特证交接单信息
     @Select("select prod_group_t.group_no,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,9) as GAJG_DM,\n" +
             "count(prod_card_t.accept_no) valid_count,GAJG_DM.GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE \n" +
-            "from prod_card_t@PROD_LINK \n" +
-            "left join prod_group_t@PROD_LINK on subStr(prod_card_t.accept_no,0,8)= prod_group_t.group_no \n" +
+            "from prod_card_t@PRODYD_LINK \n" +
+            "left join prod_group_t@PRODYD_LINK on subStr(prod_card_t.accept_no,0,8)= prod_group_t.group_no \n" +
             "left join SPECIAL_CARD on SPECIAL_CARD.ACCEPT_NO = prod_card_t.accept_no\n" +
             "left join task on task.task_id =SPECIAL_CARD.task_id \n" +
             "left join GAJG_DM on subStr(prod_card_t.UPLOAD_NO,0,9)= GAJG_DM.GAJG_DM \n" +
@@ -25,14 +25,14 @@ public interface ReceiptMapper {
     public Map<String,Object> selectReceiptListDate(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
 
     //根据身份证号查组号
-    @Select("select subStr(ACCEPT_NO,0,8) as groupNo from prod_card_t@PROD_LINK where ID_NO=#{id} and prod_card_t.BEGIN_DATE= #{beginDate}  and  prod_card_t.EXPIRE_DATE = #{expireDate} ")
+    @Select("select subStr(ACCEPT_NO,0,8) as groupNo from prod_card_t@PRODYD_LINK where ID_NO=#{id} and prod_card_t.BEGIN_DATE= #{beginDate}  and  prod_card_t.EXPIRE_DATE = #{expireDate} ")
     public List<Map<String,Object>> selectGroupNoById(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
 
     //根据组号查询普通证交接单信息
     @Select("select prod_group_t.group_no,prod_card_t.accept_no,subStr(prod_card_t.UPLOAD_NO,0,9) as GAJG_DM,\n" +
             "count(prod_card_t.accept_no) valid_count,GAJG_DM.GAJG_MC, task.CARD_TYPE,task.OLD_CARD_TYPE,prod_card_t.id_no,prod_card_t.sex_no,prod_card_t.upload_no   \n" +
-            "from prod_card_t@PROD_LINK \n" +
-            "left join prod_group_t@PROD_LINK on subStr(prod_card_t.accept_no,0,8)= prod_group_t.group_no \n" +
+            "from prod_card_t@PRODYD_LINK \n" +
+            "left join prod_group_t@PRODYD_LINK on subStr(prod_card_t.accept_no,0,8)= prod_group_t.group_no \n" +
             "left join group_no on group_no.group_no = prod_group_t.group_no \n" +
             "left join task on task.task_id =group_no.task_id \n" +
             "left join GAJG_DM on subStr(prod_card_t.UPLOAD_NO,0,9)= GAJG_DM.GAJG_DM \n" +
@@ -82,7 +82,7 @@ public interface ReceiptMapper {
             "PROD_CARD_T.SIGN_GOVT,"+
             "subStr(prod_card_t.UPLOAD_NO,0,9) AS GAJG_DM," +
             "receipt_list.ID\n" +
-            "from prod_card_t@PROD_LINK\n" +
+            "from prod_card_t@PRODYD_LINK\n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = subStr(prod_card_t.UPLOAD_NO,0,9) "+
             "left join  receipt_list on receipt_list.QR_CODE = subStr(prod_card_t.accept_no,0,8) \n" +
             "where PROD_CARD_T.ACCEPT_NO=#{acceptNo}")
@@ -93,7 +93,7 @@ public interface ReceiptMapper {
             "prod_card_t.name,prod_card_t.SEX_NO,prod_card_t.id_no," +
             "GAJG_DM.GAJG_MC,PROD_CARD_T.SIGN_GOVT,subStr(prod_card_t.UPLOAD_NO,0,9) AS GAJG_DM," +
             "receipt_list.ID\n" +
-            "from prod_card_t@PROD_LINK \n" +
+            "from prod_card_t@PRODYD_LINK \n" +
             "left join GAJG_DM on GAJG_DM.GAJG_DM = subStr(prod_card_t.UPLOAD_NO,0,9) "+
             "left join  receipt_list on receipt_list.QR_CODE =prod_card_t.accept_no \n" +
             "where prod_card_t.id_no=#{id} and prod_card_t.BEGIN_DATE= #{beginDate}  and  prod_card_t.EXPIRE_DATE = #{expireDate}")
@@ -117,7 +117,7 @@ public interface ReceiptMapper {
 
     //根据身份证号查询特证表count
     @Select("select count(*) from SPECIAL_CARD \n" +
-            "left join prod_card_t@prod_link on special_card.accept_no = prod_card_t.accept_no\n" +
+            "left join prod_card_t@prodYD_LINK on special_card.accept_no = prod_card_t.accept_no\n" +
             "where prod_card_t.id_no = #{id} and prod_card_t.BEGIN_DATE= #{beginDate}  and  prod_card_t.EXPIRE_DATE = #{expireDate}")
     public int selectSpecialCardByAcceptNo(@Param("id")String id,@Param("beginDate")String beginDate,@Param("expireDate")String expireDate);
 
@@ -127,7 +127,7 @@ public interface ReceiptMapper {
 
     //根据身份证号查询普通证交接单
     @Select("SELECT RECEIPT_LIST.* FROM RECEIPT_LIST \n" +
-            "LEFT JOIN PROD_CARD_T@PROD_LINK ON subStr(PROD_CARD_T.ACCEPT_NO,0,8) =RECEIPT_LIST.QR_CODE\n" +
+            "LEFT JOIN PROD_CARD_T@PRODYD_LINK ON subStr(PROD_CARD_T.ACCEPT_NO,0,8) =RECEIPT_LIST.QR_CODE\n" +
             "WHERE PROD_CARD_T.ID_NO =#{id}")
     public Map<String,Object> selectReceiptList(@Param("id") String id);
 
@@ -155,7 +155,7 @@ public interface ReceiptMapper {
     public boolean updateReceiptDateByReceiptId(@Param("receiptId") String receiptId);
 
     //根据输入id查询交接单是否生成
-    @Select("select id,CHECK_NAME ,GAJG_DM.GAJG_MC from receipt_list left join GAJG_DM on GAJG_DM.GAJG_DM = receipt_list.POLICE_CODE where QR_CODE=(select accept_no from prod_card_t@prod_link where id_no=#{id} and BEGIN_DATE= #{beginDate}  and  EXPIRE_DATE = #{expireDate} and receipt_date is  null ) ")
+    @Select("select id,CHECK_NAME ,GAJG_DM.GAJG_MC from receipt_list left join GAJG_DM on GAJG_DM.GAJG_DM = receipt_list.POLICE_CODE where QR_CODE=(select accept_no from prod_card_t@prodYD_LINK where id_no=#{id} and BEGIN_DATE= #{beginDate}  and  EXPIRE_DATE = #{expireDate} and receipt_date is  null ) ")
     public List<Map<String,Object>> selectCountById(@Param("id") String id,@Param("beginDate") String beginDate,@Param("expireDate") String expireDate);
 
     //根据输入id查询是否生成详单
@@ -166,7 +166,7 @@ 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 " +
+            "from prod_trace_t@PRODYD_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);
 
@@ -174,7 +174,7 @@ 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 " +
+            "from prod_trace_t@PRODYD_LINK " +
             "WHERE  ACCEPT_NO=#{groupNo}")
     public Map<String,Object> selectCountTimeT(@Param("groupNo") String groupNo);
 
@@ -189,7 +189,7 @@ public interface ReceiptMapper {
             "prod_trace_t.DOWNLOAD_DATE as downloadDate,\n" +
             "prod_trace_t.CHECK_DATE as  checkDate,\n" +
             "prod_trace_t.ELECTRIC_WRITE_DATE as electricDate\n" +
-            "from prod_trace_t@PROD_LINK " +
+            "from prod_trace_t@PRODYD_LINK " +
             "WHERE  ACCEPT_NO=#{groupNo}")
     public Map<String,Object> selectTimes(@Param("groupNo") String groupNo);
 

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

@@ -72,7 +72,7 @@ public interface SelectSerialNumberMapper {
      * 查询输入身份证号/受理号是否是特证
      */
     @Select("select count(*)from SPECIAL_CARD \n" +
-            "left join  prod_card_t@PROD_LINK ON SPECIAL_CARD.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" +
+            "left join  prod_card_t@PRODYD_LINK ON SPECIAL_CARD.ACCEPT_NO = PROD_CARD_T.ACCEPT_NO\n" +
             "where SPECIAL_CARD.ACCEPT_NO=#{id}  OR PROD_CARD_T.ID_NO=#{id}")
     public int selectCount(String id);
 
@@ -85,7 +85,7 @@ public interface SelectSerialNumberMapper {
             "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 PROD_CARD_T.ACCEPT_NO=GROUP_NO.GROUP_NO "+
+            "LEFT JOIN PROD_CARD_T@PRODYD_LINK ON PROD_CARD_T.ACCEPT_NO=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.WORK_GROUP,TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
@@ -100,7 +100,7 @@ public interface SelectSerialNumberMapper {
             "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 "+
+            "LEFT JOIN PROD_CARD_T@PRODYD_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.WORK_GROUP,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" +
@@ -116,7 +116,7 @@ public interface SelectSerialNumberMapper {
             "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 ACC_CARD_T@ACCUYD_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 GROUP_NO.GROUP_NO =substr(#{id},0,8) OR ACC_CARD_T.ID_NO=#{id} and  GROUP_NO.GROUP_NO is not null\n" +
             "group by task.WORK_GROUP,TASK.TASK_ID, COUNTY_DIC.COUNTYNAME, COUNTY_DIC.COUNTY_CODE, CARD_TYPE_DIC.CARD_TYPE, CARD_TYPE_DIC.CARD_TYPE_ID, \n" +
@@ -131,7 +131,7 @@ public interface SelectSerialNumberMapper {
             "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 "+
+            "LEFT JOIN ACC_CARD_T@ACCUYD_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.WORK_GROUP,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" +
@@ -148,7 +148,7 @@ public interface SelectSerialNumberMapper {
             "ACC_CARD_T.BEGIN_DATE,\n" +
             "ACC_CARD_T.EXPIRE_DATE,\n" +
             "ACC_CARD_T.SIGN_GOVT\n" +
-            "FROM ACC_CARD_T@ACCU_LINK\n" +
+            "FROM ACC_CARD_T@ACCUYD_LINK\n" +
             "LEFT JOIN COUNTY_DIC ON subStr(ACC_CARD_T.UPLOAD_NO,0,6)=COUNTY_DIC.COUNTY_CODE\n" +
             "LEFT JOIN GROUP_NO ON subStr(ACC_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO \n" +
             "LEFT JOIN GAJG_DM ON subStr(ACC_CARD_T.upload_no,0,9)= GAJG_DM.GAJG_DM\n" +
@@ -160,11 +160,11 @@ public interface SelectSerialNumberMapper {
             "decode(CHECK_DATE,  null,decode(ELECTRIC_WRITE_DATE, null,decode(DOWNLOAD_DATE, null,1,2,5)),6) state,\n" +
             "decode(CHECK_DATE,  null,decode(ELECTRIC_WRITE_DATE, null,decode(DOWNLOAD_DATE, null,EXPORT_DATE,DOWNLOAD_DATE,ELECTRIC_WRITE_DATE)),CHECK_DATE) Last_date,\n" +
             "GAJG_DM.GAJG_MC AS GAJG1,PROD_CARD_T.BEGIN_DATE,PROD_CARD_T.EXPIRE_DATE,PROD_CARD_T.SIGN_GOVT\n" +
-            "FROM PROD_CARD_T@PROD_LINK\n" +
+            "FROM PROD_CARD_T@PRODYD_LINK\n" +
             "LEFT JOIN COUNTY_DIC ON subStr(PROD_CARD_T.UPLOAD_NO,0,6)=COUNTY_DIC.COUNTY_CODE\n" +
             "LEFT JOIN GROUP_NO ON subStr(PROD_CARD_T.ACCEPT_NO,0,8)=GROUP_NO.GROUP_NO\n" +
             "LEFT JOIN GAJG_DM ON subStr(PROD_CARD_T.upload_no,0,9)= GAJG_DM.GAJG_DM\n" +
-            "LEFT JOIN PROD_TRACE_T@PROD_LINK ON PROD_TRACE_T.ACCEPT_NO =PROD_CARD_T.ACCEPT_NO\n" +
+            "LEFT JOIN PROD_TRACE_T@PRODYD_LINK ON PROD_TRACE_T.ACCEPT_NO =PROD_CARD_T.ACCEPT_NO\n" +
             "WHERE PROD_CARD_T.ACCEPT_NO =#{id} OR PROD_CARD_T.ID_NO  =#{id}")
     public List<Map<String,Object>> selectByAcceptNoOrCardIdFromPROD(String id);
 

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

@@ -42,5 +42,5 @@ public interface FailedCardService {
 
     public List<Map<String,Object>> selectFailedCardInfo(String date ,String name);
 
-
+    public boolean deleteFailedCardInfo(String failedCardId);
 }

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

@@ -101,4 +101,6 @@ public interface TaskListService {
     public List<Map<String,Object>> selectWorkGroupReport(String startDate,String endDate,String workGroup);
 
     public boolean updateWorkGroup(List<String> list,String workGroup);
+
+    public List<Map<String,Object>> selectRemainderCardInfo(String date ,String name);
 }

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

@@ -136,4 +136,9 @@ public class FailedCardServiceImpl implements FailedCardService {
     public List<Map<String,Object>> selectFailedCardInfo(String date, String name) {
         return failedCardMapper.selectFailedCardInfo(date,name);
     }
+
+    @Override
+    public boolean deleteFailedCardInfo(String failedCardId) {
+        return failedCardMapper.deleteFailedCardInfo(Long.valueOf(failedCardId));
+    }
 }

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

@@ -99,7 +99,6 @@ public class TaskListServiceImpl implements TaskListService {
             for (String taskId : list) {
                 taskListMapper.updateState2(taskId, process, name);
             }
-
         } else {
             for (String taskId : list) {
                 taskListMapper.updateState2(taskId, process, name);
@@ -216,8 +215,9 @@ public class TaskListServiceImpl implements TaskListService {
 
                         } else {
                             if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
-                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
+                                nsList.add(Integer.parseInt(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G",""))));
                             }
+
                         }
                     }
                     countyMapGroup.put("groupNum", createGroupNo(c, nsList));
@@ -966,6 +966,13 @@ public class TaskListServiceImpl implements TaskListService {
         return true;
     }
 
+
+    @Override
+    public List<Map<String, Object>> selectRemainderCardInfo(String date, String name) {
+
+        return taskListMapper.selectRemainderCardInfo(date,name);
+    }
+
     private String createGroupNo(List<Integer> c, List<Integer> nsList) {
         try {
             String groupNo = "";
@@ -1076,7 +1083,8 @@ public class TaskListServiceImpl implements TaskListService {
                             }
                         } else {
                             if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
-                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
+                                nsList.add(Integer.parseInt(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G",""))));
+//                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
                             }
                         }
                     }
@@ -1185,7 +1193,8 @@ public class TaskListServiceImpl implements TaskListService {
                             }
                         } else {
                             if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
-                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
+                                nsList.add(Integer.parseInt(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G",""))));
+//                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
                             }
                         }
                     }
@@ -1297,7 +1306,8 @@ public class TaskListServiceImpl implements TaskListService {
                             }
                         } else {
                             if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
-                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
+                                nsList.add(Integer.parseInt(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G",""))));
+//                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
                             }
                         }
                     }
@@ -1402,7 +1412,8 @@ public class TaskListServiceImpl implements TaskListService {
                             }
                         } else {
                             if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
-                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
+                                nsList.add(Integer.parseInt(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G",""))));
+//                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
                             }
                         }
                     }
@@ -1503,7 +1514,8 @@ public class TaskListServiceImpl implements TaskListService {
                             }
                         } else {
                             if ((((countyMapList.get(i)).get("GROUP_NO")) + "").length() == 8) {
-                                nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
+                                nsList.add(Integer.parseInt(((((countyMapList.get(i)).get("GROUP_NO")) + "").replace("E","").replace("G",""))));
+                                //nsList.add(Integer.parseInt((((countyMapList.get(i)).get("GROUP_NO")) + "")));
                             }
                         }
                     }

src/main/resources/application.yml

 server:
-  port: 8083
+  port: 8082
 #spring相关
 spring:
   datasource:
     driver-class-name: oracle.jdbc.driver.OracleDriver
-    url: jdbc:oracle:thin:@192.168.1.16:1521:yingxin
+    url: jdbc:oracle:thin:@192.168.1.102:1521:yingxin
     username: yingxin
     password: yingxin
   servlet:

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

@@ -153,8 +153,6 @@
             </div>
         </div>
         <!---没查到数据-->
-        <div >{{searchResult.length}} searchResult.length</div>
-        <div >{{searchResult.size()}} searchResult.size()</div>
         <div class="box-info"
              ng-if="(searchResult.workOrderDate.length==0&&searchResult.ACCdata.length==0&&searchResult.PRODData.length==0) ||searchResult==null">
             <div>