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

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

@@ -81,8 +81,6 @@ public class FailedCardApi {
         return resultList;
     }
 
-
-
     /**
      * 生成余证(每个余证生成一个任务单)
      * @param jsonStr
@@ -140,6 +138,7 @@ public class FailedCardApi {
     @RequestMapping("insertBackCard")
     @Transactional(rollbackFor = Exception.class)
     public boolean insertBackCard(@RequestBody String jsonStr){
+        try {
             JSONArray jsonarray = JSONArray.fromObject(jsonStr);
             TaskEntity taskEntity = new TaskEntity();
             String str2 = null;
@@ -168,8 +167,11 @@ public class FailedCardApi {
                 //生成任务单
                 taskListService.saveTask(taskEntity);
                 //生成新组号列表
-           Map<String,Object> groupDataMap= failedCardService.selectGroupDate(groupList.get(i));
-           failedCardService.insertGroupNo(String.valueOf(groupDataMap.get("GROUP_NO")),String.valueOf(groupDataMap.get("TASK_ID")),(Long) groupDataMap.get("VALID_COUNT"),(Long)groupDataMap.get("INVALID_COUNT"));
+                Map<String, Object> groupDataMap = failedCardService.selectGroupDate(groupList.get(i));
+                failedCardService.insertGroupNo(String.valueOf(groupDataMap.get("GROUP_NO")), String.valueOf(groupDataMap.get("TASK_ID")), (Long) groupDataMap.get("VALID_COUNT"), (Long) groupDataMap.get("INVALID_COUNT"));
+            }
+        } catch (NullPointerException e) {
+            return false;
         }
         return true;
     }

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

@@ -114,14 +114,17 @@ public class LogApi {
 
     /**
      * 删除制证包及其数据
-     * @param fileId
+     * @param uploadTime
      * @return true
      */
      @RequestMapping("deleteFiles")
      @Transactional(rollbackFor = Exception.class)
-     public boolean deleteFiles(@RequestParam("fileId")String fileId){
-         logService.deleteFilesData(fileId);
-         logService.deleteFile(fileId);
+     public boolean deleteFiles(@RequestParam("uploadTime")String uploadTime){
+         List<String> idList =logService.selectId(uploadTime);
+         for (int i=0;i<idList.size();i++){
+             logService.deleteFilesData(idList.get(i));
+             logService.deleteFile(idList.get(i));
+         }
          return true;
      }
 

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

@@ -136,11 +136,14 @@ public interface LogMapper {
 
 
 
-    @Delete("delete from PREPRO_PERSON where file_id = #{fileId}")
-    public boolean deleteFilesData(@Param("fileId")String fileId);
+    @Select("select id  from files where TO_CHAR(UPLOAD_DATE,'yyyy-mm-dd hh24:mi:ss') = #{uploadTime}")
+    public List<String> selectId(@Param("uploadTime")String uploadTime);
 
-    @Delete("delete from files where id=#{fileId}")
-    public boolean deleteFile(@Param("fileId")String fileId);
+    @Delete("delete from PREPRO_PERSON where PREPRO_PERSON.sid = #{id}")
+    public boolean deleteFilesData(@Param("uploadTime")String id);
+
+    @Delete("delete from files where id=#{id}")
+    public boolean deleteFile(@Param("uploadTime")String id);
 
 
 

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

@@ -25,7 +25,9 @@ public interface LogService {
     public boolean insertAnalysisDate(String printDate,String latticeMouthInformation);
 
 
-    public boolean deleteFilesData(@Param("fileId")String fileId);
+    public boolean deleteFilesData(@Param("id")String id);
 
-    public boolean deleteFile(@Param("fileId")String fileId);
+    public boolean deleteFile(@Param("id")String id);
+
+    public List<String> selectId(@Param("uploadTime")String uploadTime);
 }

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

@@ -63,14 +63,20 @@ public class LogServiceImpl implements LogService {
     }
 
     @Override
-    public boolean deleteFilesData(String fileId) {
-        logMapper.deleteFilesData(fileId);
+    public boolean deleteFilesData(String id) {
+        logMapper.deleteFilesData(id);
         return true;
     }
 
     @Override
-    public boolean deleteFile(String fileId) {
-        logMapper.deleteFile(fileId);
+    public boolean deleteFile(String id) {
+        logMapper.deleteFile(id);
         return true;
     }
+
+    @Override
+    public List<String> selectId(String uploadTime) {
+       List<String> id= logMapper.selectId(uploadTime);
+        return id;
+    }
 }