Tenlion/btyjj-inspection
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理流程

Browse Source
This commit is contained in:
wenc000 2020-03-31 19:12:42 +08:00
commit c828375cbf
7 changed files with 256 additions and 210 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/cm/inspection/listener/process/SelfCheckReportCompleteListener.java
View File

@ -34,7 +34,6 @@ public class SelfCheckReportCompleteListener implements TaskListener {
delegateTask.setAssignee(leader);
return;
}
}
}

13
src/main/java/com/cm/inspection/service/check/impl/CheckServiceImpl.java
View File

@ -16,6 +16,10 @@ import com.cm.inspection.pojo.vos.check.CheckVO;
import com.cm.inspection.pojo.vos.hiddendangerreport.HiddenDangerReportVO;
import com.cm.inspection.service.BaseService;
import com.cm.inspection.service.check.ICheckService;
<<<<<<< HEAD
=======
import com.cm.inspection.service.enterpriseofgridoperator.IEnterpriseOfGridOperatorService;
>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
import com.cm.inspection.service.gridpersonnel.IGridPersonnelService;
import com.cm.inspection.service.hiddendangerreport.IHiddenDangerReportService;
import com.cm.inspection.service.process.IProcessService;
@ -79,6 +83,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
String businessKey = String.format("check:%s", checkId);
params.put("reporter", userId);
processService.startProcess(IProcessService.CHECK_SELF_PROCESS, businessKey, params);
Task task = processService.getTaskByAssigneeAndBusinessKey(userId, businessKey);
params.clear();
params.put("isCoordination", isCoordination);
@ -96,6 +101,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
LOG.debug("2.isAllPass: {}", isAllPass);
params.put("isAllPass", isAllPass);
if (isAllPass == 0) {
<<<<<<< HEAD
LOG.debug("3.检查项没有完全通过，需要复查");
params.put("reReporter", userId);
processService.setTaskVariableByTaskId(task.getId(), "isReport", 1);
@ -119,6 +125,13 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
processService.setTaskVariableByTaskId(task.getId(), "isLeader", 1);
LOG.debug("2.标记上一次的检查项");
processService.setTaskVariableByTaskId(task.getId(), "lastCheckId", checkId);
=======
LOG.debug("检查项没有完全通过，需要复查");
params.put("reReporter", userId);
}
} else {
List<GridPersonnelDTO> gridPersonnelDTOs = gridPersonnelService.listGridPersonnelByUserId(userId);
>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
}
processService.saveTaskCompleteByTaskId(task.getId(), params);
}

10
src/main/java/com/cm/inspection/service/gridpersonnel/IGridPersonnelService.java
View File

@ -109,6 +109,7 @@ public interface IGridPersonnelService {
SuccessResultList<List<GridPersonnelDTO>> listPageGridPersonnel(ListPage page) throws SearchException;
/**
<<<<<<< HEAD
* 网格人员列表（通过用户名和是否是网格员）
*
* @param userId
@ -117,4 +118,13 @@ public interface IGridPersonnelService {
* @throws SearchException
*/
List<GridPersonnelDTO> listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) throws SearchException;
=======
* 通过UserId
*
* @param userId
* @return
* @throws SearchException
*/
List<GridPersonnelDTO> listGridPersonnelByUserId(String userId) throws SearchException;
>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
}

5
src/main/java/com/cm/inspection/service/gridpersonnel/impl/GridPersonnelServiceImpl.java
View File

@ -143,11 +143,16 @@ public class GridPersonnelServiceImpl extends BaseService implements IGridPerson
}
@Override
<<<<<<< HEAD
public List<GridPersonnelDTO> listGridPersonnelByUserIdAndIsGridOperator(String userId, int isGridOperator) throws SearchException {
Map<String, Object> params = getHashMap(2);
params.put("userId", userId);
params.put("isGridOperator", isGridOperator);
return listGridPersonnel(params);
=======
public List<GridPersonnelDTO> listGridPersonnelByUserId(String userId) throws SearchException {
return null;
>>>>>>> 68f1a72fb99bfded0696f942c5fb73af22e89872
}
}

8
src/main/resources/application-test.yml
View File

@ -1,6 +1,6 @@
server:
port: 7006
url: http://192.168.0.113:7006/inspection
url: http://192.168.0.106:7006/inspection
title: 隐患上报系统
servlet:
context-path: /inspection
@ -78,11 +78,11 @@ file:
# 安全
security:
oauth2:
oauth-server: http://192.168.0.113:7001/usercenter
oauth-server: http://192.168.0.106:7001/usercenter
oauth-logout: ${security.oauth2.oauth-server}/logout?redirect_uri=${server.url}
client:
client-id: 89e9c099c0a24e7f90d3cdc0447a86b3
client-secret: VlQ1WE53RDZ6QVJLaHd2b1dGMUdEdGFjYTRhVHUyOHNpQzZoVzE3V1NDOG1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
client-id: 32ec344a5fd04fd9911586df5d1dc36b
client-secret: a2NORTAyZmthdTNtVHNwLytGVVo0ckFhNktHQU9JWVFmUks0TGw5L2hQRW1ac2wwZTJHWk5NbXh3L3h3U2c4Rg==
user-authorization-uri: ${security.oauth2.oauth-server}/oauth/authorize
access-token-uri: ${security.oauth2.oauth-server}/oauth/token
grant-type: authorization_code

58
src/main/resources/bpmn/check-self.bpmn
View File

@ -1,62 +1,54 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL"
xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI"
xmlns:activiti="http://activiti.org/bpmn"
xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC"
xmlns:tns="http://www.activiti.org/test"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
expressionLanguage="http://www.w3.org/1999/XPath"
id="m1585124459573"
name=""
targetNamespace="http://www.activiti.org/test"
typeLanguage="http://www.w3.org/2001/XMLSchema">
<process xmlns="" id="checkSelfProcess" isClosed="false" isExecutable="true"
processType="None">
<definitions xmlns="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:activiti="http://activiti.org/bpmn" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:omgdc="http://www.omg.org/spec/DD/20100524/DC" xmlns:omgdi="http://www.omg.org/spec/DD/20100524/DI" xmlns:tns="http://www.activiti.org/test" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" expressionLanguage="http://www.w3.org/1999/XPath" id="m1585124459573" name="" targetNamespace="http://www.activiti.org/test" typeLanguage="http://www.w3.org/2001/XMLSchema">
<process id="checkSelfProcess" isClosed="false" isExecutable="true" processType="None">
<startEvent id="_2" name="StartEvent"/>
<userTask activiti:assignee="${reporter}" activiti:exclusive="true" id="_3"
name="reportCase">
<userTask activiti:assignee="${reporter}" activiti:exclusive="true" id="_3" name="reportCase">
<extensionElements>
<activiti:taskListener class="com.cm.inspection.listener.process.SelfCheckReportCompleteListener"
event="delete"/>
<activiti:taskListener class="com.cm.inspection.listener.process.SelfCheckReportCompleteListener" event="delete"/>
</extensionElements>
</userTask>
<exclusiveGateway gatewayDirection="Unspecified" id="_4" name="isAllPass"/>
<exclusiveGateway gatewayDirection="Unspecified" id="_5" name="isCoordination"/>
<userTask activiti:assignee="${reporter}" activiti:exclusive="true" id="_7"
name="ReExamination"/>
<userTask activiti:assignee="${reReporter}" activiti:exclusive="true" id="_7" name="ReExamination"/>
<sequenceFlow id="_8" sourceRef="_2" targetRef="_3"/>
<endEvent id="_14" name="EndEvent"/>
<sequenceFlow id="_15" sourceRef="_4" targetRef="_14">
<conditionExpression xsi:type="tFormalExpression">${isAllPass==1}</conditionExpression>
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${isAllPass==1}]]>
</conditionExpression>
</sequenceFlow>
<userTask activiti:assignee="${leader}" activiti:exclusive="true" id="_16"
name="superiorProcessing"/>
<userTask activiti:exclusive="true" id="_16" name="superiorProcessing"/>
<sequenceFlow id="_17" sourceRef="_5" targetRef="_16">
<conditionExpression xsi:type="tFormalExpression">${isCoordination==0}</conditionExpression>
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${isCoordination==0}]]>
</conditionExpression>
</sequenceFlow>
<exclusiveGateway gatewayDirection="Unspecified" id="_19" name="isSuccessfulTreatment"/>
<sequenceFlow id="_20" sourceRef="_16" targetRef="_19"/>
<sequenceFlow id="_21" sourceRef="_19" targetRef="_16">
<conditionExpression xsi:type="tFormalExpression">${isSuccessfulTreatment==0}</conditionExpression>
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${isSuccessfulTreatment==0}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_22" sourceRef="_19" targetRef="_14">
<conditionExpression xsi:type="tFormalExpression">${isSuccessfulTreatment==1}</conditionExpression>
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${isSuccessfulTreatment==1}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_23" sourceRef="_3" targetRef="_5"/>
<sequenceFlow id="_24" sourceRef="_5" targetRef="_4">
<conditionExpression xsi:type="tFormalExpression">${isCoordination==1}</conditionExpression>
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${isCoordination==1}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_25" sourceRef="_4" targetRef="_7">
<conditionExpression xsi:type="tFormalExpression">${isAllPass==0}</conditionExpression>
<conditionExpression xsi:type="tFormalExpression">
<![CDATA[${isAllPass==0}]]>
</conditionExpression>
</sequenceFlow>
<sequenceFlow id="_26" sourceRef="_7" targetRef="_5"/>
</process>
<bpmndi:BPMNDiagram xmlns=""
documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0"
id="Diagram-_1"
name="New Diagram">
<bpmndi:BPMNDiagram documentation="background=#FFFFFF;count=1;horizontalcount=1;orientation=0;width=842.4;height=1195.2;imageableWidth=832.4;imageableHeight=1185.2;imageableX=5.0;imageableY=5.0" id="Diagram-_1" name="New Diagram">
<bpmndi:BPMNPlane bpmnElement="checkSelfProcess">
<bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
<omgdc:Bounds height="32.0" width="32.0" x="420.0" y="5.0"/>

71
src/main/resources/static/route/check/save-check.html
View File

@ -22,8 +22,8 @@
<div class="layui-card-body" style="padding: 15px;">
<form class="layui-form layui-form-pane" lay-filter="dataForm">
<div class="layui-form-item">
<label class="layui-form-label">1级区域</label>
<div class="layui-input-block layui-form" id="area1SelectTemplateBox" lay-filter="area1SelectTemplateBox"></div>
<label class="layui-form-label">区域</label>
<div class="layui-inline layui-form" id="area1SelectTemplateBox" lay-filter="area1SelectTemplateBox"></div>
<script id="area1SelectTemplate" type="text/html">
<select id="area1" name="area1" lay-filter="area1">
<option value="">请选择1级区域</option>
@ -32,10 +32,7 @@
{{# } }}
</select>
</script>
</div>
<div class="layui-form-item">
<label class="layui-form-label">2级区域</label>
<div class="layui-input-block layui-form" id="area2SelectTemplateBox" lay-filter="area2SelectTemplateBox"></div>
<div class="layui-inline layui-form" id="area2SelectTemplateBox" lay-filter="area2SelectTemplateBox"></div>
<script id="area2SelectTemplate" type="text/html">
<select id="area2" name="area2" lay-filter="area2">
<option value="">请选择2级区域</option>
@ -44,10 +41,7 @@
{{# } }}
</select>
</script>
</div>
<div class="layui-form-item">
<label class="layui-form-label">3级区域</label>
<div class="layui-input-block layui-form" id="area3SelectTemplateBox" lay-filter="area3SelectTemplateBox"></div>
<div class="layui-inline layui-form" id="area3SelectTemplateBox" lay-filter="area3SelectTemplateBox"></div>
<script id="area3SelectTemplate" type="text/html">
<select id="area3" name="area3" lay-filter="area3">
<option value="">请选择3级区域</option>
@ -56,10 +50,7 @@
{{# } }}
</select>
</script>
</div>
<div class="layui-form-item">
<label class="layui-form-label">4级区域</label>
<div class="layui-input-block layui-form" id="area4SelectTemplateBox" lay-filter="area4SelectTemplateBox"></div>
<div class="layui-inline layui-form" id="area4SelectTemplateBox" lay-filter="area4SelectTemplateBox"></div>
<script id="area4SelectTemplate" type="text/html">
<select id="area4" name="area4" lay-filter="area4">
<option value="">请选择4级区域</option>
@ -68,10 +59,7 @@
{{# } }}
</select>
</script>
</div>
<div class="layui-form-item">
<label class="layui-form-label">5级区域</label>
<div class="layui-input-block layui-form" id="area5SelectTemplateBox" lay-filter="area5SelectTemplateBox"></div>
<div class="layui-inline layui-form" id="area5SelectTemplateBox" lay-filter="area5SelectTemplateBox"></div>
<script id="area5SelectTemplate" type="text/html">
<select id="area5" name="area5">
<option value="">请选择5级区域</option>
@ -106,7 +94,6 @@
</div>
</div>
<div class="layui-form-item layui-form-text">
<label class="layui-form-label">检查项</label>
<div class="layui-input-block" id="checkItemTemplateBox"></div>
<script id="checkItemTemplate" type="text/html">
<table class="layui-table">
@ -376,6 +363,7 @@
// 提交表单
form.on('submit(submitForm)', function(formData) {
var field = formData.field;
// 获取隐患项列表
var hdFieldArray = [];
for(var i in field) {
if(i.indexOf('hd_') > -1) {
@ -386,9 +374,48 @@
delete field[i];
}
}
console.log(hdFieldArray);
console.log(field);
return;
// 筛选隐藏项
var hiddenDangerReports = [];
var temp;
for(var i = 0, item; item = hdFieldArray[i]; i++) {
var hiddenDangerReportArray = item.k.split('_');
var checkItemId = hiddenDangerReportArray[2];
var removeItemCount = 0;
var hiddenDangerReport = {
checkItemId: checkItemId
};
for(var j = 0, checkItem; checkItem = hdFieldArray[j]; j++) {
var checkItemKey = checkItem.k;
if(checkItemKey.indexOf(checkItemId) > -1) {
if(checkItemKey.indexOf('checkResult') > -1) {
hiddenDangerReport.checkResult = checkItem.v;
hdFieldArray.splice(j, 1);
j--;
removeItemCount++;
} else if(checkItemKey.indexOf('immediatelyChangeType') > -1) {
hiddenDangerReport.immediatelyChangeType = checkItem.v;
hdFieldArray.splice(j, 1);
j--;
removeItemCount++;
} else if(checkItemKey.indexOf('rectificationDays') > -1) {
hiddenDangerReport.rectificationDays = checkItem.v;
hdFieldArray.splice(j, 1);
j--;
removeItemCount++;
} else if(checkItemKey.indexOf('scenePhotos') > -1) {
hiddenDangerReport.scenePhotos = checkItem.v;
hdFieldArray.splice(j, 1);
j--;
removeItemCount++;
}
}
}
hiddenDangerReports.push(hiddenDangerReport);
if(removeItemCount > 0) {
i--;
}
}
field.hiddenDangerReports = hiddenDangerReports;
top.dialog.confirm(top.dataMessage.commit, function(index) {
top.dialog.close(index);
var loadLayerIndex;