diff --git a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java index 2a15c32..0ef71e3 100644 --- a/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java +++ b/src/main/java/com/biutag/supervisiondata/event/ApplicationEvent.java @@ -113,7 +113,7 @@ public class ApplicationEvent { // personalService.syncPerson(LocalDate.now()); // petitionService.petitionModelTask(initDomain(List.of(40))); - riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); +// riskTaskService.eduAndAreaModelTask(initDomain(List.of(34,41))); // riskTaskService.infoModelTask(initDomain(List.of(32,33))); // marriageService.marriageModelTask(initDomain(List.of(39,51))); // diff --git a/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java b/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java index 4514c02..1e6c491 100644 --- a/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java +++ b/src/main/java/com/biutag/supervisiondata/service/impl/RiskPersonalServiceImpl.java @@ -13,7 +13,6 @@ import com.biutag.supervisiondata.service.RiskPersonalService; import com.biutag.supervisiondata.util.IdCodeUtil; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; import java.time.LocalDate; @@ -76,7 +75,7 @@ public class RiskPersonalServiceImpl implements RiskPersonalService { } RiskPersonal update = new RiskPersonal(); update.setId(oldPersonal.getId()); - if(oldPersonal.getTags().indexOf(bigTag) == -1) { + if(!oldPersonal.getTags().contains(bigTag)) { update.setTags(oldPersonal.getTags().concat(",".concat(bigTag))); updateData.add(update); } @@ -110,7 +109,14 @@ public class RiskPersonalServiceImpl implements RiskPersonalService { if(old.getTags().contains(riskPersonal.getTags())) { continue; } - RiskPersonal update = getRiskPersonal(riskPersonal, old); + RiskPersonal update = new RiskPersonal(); + update.setId(old.getId()); + update.setTags(old.getTags().concat(",").concat(riskPersonal.getTags())); + if(old.getControlDepartType() == null || riskPersonal.getControlDepartType()> old.getControlDepartType()) { + update.setControlDepartId(riskPersonal.getControlDepartId()); + update.setControlDepartName(riskPersonal.getControlDepartName()); + update.setControlDepartType(riskPersonal.getControlDepartType()); + } toUpdate.add(update); } if(!toInsert.isEmpty()) { @@ -123,18 +129,6 @@ public class RiskPersonalServiceImpl implements RiskPersonalService { } } - private static @NotNull RiskPersonal getRiskPersonal(RiskPersonal riskPersonal, RiskPersonal old) { - RiskPersonal update = new RiskPersonal(); - update.setId(old.getId()); - update.setTags(old.getTags().concat(",").concat(riskPersonal.getTags())); - if(old.getControlDepartType() == null || riskPersonal.getControlDepartType()> old.getControlDepartType()) { - update.setControlDepartId(riskPersonal.getControlDepartId()); - update.setControlDepartName(riskPersonal.getControlDepartName()); - update.setControlDepartType(riskPersonal.getControlDepartType()); - } - return update; - } - private final WdpcHZCRYXXRepository hzcryxxRepository; @Override