Browse Source

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
master
kami 1 year ago
parent
commit
d5b6e360bc
  1. 2
      src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java
  2. 2
      src/main/java/com/biutag/supervisiondata/service/impl/PointServiceImpl.java

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

@ -139,7 +139,7 @@ public class ApplicationEvent {
gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73))); gBaseJJDService.syncNeighborAndColleagueDispute(initDomain(List.of(73)));
gBaseJJDService.syncBullying(initDomain(List.of(74))); gBaseJJDService.syncBullying(initDomain(List.of(74)));
gBaseSHRWFRService.crimeName(initDomain(List.of(76))); gBaseSHRWFRService.crimeName(initDomain(List.of(76)));
pointService.syncIsPetition(initDomain(List.of(111))); pointService.syncIsPetition(initDomain(List.of(40)));
pointService.syncFatherEducation(initDomain(List.of(112))); pointService.syncFatherEducation(initDomain(List.of(112)));
pointService.syncMotherEducation(initDomain(List.of(113))); pointService.syncMotherEducation(initDomain(List.of(113)));
pointService.syncDomicileType(initDomain(List.of(114))); pointService.syncDomicileType(initDomain(List.of(114)));

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

@ -1230,7 +1230,7 @@ public class PointServiceImpl implements PointService {
@Override @Override
public void syncIsPetition(TaskParamDomain domain) { public void syncIsPetition(TaskParamDomain domain) {
RiskTask task = createTask(domain.getPersons().size(), 111); RiskTask task = createTask(domain.getPersons().size(), 40);
taskRepository.save(task); taskRepository.save(task);
Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true); Map<String, RiskModelTaskClue> oldMap = domain.getOldMap(task.getModelId(), true);

Loading…
Cancel
Save