From 48984da72dd03b6b0cce54433215abfc402a4ea5 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 16:58:07 +0800
Subject: [PATCH] art: 设备管理-点检工单-自动生成点检，点检过期未保养标记过期
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 179 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 136 insertions(+), 43 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 fc599b0..6a381ad 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
@@ -3,21 +3,29 @@
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.StrUtil;
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.metadata.IPage;
+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;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.oConvertUtils;
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.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;
@@ -43,11 +51,14 @@
/**
* @Description: 鐐规宸ュ崟
* @Author: jeecg-boot
- * @Date: 2025-04-02
+ * @Date: 2025-04-02
* @Version: V1.0
*/
@Service("IEamInspectionOrderService")
public class EamInspectionOrderServiceImpl extends ServiceImpl<EamInspectionOrderMapper, EamInspectionOrder> implements IEamInspectionOrderService, FlowCallBackServiceI {
+
+ @Resource
+ private EamInspectionOrderMapper eamInspectionOrderMapper;
@Autowired
private IEamInspectionOrderDetailService eamInspectionOrderDetailService;
@Resource
@@ -70,19 +81,82 @@
private IEamReportRepairService eamReportRepairService;
@Override
+ public IPage<EamInspectionOrder> queryPageList(Page<EamInspectionOrder> page, EamInspectionOrderQuery query) {
+ QueryWrapper<EamInspectionOrder> 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.getInspectionStatus())) {
+ queryWrapper.eq("wmo.inspection_status", query.getInspectionStatus());
+ }
+ if (query.getInspectionDateBegin() != null && query.getInspectionDateEnd() != null) {
+ queryWrapper.between("wmo.inspection_date", query.getInspectionDateBegin(), query.getInspectionDateEnd());
+ }
+ //鎺掑簭
+ 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 eamInspectionOrderMapper.queryPageList(page, queryWrapper);
+ }
+
+ @Override
+ public List<EamInspectionOrder> selectUnCompleteOrder(String expiredDate) {
+ LambdaQueryWrapper<EamInspectionOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.lt(EamInspectionOrder::getInspectionDate, expiredDate);
+ List<String> unCompleteStatus = new ArrayList<>();
+ unCompleteStatus.add(InspectionStatus.WAIT_INSPECTION.name());
+ unCompleteStatus.add(InspectionStatus.UNDER_INSPECTION.name());
+ queryWrapper.in(EamInspectionOrder::getInspectionStatus, unCompleteStatus);
+ queryWrapper.orderByAsc(EamInspectionOrder::getInspectionDate);
+ return eamInspectionOrderMapper.selectList(queryWrapper);
+ }
+
+ @Override
@Transactional(rollbackFor = Exception.class)
public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
- BeanUtils.copyProperties(eamInspectionOrderRequest,eamInspectionOrder);
+ BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
//淇敼鐘舵��
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
+ if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
- }else {
+ } else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name());
}
save(eamInspectionOrder);
//澶勭悊鏄庣粏鏁版嵁
- if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) {
eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> {
tableDetail.setOrderId(eamInspectionOrder.getId());
tableDetail.setId(null);
@@ -90,7 +164,7 @@
eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList());
}
//澶勭悊闄勪欢
- if(CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
+ if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getFileList())) {
FileUploadResult fileUploadResult = eamInspectionOrderRequest.getFileList().get(0);
ObjectMapper mapper = new ObjectMapper();
try {
@@ -100,7 +174,7 @@
log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e);
}
}
- if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())){
+ if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) {
triggerProcess(eamInspectionOrder);
}
return true;
@@ -108,6 +182,7 @@
/**
* 瑙﹀彂娴佺▼
+ *
* @param eamInspectionOrder
* @return
*/
@@ -115,26 +190,26 @@
EamEquipment equipment = eamEquipmentService.getById(eamInspectionOrder.getEquipmentId());
if (equipment == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setEquipmentCode(equipment.getEquipmentCode());
}
System.out.println("璁惧鐐规锛�" + eamInspectionOrder.getId());
- flowCommonService.initActBusiness("宸ュ崟鍙凤細"+eamInspectionOrder.getOrderNum()+"璁惧缂栧彿"+eamInspectionOrder.getEquipmentCode()+"杩涜璁惧鐐规",
+ flowCommonService.initActBusiness("宸ュ崟鍙凤細" + eamInspectionOrder.getOrderNum() + "璁惧缂栧彿" + eamInspectionOrder.getEquipmentCode() + "杩涜璁惧鐐规",
eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null);
Map<String, Object> variables = new HashMap<>();
variables.put("dataId", eamInspectionOrder.getId());
- if (StrUtil.isEmpty(eamInspectionOrder.getRemark())){
+ if (StrUtil.isEmpty(eamInspectionOrder.getRemark())) {
variables.put("organization", "鏂板鐐规宸ュ崟榛樿鍚姩娴佺▼");
variables.put("comment", "鏂板鐐规宸ュ崟榛樿鍚姩娴佺▼");
- }else {
+ } else {
variables.put("organization", eamInspectionOrder.getRemark());
variables.put("comment", eamInspectionOrder.getRemark());
}
- variables.put("proofreading",true);
- List<String> usernames=new ArrayList<>();
+ variables.put("proofreading", true);
+ List<String> usernames = new ArrayList<>();
usernames.add(eamInspectionOrder.getOperator());
variables.put("NextAssignee", usernames);
- Result result= flowDefinitionService.startProcessInstanceByKey("eam_inspection", variables);
+ Result result = flowDefinitionService.startProcessInstanceByKey("eam_inspection", variables);
return result.isSuccess();
}
@@ -143,7 +218,7 @@
public boolean editInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) {
EamInspectionOrder eamInspectionOrder = new EamInspectionOrder();
BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder);
- if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())){
+ if (StrUtil.isNotEmpty(eamInspectionOrder.getOperator())) {
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
}
super.updateById(eamInspectionOrder);
@@ -162,16 +237,17 @@
/**
* 棰嗗彇鐐规宸ュ崟
+ *
* @param id
* @return
*/
@Override
- public boolean takeInspectionOrder(String id){
+ public boolean takeInspectionOrder(String id) {
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- EamInspectionOrder eamInspectionOrder=this.getById(id);
- if (eamInspectionOrder==null) {
+ EamInspectionOrder eamInspectionOrder = this.getById(id);
+ if (eamInspectionOrder == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setOperator(user.getUsername());
//淇敼鐘舵��
eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name());
@@ -183,15 +259,16 @@
/**
* 浣滃簾鐐规宸ュ崟
+ *
* @param id
* @return
*/
@Override
- public boolean cancelInspectionOrder(String id){
+ public boolean cancelInspectionOrder(String id) {
EamInspectionOrder eamInspectionOrder = this.getById(id);
if (eamInspectionOrder == null) {
return false;
- }else {
+ } else {
eamInspectionOrder.setInspectionStatus(InspectionStatus.ABOLISH.name());
return updateById(eamInspectionOrder);
}
@@ -199,6 +276,7 @@
/**
* 鐐规娴佺▼
+ *
* @param eamInspectionOrderRequest
* @return
*/
@@ -252,7 +330,7 @@
updateEamInspectionOrder(eamInspectionOrder);
//鏌ヨ鏁版嵁,杩涜璁惧缁翠慨澶勭悊
- if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())){
+ if (eamInspectionOrder.getInspectionStatus().equals(InspectionStatus.WAIT_CONFIRM.name())) {
updateEamInspectionOrderDetail(eamInspectionOrder);
}
@@ -261,6 +339,7 @@
return Result.error("鎿嶄綔澶辫触锛�" + e.getMessage());
}
}
+
private boolean isValidRequest(EamInspectionOrderRequest request) {
return StrUtil.isNotBlank(request.getTaskId()) && StrUtil.isNotBlank(request.getDataId());
@@ -324,11 +403,11 @@
} else {
// 鐝粍闀跨‘璁�
values.put("dataId", order.getId());
- values.put("organization", request.getDealSuggestion());
- values.put("comment", request.getDealSuggestion());
- values.put("confirmation", request.getDealType());
- request.setComment(request.getDealSuggestion());
- if ("2".equals(request.getDealType())) {
+ values.put("organization", request.getConfirmComment());
+ values.put("comment", request.getConfirmComment());
+ values.put("confirmation", request.getConfirmDealType());
+ request.setComment(request.getConfirmComment());
+ if ("2".equals(request.getConfirmDealType())) {
// 鐝粍闀块┏鍥�
List<String> usernames = new ArrayList<>();
usernames.add(order.getOperator());
@@ -341,16 +420,28 @@
private void updateOrderStatus(Result result, EamInspectionOrderRequest request, EamInspectionOrder order, LoginUser user) {
if (result.isSuccess()) {
- if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getDealType())) {
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && StrUtil.isEmpty(request.getConfirmDealType())) {
// 鐐规瀹屾垚
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);
+ }
+ }
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.getDealType())) {
+ } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) {
// 鐝粍闀跨‘璁や换鍔�
order.setInspectionStatus(InspectionStatus.COMPLETE.name());
order.setConfirmUser(user.getUsername());
+ order.setConfirmComment(request.getConfirmComment());
+ order.setConfirmDealType(request.getConfirmDealType());
order.setConfirmTime(new Date());
}
}
@@ -362,40 +453,42 @@
/**
* 璁惧鏄惁瀛樺湪寮傚父,骞惰繘琛岃澶囩淮淇�
+ *
* @param eamInspectionOrder
*/
private void updateEamInspectionOrderDetail(EamInspectionOrder eamInspectionOrder) {
List<EamInspectionOrderDetail> eamInspectionOrderDetails = eamInspectionOrderDetailService
.list(new QueryWrapper<EamInspectionOrderDetail>()
- .eq("order_id", eamInspectionOrder.getId()).eq("report_flag","1").eq("inspection_result", "2"));
+ .eq("order_id", eamInspectionOrder.getId()).eq("report_flag", "1").eq("inspection_result", "2"));
eamReportRepairService.reportRepairFromInspection(eamInspectionOrder.getEquipmentId(), eamInspectionOrder.getOperator(), eamInspectionOrderDetails);
}
/**
* 鎵归噺浣滃簾涓庨鍙�
+ *
* @param ids
* @param type
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Result<?> batchCancelOrTakeInspectionOrder(String ids, String type){
+ public Result<?> batchCancelOrTakeInspectionOrder(String ids, String type) {
if (type == null) {
return Result.error("璇烽�夋嫨鎿嶄綔绫诲瀷");
}
LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
List<String> list = Arrays.asList(ids.split(","));
- QueryWrapper<EamInspectionOrder> queryWrapper =new QueryWrapper<>();
+ QueryWrapper<EamInspectionOrder> queryWrapper = new QueryWrapper<>();
queryWrapper.in("id", list);
queryWrapper.eq("inspection_status", InspectionStatus.WAIT_INSPECTION.name());
- List<EamInspectionOrder> eamInspectionOrderList =this.list(queryWrapper);
- if (!eamInspectionOrderList.isEmpty()){
+ List<EamInspectionOrder> eamInspectionOrderList = this.list(queryWrapper);
+ if (!eamInspectionOrderList.isEmpty()) {
eamInspectionOrderList.forEach(eamInspectionOrder -> {
eamInspectionOrder.setInspectionStatus(type);
- if (InspectionStatus.UNDER_INSPECTION.name().equals(type)){
+ if (InspectionStatus.UNDER_INSPECTION.name().equals(type)) {
eamInspectionOrder.setOperator(loginUser.getUsername());
this.triggerProcess(eamInspectionOrder);
- }else {
+ } else {
eamInspectionOrder.setOperator(null);
}
});
@@ -406,13 +499,13 @@
@Override
- public Result<?> selectVoById(String id){
- List<EamInspectionOrder> eamInspectionOrders=this.list(new QueryWrapper<EamInspectionOrder>().eq("id", id));
- List<EamInspectionOrderRequest> eamInspectionOrderRequestList=new ArrayList<>();
+ public Result<?> selectVoById(String id) {
+ List<EamInspectionOrder> eamInspectionOrders = this.list(new QueryWrapper<EamInspectionOrder>().eq("id", id));
+ List<EamInspectionOrderRequest> eamInspectionOrderRequestList = new ArrayList<>();
eamInspectionOrders.forEach(eamInspectionOrder -> {
- EamInspectionOrderRequest eamInspectionOrderRequest=new EamInspectionOrderRequest();
- BeanUtils.copyProperties(eamInspectionOrder,eamInspectionOrderRequest);
- List<EamInspectionOrderDetail> eamInspectionOrderDetails=eamInspectionOrderDetailService
+ EamInspectionOrderRequest eamInspectionOrderRequest = new EamInspectionOrderRequest();
+ BeanUtils.copyProperties(eamInspectionOrder, eamInspectionOrderRequest);
+ List<EamInspectionOrderDetail> eamInspectionOrderDetails = eamInspectionOrderDetailService
.list(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId()));
eamInspectionOrderRequest.setTableDetailList(eamInspectionOrderDetails);
eamInspectionOrderRequestList.add(eamInspectionOrderRequest);
@@ -441,7 +534,7 @@
public List<String> flowCandidateUsernamesOfTask(String taskNameId, Map<String, Object> values) {
//涓氬姟鏄惁骞查娴佺▼锛屼笟鍔″共棰勶紝娴佺▼骞查锛屾寚瀹氫汉鍛樿繘琛屽鐞�
//鑾峰彇涓嬩竴姝ュ鐞嗕汉
- Object object=values.get("NextAssignee");
+ Object object = values.get("NextAssignee");
return (List<String>) object;
}
}
--
Gitblit v1.9.3