From 5f0bc1e4ad0c51a8bf1382dc3f98e282c1393c3b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 11 九月 2025 17:48:55 +0800
Subject: [PATCH] 真空热处理炉批量打印接口 三保 加工设备保养计划变更申请单批量打印接口 设备精度检查单批量打印接口开发
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java | 100 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 90 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
index ced2b3b..9407613 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
@@ -5,11 +5,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.ibatis.type.JdbcType;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
import org.flowable.task.api.Task;
@@ -21,10 +24,7 @@
import org.jeecg.common.util.TranslateDictTextUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.constant.*;
-import org.jeecg.modules.eam.entity.EamBaseHFCode;
-import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange;
-import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamThirdMaintenanceChangeMapper;
import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery;
import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest;
@@ -34,6 +34,7 @@
import org.jeecg.modules.eam.service.IEamThirdMaintenanceOrderService;
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;
@@ -49,6 +50,7 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.sql.Timestamp;
import java.util.*;
import java.util.stream.Collectors;
@@ -58,8 +60,8 @@
* @Date: 2025-07-11
* @Version: V1.0
*/
-@Service
-public class EamThirdMaintenanceChangeServiceImpl extends ServiceImpl<EamThirdMaintenanceChangeMapper, EamThirdMaintenanceChange> implements IEamThirdMaintenanceChangeService {
+@Service("IEamThirdMaintenanceChangeService")
+public class EamThirdMaintenanceChangeServiceImpl extends ServiceImpl<EamThirdMaintenanceChangeMapper, EamThirdMaintenanceChange> implements IEamThirdMaintenanceChangeService, FlowCallBackServiceI {
@Resource
private EamThirdMaintenanceChangeMapper eamThirdMaintenanceChangeMapper;
@@ -101,9 +103,9 @@
if (sysUser == null) {
return page;
}
- if (StringUtils.isNotBlank(sysUser.getEquipmentIds())) {
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
//閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
- List<String> equipArr = Arrays.asList(sysUser.getEquipmentIds().split(","));
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
queryWrapper.in("e.equipment_code", equipArr);
} else {
//娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
@@ -177,6 +179,7 @@
request.setApplicant(sysUser.getUsername());
request.setApplyDate(new Date());
request.setFactoryOrgCode(equipment.getFactoryOrgCode());
+ request.setEquipmentId(equipment.getId());
// 涓変繚鍙樻洿宸ュ崟HF
EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_CHANGE.name());
if (eamBaseHFCode == null) {
@@ -203,6 +206,14 @@
}
entity.setApplyReasonType(request.getApplyReasonType());
entity.setApplyReason(request.getApplyReason());
+ entity.setRemark(request.getRemark());
+ entity.setApplyCategory(request.getApplyCategory());
+ if ("SCRAPPED".equals(request.getApplyCategory())) {
+ // 鐩存帴璁句负 null
+ entity.setDeferredMaintenanceDate(null);
+ } else {
+ entity.setDeferredMaintenanceDate(request.getDeferredMaintenanceDate());
+ }
this.getBaseMapper().updateById(entity);
return true;
}
@@ -313,6 +324,46 @@
//鏇存柊宸ュ崟淇℃伅
this.getBaseMapper().updateById(entity);
return entity;
+ }
+
+ /**
+ * 涓変繚鍔犲伐璁惧淇濆吇璁″垝鍙樻洿鐢宠鍗曟壒閲忔墦鍗版帴鍙�
+ * @param ids
+ * @return
+ */
+ @Override
+ public List<EamThirdMaintenanceChange> export(String ids){
+ QueryWrapper<EamThirdMaintenanceChange> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("tmc.del_flag",CommonConstant.DEL_FLAG_0.toString());
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return new ArrayList<>();
+ }
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ //閫夋嫨浜嗚澶囷紝鏍规嵁璁惧id杩囨护璁惧
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+ List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
+ list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
+ if(!CollectionUtils.isEmpty(baseFactoryUserList)){
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ queryWrapper.in("e.factory_org_code", factoryCode);
+ } else {
+ return new ArrayList<>();
+ }
+ }
+ //鏌ヨ鏉′欢杩囨护
+ if (StrUtil.isNotEmpty(ids)) {
+ List<String> idList = Arrays.asList(ids.split(","));
+ queryWrapper.in("tmc.id", idList);
+ } else {
+ queryWrapper.orderByDesc("tmc.create_time");
+ }
+ return eamThirdMaintenanceChangeMapper.queryList(queryWrapper);
}
/**
@@ -470,8 +521,13 @@
if(BusinessCodeConst.APPROVED.equals(request.getProductionSupportSignatureResult())) {
//閫氳繃
entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.COMPLETED.name());
- order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
- order.setMaintenanceDate(entity.getDeferredMaintenanceDate());
+ if ("SCRAPPED".equals(request.getApplyCategory())) {
+ order.setMaintenanceDate(null);
+ order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.ABOLISH.name());
+ } else {
+ order.setMaintenanceDate(entity.getDeferredMaintenanceDate());
+ order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name());
+ }
thirdMaintenanceOrderService.updateById(order);
}else {
//椹冲洖
@@ -499,4 +555,28 @@
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