盖章意见添加字段

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -1,6 +1,5 @@
 package com.ningdatech.pmapi.projectlib.model.entity;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
 import com.ningdatech.pmapi.common.compare.Compare;
 import io.swagger.annotations.ApiModel;
@@ -9,7 +8,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
@@ -474,14 +472,17 @@ public class Project implements Serializable {
     private Long prePlanProjectId;
 
     @ApiModelProperty("区县预审上级条线主管单位盖章审核意见")
-    @Compare("区县预审上级条线主管单位盖章审核意见")
-    private String countrySealAuditOpinion;
+    private String countryHigherSealAuditOpinion;
 
     @ApiModelProperty("区县预审上级条线主管单位盖章审核日期")
-    @Compare("区县预审上级条线主管单位盖章审核日期")
-    private String countrySealAuditDate;
+    private String countryHigherSealAuditDate;
 
     @ApiModelProperty("区县预审盖章上级条线主管单位印章编号")
-    @Compare("区县预审盖章上级条线主管单位印章编号")
-    private String countrySealNo;
+    private String countryHigherSealNo;
+
+    @ApiModelProperty("区县预审本级主管单位盖章审核意见")
+    private String countrySealAuditOpinion;
+
+    @ApiModelProperty("区县预审本级主管单位盖章审核日期")
+    private String countrySealAuditDate;
 }

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java

@@ -28,7 +28,6 @@ import com.ningdatech.pmapi.todocenter.model.vo.TodoNumVO;
 import com.ningdatech.pmapi.user.security.auth.model.UserInfoDetails;
 import com.wflow.contants.HisProInsEndActId;
 import com.wflow.workflow.bean.dto.ReqAuditOpinionSaveDTO;
-import com.wflow.workflow.bean.process.ProcessComment;
 import com.wflow.workflow.bean.process.enums.NodeTypeEnum;
 import com.wflow.workflow.utils.ProcessTaskUtils;
 import org.apache.commons.io.FileUtils;
@@ -1201,8 +1200,8 @@ public class TodoCenterManage {
                         if (empPosUnitCode.equals(higherSuperOrgCode)) {
                             // 有上级条线主管单位信息且登录用户所在单位是上级条线主管单位,
                             // 如果项目关联的预审文件ID和上级条线审核意见不为空，说明已经提交过审核意见，直接返回文件ID
-                            if (Boolean.TRUE.equals(getCountryNotSealedInfoVO(pretrialFileId, notSealedInfoVo,
-                                    project.getCountrySealAuditOpinion()))){
+                            if (Boolean.TRUE.equals(getCountryHigherNotSealedInfoVO(pretrialFileId, notSealedInfoVo,
+                                    project.getCountryHigherSealAuditOpinion()))){
                                 return notSealedInfoVo;
                             }
                             countryParamsMap.put("higherOrgOpinion", auditOpinion);
@@ -1215,9 +1214,9 @@ public class TodoCenterManage {
                                 sealNo = companySignature.getSealSn();
                             }
                             // 保存区县预审上级条线主管单位盖章审核意见、审核日期和盖章编号
-                            project.setCountrySealNo(sealNo);
-                            project.setCountrySealAuditOpinion(auditOpinion);
-                            project.setCountrySealAuditDate(auditDate);
+                            project.setCountryHigherSealNo(sealNo);
+                            project.setCountryHigherSealAuditOpinion(auditOpinion);
+                            project.setCountryHigherSealAuditDate(auditDate);
                             projectService.updateById(project);
                             countryParamsMap.put("superOrgOpinion", null);
                             countryParamsMap.put("superOrgAuditDate", null);
@@ -1229,12 +1228,12 @@ public class TodoCenterManage {
                         else if (CommonEnum.YES.getCode().equals(isSuperOrg)) {
                             // 有上级条线主管单位信息且有本级主管单位信息
                             // 有主管单位信息且登录用户所在单位是主管单位
-                            // 如果项目关联的预审文件ID和上级条线审核意见不为空，说明已经提交过审核意见，直接返回文件ID
+                            // 装配本级主管单位审核意见
+                            // 如果项目关联的预审文件ID和上级条线审核意见以及区县审核意见不为空，说明已经提交过审核意见，直接返回文件ID
                             if (Boolean.TRUE.equals(getCountryNotSealedInfoVO(pretrialFileId, notSealedInfoVo,
-                                    project.getCountrySealAuditOpinion()))){
+                                    project.getCountryHigherSealAuditOpinion(),project.getCountrySealAuditOpinion()))){
                                 return notSealedInfoVo;
                             }
-                            // 装配本级主管单位审核意见
                             checkEmpPosUnitCode(empPosUnitCode,auditOpinion,auditDate,superOrgCode,countryParamsMap);
                             // 装配上级条线主管单位意见,调用盖章接口，
                             // 重新生成上级条线主管单位盖章而本级主管单位未盖章的pdf文件
@@ -1244,9 +1243,9 @@ public class TodoCenterManage {
                         }else if (CommonEnum.NO.getCode().equals(isSuperOrg)) {
                             // 有上级条线主管单位信息,没有本级主管单位信息
                             // 没有选主管单位，默认为项目建设单位且登录用户所在单位为项目建设单位
-                            // 如果项目关联的预审文件ID和上级条线审核意见不为空，说明已经提交过审核意见，直接返回文件ID
+                            // 如果项目关联的预审文件ID和上级条线审核意见以及区县审核意见不为空，说明已经提交过审核意见，直接返回文件ID
                             if (Boolean.TRUE.equals(getCountryNotSealedInfoVO(pretrialFileId, notSealedInfoVo,
-                                    project.getCountrySealAuditOpinion()))){
+                                    project.getCountryHigherSealAuditOpinion(),project.getCountrySealAuditOpinion()))){
                                 return notSealedInfoVo;
                             }
                             checkEmpPosUnitCode(empPosUnitCode,auditOpinion,auditDate,buildOrgCode,countryParamsMap);
@@ -1326,7 +1325,7 @@ public class TodoCenterManage {
         return false;
     }
 
-    private Boolean getCountryNotSealedInfoVO(Long fileId,NotSealedInfoVO notSealedInfoVo,String auditOpinion) {
+    private Boolean getCountryHigherNotSealedInfoVO(Long fileId, NotSealedInfoVO notSealedInfoVo, String auditOpinion) {
         if (Objects.nonNull(fileId) && StringUtils.isNotBlank(auditOpinion)){
             notSealedInfoVo.setFileId(fileId);
             notSealedInfoVo.setIsCommit(Boolean.TRUE);
@@ -1335,9 +1334,20 @@ public class TodoCenterManage {
         return false;
     }
 
+    private Boolean getCountryNotSealedInfoVO(Long fileId, NotSealedInfoVO notSealedInfoVo, String higherAuditOpinion,
+                                              String auditOpinion) {
+        if (Objects.nonNull(fileId) && StringUtils.isNotBlank(higherAuditOpinion)
+                && StringUtils.isNotBlank(auditOpinion)){
+            notSealedInfoVo.setFileId(fileId);
+            notSealedInfoVo.setIsCommit(Boolean.TRUE);
+            return true;
+        }
+        return false;
+    }
+
     private SealInfoDTO getHigherSealInfoDTO(Project project, JSONObject countryParamsMap) {
-        String countrySealAuditOpinion = project.getCountrySealAuditOpinion();
-        String countrySealAuditDate = project.getCountrySealAuditDate();
+        String countrySealAuditOpinion = project.getCountryHigherSealAuditOpinion();
+        String countrySealAuditDate = project.getCountryHigherSealAuditDate();
         countryParamsMap.put("higherOrgOpinion", countrySealAuditOpinion);
         countryParamsMap.put("higherOrgAuditDate", countrySealAuditDate);
         SealInfoDTO sealInfoDTO = new SealInfoDTO();
@@ -1346,7 +1356,7 @@ public class TodoCenterManage {
         sealInfoDTO.setPosX(TodoCenterConstant.SealTemplate.COUNTRY_SEAL_POS_X);
         sealInfoDTO.setPosY(TodoCenterConstant.SealTemplate.COUNTRY_SEAL_POS_Y);
         sealInfoDTO.setSignType(TodoCenterConstant.SealTemplate.COUNTRY_SEAL_SIGN_TYPE);
-        sealInfoDTO.setSealSn(project.getCountrySealNo());
+        sealInfoDTO.setSealSn(project.getCountryHigherSealNo());
         return sealInfoDTO;
     }