修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -369,18 +369,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         Bean.copyExistPropertis(dangerDto, latentDanger);
         if (ValidationUtil.isEmpty(dangerDto.getId())) {
             // 新增
-            latentDanger.setBusinessKey(businessKey == null?"":businessKey);
-            latentDanger.setDiscovererDepartmentId(departmentId == null?"":departmentId);
-            latentDanger.setDiscovererUserId(userId == null?"": userId);
-            latentDanger.setOrgCode(orgCode == null?"":orgCode);
-            latentDanger.setDangerType(dangerTypeEnum.getCode() == null?"":dangerTypeEnum.getCode());
-            latentDanger.setDangerTypeName(dangerTypeEnum.getName() == null?"":dangerTypeEnum.getName());
+            latentDanger.setBusinessKey(businessKey == null ? "" : businessKey);
+            latentDanger.setDiscovererDepartmentId(departmentId == null ? "" : departmentId);
+            latentDanger.setDiscovererUserId(userId == null ? "" : userId);
+            latentDanger.setOrgCode(orgCode == null ? "" : orgCode);
+            latentDanger.setDangerType(dangerTypeEnum.getCode() == null ? "" : dangerTypeEnum.getCode());
+            latentDanger.setDangerTypeName(dangerTypeEnum.getName() == null ? "" : dangerTypeEnum.getName());
             if (LatentDangerBizTypeEnum.防火监督.getCode().equals(bizType)) {
-                latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() == null?"":LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() );
-                latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName() == null?"":LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
+                latentDanger.setDangerState(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode() == null ? "" : LatentDangerState.SupervisionDangerStateEnum.提交隐患.getCode());
+                latentDanger.setDangerStateName(LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName() == null ? "" : LatentDangerState.SupervisionDangerStateEnum.提交隐患.getName());
             } else if (LatentDangerBizTypeEnum.巡检.getCode().equals(bizType)) {
-                latentDanger.setDangerState(LatentDangerState.PatrolDangerStateEnum.待评审.getCode() == null?"":LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
-                latentDanger.setDangerStateName(LatentDangerState.PatrolDangerStateEnum.待评审.getName() == null?"":LatentDangerState.PatrolDangerStateEnum.待评审.getName() );
+                latentDanger.setDangerState(LatentDangerState.PatrolDangerStateEnum.待评审.getCode() == null ? "" : LatentDangerState.PatrolDangerStateEnum.待评审.getCode());
+                latentDanger.setDangerStateName(LatentDangerState.PatrolDangerStateEnum.待评审.getName() == null ? "" : LatentDangerState.PatrolDangerStateEnum.待评审.getName());
             }
             if (ValidationUtil.isEmpty(dangerDto.getDangerName())) {
                 latentDanger.setDangerName(dangerDto.getInputItemName());
@@ -2170,7 +2170,11 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             throw new Exception("隐患不存");
         }
         latentDangerDto.setDangerPosition(null);
-        Bean.copyExistPropertis(latentDangerDto, latentDanger);
+        //以下方法存在bug会将数值类型的默认值0拷贝到对象上造成数据覆盖
+        //Bean.copyExistPropertis(latentDangerDto, latentDanger);
+        latentDanger.setId(latentDangerDto.getId());
+        latentDanger.setFlowJson(latentDangerDto.getFlowJson());
+
         if (!ValidationUtil.isEmpty(latentDangerDto.getPhotoUrl())) {
             latentDanger.setPhotoUrls(Joiner.on(",").join(latentDangerDto.getPhotoUrl()));
         }