|
|
|
|
@ -90,9 +90,12 @@ public class PetitionServiceImpl implements PetitionService {
|
|
|
|
|
person.setName(data.getName()); |
|
|
|
|
person.setMobileNumber(data.getPhone()); |
|
|
|
|
person.setTags(Default.PETITION_12337_TAG); |
|
|
|
|
// person.setControlDepartId(data.getThirdDepartId());
|
|
|
|
|
// person.setControlDepartName(data.getThirdDepartName());
|
|
|
|
|
// person.setControlTime(data.getDiscoverTime());
|
|
|
|
|
if(data.getThirdDepartId() != null) { |
|
|
|
|
person.setControlDepartId(data.getThirdDepartId()); |
|
|
|
|
person.setControlDepartName(data.getThirdDepartName()); |
|
|
|
|
person.setControlTime(data.getDiscoverTime()); |
|
|
|
|
person.setControlDepartType(DepartType.OTHER.getType()); |
|
|
|
|
} |
|
|
|
|
personals1.add(person); |
|
|
|
|
idCards.add(data.getIdCode()); |
|
|
|
|
} |
|
|
|
|
@ -107,9 +110,12 @@ public class PetitionServiceImpl implements PetitionService {
|
|
|
|
|
person.setName(data.getResponderName()); |
|
|
|
|
person.setMobileNumber(data.getResponderPhone()); |
|
|
|
|
person.setTags(Default.PETITION_TAG); |
|
|
|
|
// person.setControlDepartId(data.getThirdDepartId());
|
|
|
|
|
// person.setControlDepartName(data.getThirdDepartName());
|
|
|
|
|
// person.setControlTime(data.getDiscoveryTime());
|
|
|
|
|
if(data.getThirdDepartId() != null) { |
|
|
|
|
person.setControlDepartId(data.getThirdDepartId()); |
|
|
|
|
person.setControlDepartName(data.getThirdDepartName()); |
|
|
|
|
person.setControlTime(data.getDiscoveryTime()); |
|
|
|
|
person.setControlDepartType(DepartType.OTHER.getType()); |
|
|
|
|
} |
|
|
|
|
personals2.add(person); |
|
|
|
|
idCards_b.add(data.getResponderIdCode()); |
|
|
|
|
} |
|
|
|
|
@ -123,9 +129,12 @@ public class PetitionServiceImpl implements PetitionService {
|
|
|
|
|
person.setName(data.getResponderName()); |
|
|
|
|
person.setMobileNumber(data.getResponderPhone()); |
|
|
|
|
person.setTags(Default.PETITION_CASE_TAG); |
|
|
|
|
// person.setControlDepartId(data.getThirdDepartId());
|
|
|
|
|
// person.setControlDepartName(data.getThirdDepartName());
|
|
|
|
|
// person.setControlTime(data.getDiscoveryTime());
|
|
|
|
|
if(data.getThirdDepartId() != null) { |
|
|
|
|
person.setControlDepartId(data.getThirdDepartId()); |
|
|
|
|
person.setControlDepartName(data.getThirdDepartName()); |
|
|
|
|
person.setControlTime(data.getDiscoveryTime()); |
|
|
|
|
person.setControlDepartType(DepartType.OTHER.getType()); |
|
|
|
|
} |
|
|
|
|
personals3.add(person); |
|
|
|
|
mobiles.add(data.getResponderPhone()); |
|
|
|
|
} |
|
|
|
|
@ -373,9 +382,6 @@ public class PetitionServiceImpl implements PetitionService {
|
|
|
|
|
// 数据部分
|
|
|
|
|
List<RiskModelTaskClue> toUpdates = new ArrayList<>(); |
|
|
|
|
List<RiskModelTaskClue> toInsert = new ArrayList<>(); |
|
|
|
|
List<RiskPersonal> touUpdatePerson = new ArrayList<>(); |
|
|
|
|
List<RiskPersonalControlRecord> toInsertRecrod = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 操作前查询之前的数据,可能要合并
|
|
|
|
|
List<RiskModelTaskClue> oldList = Optional.ofNullable(domain.getMap().get(task.getModelId())).orElse(new ArrayList<>()); |
|
|
|
|
@ -408,7 +414,6 @@ public class PetitionServiceImpl implements PetitionService {
|
|
|
|
|
// 找不到旧编号才继续
|
|
|
|
|
if(oldClueMap.get(BhUtil.petBh(clueData.getId())) == null) { |
|
|
|
|
winner.add(createClue(task.getModelId(), 5, task.getId(), clueData)); |
|
|
|
|
toInsertRecrod.add(createControlRecord(clueData)); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
// - 结合新旧数据,从新计算季度,季度最晚的算分
|
|
|
|
|
|