From a16b8f1035fa93ac1333fb273da2c48b68bf7126 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 14 五月 2025 17:45:38 +0800
Subject: [PATCH] art: 设备管理-二保-新增，编辑功能
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 300 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 295 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
index 3778268..f1d28a2 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java
@@ -1,11 +1,43 @@
package org.jeecg.modules.eam.service.impl;
-import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder;
-import org.jeecg.modules.eam.mapper.EamSecondMaintenanceOrderMapper;
-import org.jeecg.modules.eam.service.IEamSecondMaintenanceOrderService;
-import org.springframework.stereotype.Service;
-
+import cn.hutool.core.collection.CollectionUtil;
+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.flowable.engine.TaskService;
+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.SecondMaintenanceStatusEnum;
+import org.jeecg.modules.eam.constant.WeekMaintenanceStatusEnum;
+import org.jeecg.modules.eam.entity.EamEquipment;
+import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder;
+import org.jeecg.modules.eam.entity.EamSecondMaintenanceOrderDetail;
+import org.jeecg.modules.eam.mapper.EamSecondMaintenanceOrderMapper;
+import org.jeecg.modules.eam.request.EamSecondMaintenanceQuery;
+import org.jeecg.modules.eam.request.EamSecondMaintenanceRequest;
+import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.service.FlowCommonService;
+import org.jeecg.modules.flowable.service.IFlowDefinitionService;
+import org.jeecg.modules.flowable.service.IFlowTaskService;
+import org.jeecg.modules.system.service.ISysUserService;
+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.Date;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* @Description: 璁惧浜岀骇淇濆吇
@@ -15,5 +47,263 @@
*/
@Service
public class EamSecondMaintenanceOrderServiceImpl extends ServiceImpl<EamSecondMaintenanceOrderMapper, EamSecondMaintenanceOrder> implements IEamSecondMaintenanceOrderService {
+ @Resource
+ private EamSecondMaintenanceOrderMapper eamSecondMaintenanceOrderMapper;
+ @Autowired
+ private IEamSecondMaintenanceOrderDetailService secondMaintenanceOrderDetailService;
+ @Autowired
+ private FlowCommonService flowCommonService;
+ @Autowired
+ private IFlowDefinitionService flowDefinitionService;
+ @Autowired
+ private IFlowMyBusinessService flowMyBusinessService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private IFlowTaskService flowTaskService;
+
+ @Autowired
+ private ISysUserService sysUserService;
+ @Autowired
+ private IEamEquipmentService eamEquipmentService;
+ @Autowired
+ private IEamReportRepairService eamReportRepairService;
+ @Autowired
+ private IEamEquipmentExtendService eamEquipmentExtendService;
+
+ @Override
+ public IPage<EamSecondMaintenanceOrder> queryPageList(Page<EamSecondMaintenanceOrder> page, EamSecondMaintenanceQuery query) {
+ QueryWrapper<EamSecondMaintenanceOrder> queryWrapper = new QueryWrapper<>();
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return page;
+ }
+ if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹溅闂磋繃婊よ澶�
+ queryWrapper.exists("select 1 from mdc_user_production t where t.user_id={0} and t.pro_id=e.org_id ", sysUser.getId());
+ }
+ //鏌ヨ鏉′欢杩囨护
+ if (query != null) {
+ if (StringUtils.isNotBlank(query.getEquipmentId())) {
+ queryWrapper.eq("wmo.equipment_id", query.getEquipmentId());
+ }
+ if (StringUtils.isNotBlank(query.getOrderNum())) {
+ queryWrapper.like("wmo.order_num", query.getOrderNum());
+ }
+ if (StringUtils.isNotBlank(query.getMaintenanceStatus())) {
+ queryWrapper.eq("wmo.maintenance_status", query.getMaintenanceStatus());
+ }
+ if (query.getMaintenanceDateBegin() != null && query.getMaintenanceDateEnd() != null) {
+ queryWrapper.between("wmo.maintenance_date", query.getMaintenanceDateBegin(), query.getMaintenanceDateEnd());
+ }
+ //鎺掑簭
+ if (StringUtils.isNotBlank(query.getColumn()) && StringUtils.isNotBlank(query.getOrder())) {
+ String column = query.getColumn();
+ if (column.endsWith(CommonConstant.DICT_TEXT_SUFFIX)) {
+ column = column.substring(0, column.lastIndexOf(CommonConstant.DICT_TEXT_SUFFIX));
+ }
+ if (DataBaseConstant.SQL_ASC.equalsIgnoreCase(query.getOrder())) {
+ queryWrapper.orderByAsc("wmo." + oConvertUtils.camelToUnderline(column));
+ } else {
+ queryWrapper.orderByDesc("wmo." + oConvertUtils.camelToUnderline(column));
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+
+ return eamSecondMaintenanceOrderMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean addWeekMaintenance(EamSecondMaintenanceRequest request) {
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
+ }
+ EamSecondMaintenanceOrder order = new EamSecondMaintenanceOrder();
+ order.setOrderNum(request.getOrderNum());
+ order.setEquipmentId(request.getEquipmentId());
+ order.setStandardId(request.getStandardId());
+ order.setMaintenanceDate(request.getMaintenanceDate());
+ order.setOperator(request.getOperator());
+ order.setRemark(request.getRemark());
+ //鐘舵�佸垵濮嬪寲
+ order.setMaintenanceStatus(SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ order.setCreationMethod(request.getCreationMethod());
+ //鍒犻櫎鏍囪
+ order.setDelFlag(CommonConstant.DEL_FLAG_0);
+ eamSecondMaintenanceOrderMapper.insert(order);
+ //澶勭悊鏄庣粏鏁版嵁
+ if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ request.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setId(null);
+ tableDetail.setOrderId(order.getId());
+ });
+ secondMaintenanceOrderDetailService.saveBatch(request.getTableDetailList());
+ }
+ //鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
+ if (StringUtils.isNotBlank(order.getOperator())) {
+ //鍚姩娴佺▼ TODO
+// flowCommonService.initActBusiness("宸ュ崟鍙�:" + order.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + ";杩涜璁惧浜屼繚",
+// 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);
+// //鏇存柊璁惧淇濆吇鐘舵��
+// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(order.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
+// return result.isSuccess();
+// }
+ }
+
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean editWeekMaintenance(EamSecondMaintenanceRequest request) {
+ EamEquipment equipment = eamEquipmentService.getById(request.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
+ }
+ EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderMapper.selectById(request.getId());
+ if (entity == null) {
+ throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
+ }
+ if (!WeekMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ throw new JeecgBootException("鍙湁寰呬繚鍏荤姸鎬佺殑鏁版嵁鎵嶅彲缂栬緫锛�");
+ }
+ entity.setMaintenanceDate(request.getMaintenanceDate());
+ entity.setOperator(request.getOperator());
+ entity.setRemark(request.getRemark());
+
+ eamSecondMaintenanceOrderMapper.updateById(entity);
+ //澶勭悊璇︽儏
+ if (CollectionUtil.isNotEmpty(request.getTableDetailList())) {
+ List<EamSecondMaintenanceOrderDetail> addList = new ArrayList<>();
+ List<EamSecondMaintenanceOrderDetail> updateList = new ArrayList<>();
+ request.getTableDetailList().forEach(tableDetail -> {
+ tableDetail.setOrderId(entity.getId());
+ if (tableDetail.getId() == null) {
+ addList.add(tableDetail);
+ } else {
+ updateList.add(tableDetail);
+ }
+ });
+ if (CollectionUtil.isNotEmpty(addList)) {
+ secondMaintenanceOrderDetailService.saveBatch(addList);
+ }
+ if (CollectionUtil.isNotEmpty(updateList)) {
+ secondMaintenanceOrderDetailService.updateBatchById(updateList);
+ }
+ }
+ if (CollectionUtil.isNotEmpty(request.getRemoveDetailList())) {
+ List<String> ids = request.getRemoveDetailList().stream().map(EamSecondMaintenanceOrderDetail::getId).collect(Collectors.toList());
+ secondMaintenanceOrderDetailService.removeBatchByIds(ids);
+ }
+ //鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
+ if (StringUtils.isNotBlank(entity.getOperator())) {
+ //鍚姩娴佺▼ TODO
+// 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) {
+// //鏇存柊鍛ㄤ繚鐘舵��
+// entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+// entity.setActualStartTime(new Date());
+// eamWeekMaintenanceOrderMapper.updateById(entity);
+// //鏇存柊璁惧淇濆吇鐘舵��
+// eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_MAINTENANCE.name());
+// return result.isSuccess();
+// }
+
+ }
+ return true;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public boolean collect(String id) {
+ EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderMapper.selectById(id);
+ if (entity == null) {
+ throw new JeecgBootException("瑕侀鍙栫殑宸ュ崟涓嶅瓨鍦紝璇峰埛鏂伴噸璇曪紒");
+ }
+ if (!SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
+ throw new JeecgBootException("璇ュ伐鍗曞凡杩涜杩囬鍙栵紒");
+ }
+ EamEquipment equipment = eamEquipmentService.getById(entity.getEquipmentId());
+ if (equipment == null) {
+ throw new JeecgBootException("璁惧涓嶅瓨鍦紝娣诲姞澶辫触锛�");
+ }
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if(sysUser == null || !BusinessCodeConst.PCR0001.equals(sysUser.getPost())) {
+ throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒");
+ }
+ entity.setOperator(sysUser.getUsername());
+ entity.setMaintenanceStatus(WeekMaintenanceStatusEnum.UNDER_MAINTENANCE.name());
+ entity.setActualStartTime(new Date());
+ eamSecondMaintenanceOrderMapper.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();
+// }
+ return true;
+ }
}
--
Gitblit v1.9.3