From fccfe7d50f42f5be4c4612d61b7ae852e2ef37cd Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 17 四月 2025 15:26:09 +0800
Subject: [PATCH] 优化指派设备与审签设备的权限校验查询，新增导入电子样板触发审签流程，新增电子样板指派设备功能
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 66 +++++++++++++++++++++++++++++---
1 files changed, 59 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
index cab053b..c17c420 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java
@@ -14,7 +14,7 @@
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
-import org.jeecg.modules.eam.constant.MaintenanceStatusEnum;
+import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
import org.jeecg.modules.eam.constant.OrderCreationMethodEnum;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrderDetail;
@@ -66,7 +66,7 @@
order.setOperator(request.getOperator());
order.setRemark(request.getRemark());
//鐘舵�佸垵濮嬪寲
- order.setMaintenanceStatus(MaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ order.setMaintenanceStatus(WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
order.setCreationMethod(OrderCreationMethodEnum.MANUAL.name());
//鍒犻櫎鏍囪
order.setDelFlag(CommonConstant.DEL_FLAG_0);
@@ -80,7 +80,33 @@
eamWeekMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
}
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
- //TODO
+ if(StringUtils.isNotBlank(order.getOperator())) {
+ //鍚姩娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�:" + order.getOrderNum() + ";寮�濮嬭繘琛岃澶囧懆淇�",
+ order.getId(), "IEamWeekMaintenanceOrderService", "week_maintenance_process", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", order.getId());
+ if (StrUtil.isEmpty(order.getRemark())) {
+ variables.put("organization", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+ variables.put("comment", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+ } else {
+ variables.put("organization", order.getRemark());
+ variables.put("comment", order.getRemark());
+ }
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
+ usernames.add(order.getOperator());
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
+ if(result != null){
+ //鏇存柊鍛ㄤ繚鐘舵��
+ order.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ order.setActualStartTime(new Date());
+ eamWeekMaintenanceOrderMapper.updateById(order);
+ return result.isSuccess();
+ }
+ }
+
return true;
}
@@ -142,7 +168,7 @@
if(entity == null){
throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
}
- if(!MaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())){
+ if(!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())){
throw new JeecgBootException("鍙湁寰呬繚鍏荤姸鎬佺殑鏁版嵁鎵嶅彲缂栬緫锛�");
}
entity.setMaintenanceDate(request.getMaintenanceDate());
@@ -174,7 +200,32 @@
eamWeekMaintenanceOrderDetailService.removeBatchByIds(ids);
}
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
- //TODO
+ if(StringUtils.isNotBlank(entity.getOperator())) {
+ //鍚姩娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";寮�濮嬭繘琛岃澶囧懆淇�",
+ entity.getId(), "IEamWeekMaintenanceOrderService", "week_maintenance_process", null);
+ Map<String, Object> variables = new HashMap<>();
+ variables.put("dataId", entity.getId());
+ if (StrUtil.isEmpty(entity.getRemark())) {
+ variables.put("organization", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+ variables.put("comment", "鏂板鍛ㄤ繚宸ュ崟榛樿鍚姩娴佺▼");
+ } else {
+ variables.put("organization", entity.getRemark());
+ variables.put("comment", entity.getRemark());
+ }
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
+ usernames.add(entity.getOperator());
+ variables.put("NextAssignee", usernames);
+ Result result = flowDefinitionService.startProcessInstanceByKey("week_maintenance_process", variables);
+ if(result != null){
+ //鏇存柊鍛ㄤ繚鐘舵��
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ entity.setActualStartTime(new Date());
+ eamWeekMaintenanceOrderMapper.updateById(entity);
+ return result.isSuccess();
+ }
+ }
return true;
}
@@ -185,12 +236,13 @@
if(entity == null) {
throw new JeecgBootException("瑕侀鍙栫殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
}
- if(!MaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ if(!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囬鍙栵紒");
}
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
entity.setOperator(sysUser.getUsername());
- entity.setMaintenanceStatus(MaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ entity.setActualStartTime(new Date());
eamWeekMaintenanceOrderMapper.updateById(entity);
//鍚姩娴佺▼
--
Gitblit v1.9.3