From fd5cdba866601d040769a45f32e97c92eb40a39e Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 18 Jul 2024 11:19:04 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20scc=E6=B5=81=E7=A8=8B=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=88=86=E5=8F=91=E8=8A=82=E7=82=B9=E6=98=AF=E5=90=A6=E8=83=BD?= =?UTF-8?q?=E5=A4=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/ProcessStandardComplianceCheck.java | 4 ++++ .../impl/ProcessStandardComplianceCheckServiceImpl.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java index cf595abe..a0909ff9 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/entity/ProcessStandardComplianceCheck.java @@ -195,6 +195,10 @@ public class ProcessStandardComplianceCheck implements Serializable { @TableField(exist = false) private String seniorManager; + @ApiModelProperty(value = "是否锁定下发下拉选项") + @TableField(exist = false) + private boolean lockDistributeFlag; + @TableField(exist = false) private static final long serialVersionUID = 1L; } \ No newline at end of file diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index a3eb88dd..fcbe1072 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -451,6 +451,9 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl (boolean) value ? YesOrNoEnum.YES.getValue() : YesOrNoEnum.NO.getValue()); + // 如果没有下发过 + String distributeFlag = scc.getDistributeFlag(); + scc.setLockDistributeFlag(YesOrNoEnum.YES.getValue().equals(distributeFlag)); actFlowCommonService.setStringAttribute(mainInstanceId, DEPT_USER, scc::setDeptUser, Object::toString); actFlowCommonService.setStringAttribute(mainInstanceId, MAIN_CHECK_USER, scc::setMainCheckUser, Object::toString); actFlowCommonService.setListAttribute(mainInstanceId, COUNTERSIGN_USER_LIST, v -> scc.setCountersignUser(String.join(",", v)), v -> (List) v);