Merge remote-tracking branch 'origin/master'

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

@@ -149,6 +149,7 @@ public class ApplicationEvent {
             pointService.syncFamilyDie(initDomain(List.of(118)));
             pointService.syncFatherDie(initDomain(List.of(119)));
             pointService.syncMotherDie(initDomain(List.of(120)));
+//            pointService.syncChildrenNo(initDomain(List.of(120)));// 未完成
 
             // *********暂时不要**********
 //            riskTaskService.heightFight(initDomain(List.of(42)));

src/main/java/com/biutag/supervisiondata/pojo/constants/Default.java

@@ -120,5 +120,9 @@ public class Default {
 
     public static final String FAMILYDIE = "亲近家人死亡";
 
+    public static final String FATHERDIE = "父亲是否健在";
+
+    public static final String MOTHERDIE = "母亲是否健在";
+
 
 }

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

@@ -407,7 +407,7 @@ public class PointServiceImpl implements PointService {
             toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
         }
         if (!toInsert.isEmpty()) {
-            modelTaskClueService.saveClues(toInsert, Default.FAMILYDIE);
+            modelTaskClueService.saveClues(toInsert, Default.FATHERDIE);
         }
         RiskTask updateTask = new RiskTask();
         updateTask.setId(task.getId());
@@ -457,7 +457,7 @@ public class PointServiceImpl implements PointService {
             toInsert.add(createClue(task.getModelId(), 5, task.getId(), data));
         }
         if (!toInsert.isEmpty()) {
-            modelTaskClueService.saveClues(toInsert, Default.FAMILYDIE);
+            modelTaskClueService.saveClues(toInsert, Default.MOTHERDIE);
         }
         RiskTask updateTask = new RiskTask();
         updateTask.setId(task.getId());