From e1d063d2de617910dad7e5f0481d9bfcd49e7651 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 05 七月 2025 17:29:46 +0800
Subject: [PATCH] art:vue模板修改，重置按钮 primary 改为 info
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 105 +++++++++++++++++++++++++++++-----------------------
1 files changed, 59 insertions(+), 46 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
index 24de739..df387bf 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -6,15 +6,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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 com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
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.FileUploadResult;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.constant.DataBaseConstant;
@@ -22,19 +20,20 @@
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
+import org.jeecg.modules.eam.base.entity.BaseFactory;
+import org.jeecg.modules.eam.base.entity.BaseFactoryUser;
+import org.jeecg.modules.eam.base.service.IBaseFactoryService;
+import org.jeecg.modules.eam.base.service.IBaseFactoryUserService;
import org.jeecg.modules.eam.constant.BusinessCodeConst;
import org.jeecg.modules.eam.constant.EquipmentOperationTagEnum;
+import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum;
import org.jeecg.modules.eam.constant.InspectionStatus;
-import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.entity.EamInspectionOrder;
-import org.jeecg.modules.eam.entity.EamInspectionOrderDetail;
+import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamInspectionOrderMapper;
import org.jeecg.modules.eam.request.EamInspectionOrderQuery;
import org.jeecg.modules.eam.request.EamInspectionOrderRequest;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderDetailService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
+import org.jeecg.modules.eam.service.*;
+import org.jeecg.modules.eam.util.DateUtils;
import org.jeecg.modules.eam.vo.InspectionVo;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
@@ -42,14 +41,13 @@
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.IMdcUserProductionService;
import org.springframework.beans.BeanUtils;
-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.*;
+import java.util.stream.Collectors;
/**
* @Description: 鐐规宸ュ崟
@@ -62,26 +60,30 @@
@Resource
private EamInspectionOrderMapper eamInspectionOrderMapper;
- @Autowired
+ @Resource
private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
+ @Resource
+ private IEamWeekInspectionDetailService eamWeekInspectionDetailService;
+ @Resource
+ private IBaseFactoryUserService baseFactoryUserService;
+ @Resource
+ private IBaseFactoryService baseFactoryService;
@Resource
private FlowCommonService flowCommonService;
@Resource
private IFlowDefinitionService flowDefinitionService;
- @Autowired
+ @Resource
private IFlowTaskService flowTaskService;
- @Autowired
+ @Resource
private IEamEquipmentService eamEquipmentService;
- @Autowired
+ @Resource
private FlowMyBusinessServiceImpl flowMyBusinessService;
- @Autowired
+ @Resource
private TaskService taskService;
- @Autowired
- private IEamEquipmentService iEamEquipmentService;
- @Autowired
- private IMdcUserProductionService mdcUserProductionService;
- @Autowired
+ @Resource
private IEamReportRepairService eamReportRepairService;
+ @Resource
+ private IEamMaintenanceStandardDetailService eamMaintenanceStandardDetailService;
@Override
public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
@@ -96,8 +98,14 @@
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());
+ //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶�
+ List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService.
+ list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId()));
+ if(!CollectionUtils.isEmpty(baseFactoryUserList)){
+ List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList());
+ List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList());
+ queryWrapper.in("e.factory_code", factoryCode);
+ }
}
//鏌ヨ鏉′欢杩囨护
if (query != null) {
@@ -157,6 +165,7 @@
} else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
}
+ eamInspectionOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
save(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
@@ -165,6 +174,10 @@
tableDetail.setId(null);
});
eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
+ }
+ //澶勭悊鍛ㄧ偣妫�鏄庣粏鏁版嵁
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableWeekDetailList())) {
+ eamWeekInspectionDetailService.saveOrUpdateBatch(eamInspectionOrderRequest.getTableWeekDetailList());
}
if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
triggerProcess(eamInspectionOrder);
@@ -183,9 +196,9 @@
if (equipment == null) {
return false;
} else {
- eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
+ eamInspectionOrder.setEquipmentId(equipment.getEquipmentCode());
}
- flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + eamInspectionOrder.getEquipmentCode() + ";瀹夎浣嶇疆: " + equipment.getInstallationPosition(),
+ flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + eamInspectionOrder.getEquipmentId() + ";瀹夎浣嶇疆: " + equipment.getInstallationPosition(),
eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", eamInspectionOrder.getId());
@@ -213,16 +226,16 @@
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
}
super.updateById(eamInspectionOrder);
- //澶勭悊鏄庣粏鏁版嵁
- if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
- eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
- tableDetail.setOrderId(eamInspectionOrder.getId());
- tableDetail.setCreateTime(new Date());
- });
- //鍒犻櫎鏄庣粏
- eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
- eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
- }
+// //澶勭悊鏄庣粏鏁版嵁
+// if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
+// eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
+// tableDetail.setOrderId(eamInspectionOrder.getId());
+// tableDetail.setCreateTime(new Date());
+// });
+// //鍒犻櫎鏄庣粏
+// eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
+// eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
+// }
return true;
}
@@ -417,16 +430,16 @@
// 鐐规瀹屾垚
order.setInspectionStatus(InspectionStatus.WAIT_CONFIRM.name());
order.setOperateTime(new Date());
- if (CollectionUtil.isNotEmpty(request.getFileList())) {
- List<FileUploadResult> fileUploadResultList = request.getFileList();
- ObjectMapper mapper = new ObjectMapper();
- try {
- String referenceFile = mapper.writeValueAsString(fileUploadResultList);
- order.setImageFiles(referenceFile);
- } catch (JsonProcessingException e) {
- log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
- }
- }
+// if (CollectionUtil.isNotEmpty(request.getFileList())) {
+// List<FileUploadResult> fileUploadResultList = request.getFileList();
+// ObjectMapper mapper = new ObjectMapper();
+// try {
+// String referenceFile = mapper.writeValueAsString(fileUploadResultList);
+// order.setImageFiles(referenceFile);
+// } catch (JsonProcessingException e) {
+// log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
+// }
+// }
eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId()));
eamInspectionOrderDetailService.saveBatch(request.getTableDetailList());
} else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {
--
Gitblit v1.9.3