From 1dbc8f9ee50b2979decba91ea177f275c09833b4 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 21 五月 2025 09:03:01 +0800
Subject: [PATCH] art: 设备管理-三保-三保数据库设计变更代码修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java | 65 +++++++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 39 +++++++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java | 20 +++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 108 ++++++++++++++++-----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java | 16 +++
5 files changed, 189 insertions(+), 59 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java
index ac4e405..315b587 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamPrecisionCheckDetail.java
@@ -8,51 +8,62 @@
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
import java.io.Serializable;
import java.util.Date;
+
/**
* @Description: 璁惧绮惧害妫�娴嬫槑缁�
* @Author: jeecg-boot
- * @Date: 2025-05-13
+ * @Date: 2025-05-13
* @Version: V1.0
*/
@Data
@TableName("eam_precision_check_detail")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
-@ApiModel(value="eam_precision_check_detail瀵硅薄", description="璁惧绮惧害妫�娴嬫槑缁�")
+@ApiModel(value = "eam_precision_check_detail瀵硅薄", description = "璁惧绮惧害妫�娴嬫槑缁�")
public class EamPrecisionCheckDetail implements Serializable {
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
+
+ /**
+ * 涓婚敭
+ */
+ @TableId(type = IdType.ASSIGN_ID)
@ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @Excel(name = "鍒涘缓浜�", width = 15)
+ private String id;
+ /**
+ * 鍒涘缓浜�
+ */
@ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃堕棿*/
+ private String createBy;
+ /**
+ * 鍒涘缓鏃堕棿
+ */
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
- private Date createTime;
- /**鏇存柊浜�*/
- @Excel(name = "鏇存柊浜�", width = 15)
+ private Date createTime;
+ /**
+ * 鏇存柊浜�
+ */
@ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃堕棿*/
+ private String updateBy;
+ /**
+ * 鏇存柊鏃堕棿
+ */
@ApiModelProperty(value = "鏇存柊鏃堕棿")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- private Integer delFlag;
- /**璁惧鍙傛暟id*/
- @Excel(name = "璁惧鍙傛暟id", width = 15)
+ private Date updateTime;
+ /**
+ * 宸ュ崟ID
+ */
+ @ApiModelProperty(value = "宸ュ崟ID")
+ private String orderId;
+ /**
+ * 璁惧鍙傛暟id
+ */
@ApiModelProperty(value = "璁惧鍙傛暟id")
- private String equipmentPrecisionId;
- /**瀹炴祴鍊�*/
- @Excel(name = "瀹炴祴鍊�", width = 15)
+ private String equipmentPrecisionId;
+ /**
+ * 瀹炴祴鍊�
+ */
@ApiModelProperty(value = "瀹炴祴鍊�")
- private java.math.BigDecimal actualValue;
+ private java.math.BigDecimal actualValue;
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
index b1200b5..4a573c9 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
@@ -127,10 +127,10 @@
@Dict(dicCode = "order_creation_method")
private String creationMethod;
/**
- * 璁惧绠＄悊鍛樼‘璁�
+ * 鏈哄姩鍔炵‘璁�
*/
- @Excel(name = "璁惧绠＄悊鍛樼‘璁�", width = 15)
- @ApiModelProperty(value = "璁惧绠＄悊鍛樼‘璁�")
+ @Excel(name = "鏈哄姩鍔炵‘璁�", width = 15)
+ @ApiModelProperty(value = "鏈哄姩鍔炵‘璁�")
@Dict(dicCode = "sys_user, realname, username")
private String confirmUser;
/**
@@ -146,6 +146,39 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "纭鏃堕棿")
private Date confirmTime;
+
+ /**
+ * 鍗曚綅棰嗗纭
+ */
+ @Excel(name = "鍗曚綅棰嗗纭", width = 15)
+ @ApiModelProperty(value = "鍗曚綅棰嗗纭")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String confirmLeader;
+ /**
+ * 棰嗗鎰忚
+ */
+ @ApiModelProperty(value = "棰嗗鎰忚")
+ private String leaderConfirmComment;
+ /**
+ * 棰嗗纭鏃堕棿
+ */
+ @ApiModelProperty(value = "棰嗗纭鏃堕棿")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date leaderConfirmTime;
+
+ @ApiModelProperty(value = "绮惧害妫�楠屼汉")
+ @Dict(dicCode = "sys_user, realname, username")
+ private String precisionChecker;
+
+ /**
+ * 绮惧害妫�楠屾椂闂�
+ */
+ @ApiModelProperty(value = "绮惧害妫�楠屾椂闂�")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date precisionCheckTime;
+
/**
* 淇濆吇涓婁紶鍥剧墖
*/
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java
index a81c379..6728f04 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamPrecisionCheckDetailService.java
@@ -3,6 +3,8 @@
import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
* @Description: 璁惧绮惧害妫�娴嬫槑缁�
* @Author: jeecg-boot
@@ -11,4 +13,18 @@
*/
public interface IEamPrecisionCheckDetailService extends IService<EamPrecisionCheckDetail> {
+ /**
+ * 鏍规嵁宸ュ崟ID 鏌ヨ 绮惧害淇℃伅
+ * @param orderId
+ * @return
+ */
+ List<EamPrecisionCheckDetail> getByOrderId(String orderId);
+
+ /**
+ * 鏍￠獙鏄惁瀛樺湪绮惧害妫�楠�
+ * @param orderId
+ * @return
+ */
+ boolean hasPrecisionCheckDetail(String orderId);
+
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java
index e589bc9..237328d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamPrecisionCheckDetailServiceImpl.java
@@ -1,11 +1,15 @@
package org.jeecg.modules.eam.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.eam.entity.EamPrecisionCheckDetail;
import org.jeecg.modules.eam.mapper.EamPrecisionCheckDetailMapper;
import org.jeecg.modules.eam.service.IEamPrecisionCheckDetailService;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import javax.annotation.Resource;
+import java.util.Collections;
+import java.util.List;
/**
* @Description: 璁惧绮惧害妫�娴嬫槑缁�
@@ -16,4 +20,18 @@
@Service
public class EamPrecisionCheckDetailServiceImpl extends ServiceImpl<EamPrecisionCheckDetailMapper, EamPrecisionCheckDetail> implements IEamPrecisionCheckDetailService {
+ @Resource
+ private EamPrecisionCheckDetailMapper eamPrecisionCheckDetailMapper;
+
+ @Override
+ public List<EamPrecisionCheckDetail> getByOrderId(String orderId) {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public boolean hasPrecisionCheckDetail(String orderId) {
+ LambdaQueryWrapper<EamPrecisionCheckDetail> wrapper = new LambdaQueryWrapper<>();
+ wrapper.eq(EamPrecisionCheckDetail::getOrderId, orderId);
+ return eamPrecisionCheckDetailMapper.selectCount(wrapper) > 0;
+ }
}
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index 132c6f6..16c529a 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.service.impl;
import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,12 +10,15 @@
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
+import org.flowable.task.api.Task;
+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;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.SecondMaintenanceStatusEnum;
import org.jeecg.modules.eam.constant.ThirdMaintenanceStatusEnum;
import org.jeecg.modules.eam.entity.EamEquipment;
@@ -23,7 +28,9 @@
import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest;
import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+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.jeecg.modules.flowable.service.IFlowTaskService;
@@ -33,10 +40,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -45,8 +49,8 @@
* @Date: 2025-04-29
* @Version: V1.0
*/
-@Service
-public class EamThirdMaintenanceOrderServiceImpl extends ServiceImpl<EamThirdMaintenanceOrderMapper, EamThirdMaintenanceOrder> implements IEamThirdMaintenanceOrderService {
+@Service("IEamThirdMaintenanceOrderService")
+public class EamThirdMaintenanceOrderServiceImpl extends ServiceImpl<EamThirdMaintenanceOrderMapper, EamThirdMaintenanceOrder> implements IEamThirdMaintenanceOrderService, FlowCallBackServiceI {
@Resource
private EamThirdMaintenanceOrderMapper eamThirdMaintenanceOrderMapper;
@Autowired
@@ -70,6 +74,8 @@
private IEamReportRepairService eamReportRepairService;
@Autowired
private IEamEquipmentExtendService eamEquipmentExtendService;
+ @Autowired
+ private IEamPrecisionCheckDetailService precisionCheckDetailService;
@Override
public IPage<EamThirdMaintenanceOrder> queryPageList(Page<EamThirdMaintenanceOrder> page, EamThirdMaintenanceQuery query) {
@@ -150,6 +156,8 @@
});
thirdMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
}
+ //澶勭悊绮惧害鍙傛暟 TODO
+
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
if (StringUtils.isNotBlank(order.getOperator())) {
//鍚姩娴佺▼ TODO
@@ -281,28 +289,72 @@
entity.setActualStartTime(new Date());
eamThirdMaintenanceOrderMapper.updateById(entity);
-// //鍚姩娴佺▼
-// flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧鍛ㄤ繚",
-// 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) {
-// //鏇存柊璁惧淇濆吇鐘舵��
-// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
-// return result.isSuccess();
-// }
+ //鍚姩娴佺▼
+ flowCommonService.initActBusiness("宸ュ崟鍙�:" + entity.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧涓変繚",
+ entity.getId(), "IEamThirdMaintenanceOrderService", "third_maintenance_process", null);
+ Map<String, Object> variables = new HashMap<>();
+ boolean equipmentPrecisionFlag = precisionCheckDetailService.hasPrecisionCheckDetail(entity.getId());
+ variables.put("equipmentPrecisionFlag", equipmentPrecisionFlag);
+ 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("third_maintenance_process", variables);
+ if (result != null) {
+ //鏇存柊璁惧淇濆吇鐘舵��
+ eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_THIRD_MAINTENANCE.name());
+ return result.isSuccess();
+ }
return true;
}
+
+ private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
+ List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
+ return todoUsers != null && todoUsers.contains(user.getUsername());
+ }
+
+ private boolean claimTask(String taskId, LoginUser user) {
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+ if (task == null) {
+ return false;
+ }
+ if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) {
+ return false;
+ }
+ taskService.claim(taskId, user.getUsername());
+ 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