From e6dc32961e54d2517c205acaad0dbbd72d30c412 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Wed, 1 Nov 2023 10:57:00 +0800
Subject: [PATCH] =?UTF-8?q?temp=20=E4=B8=B4=E6=97=B6=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=8E=89=E9=9B=B6=E9=83=A8=E4=BB=B6=E7=9A=84=E7=BF=BB=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsCommonServiceImpl.java   |  2 +-
 .../resources/bpmn/标准法规入库_变更流程.bpmn | 86 +++++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletion(-)
 create mode 100644 laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
index 556a8a38..d5875556 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
@@ -862,7 +862,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
                 queryWrapper.eq(SysDictItem::getDictId, lawsTag.getDictId());
                 queryWrapper.eq(SysDictItem::getItemValue, value);
                 SysDictItem dictItem = sysDictItemService.getOne(queryWrapper);
-                value = dictItem.getItemText();
+                //value = dictItem.getItemText(); // 先注释掉，后面确定好显示后再放开
             }
         } else if (FieldCommon.TYPE_DICT.contains(lawsTag.getFieldShowType())) {
             // 字典翻译
diff --git a/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn b/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn
new file mode 100644
index 00000000..db66837a
--- /dev/null
+++ b/laws-modules/src/main/resources/bpmn/标准法规入库_变更流程.bpmn
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" typeLanguage="http://www.w3.org/2001/XMLSchema" expressionLanguage="http://www.w3.org/1999/XPath" targetNamespace="http://www.activiti.org/test">
+  <bpmn:process id="Process_0si2qto" isExecutable="true">
+    <bpmn:startEvent id="StartEvent_1">
+      <bpmn:outgoing>Flow_0p6jmej</bpmn:outgoing>
+    </bpmn:startEvent>
+    <bpmn:userTask id="Activity_16zkjpn" name="填写法规信息" activiti:assignee="${engineer}">
+      <bpmn:incoming>Flow_0p6jmej</bpmn:incoming>
+      <bpmn:outgoing>Flow_0m512as</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="Flow_0p6jmej" sourceRef="StartEvent_1" targetRef="Activity_16zkjpn" />
+    <bpmn:userTask id="Activity_084um6e" name="审批" activiti:assignee="${leader}">
+      <bpmn:incoming>Flow_0m512as</bpmn:incoming>
+      <bpmn:incoming>Flow_0xggagf</bpmn:incoming>
+      <bpmn:outgoing>Flow_1h4a3b6</bpmn:outgoing>
+    </bpmn:userTask>
+    <bpmn:sequenceFlow id="Flow_0m512as" sourceRef="Activity_16zkjpn" targetRef="Activity_084um6e" />
+    <bpmn:exclusiveGateway id="Gateway_0fuuuxl">
+      <bpmn:incoming>Flow_1h4a3b6</bpmn:incoming>
+      <bpmn:outgoing>Flow_1xbzk8b</bpmn:outgoing>
+      <bpmn:outgoing>Flow_0xggagf</bpmn:outgoing>
+    </bpmn:exclusiveGateway>
+    <bpmn:sequenceFlow id="Flow_1h4a3b6" sourceRef="Activity_084um6e" targetRef="Gateway_0fuuuxl" />
+    <bpmn:endEvent id="Event_1j733yj">
+      <bpmn:incoming>Flow_1xbzk8b</bpmn:incoming>
+    </bpmn:endEvent>
+    <bpmn:sequenceFlow id="Flow_1xbzk8b" name="通过" sourceRef="Gateway_0fuuuxl" targetRef="Event_1j733yj">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${pass}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+    <bpmn:sequenceFlow id="Flow_0xggagf" name="驳回" sourceRef="Gateway_0fuuuxl" targetRef="Activity_084um6e">
+      <bpmn:conditionExpression xsi:type="bpmn:tFormalExpression">${!pass}</bpmn:conditionExpression>
+    </bpmn:sequenceFlow>
+  </bpmn:process>
+  <bpmndi:BPMNDiagram id="BPMNDiagram_1">
+    <bpmndi:BPMNPlane id="BPMNPlane_1" bpmnElement="Process_0si2qto">
+      <bpmndi:BPMNShape id="_BPMNShape_StartEvent_2" bpmnElement="StartEvent_1">
+        <dc:Bounds x="179" y="159" width="36" height="36" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="186" y="202" width="22" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_16zkjpn_di" bpmnElement="Activity_16zkjpn">
+        <dc:Bounds x="270" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Activity_084um6e_di" bpmnElement="Activity_084um6e">
+        <dc:Bounds x="430" y="137" width="100" height="80" />
+        <bpmndi:BPMNLabel />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Gateway_0fuuuxl_di" bpmnElement="Gateway_0fuuuxl" isMarkerVisible="true">
+        <dc:Bounds x="595" y="152" width="50" height="50" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNShape id="Event_1j733yj_di" bpmnElement="Event_1j733yj">
+        <dc:Bounds x="712" y="159" width="36" height="36" />
+      </bpmndi:BPMNShape>
+      <bpmndi:BPMNEdge id="Flow_0p6jmej_di" bpmnElement="Flow_0p6jmej">
+        <di:waypoint x="215" y="177" />
+        <di:waypoint x="270" y="177" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0m512as_di" bpmnElement="Flow_0m512as">
+        <di:waypoint x="370" y="177" />
+        <di:waypoint x="430" y="177" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1h4a3b6_di" bpmnElement="Flow_1h4a3b6">
+        <di:waypoint x="530" y="177" />
+        <di:waypoint x="595" y="177" />
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_1xbzk8b_di" bpmnElement="Flow_1xbzk8b">
+        <di:waypoint x="645" y="177" />
+        <di:waypoint x="712" y="177" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="668" y="159" width="22" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+      <bpmndi:BPMNEdge id="Flow_0xggagf_di" bpmnElement="Flow_0xggagf">
+        <di:waypoint x="620" y="152" />
+        <di:waypoint x="620" y="100" />
+        <di:waypoint x="480" y="100" />
+        <di:waypoint x="480" y="137" />
+        <bpmndi:BPMNLabel>
+          <dc:Bounds x="540" y="82" width="21" height="14" />
+        </bpmndi:BPMNLabel>
+      </bpmndi:BPMNEdge>
+    </bpmndi:BPMNPlane>
+  </bpmndi:BPMNDiagram>
+</definitions>