From 644f2477e11b663dad53f05e4c52315916265911 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 08 四月 2025 17:30:41 +0800
Subject: [PATCH] art: 设备管理-周保-字段添加，保养状态修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekMaintenanceOrderController.java | 28 +++++++--
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamWeekMaintenanceOrderServiceImpl.java | 86 +++++++++++++++++++++++++++-
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java | 3
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 33 ++++++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java | 7 ++
5 files changed, 143 insertions(+), 14 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java
index bf36926..10b08e5 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/MaintenanceStatusEnum.java
@@ -3,8 +3,9 @@
public enum MaintenanceStatusEnum {
WAIT_MAINTENANCE, //寰呬繚鍏�
UNDER_MAINTENANCE, //淇濆吇涓�
- WAIT_SPARES, //绛夊浠�
WAIT_CONFIRM, //寰呯‘璁�
+ WAIT_INITIAL_ACCEPTANCE, // 寰呭垵楠�
+ WAIT_FINAL_ACCEPTANCE, //寰呯粓楠�
COMPLETE, //宸插畬鎴�
ABOLISH, //宸蹭綔搴�
;
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 e465d8b..58eff79 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
@@ -8,12 +8,9 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
-import org.jeecg.modules.eam.constant.MaintenanceStandardStatusEnum;
import org.jeecg.modules.eam.constant.MaintenanceStatusEnum;
-import org.jeecg.modules.eam.entity.EamMaintenanceStandard;
import org.jeecg.modules.eam.entity.EamWeekMaintenanceOrder;
import org.jeecg.modules.eam.request.EamWeekMaintenanceQuery;
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
@@ -131,8 +128,8 @@
* @param id
* @return
*/
- @AutoLog(value = "淇濆吇鏍囧噯-浣滃簾")
- @ApiOperation(value = "淇濆吇鏍囧噯-浣滃簾", notes = "淇濆吇鏍囧噯-浣滃簾")
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-浣滃簾")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-浣滃簾", notes = "鍛ㄤ繚宸ュ崟-浣滃簾")
@DeleteMapping(value = "/abolish")
public Result<?> abolish(@RequestParam(name = "id", required = true) String id) {
EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderService.getById(id);
@@ -145,6 +142,23 @@
entity.setMaintenanceStatus(MaintenanceStatusEnum.ABOLISH.name());
eamWeekMaintenanceOrderService.updateById(entity);
return Result.OK("浣滃簾鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id棰嗗彇
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-棰嗗彇")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-棰嗗彇", notes = "鍛ㄤ繚宸ュ崟-棰嗗彇")
+ @GetMapping(value = "/collect")
+ public Result<?> collect(@RequestParam(name = "id", required = true) String id) {
+ boolean b = eamWeekMaintenanceOrderService.collect(id);
+ if(!b) {
+ Result.OK("棰嗗彇澶辫触!");
+ }
+ return Result.OK("棰嗗彇鎴愬姛!");
}
/**
@@ -167,8 +181,8 @@
* @param ids
* @return
*/
- @AutoLog(value = "淇濆吇鏍囧噯-鎵归噺浣滃簾")
- @ApiOperation(value = "淇濆吇鏍囧噯-鎵归噺浣滃簾", notes = "淇濆吇鏍囧噯-鎵归噺浣滃簾")
+ @AutoLog(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
+ @ApiOperation(value = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾", notes = "鍛ㄤ繚宸ュ崟-鎵归噺浣滃簾")
@DeleteMapping(value = "/abolishBatch")
public Result<?> abolishBatch(@RequestParam(name = "ids", required = true) String ids) {
List<String> list = Arrays.asList(ids.split(","));
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
index 2a8b2a6..6c4d814 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -81,7 +81,7 @@
private String operator;
/**淇濆吇鐘舵��*/
@ApiModelProperty(value = "淇濆吇鐘舵��")
- @Dict(dicCode = "maintenance_status")
+ @Dict(dicCode = "week_maintenance_status")
private String maintenanceStatus;
/**鍒涘缓鏂瑰紡*/
@ApiModelProperty(value = "鍒涘缓鏂瑰紡")
@@ -102,6 +102,37 @@
/**澶囨敞*/
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**纭鎰忚*/
+ @ApiModelProperty(value = "纭鎰忚")
+ private String confirmComment;
+ /**鍒濋獙鏀朵汉*/
+ @ApiModelProperty(value = "鍒濋獙鏀朵汉")
+ private String initialAcceptanceUser;
+ /**鍒濋獙鏀舵椂闂�*/
+ @ApiModelProperty(value = "鍒濋獙鏀舵椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date initialAcceptanceTime;
+ /**鍒濋獙鏀舵剰瑙�*/
+ @ApiModelProperty(value = "鍒濋獙鏀舵剰瑙�")
+ private String initialAcceptanceComment;
+ /**鍒濋獙鏀堕檮浠�*/
+ @ApiModelProperty(value = "鍒濋獙鏀堕檮浠�")
+ private String initialAcceptanceFiles;
+ /**缁堥獙鏀朵汉*/
+ @ApiModelProperty(value = "缁堥獙鏀朵汉")
+ private String finalAcceptanceUser;
+ /**缁堥獙鏀舵椂闂�*/
+ @ApiModelProperty(value = "缁堥獙鏀舵椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date finalAcceptanceTime;
+ /**缁堥獙鏀舵剰瑙�*/
+ @ApiModelProperty(value = "缁堥獙鏀舵剰瑙�")
+ private String finalAcceptanceComment;
+ /**缁堥獙鏀堕檮浠�*/
+ @ApiModelProperty(value = "缁堥獙鏀堕檮浠�")
+ private String finalAcceptanceFiles;
//鍒楄〃灞曠ず
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
index b2c6d8e..8679fcd 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamWeekMaintenanceOrderService.java
@@ -36,4 +36,11 @@
* @return
*/
boolean editWeekMaintenance(EamWeekMaintenanceRequest request);
+
+ /**
+ * 棰嗗彇鍛ㄤ繚宸ュ崟
+ * @param id
+ * @return
+ */
+ boolean collect(String id);
}
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 b8e533c..cab053b 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
@@ -1,12 +1,14 @@
package org.jeecg.modules.eam.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
@@ -21,14 +23,16 @@
import org.jeecg.modules.eam.request.EamWeekMaintenanceRequest;
import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderDetailService;
import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
+import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -37,14 +41,19 @@
* @Date: 2025-04-02
* @Version: V1.0
*/
-@Service
-public class EamWeekMaintenanceOrderServiceImpl extends ServiceImpl<EamWeekMaintenanceOrderMapper, EamWeekMaintenanceOrder> implements IEamWeekMaintenanceOrderService {
+@Service("IEamWeekMaintenanceOrderService")
+public class EamWeekMaintenanceOrderServiceImpl extends ServiceImpl<EamWeekMaintenanceOrderMapper, EamWeekMaintenanceOrder> implements IEamWeekMaintenanceOrderService, FlowCallBackServiceI {
@Resource
private EamWeekMaintenanceOrderMapper eamWeekMaintenanceOrderMapper;
@Autowired
private IEamWeekMaintenanceOrderDetailService eamWeekMaintenanceOrderDetailService;
+
+ @Resource
+ private FlowCommonService flowCommonService;
+ @Resource
+ private IFlowDefinitionService flowDefinitionService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -70,6 +79,8 @@
});
eamWeekMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
}
+ //鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
+ //TODO
return true;
}
@@ -162,6 +173,71 @@
List<String> ids = request.getRemoveDetailList().stream().map(EamWeekMaintenanceOrderDetail::getId).collect(Collectors.toList());
eamWeekMaintenanceOrderDetailService.removeBatchByIds(ids);
}
+ //鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
+ //TODO
return true;
}
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean collect(String id) {
+ EamWeekMaintenanceOrder entity = eamWeekMaintenanceOrderMapper.selectById(id);
+ if(entity == null) {
+ throw new JeecgBootException("瑕侀鍙栫殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if(!MaintenanceStatusEnum.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());
+ eamWeekMaintenanceOrderMapper.updateById(entity);
+
+ //鍚姩娴佺▼
+ 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){
+ return result.isSuccess();
+ }
+ return true;
+ }
+
+ @Override
+ public void afterFlowHandle(FlowMyBusiness business) {
+ business.getTaskNameId();//鎺ヤ笅鏉ュ鎵圭殑鑺傜偣
+ business.getValues();//鍓嶇浼犺繘鏉ョ殑鍙傛暟
+ business.getActStatus();
+ }
+
+ @Override
+ public Object getBusinessDataById(String dataId) {
+ return this.getById(dataId);
+ }
+
+ @Override
+ public Map<String, Object> flowValuesOfTask(String taskNameId, Map<String, Object> values) {
+ return null;
+ }
+
+ @Override
+ public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
+ //涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
+ //鑾峰彇涓嬩竴姝ュ鐞嗕汉
+ Object object=values.get("NextAssignee");
+ return (List<String>) object;
+ }
}
--
Gitblit v1.9.3