Skip to content

A
amos-boot-biz
Commit 3ed955e4 authored by zhangsen's avatar zhangsen
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents 5f5058ff a2cc4d29
Show whitespace changes
Inline Side-by-side
Showing with 92 additions and 19 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java
View file @ 3ed955e4
......@@ -48,6 +48,7 @@ import java.io.IOException;
import java.lang.reflect.Field;
import java.sql.Timestamp;
import java.util.*;
import java.util.stream.Collectors;
import static com.alibaba.fastjson.JSON.toJSONString;
......@@ -326,7 +327,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
}
if (!registerInfoMap.isEmpty()) {
objMap.putAll(registerInfoMap);
Map<String, Object> filterMap = registerInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
return objMap;
......@@ -409,7 +414,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
useInfoMap.put("USEINFO_SEQ", useInfo.getSequenceNbr());
}
if (!useInfoMap.isEmpty()) {
objMap.putAll(useInfoMap);
Map<String, Object> filterMap = useInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
//设计制造
......@@ -427,7 +436,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
designInfoMap.put("DESIGNINFO_SEQ", designInfo.getSequenceNbr());
}
if (!designInfoMap.isEmpty()) {
objMap.putAll(designInfoMap);
Map<String, Object> filterMap = designInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
//制造信息
......@@ -458,7 +471,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
factoryInfoMap.put("FACTORYINFO_SEQ", factoryInfo.getSequenceNbr());
}
if (!factoryInfoMap.isEmpty()) {
objMap.putAll(factoryInfoMap);
Map<String, Object> filterMap = factoryInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
//施工信息 【一对多，暂时只取最新一条数据】
......@@ -473,7 +490,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
constructionInfoMap.put("CONSTRUCTIONINFO_SEQ", constructionInfo.getSequenceNbr());
}
if (!constructionInfoMap.isEmpty()) {
objMap.putAll(constructionInfoMap);
Map<String, Object> filterMap = constructionInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
//注册登记
......@@ -508,7 +529,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
}
}
if (!registerInfoMap.isEmpty()) {
objMap.putAll(registerInfoMap);
Map<String, Object> filterMap = registerInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
//维保备案【一对多，暂时只取最新一条数据】
......@@ -523,7 +548,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
maintenanceRecordInfoMap.put("MAINTENANCERECORDINFO_SEQ", maintenanceRecordInfo.getSequenceNbr());
}
if (!maintenanceRecordInfoMap.isEmpty()) {
objMap.putAll(maintenanceRecordInfoMap);
Map<String, Object> filterMap = maintenanceRecordInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
//监督管理
......@@ -538,7 +567,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
supervisionInfoMap.put("SUPERVISIONINFO_SEQ", supervisionInfo.getSequenceNbr());
}
if (!supervisionInfoMap.isEmpty()) {
objMap.putAll(supervisionInfoMap);
Map<String, Object> filterMap = supervisionInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
//其他信息
......@@ -553,7 +586,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
otherInfoMap.put("OTHERINFO_SEQ", otherInfo.getSequenceNbr());
}
if (!otherInfoMap.isEmpty()) {
objMap.putAll(otherInfoMap);
Map<String, Object> filterMap = otherInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
//检验检测【一对多，暂时只取最新一条数据】
......@@ -570,7 +607,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
inspectionDetectionInfoMap.put("INSPECTIONDETECTIONINFO_SEQ", inspectionDetectionInfo.getSequenceNbr());
}
if (!inspectionDetectionInfoMap.isEmpty()) {
objMap.putAll(inspectionDetectionInfoMap);
Map<String, Object> filterMap = inspectionDetectionInfoMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
......@@ -602,7 +643,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
elevatorMap.put("ELEVATOR_SEQ", elevator.getSequenceNbr());
}
if (!elevatorMap.isEmpty()) {
objMap.putAll(elevatorMap);
Map<String, Object> filterMap = elevatorMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
} else if (EquipmentClassifityEnum.CC.getCode().equals(equipCode)) {
......@@ -618,7 +663,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
vehicleMap.put("VEHICLE_SEQ", vehicle.getSequenceNbr());
}
if (!vehicleMap.isEmpty()) {
objMap.putAll(vehicleMap);
Map<String, Object> filterMap = vehicleMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
// 主要零部件
......@@ -638,7 +687,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
ropewayMap.put("ROPEWAY_SEQ", ropeway.getSequenceNbr());
}
if (!ropewayMap.isEmpty()) {
objMap.putAll(ropewayMap);
Map<String, Object> filterMap = ropewayMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
// 主要零部件
......@@ -657,7 +710,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
ridesMap.put("RIDES_SEQ", rides.getSequenceNbr());
}
if (!ridesMap.isEmpty()) {
objMap.putAll(ridesMap);
Map<String, Object> filterMap = ridesMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
......@@ -674,7 +731,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
boilerMap.put("BOILER_SEQ", boiler.getSequenceNbr());
}
if (!boilerMap.isEmpty()) {
objMap.putAll(boilerMap);
Map<String, Object> filterMap = boilerMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
// 安全附件
......@@ -693,7 +754,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
vesselMap.put("VESSEL_SEQ", vessel.getSequenceNbr());
}
if (!vesselMap.isEmpty()) {
objMap.putAll(vesselMap);
Map<String, Object> filterMap = vesselMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
// 主要零部件和安全附件
......@@ -714,7 +779,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
pipelineMap.put("PIPELINE_SEQ", pipeline.getSequenceNbr());
}
if (!pipelineMap.isEmpty()) {
objMap.putAll(pipelineMap);
Map<String, Object> filterMap = pipelineMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
// 主要零部件
......@@ -733,7 +802,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
liftingMap.put("LIFTING_SEQ", lifting.getSequenceNbr());
}
if (!liftingMap.isEmpty()) {
objMap.putAll(liftingMap);
Map<String, Object> filterMap = liftingMap.entrySet()
.stream()
.filter(e -> e.getValue() != null && e.getValue() != "" )
.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
objMap.putAll(filterMap);
}
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationReformServiceImpl.java
View file @ 3ed955e4
......@@ -275,7 +275,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
// 驳回操作
jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.getMessage(taskCode).getReject());
jgChangeRegistrationReform.setPromoter(null);
jgChangeRegistrationReform.setPromoter("");
}
if(updateTodoAndCreate) {
// 上个代办改为已办
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment