.

src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java

@@ -104,7 +104,7 @@ public class ApplicationEvent {
         DepartUtil.init(ryRepository, departRepository);
         LocalDateTime end = LocalDate.now().minusDays(1).atTime(23, 59, 59);
         CompletableFutureUtil.runSync(() -> {
-//            personalService.init(List.of(115));
+//            personalService.init(List.of(76));
 //            personalService.pullInvestigate();
 //            personalService.pullPsychosis();
 //            gBaseSHRWFRService.pullAndSave(LocalDateTime.of(2019,12,6,0,0,0), end);

src/main/java/com/biutag/supervisiondata/rest/ApiController.java

@@ -18,7 +18,12 @@ import com.biutag.supervisiondata.service.RiskScoreRuleService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 /**
@@ -154,4 +159,25 @@ public class ApiController {
         System.out.println("模型" + modelId + "执行完毕");
         return RS.success();
     }
+
+    /**
+     * 图片上传
+     * @param file 图片文件
+     * @return 获取图片的id
+     */
+    @PostMapping("/upload/image")
+    @CrossOrigin
+    public RS<String> uploadImage(@RequestParam("file") MultipartFile file) {
+        String[] filename = file.getOriginalFilename().split("\\.");
+        String type = filename[filename.length - 1];
+        String key = UUID.randomUUID().toString();
+        File localFile = new File("/work/image/"+key+"."+type);
+        try {
+            file.transferTo(localFile);
+        } catch (IOException e) {
+            log.error("", e);
+            return RS.error("图片上传失败，请重试");
+        }
+        return RS.success(key);
+    }
 }

src/main/java/com/biutag/supervisiondata/service/impl/GBaseSHRWFRServiceImpl.java

@@ -23,6 +23,7 @@ import com.biutag.supervisiondata.service.GBaseSHRWFRService;
 import com.biutag.supervisiondata.service.RiskModelTaskClueService;
 import com.biutag.supervisiondata.service.RiskPersonalService;
 import com.biutag.supervisiondata.util.DataUtil;
+import com.biutag.supervisiondata.util.DateTimeUtil;
 import com.biutag.supervisiondata.util.DepartUtil;
 import com.biutag.supervisiondata.util.IdCodeUtil;
 import lombok.AllArgsConstructor;
@@ -223,18 +224,21 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
             StringBuilder sb = new StringBuilder();
             int size = 0;
             for (GBaseWFRXX xx : wfxxList) {
-                WdpcGrjdZblx zblx = map.get(xx.getSxzmdm());
+                String [] str = xx.getSxzmdm().split(",");
+                for (String s : str) {
+                    WdpcGrjdZblx zblx = map.get(s);
                     if (zblx == null) {
                         continue;
                     }
                     zblxList.add(zblx);
+                }
                 if (sb.indexOf(xx.getAjbh()) != -1) {
                     continue;
                 }
                 sb.append(xx.getAjbh()).append(",");
                 size++;
                 try {
-                    LocalDateTime tmp = xx.getLrsj().toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+                    LocalDateTime tmp = DateTimeUtil.date2LocalDateTime(xx.getLrsj());
                     if(time == null) {
                         time = tmp;
                         continue;
@@ -242,8 +246,7 @@ public class GBaseSHRWFRServiceImpl implements GBaseSHRWFRService {
                     if(time.isBefore(tmp)) {
                         time = tmp;
                     }
-                } catch (Exception ignored) {
+                } catch (Exception ignored) {}
-                }
             }
             if(zblxList.isEmpty()) {
                 continue;