From d6dc4fa6ee7cf3aa860bd4e06312f230db168da7 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 10 四月 2025 10:42:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 2
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 56 +++++++++++++++++++++++++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderQuery.java | 3 +
3 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
index 3678b95..13b404e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java
@@ -55,7 +55,7 @@
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
// QueryWrapper<EamWeekMaintenanceOrder> queryWrapper = QueryGenerator.initQueryWrapper(eamWeekMaintenanceOrder, req.getParameterMap());
- Page<EamWeekMaintenanceOrder> page = new Page<EamWeekMaintenanceOrder>(pageNo, pageSize);
+ Page<EamWeekMaintenanceOrder> page = new Page<>(pageNo, pageSize);
IPage<EamWeekMaintenanceOrder> pageList = eamWeekMaintenanceOrderService.queryPageList(page, query);
return Result.OK(pageList);
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderQuery.java
index a08eef2..9726bcc 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderQuery.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamRepairOrderQuery.java
@@ -18,6 +18,9 @@
@Accessors(chain = true)
@ApiModel(value="璇锋眰瀵硅薄", description="缁翠慨宸ュ崟")
public class EamRepairOrderQuery extends EamRepairOrder implements Serializable {
+
+ private static final long serialVersionUID = 7710893031748864058L;
+
/**
* 璁惧缂栫爜
*/
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 e594233..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
@@ -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;
}
@@ -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;
}
@@ -191,6 +242,7 @@
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
entity.setOperator(sysUser.getUsername());
entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ entity.setActualStartTime(new Date());
eamWeekMaintenanceOrderMapper.updateById(entity);
//鍚姩娴佺▼
--
Gitblit v1.9.3