任务单添加快证异常修改

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

@@ -458,7 +458,12 @@ public class TaskListApi {
                         specialCardService.saveSpecialCard(specialCardEntity);
                         for (GroupNoEntity groupNoEntity : groupNoEntities) {
                             if (groupNoEntity.getValidCount() == 1) {
-                                taskListService.deleteRedoTask(groupNoEntity.getTaskId());
+                                long newTaskId = taskEntity.getTaskId();
+                                long oldTaskId  = groupNoEntity.getTaskId();
+                                taskListService.updateTaskIdInDataAuditing(newTaskId,oldTaskId);
+                                if(groupNoService.selectGroupCount(oldTaskId) == 1){
+                                    taskListService.deleteRedoTask(oldTaskId);
+                                }
                                 break;
                             }
                         }

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

@@ -40,6 +40,9 @@ public interface GroupNoMapper {
     @Update("update GROUP_NO set SPECIAL_CARD_COUNT = #{specialCardCount} where id = #{id}")
     public boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity);
 
+    @Select("SELECT COUNT(*) FROM GROUP_NO WHERE TASK_ID = #{TaskId} ")
+    public int selectGroupCount(@Param("TaskId") long TaskId);
+
     /**
      * 查询组号列表
      * 受理库

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

@@ -1646,4 +1646,7 @@ public interface TaskListMapper {
     @Delete("DELETE FROM POLICE_DIC WHERE POLICE_CODE = #{policeCode}")
     public boolean deletePolice(String policeCode);
 
+    @Update("UPDATE DATA_AUDITING SET TASK_ID = #{newTaskId} WHERE TASK_ID = #{oldTaskId} ")
+    public boolean updateTaskIdInDataAuditing (@Param("newTaskId")long newTaskId,@Param("oldTaskId")long oldTaskId);
+
 }

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

@@ -14,5 +14,6 @@ public interface GroupNoService {
     public boolean saveGroupNo(GroupNoEntity groupNoEntity);
     public List<GroupNoEntity> selectGroupNoEntityByGroupNo(String groupNo);
     public boolean updateGroupNoSpecialCount(GroupNoEntity groupNoEntity);
+    public int selectGroupCount(long TaskId);
     public  List<Map<String, Object>> selectAcceptNo(String cardId);
 }

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

@@ -125,4 +125,6 @@ public interface TaskListService {
     public boolean updatePolice(String policeCode,String policeName,String newPoliceCode);
 
     public boolean deletePolice(String policeCode);
+
+    public boolean updateTaskIdInDataAuditing (long newTaskId,long oldTaskId);
 }

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

@@ -22,6 +22,7 @@ public class FileNameDicServiceImpl implements FileNameDicService {
     private PersonPostMapper personPostMapper;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void saveFileNameDic(FileNameDicEntity fileNameDicEntity) {
         fileNameDicMapper.saveFileNameDic(fileNameDicEntity);
     }

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

@@ -47,6 +47,11 @@ public class GroupNoServiceImpl implements GroupNoService {
         return groupNoMapper.updateGroupNoSpecialCount(groupNoEntity);
     }
 
+    @Override
+    public int selectGroupCount(long TaskId) {
+        return groupNoMapper.selectGroupCount(TaskId);
+    }
+
     @Override
     public List<Map<String, Object>> selectAcceptNo(String cardId) {
         return groupNoMapper.selectAcceptNo(cardId);

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

@@ -1346,6 +1346,11 @@ public class TaskListServiceImpl implements TaskListService {
         return taskListMapper.deletePolice(policeCode);
     }
 
+    @Override
+    public boolean updateTaskIdInDataAuditing (long newTaskId,long oldTaskId){
+        return taskListMapper.updateTaskIdInDataAuditing(newTaskId,oldTaskId);
+    }
+
 //    private String createGroupNoMiss(List<String> c, List<String> nsList) {
 //        try {
 //            String groupNo = "";

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

@@ -45,6 +45,7 @@ public  class ExportExcel {
         sheet.setColumnWidth(10, 30 * 110);
         sheet.setColumnWidth(11, 30 * 110);
         sheet.setColumnWidth(12, 30 * 110);
+        sheet.setColumnWidth(13, 30 * 110);
         //第三步创建行row:添加表头0行
         HSSFRow row = sheet.createRow(0);
         HSSFCellStyle style = wb.createCellStyle();//样式
@@ -69,20 +70,22 @@ public  class ExportExcel {
         cell = row.createCell(6);         //设定值
         cell.setCellValue("身份证号");
         cell = row.createCell(7);         //设定值
-        cell.setCellValue("条形码号");
+        cell.setCellValue("联系方式");
         cell = row.createCell(8);         //设定值
-        cell.setCellValue("签发机关");
+        cell.setCellValue("条形码号");
         cell = row.createCell(9);         //设定值
-        cell.setCellValue("运单号");
+        cell.setCellValue("签发机关");
         cell = row.createCell(10);         //设定值
-        cell.setCellValue("制证类型");
+        cell.setCellValue("运单号");
         cell = row.createCell(11);         //设定值
-        cell.setCellValue("原制证类型");
+        cell.setCellValue("制证类型");
         cell = row.createCell(12);         //设定值
-        cell.setCellValue("复核日期");
+        cell.setCellValue("原制证类型");
         cell = row.createCell(13);         //设定值
-        cell.setCellValue("复核人");
+        cell.setCellValue("复核日期");
         cell = row.createCell(14);         //设定值
+        cell.setCellValue("复核人");
+        cell = row.createCell(15);         //设定值
         cell.setCellValue("备注");
 
         for (int i =0;i<mapList.size();i++){
@@ -102,20 +105,22 @@ public  class ExportExcel {
             cell = row.createCell(6);         //设定值
             cell.setCellValue("null".equals(mapList.get(i).get("CARD_ID")+"")?"":mapList.get(i).get("CARD_ID")+"");
             cell = row.createCell(7);         //设定值
-            cell.setCellValue("null".equals(mapList.get(i).get("QR_CODE")+"")?"":mapList.get(i).get("QR_CODE")+"");
+            cell.setCellValue("null".equals(mapList.get(i).get("APPLY_PHONE")+"")?"":mapList.get(i).get("APPLY_PHONE")+"");
             cell = row.createCell(8);         //设定值
-            cell.setCellValue("null".equals(mapList.get(i).get("SIGN_GOVT")+"")?"":mapList.get(i).get("SIGN_GOVT")+"");
+            cell.setCellValue("null".equals(mapList.get(i).get("QR_CODE")+"")?"":mapList.get(i).get("QR_CODE")+"");
             cell = row.createCell(9);         //设定值
-            cell.setCellValue("null".equals(mapList.get(i).get("WAYBILL_NUMBER")+"")?"":mapList.get(i).get("WAYBILL_NUMBER")+"");
+            cell.setCellValue("null".equals(mapList.get(i).get("SIGN_GOVT")+"")?"":mapList.get(i).get("SIGN_GOVT")+"");
             cell = row.createCell(10);         //设定值
-            cell.setCellValue("null".equals(mapList.get(i).get("CARD_TYPE_ID")+"")?"":mapList.get(i).get("CARD_TYPE_ID")+"");
+            cell.setCellValue("null".equals(mapList.get(i).get("WAYBILL_NUMBER")+"")?"":mapList.get(i).get("WAYBILL_NUMBER")+"");
             cell = row.createCell(11);         //设定值
-            cell.setCellValue("null".equals(mapList.get(i).get("OLD_CARD_TYPE_ID")+"")?"":mapList.get(i).get("OLD_CARD_TYPE_ID")+"");
+            cell.setCellValue("null".equals(mapList.get(i).get("CARD_TYPE_ID")+"")?"":mapList.get(i).get("CARD_TYPE_ID")+"");
             cell = row.createCell(12);         //设定值
-            cell.setCellValue(mapList.get(i).get("CHECK_DATE")+"");
+            cell.setCellValue("null".equals(mapList.get(i).get("OLD_CARD_TYPE_ID")+"")?"":mapList.get(i).get("OLD_CARD_TYPE_ID")+"");
             cell = row.createCell(13);         //设定值
-            cell.setCellValue("null".equals(mapList.get(i).get("CHECK_NAME")+"")?"":mapList.get(i).get("CHECK_NAME")+"");
+            cell.setCellValue(mapList.get(i).get("CHECK_DATE")+"");
             cell = row.createCell(14);         //设定值
+            cell.setCellValue("null".equals(mapList.get(i).get("CHECK_NAME")+"")?"":mapList.get(i).get("CHECK_NAME")+"");
+            cell = row.createCell(15);         //设定值
             cell.setCellValue("null".equals(mapList.get(i).get("NOTE")+"")?"":mapList.get(i).get("NOTE")+"");
 
         }