From f5318273410b8e4e7c6ecf49c099d188a924ad84 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 29 Jul 2024 14:25:32 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=9D=A1=E4=BB=B6=E9=80=89=E9=A1=B9=E4=B8=AD?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=B0=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1211458778529792]条件节点条件选项中增加地域 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1211458778529792
---
 .../handler/ProcessTaskRegionCondition.java   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskRegionCondition.java b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskRegionCondition.java
index ed2adbfd5..2662d96d3 100755
--- a/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskRegionCondition.java
+++ b/src/main/java/neatlogic/module/process/condition/handler/ProcessTaskRegionCondition.java
@@ -29,7 +29,10 @@ import neatlogic.framework.process.condition.core.IProcessTaskCondition;
 import neatlogic.framework.process.condition.core.ProcessTaskConditionBase;
 import neatlogic.framework.process.constvalue.ConditionConfigType;
 import neatlogic.framework.process.constvalue.ProcessFieldType;
+import neatlogic.framework.process.dto.ProcessTaskStepVo;
+import neatlogic.framework.process.dto.ProcessTaskVo;
 import neatlogic.framework.process.workcenter.table.ProcessTaskSqlTable;
+import neatlogic.module.process.dao.mapper.processtask.ProcessTaskMapper;
 import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Component;
 
@@ -45,6 +48,9 @@ public class ProcessTaskRegionCondition extends ProcessTaskConditionBase impleme
     @Resource
     RegionMapper regionMapper;
 
+    @Resource
+    private ProcessTaskMapper processTaskMapper;
+
     @Override
     public String getName() {
         return "region";
@@ -79,6 +85,8 @@ public class ProcessTaskRegionCondition extends ProcessTaskConditionBase impleme
         config.put("multiple", true);
         config.put("value", "");
         config.put("defaultValue", "");
+        /** 以下代码是为了兼容旧数据结构，前端有些地方还在用 **/
+        config.put("isMultiple", true);
         return config;
     }
 
@@ -127,4 +135,29 @@ public class ProcessTaskRegionCondition extends ProcessTaskConditionBase impleme
     public void getSqlConditionWhere(ConditionGroupVo groupVo, Integer index, StringBuilder sqlSb) {
         getSimpleSqlConditionWhere(groupVo.getConditionList().get(index), sqlSb, new ProcessTaskSqlTable().getShortName(), ProcessTaskSqlTable.FieldEnum.REGION_ID.getValue());
     }
+
+    @Override
+    public Object getConditionParamData(ProcessTaskStepVo processTaskStepVo) {
+        ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(processTaskStepVo.getProcessTaskId());
+        if (processTaskVo == null) {
+            return null;
+        }
+        return processTaskVo.getRegionId();
+    }
+
+    @Override
+    public Object getConditionParamDataForHumanization(ProcessTaskStepVo processTaskStepVo) {
+        ProcessTaskVo processTaskVo = processTaskMapper.getProcessTaskById(processTaskStepVo.getProcessTaskId());
+        if (processTaskVo == null) {
+            return null;
+        }
+        if (processTaskVo.getRegionId() == null) {
+            return null;
+        }
+        RegionVo regionVo = regionMapper.getRegionById(processTaskVo.getRegionId());
+        if (regionVo == null) {
+            return null;
+        }
+        return regionVo.getName();
+    }
 }
-- 
Gitee