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-04-01 23:35:33 +08:00
parent 71d24ae6fb
commit a766996637
9 changed files with 238 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
params.put("reporter", userId); params.put("reporter", userId);
processService.startProcess(IProcessService.CHECK_SELF_PROCESS, businessKey, params); processService.startProcess(IProcessService.CHECK_SELF_PROCESS, businessKey, params);
Task task = processService.getTaskByAssigneeAndBusinessKey(userId, businessKey); Task task = processService.getTaskByAssigneeAndBusinessKey(userId, businessKey);
completeCheck(token, checkVO, checkId, userId, task, isCoordination); completeCheck(token, checkVO, checkId, null, userId, task, isCoordination);
} }
/** /**
@ -115,7 +115,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
Map<String, Object> params = HashMapUtil.beanToMap(checkVO); Map<String, Object> params = HashMapUtil.beanToMap(checkVO);
saveCheckWithId(newCheckId, token, params); saveCheckWithId(newCheckId, token, params);
LOG.debug("复查流程处理"); LOG.debug("复查流程处理");
completeCheck(token, checkVO, checkId, userId, task, isCoordination); completeCheck(token, checkVO, newCheckId, checkId, userId, task, isCoordination);
} }
/** /**
@ -123,18 +123,19 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
* *
* @param checkVO * @param checkVO
* @param checkId * @param checkId
* @param oldCheckId
* @param task * @param task
* @param userId * @param userId
* @param isCoordination * @param isCoordination
* @throws Exception * @throws Exception
*/ */
private void completeCheck(String token, CheckVO checkVO, String checkId, String userId, Task task, int isCoordination) throws Exception { private void completeCheck(String token, CheckVO checkVO, String checkId, String oldCheckId, String userId, Task task, int isCoordination) throws Exception {
Map<String, Object> params = getHashMap(2); Map<String, Object> params = getHashMap(2);
params.put("isCoordination", isCoordination); params.put("isCoordination", isCoordination);
if (isCoordination == 1) { if (isCoordination == 1) {
saveHiddenDangerReport(token, checkVO, checkId, userId, task, params); saveHiddenDangerReport(token, checkVO, checkId, oldCheckId, userId, task, params);
} else { } else {
setLeaderCheck(userId, checkId, task, params); setLeaderCheck(userId, checkId, oldCheckId, task, params);
} }
processService.saveTaskCompleteByTaskId(task.getId(), params); processService.saveTaskCompleteByTaskId(task.getId(), params);
} }
@ -144,11 +145,12 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
* *
* @param checkVO * @param checkVO
* @param checkId * @param checkId
* @param oldCheckId
* @param task * @param task
* @param params * @param params
* @throws Exception * @throws Exception
*/ */
private void saveHiddenDangerReport(String token, CheckVO checkVO, String checkId, String userId, Task task, Map<String, Object> params) throws Exception { private void saveHiddenDangerReport(String token, CheckVO checkVO, String checkId, String oldCheckId, String userId, Task task, Map<String, Object> params) throws Exception {
LOG.debug("1.isCoordination：1，配合处理"); LOG.debug("1.isCoordination：1，配合处理");
List<HiddenDangerReportVO> hiddenDangerReports = checkVO.getHiddenDangerReports(); List<HiddenDangerReportVO> hiddenDangerReports = checkVO.getHiddenDangerReports();
int isAllPass = 1; int isAllPass = 1;
@ -161,20 +163,23 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
} }
LOG.debug("2.isAllPass: {}", isAllPass); LOG.debug("2.isAllPass: {}", isAllPass);
params.put("isAllPass", isAllPass); params.put("isAllPass", isAllPass);
// 业务ID
String businessCheckId = task.getBusinessKey().split(":")[1];
if (isAllPass == 0) { if (isAllPass == 0) {
LOG.debug("3.检查项没有完全通过，需要复查"); LOG.debug("3.检查项没有完全通过，需要复查");
params.put("reReporter", userId); params.put("reReporter", userId);
processService.setTaskVariableByTaskId(task.getId(), "isReport", 1); processService.setTaskVariableByTaskId(task.getId(), "isReport", 1);
LOG.debug("4.标记上一次的检查项"); LOG.debug("4.标记上一次的检查项");
processService.setTaskVariableByTaskId(task.getId(), "lastCheckId", checkId); processService.setTaskVariableByTaskId(task.getId(), "lastCheckId", checkId);
if (oldCheckId != null && !StringUtils.equals(businessCheckId, oldCheckId)) {
LOG.debug("5.标记复查为完成状态");
updateCheckIsCompleteInfo(token, oldCheckId, 1);
}
} else { } else {
LOG.debug("3.全部通过，更新当前检查业务状态和流程业务状态"); LOG.debug("3.全部通过，更新当前检查业务状态和流程业务状态");
CheckVO updateCheckVO = new CheckVO(); updateCheckIsCompleteInfo(token, checkId, 1);
updateCheckVO.setIsComplete(1); if (!StringUtils.equals(businessCheckId, checkId)) {
updateCheck(checkId, updateCheckVO); updateCheckIsCompleteInfo(token, businessCheckId, 1);
String businessCheckId = task.getBusinessKey().split(":")[1];
if (!StringUtils.equals(checkId, businessCheckId)) {
updateCheck(businessCheckId, updateCheckVO);
} }
} }
} }
@ -184,10 +189,11 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
* *
* @param userId * @param userId
* @param checkId * @param checkId
* @param newCheckId
* @param task * @param task
* @param params * @param params
*/ */
private void setLeaderCheck(String userId, String checkId, Task task, Map<String, Object> params) { private void setLeaderCheck(String userId, String checkId, String newCheckId, Task task, Map<String, Object> params) {
LOG.debug("1.isCoordination：2, 不配合"); LOG.debug("1.isCoordination：2, 不配合");
// 查询上级领导，如果上级领导为空，指向自己，如果有多个网格员角色取最高level的上级领导 // 查询上级领导，如果上级领导为空，指向自己，如果有多个网格员角色取最高level的上级领导
List<GridPersonnelDTO> gridPersonnelDTOs = gridPersonnelService.listGridPersonnelByUserIdAndIsGridOperator(userId, 1); List<GridPersonnelDTO> gridPersonnelDTOs = gridPersonnelService.listGridPersonnelByUserIdAndIsGridOperator(userId, 1);
@ -199,7 +205,6 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
processService.setTaskVariableByTaskId(task.getId(), "isLeader", 1); processService.setTaskVariableByTaskId(task.getId(), "isLeader", 1);
// 删除之上报相关属性 // 删除之上报相关属性
processService.removeTaskVariableByTaskId(task.getId(), "isReport"); processService.removeTaskVariableByTaskId(task.getId(), "isReport");
processService.removeTaskVariableByTaskId(task.getId(), "reReporter");
LOG.debug("2.标记上一次的检查项"); LOG.debug("2.标记上一次的检查项");
processService.setTaskVariableByTaskId(task.getId(), "lastCheckId", checkId); processService.setTaskVariableByTaskId(task.getId(), "lastCheckId", checkId);
} }
@ -280,6 +285,25 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
checkDao.updateCheck(params); checkDao.updateCheck(params);
} }
/**
* 修改完成状态
*
* @param token
* @param checkId
* @param isComplete
*/
private void updateCheckIsCompleteInfo(String token, String checkId, int isComplete) {
Map<String, Object> params = getHashMap(6);
params.put("isComplete", isComplete);
params.put("checkId", checkId);
if (token != null) {
setUpdateInfo(token, params);
} else {
setUpdateInfo(params);
}
checkDao.updateCheck(params);
}
@Override @Override
public CheckDTO getCheckById(String checkId) throws SearchException { public CheckDTO getCheckById(String checkId) throws SearchException {
Map<String, Object> params = super.getHashMap(1); Map<String, Object> params = super.getHashMap(1);

72
src/main/java/com/cm/inspection/service/process/IProcessService.java
View File

@ -58,7 +58,16 @@ public interface IProcessService {
* @param key * @param key
* @return * @return
*/ */
List<Task> listTaskByAssigneeAndVariablesKey(String assignee, String key); List<Task> listTaskByAssigneeAndVariableKey(String assignee, String key);
/**
* 任务列表（通过执行人和流程变量Key）
*
* @param assignee
* @param key
* @return
*/
List<Task> listTaskByAssigneeAndRuntimeVariableKey(String assignee, String key);
/** /**
* 获取任务（通过业务主键） * 获取任务（通过业务主键）
@ -114,6 +123,16 @@ public interface IProcessService {
*/ */
Task getTaskByAssigneeAndVariableKeyAndValue(String assignee, String key, Object value); Task getTaskByAssigneeAndVariableKeyAndValue(String assignee, String key, Object value);
/**
* 获取任务（通过执行人和流程变量名和流程变量值）
*
* @param assignee
* @param key
* @param value
* @return
*/
Task getTaskByAssigneeAndRuntimeVariableKeyAndRuntimeVariableValue(String assignee, String key, Object value);
/** /**
* 设置任务变量 * 设置任务变量
* *
@ -122,6 +141,14 @@ public interface IProcessService {
*/ */
void setTaskVariablesByTaskId(String taskId, Map<String, Object> variables); void setTaskVariablesByTaskId(String taskId, Map<String, Object> variables);
/**
* 设置流程变量
*
* @param executionId
* @param variables
*/
void setRuntimeVariablesByExecutionId(String executionId, Map<String, Object> variables);
/** /**
* 设置任务变量 * 设置任务变量
* *
@ -131,6 +158,15 @@ public interface IProcessService {
*/ */
void setTaskVariableByTaskId(String taskId, String key, Object value); void setTaskVariableByTaskId(String taskId, String key, Object value);
/**
* 设置流程变量
*
* @param executionId
* @param key
* @param value
*/
void setRuntimeVariableByExecutionId(String executionId, String key, Object value);
/** /**
* 获取任务变量 * 获取任务变量
* *
@ -139,16 +175,32 @@ public interface IProcessService {
*/ */
Map<String, Object> getTaskVariablesByTaskId(String taskId); Map<String, Object> getTaskVariablesByTaskId(String taskId);
/**
* 获取流程变量
*
* @param executionId
* @return
*/
Map<String, Object> getRuntimeVariablesByExecutionId(String executionId);
/** /**
* 获取任务变量（通过键、值） * 获取任务变量（通过键、值）
* *
* @param taskId * @param taskId
* @param key * @param key
* @param value
* @return * @return
*/ */
Object getTaskVariableByTaskId(String taskId, String key); Object getTaskVariableByTaskId(String taskId, String key);
/**
* 获取流程变量（通过键、值）
*
* @param executionId
* @param key
* @return
*/
Object getRuntimeVariableByExecutionId(String executionId, String key);
/** /**
* 删除任务变量 * 删除任务变量
* *
@ -157,6 +209,14 @@ public interface IProcessService {
*/ */
void removeTaskVariablesByTaskId(String taskId, List<String> keys); void removeTaskVariablesByTaskId(String taskId, List<String> keys);
/**
* 删除流程变量
*
* @param executionId
* @param keys
*/
void removeRuntimeVariablesByExecutionId(String executionId, List<String> keys);
/** /**
* 删除任务变量 * 删除任务变量
* *
@ -165,6 +225,14 @@ public interface IProcessService {
*/ */
void removeTaskVariableByTaskId(String taskId, String key); void removeTaskVariableByTaskId(String taskId, String key);
/**
* 删除流程变量
*
* @param executionId
* @param key
*/
void removeRuntimeVariableByExecutionId(String executionId, String key);
/** /**
* 完成案件（通过taskId） * 完成案件（通过taskId）
* *

58
src/main/java/com/cm/inspection/service/process/impl/ProcessServiceImpl.java
View File

@ -59,7 +59,7 @@ public class ProcessServiceImpl implements IProcessService {
} }
@Override @Override
public List<Task> listTaskByAssigneeAndVariablesKey(String assignee, String key) { public List<Task> listTaskByAssigneeAndVariableKey(String assignee, String key) {
List<Task> taskList = listTaskByAssignee(assignee); List<Task> taskList = listTaskByAssignee(assignee);
for (int i = 0; i < taskList.size(); i++) { for (int i = 0; i < taskList.size(); i++) {
Task task = taskList.get(i); Task task = taskList.get(i);
@ -72,6 +72,20 @@ public class ProcessServiceImpl implements IProcessService {
return taskList; return taskList;
} }
@Override
public List<Task> listTaskByAssigneeAndRuntimeVariableKey(String assignee, String key) {
List<Task> taskList = listTaskByAssignee(assignee);
for (int i = 0; i < taskList.size(); i++) {
Task task = taskList.get(i);
Object value = runtimeService.getVariable(task.getExecutionId(), key);
if (value == null) {
taskList.remove(i);
i--;
}
}
return taskList;
}
@Override @Override
public Task getTaskByBusinessKey(List<Task> listTask, String businessKey) { public Task getTaskByBusinessKey(List<Task> listTask, String businessKey) {
if (listTask == null) { if (listTask == null) {
@ -128,36 +142,78 @@ public class ProcessServiceImpl implements IProcessService {
return null; return null;
} }
@Override
public Task getTaskByAssigneeAndRuntimeVariableKeyAndRuntimeVariableValue(String assignee, String key, Object value) {
List<Task> taskList = listTaskByAssignee(assignee);
for (Task task : taskList) {
Object valueObj = runtimeService.getVariable(task.getExecutionId(), key);
if (!ObjectUtils.notEqual(value, valueObj)) {
return task;
}
}
return null;
}
@Override @Override
public void setTaskVariablesByTaskId(String taskId, Map<String, Object> variables) { public void setTaskVariablesByTaskId(String taskId, Map<String, Object> variables) {
taskService.setVariables(taskId, variables); taskService.setVariables(taskId, variables);
} }
@Override
public void setRuntimeVariablesByExecutionId(String executionId, Map<String, Object> variables) {
runtimeService.setVariables(executionId, variables);
}
@Override @Override
public void setTaskVariableByTaskId(String taskId, String key, Object value) { public void setTaskVariableByTaskId(String taskId, String key, Object value) {
taskService.setVariable(taskId, key, value); taskService.setVariable(taskId, key, value);
} }
@Override
public void setRuntimeVariableByExecutionId(String executionId, String key, Object value) {
runtimeService.setVariable(executionId, key, value);
}
@Override @Override
public Map<String, Object> getTaskVariablesByTaskId(String taskId) { public Map<String, Object> getTaskVariablesByTaskId(String taskId) {
return taskService.getVariables(taskId); return taskService.getVariables(taskId);
} }
@Override
public Map<String, Object> getRuntimeVariablesByExecutionId(String executionId) {
return runtimeService.getVariables(executionId);
}
@Override @Override
public Object getTaskVariableByTaskId(String taskId, String key) { public Object getTaskVariableByTaskId(String taskId, String key) {
return taskService.getVariable(taskId, key); return taskService.getVariable(taskId, key);
} }
@Override
public Object getRuntimeVariableByExecutionId(String executionId, String key) {
return runtimeService.getVariable(executionId, key);
}
@Override @Override
public void removeTaskVariablesByTaskId(String taskId, List<String> keys) { public void removeTaskVariablesByTaskId(String taskId, List<String> keys) {
taskService.removeVariables(taskId, keys); taskService.removeVariables(taskId, keys);
} }
@Override
public void removeRuntimeVariablesByExecutionId(String executionId, List<String> keys) {
}
@Override @Override
public void removeTaskVariableByTaskId(String taskId, String key) { public void removeTaskVariableByTaskId(String taskId, String key) {
taskService.removeVariable(taskId, key); taskService.removeVariable(taskId, key);
} }
@Override
public void removeRuntimeVariableByExecutionId(String executionId, String key) {
}
@Override @Override
public void saveTaskCompleteByTaskId(String taskId, Map<String, Object> params) { public void saveTaskCompleteByTaskId(String taskId, Map<String, Object> params) {
taskService.complete(taskId, params); taskService.complete(taskId, params);

13
src/main/resources/banner.txt
View File

@ -1 +1,12 @@
banner
/$$$$$$ /$$ /$$
|_ $$_/ | $$ |__/
| $$ /$$$$$$$ /$$$$$$$ /$$$$$$ /$$$$$$ /$$$$$$$ /$$$$$$ /$$ /$$$$$$ /$$$$$$$
| $$ | $$__ $$ /$$_____/ /$$__ $$ /$$__ $$ /$$_____/|_ $$_/ | $$ /$$__ $$| $$__ $$
| $$ | $$ \ $$| $$$$$$ | $$ \ $$| $$$$$$$$| $$ | $$ | $$| $$ \ $$| $$ \ $$
| $$ | $$ | $$ \____ $$| $$ | $$| $$_____/| $$ | $$ /$$| $$| $$ | $$| $$ | $$
/$$$$$$| $$ | $$ /$$$$$$$/| $$$$$$$/| $$$$$$$| $$$$$$$ | $$$$/| $$| $$$$$$/| $$ | $$
|______/|__/ |__/|_______/ | $$____/ \_______/ \_______/ \___/ |__/ \______/ |__/ |__/
| $$
| $$
|__/

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

@ -17,7 +17,7 @@
<![CDATA[${isAllPass==1}]]> <![CDATA[${isAllPass==1}]]>
</conditionExpression> </conditionExpression>
</sequenceFlow> </sequenceFlow>
<userTask activiti:exclusive="true" id="_16" name="superiorProcessing"/> <userTask activiti:assignee="${leader}" activiti:exclusive="true" id="_16" name="superiorProcessing"/>
<sequenceFlow id="_17" sourceRef="_5" targetRef="_16"> <sequenceFlow id="_17" sourceRef="_5" targetRef="_16">
<conditionExpression xsi:type="tFormalExpression"> <conditionExpression xsi:type="tFormalExpression">
<![CDATA[${isCoordination==0}]]> <![CDATA[${isCoordination==0}]]>
@ -51,122 +51,122 @@
<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: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:BPMNPlane bpmnElement="checkSelfProcess">
<bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2"> <bpmndi:BPMNShape bpmnElement="_2" id="Shape-_2">
<omgdc:Bounds height="32.0" width="32.0" x="420.0" y="5.0"/> <omgdc:Bounds height="32.0" width="32.0" x="405.0" y="5.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/> <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3"> <bpmndi:BPMNShape bpmnElement="_3" id="Shape-_3">
<omgdc:Bounds height="55.0" width="105.0" x="385.0" y="70.0"/> <omgdc:Bounds height="55.0" width="105.0" x="370.0" y="70.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/> <omgdc:Bounds height="55.0" width="105.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4" isMarkerVisible="false"> <bpmndi:BPMNShape bpmnElement="_4" id="Shape-_4" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="420.0" y="245.0"/> <omgdc:Bounds height="32.0" width="32.0" x="405.0" y="245.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/> <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5" isMarkerVisible="false"> <bpmndi:BPMNShape bpmnElement="_5" id="Shape-_5" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="420.0" y="145.0"/> <omgdc:Bounds height="32.0" width="32.0" x="405.0" y="145.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/> <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_7" id="Shape-_7"> <bpmndi:BPMNShape bpmnElement="_7" id="Shape-_7">
<omgdc:Bounds height="55.0" width="130.0" x="380.0" y="360.0"/> <omgdc:Bounds height="55.0" width="130.0" x="365.0" y="360.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="130.0" x="0.0" y="0.0"/> <omgdc:Bounds height="55.0" width="130.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_14" id="Shape-_14"> <bpmndi:BPMNShape bpmnElement="_14" id="Shape-_14">
<omgdc:Bounds height="32.0" width="32.0" x="580.0" y="455.0"/> <omgdc:Bounds height="32.0" width="32.0" x="565.0" y="455.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/> <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_16" id="Shape-_16"> <bpmndi:BPMNShape bpmnElement="_16" id="Shape-_16">
<omgdc:Bounds height="55.0" width="170.0" x="655.0" y="150.0"/> <omgdc:Bounds height="55.0" width="170.0" x="640.0" y="150.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="55.0" width="170.0" x="0.0" y="0.0"/> <omgdc:Bounds height="55.0" width="170.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNShape bpmnElement="_19" id="Shape-_19" isMarkerVisible="false"> <bpmndi:BPMNShape bpmnElement="_19" id="Shape-_19" isMarkerVisible="false">
<omgdc:Bounds height="32.0" width="32.0" x="730.0" y="240.0"/> <omgdc:Bounds height="32.0" width="32.0" x="715.0" y="240.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/> <omgdc:Bounds height="32.0" width="32.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNShape> </bpmndi:BPMNShape>
<bpmndi:BPMNEdge bpmnElement="_24" id="BPMNEdge__24" sourceElement="_5" targetElement="_4"> <bpmndi:BPMNEdge bpmnElement="_24" id="BPMNEdge__24" sourceElement="_5" targetElement="_4">
<omgdi:waypoint x="436.0" y="177.0"/> <omgdi:waypoint x="421.0" y="177.0"/>
<omgdi:waypoint x="436.0" y="245.0"/> <omgdi:waypoint x="421.0" y="245.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/> <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_23" id="BPMNEdge__23" sourceElement="_3" targetElement="_5"> <bpmndi:BPMNEdge bpmnElement="_23" id="BPMNEdge__23" sourceElement="_3" targetElement="_5">
<omgdi:waypoint x="436.0" y="125.0"/> <omgdi:waypoint x="421.0" y="125.0"/>
<omgdi:waypoint x="436.0" y="145.0"/> <omgdi:waypoint x="421.0" y="145.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/> <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_15" id="BPMNEdge__15" sourceElement="_4" targetElement="_14"> <bpmndi:BPMNEdge bpmnElement="_15" id="BPMNEdge__15" sourceElement="_4" targetElement="_14">
<omgdi:waypoint x="452.0" y="261.0"/> <omgdi:waypoint x="437.0" y="261.0"/>
<omgdi:waypoint x="530.0" y="310.0"/> <omgdi:waypoint x="515.0" y="310.0"/>
<omgdi:waypoint x="580.0" y="471.0"/> <omgdi:waypoint x="565.0" y="471.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/> <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_26" id="BPMNEdge__26" sourceElement="_7" targetElement="_5"> <bpmndi:BPMNEdge bpmnElement="_26" id="BPMNEdge__26" sourceElement="_7" targetElement="_5">
<omgdi:waypoint x="380.0" y="387.5"/> <omgdi:waypoint x="365.0" y="387.5"/>
<omgdi:waypoint x="340.0" y="270.0"/> <omgdi:waypoint x="325.0" y="270.0"/>
<omgdi:waypoint x="420.0" y="161.0"/> <omgdi:waypoint x="405.0" y="161.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/> <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_25" id="BPMNEdge__25" sourceElement="_4" targetElement="_7"> <bpmndi:BPMNEdge bpmnElement="_25" id="BPMNEdge__25" sourceElement="_4" targetElement="_7">
<omgdi:waypoint x="436.0" y="277.0"/> <omgdi:waypoint x="421.0" y="277.0"/>
<omgdi:waypoint x="436.0" y="360.0"/> <omgdi:waypoint x="421.0" y="360.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="2.0" width="0.0" x="0.0" y="-1.0"/> <omgdc:Bounds height="2.0" width="0.0" x="0.0" y="-1.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_17" id="BPMNEdge__17" sourceElement="_5" targetElement="_16"> <bpmndi:BPMNEdge bpmnElement="_17" id="BPMNEdge__17" sourceElement="_5" targetElement="_16">
<omgdi:waypoint x="452.0" y="161.0"/> <omgdi:waypoint x="437.0" y="161.0"/>
<omgdi:waypoint x="655.0" y="177.5"/> <omgdi:waypoint x="640.0" y="177.5"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/> <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_2" targetElement="_3"> <bpmndi:BPMNEdge bpmnElement="_8" id="BPMNEdge__8" sourceElement="_2" targetElement="_3">
<omgdi:waypoint x="436.0" y="37.0"/> <omgdi:waypoint x="421.0" y="37.0"/>
<omgdi:waypoint x="436.0" y="70.0"/> <omgdi:waypoint x="421.0" y="70.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/> <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_20" id="BPMNEdge__20" sourceElement="_16" targetElement="_19"> <bpmndi:BPMNEdge bpmnElement="_20" id="BPMNEdge__20" sourceElement="_16" targetElement="_19">
<omgdi:waypoint x="746.0" y="205.0"/> <omgdi:waypoint x="731.0" y="205.0"/>
<omgdi:waypoint x="746.0" y="240.0"/> <omgdi:waypoint x="731.0" y="240.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/> <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_22" id="BPMNEdge__22" sourceElement="_19" targetElement="_14"> <bpmndi:BPMNEdge bpmnElement="_22" id="BPMNEdge__22" sourceElement="_19" targetElement="_14">
<omgdi:waypoint x="730.0" y="256.0"/> <omgdi:waypoint x="715.0" y="256.0"/>
<omgdi:waypoint x="612.0" y="471.0"/> <omgdi:waypoint x="597.0" y="471.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="2.0" width="0.0" x="0.0" y="-1.0"/> <omgdc:Bounds height="2.0" width="0.0" x="0.0" y="-1.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>
</bpmndi:BPMNEdge> </bpmndi:BPMNEdge>
<bpmndi:BPMNEdge bpmnElement="_21" id="BPMNEdge__21" sourceElement="_19" targetElement="_16"> <bpmndi:BPMNEdge bpmnElement="_21" id="BPMNEdge__21" sourceElement="_19" targetElement="_16">
<omgdi:waypoint x="762.0" y="256.0"/> <omgdi:waypoint x="747.0" y="256.0"/>
<omgdi:waypoint x="865.0" y="205.0"/> <omgdi:waypoint x="850.0" y="205.0"/>
<omgdi:waypoint x="825.0" y="205.0"/> <omgdi:waypoint x="810.0" y="205.0"/>
<bpmndi:BPMNLabel> <bpmndi:BPMNLabel>
<omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/> <omgdc:Bounds height="0.0" width="0.0" x="0.0" y="0.0"/>
</bpmndi:BPMNLabel> </bpmndi:BPMNLabel>

2
src/main/resources/mybatis/mapper/gridpersonnel/gridpersonnel-mapper.xml
View File

@ -216,7 +216,7 @@
</if> </if>
<if test="userId != null and userId != ''"> <if test="userId != null and userId != ''">
AND AND
t1.user_id LIKE CONCAT(#{keywords}, '%') t1.user_id LIKE CONCAT(#{userId}, '%')
</if> </if>
<if test="level != null"> <if test="level != null">
AND AND

21
src/main/resources/static/route/check/list-check.html
View File

@ -150,25 +150,36 @@
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
return '-'; return '-';
} }
return rowData; if(rowData == 1) {
return '检查';
} else if(rowData == 2) {
return '复查';
}
return '无';
} }
}, },
{field: 'isCoordination', width: 100, title: '是否配合', align:'center', {field: 'isCoordination', width: 100, title: '是否配合', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null) {
return '-'; return '-';
} }
return rowData; if(rowData == 1) {
return '配合'
}
return '不配合';
} }
}, },
{field: 'isComplete', width: 100, title: '是否完成', align:'center', {field: 'isComplete', width: 100, title: '是否完成', align:'center',
templet: function(row) { templet: function(row) {
var rowData = row[this.field]; var rowData = row[this.field];
if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') { if(typeof(rowData) === 'undefined' || rowData == null) {
return '-'; return '-';
} }
return rowData; if(rowData == 1) {
return '完成'
}
return '未完成';
} }
}, },
]], ]],

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

@ -73,14 +73,17 @@
<label class="layui-form-label">企业</label> <label class="layui-form-label">企业</label>
<div class="layui-input-block layui-form"> <div class="layui-input-block layui-form">
<input type="hidden" id="enterpriseId" name="enterpriseId" class="layui-input"> <input type="hidden" id="enterpriseId" name="enterpriseId" class="layui-input">
<input type="text" id="enterpriseName" class="layui-input" placeholder="请选择企业" style="cursor: pointer;"> <input type="text" id="enterpriseName" class="layui-input" lay-verify="required" placeholder="请选择企业" style="cursor: pointer;">
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-form-item" pane>
<label class="layui-form-label">是否配合</label> <label class="layui-form-label">是否配合</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="radio" name="isCoordination" value="0" title="否" checked> <select name="isCoordination" lay-verify="required">
<input type="radio" name="isCoordination" value="1" title="是"> <option value="">请选择</option>
<option value="0">不配合</option>
<option value="1">配合</option>
</select>
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">

9
src/main/resources/static/route/check/update-check-mine.html → src/main/resources/static/route/check/update-recheck-mine.html
View File

@ -25,14 +25,17 @@
<label class="layui-form-label">企业</label> <label class="layui-form-label">企业</label>
<div class="layui-input-block layui-form"> <div class="layui-input-block layui-form">
<input type="hidden" id="enterpriseId" name="enterpriseId" class="layui-input"> <input type="hidden" id="enterpriseId" name="enterpriseId" class="layui-input">
<input type="text" id="enterpriseName" name="enterpriseName" class="layui-input" placeholder="请选择企业" style="cursor: pointer;"> <input type="text" id="enterpriseName" name="enterpriseName" lay-verify="required" class="layui-input" placeholder="请选择企业" style="cursor: pointer;">
</div> </div>
</div> </div>
<div class="layui-form-item" pane> <div class="layui-form-item" pane>
<label class="layui-form-label">是否配合</label> <label class="layui-form-label">是否配合</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="radio" name="isCoordination" value="0" title="否" checked> <select name="isCoordination" lay-verify="required">
<input type="radio" name="isCoordination" value="1" title="是"> <option value="">请选择</option>
<option value="0">不配合</option>
<option value="1">配合</option>
</select>
</div> </div>
</div> </div>
<div class="layui-form-item layui-form-text"> <div class="layui-form-item layui-form-text">