计量任务意见

blade-service-api/blade-meter-api/src/main/java/org/springblade/meter/entity/MeterApproveOpinion.java

@@ -139,4 +139,43 @@ public class MeterApproveOpinion extends BaseEntity {
     @ApiModelProperty(value = "董事长意见时间")
     private LocalDateTime chiefExecutiveTime;
 
+    @ApiModelProperty(value = "计量工程师意见")
+    private String meterEngineer;
+
+    @ApiModelProperty(value = "计量工程师名称")
+    private String meterEngineerUserName;
+
+    @ApiModelProperty(value = "计量工程师时间")
+    private LocalDateTime meterEngineerTime;
+
+    @ApiModelProperty(value = "项目经理意见")
+    private String projectManager;
+
+    @ApiModelProperty(value = "项目经理名称")
+    private String projectManagerUserName;
+
+    @ApiModelProperty(value = "项目经理时间")
+    private LocalDateTime projectManagerTime;
+
+    @ApiModelProperty(value = "合同监理工程师意见")
+    private String contractSupervisorEngineer;
+
+    @ApiModelProperty(value = "合同监理工程师名称")
+    private String contractSupervisorEngineerUserName;
+
+    @ApiModelProperty(value = "合同监理工程师时间")
+    private LocalDateTime contractSupervisorEngineerTime;
+
+    @ApiModelProperty(value = "业主代表意见")
+    private String ownerDelegate;
+
+    @ApiModelProperty(value = "业主代表名称")
+    private String ownerDelegateUserName;
+
+    @ApiModelProperty(value = "业主代表时间")
+    private LocalDateTime ownerDelegateTime;
+
+    @ApiModelProperty(value = "项目名称")
+    private String projectName;
+
 }

blade-service/blade-meter/src/main/java/org/springblade/meter/controller/TaskController.java

@@ -1374,6 +1374,7 @@ public class TaskController extends BladeController {
                     opinion.setId(SnowFlakeUtil.getId());
                     opinion.setTaskId(task.getId());
                     opinion.setProjectId(Long.valueOf(task.getProjectId()));
+                    opinion.setProjectName(projectClient.getById(task.getProjectId()).getProjectName());
                     opinion.setContractId(Long.valueOf(task.getContractId()));
                     opinionMapper.insert(opinion);
                 }
@@ -2814,6 +2815,70 @@ public class TaskController extends BladeController {
                 }
             }
 
+            if (StringUtils.isBlank(opinion.getMeterEngineer())) {
+                opinion.setSupervisorAudit(null);
+            } else {
+                //如果存在数据则判断之前是否填写总监理工程师，填写了则不管，没填写这次填写了，则设置用户id名称时间
+                if (oldOpinion != null) {
+                    if (StringUtils.isBlank(oldOpinion.getMeterEngineer())) {
+                        opinion.setMeterEngineerUserName(AuthUtil.getNickName());
+                        opinion.setMeterEngineerTime(LocalDateTime.now());
+                    }
+                } else {
+                    //如果不存在数据，则判断当前是否填写了总监理工程师数据，填写了，则设置用户id名称时间
+                    opinion.setMeterEngineerUserName(AuthUtil.getNickName());
+                    opinion.setMeterEngineerTime(LocalDateTime.now());
+                }
+            }
+
+            if (StringUtils.isBlank(opinion.getProjectManager())) {
+                opinion.setSupervisorAudit(null);
+            } else {
+                //如果存在数据则判断之前是否填写总监理工程师，填写了则不管，没填写这次填写了，则设置用户id名称时间
+                if (oldOpinion != null) {
+                    if (StringUtils.isBlank(oldOpinion.getProjectManager())) {
+                        opinion.setProjectManagerUserName(AuthUtil.getNickName());
+                        opinion.setProjectManagerTime(LocalDateTime.now());
+                    }
+                } else {
+                    //如果不存在数据，则判断当前是否填写了总监理工程师数据，填写了，则设置用户id名称时间
+                    opinion.setProjectManagerUserName(AuthUtil.getNickName());
+                    opinion.setProjectManagerTime(LocalDateTime.now());
+                }
+            }
+
+            if (StringUtils.isBlank(opinion.getContractSupervisorEngineer())) {
+                opinion.setSupervisorAudit(null);
+            } else {
+                //如果存在数据则判断之前是否填写总监理工程师，填写了则不管，没填写这次填写了，则设置用户id名称时间
+                if (oldOpinion != null) {
+                    if (StringUtils.isBlank(oldOpinion.getContractSupervisorEngineer())) {
+                        opinion.setContractSupervisorEngineerUserName(AuthUtil.getNickName());
+                        opinion.setContractSupervisorEngineerTime(LocalDateTime.now());
+                    }
+                } else {
+                    //如果不存在数据，则判断当前是否填写了总监理工程师数据，填写了，则设置用户id名称时间
+                    opinion.setContractSupervisorEngineerUserName(AuthUtil.getNickName());
+                    opinion.setContractSupervisorEngineerTime(LocalDateTime.now());
+                }
+            }
+
+            if (StringUtils.isBlank(opinion.getOwnerDelegate())) {
+                opinion.setSupervisorAudit(null);
+            } else {
+                //如果存在数据则判断之前是否填写总监理工程师，填写了则不管，没填写这次填写了，则设置用户id名称时间
+                if (oldOpinion != null) {
+                    if (StringUtils.isBlank(oldOpinion.getOwnerDelegate())) {
+                        opinion.setOwnerDelegateUserName(AuthUtil.getNickName());
+                        opinion.setOwnerDelegateTime(LocalDateTime.now());
+                    }
+                } else {
+                    //如果不存在数据，则判断当前是否填写了总监理工程师数据，填写了，则设置用户id名称时间
+                    opinion.setOwnerDelegateUserName(AuthUtil.getNickName());
+                    opinion.setOwnerDelegateTime(LocalDateTime.now());
+                }
+            }
+
             opinionMapper.updateById(opinion);
         }
     }