From f71cea3609c4c7bf0b70c77b2c9d8c571586df33 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 02 九月 2025 14:24:26 +0800
Subject: [PATCH] 二保定时任务修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamSecondMaintenanceOrderServiceImpl.java | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 111 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 2b9c57c..10cb913 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
@@ -9,7 +9,7 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import liquibase.pro.packaged.Q;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.flowable.engine.TaskService;
@@ -19,9 +19,11 @@
import org.jeecg.common.constant.DataBaseConstant;
import org.jeecg.common.exception.JeecgBootException;
import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.aspect.annotation.EquipmentHistoryLog;
import org.jeecg.modules.eam.constant.*;
+import org.jeecg.modules.eam.dto.EamSecondMaintenanceOrderExport;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.mapper.EamEquipmentMapper;
import org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper;
@@ -50,6 +52,10 @@
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.temporal.TemporalAdjusters;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -61,12 +67,12 @@
* @Version: V1.0
*/
@Service("IEamSecondMaintenanceOrderService")
+@Slf4j
public class EamSecondMaintenanceOrderServiceImpl extends ServiceImpl<EamSecondMaintenanceOrderMapper, EamSecondMaintenanceOrder> implements IEamSecondMaintenanceOrderService, FlowCallBackServiceI {
@Resource
private EamSecondMaintenanceOrderMapper eamSecondMaintenanceOrderMapper;
@Autowired
private IEamSecondMaintenanceOrderDetailService secondMaintenanceOrderDetailService;
-
@Autowired
private FlowCommonService flowCommonService;
@Autowired
@@ -95,6 +101,10 @@
private EamMaintenanceStandardMapper eamMaintenanceStandardMapper;
@Resource
private BaseFactoryMapper baseFactoryMapper;
+ @Autowired
+ private IEamSecondMaintenanceOrderDetailService eamSecondMaintenanceOrderDetailService;
+ @Autowired
+ private IEamFactorySecondMaintPlanService factorySecondMaintPlanService;
@Override
public IPage<EamSecondMaintenanceOrder> queryPageList(Page<EamSecondMaintenanceOrder> page, EamSecondMaintenanceQuery query) {
@@ -338,6 +348,11 @@
});
secondMaintenanceOrderDetailService.saveBatch(requestTableDetailList);
}
+ // 鎻掑叆棣栭〉浜屼繚鍏昏鍒�
+ // 浣跨敤 SimpleDateFormat 鐩存帴鏍煎紡鍖栦负鈥測yyy骞碝M鏈堚�濇牸寮�
+// SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈�");
+// String formattedDate = sdf.format(order.getMaintenanceDate());
+// factorySecondMaintPlanService.add(order.getEquipmentId(), formattedDate);
return true;
}
@@ -355,9 +370,14 @@
if (!SecondMaintenanceStatusEnum.WAIT_MAINTENANCE.name().equals(entity.getMaintenanceStatus())) {
throw new JeecgBootException("鍙湁寰呬繚鍏荤姸鎬佺殑鏁版嵁鎵嶅彲缂栬緫锛�");
}
+ // 缂栬緫棣栭〉浜屼繚鍏昏鍒�
+ // 浣跨敤 SimpleDateFormat 鐩存帴鏍煎紡鍖栦负鈥測yyy骞碝M鏈堚�濇牸寮�
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy骞碝M鏈�");
+ String oldFormattedDate = sdf.format(entity.getMaintenanceDate());
+ String newFormattedDate = sdf.format(request.getMaintenanceDate());
+ factorySecondMaintPlanService.dateChange(entity.getEquipmentId(), oldFormattedDate,newFormattedDate);
entity.setMaintenanceDate(request.getMaintenanceDate());
entity.setRemark(request.getRemark());
-
eamSecondMaintenanceOrderMapper.updateById(entity);
//鍒ゆ柇鏄惁瀛樺湪淇濆吇浜� 濡傛灉瀛樺湪鍒欏惎鍔ㄦ祦绋�
if (StringUtils.isNotBlank(entity.getOperator())) {
@@ -387,7 +407,6 @@
eamEquipmentExtendService.updateEquipmentMaintenanceStatus(entity.getEquipmentId(), EquipmentMaintenanceStatus.UNDER_SECOND_MAINTENANCE.name());
return result.isSuccess();
}
-
}
return true;
}
@@ -468,7 +487,7 @@
@Override
@Transactional(rollbackFor = Exception.class)
@EquipmentHistoryLog(operationTag = EquipmentOperationTagEnum.SECOND_MAINTENANCE, businessTable = "eam_second_maintenance_order")
- public EamSecondMaintenanceOrder approval(EamSecondMaintenanceRequest request) {
+ public EamSecondMaintenanceOrder approval(EamSecondMaintenanceRequest request) throws ParseException {
EamSecondMaintenanceOrder entity = eamSecondMaintenanceOrderMapper.selectById(request.getId());
if (entity == null) {
throw new JeecgBootException("瀹℃壒鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�");
@@ -663,9 +682,96 @@
}
//淇濆瓨宸ュ崟
eamSecondMaintenanceOrderMapper.updateById(entity);
+ //寮傛鐢熸垚涓嬫浜屼繚宸ュ崟
+ if (SecondMaintenanceStatusEnum.COMPLETE.name().equals(entity.getMaintenanceStatus())) {
+ //濉厖璁＄畻涓嬫浜屼繚鏃ユ湡
+ EamEquipmentExtend eamEquipmentExtend=eamEquipmentExtendService.getById(entity.getEquipmentId());
+ eamEquipmentExtend.setLatestSecondMaintenance(entity.getMaintenanceDate());
+ eamEquipmentExtend.setNextSecondMaintenance(calculateNextMaintenanceDate(entity.getMaintenanceDate()));
+ eamEquipmentExtendService.updateById(eamEquipmentExtend);
+ }
return entity;
}
+ /**
+ * 璁＄畻鍏釜鏈堝悗鐨勫綋鏈堟渶鍚庝竴澶�
+ * @param currentDate 褰撳墠宸ュ崟鏃ユ湡
+ * @return 鍏釜鏈堝悗鐨勫綋鏈堟渶鍚庝竴澶�
+ */
+ private Date calculateNextMaintenanceDate(Date currentDate) {
+ // 杞崲涓篖ocalDate澶勭悊鏃ユ湡
+ LocalDate localDate = DateUtils.dateToLocalDate(currentDate);
+ // 璁＄畻鍏釜鏈堝悗鐨勬棩鏈�
+ LocalDate sixMonthsLater = localDate.plusMonths(6);
+ // 璋冩暣鍒板綋鏈堢殑鏈�鍚庝竴澶�
+ LocalDate lastDayOfMonth = sixMonthsLater.with(TemporalAdjusters.lastDayOfMonth());
+ // 杞崲鍥濪ate绫诲瀷
+ return DateUtils.localDateToDate(lastDayOfMonth);
+ }
+
+ /**
+ * 鎵归噺鎵撳嵃浜屼繚宸ュ崟
+ * @param ids
+ * @return
+ */
+ @Override
+ public List<EamSecondMaintenanceOrderExport> export(String ids){
+ QueryWrapper<EamSecondMaintenanceOrderExport> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("wmo.del_flag",CommonConstant.DEL_FLAG_0.toString());
+ queryWrapper.eq("wmo.maintenance_status",SecondMaintenanceStatusEnum.COMPLETE.name());
+ //鐢ㄦ埛鏁版嵁鏉冮檺
+ 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("wmo.id", idList);
+ } else {
+ queryWrapper.orderByDesc("wmo.create_time");
+ }
+ List<EamSecondMaintenanceOrderExport> eamSecondMaintenanceOrderExports=eamSecondMaintenanceOrderMapper.queryList(queryWrapper);
+ //濉厖瀵瑰簲浜屼繚鏄庣粏
+ if (!eamSecondMaintenanceOrderExports.isEmpty()){
+ eamSecondMaintenanceOrderExports.forEach(item->{
+ //缁翠慨浜哄憳淇濆吇鍐呭
+ List<EamSecondMaintenanceOrderDetail> maintenanceOrderDetails=eamSecondMaintenanceOrderDetailService.
+ list(new QueryWrapper<EamSecondMaintenanceOrderDetail>().eq("order_id",item.getId()).
+ eq("item_category",EamMaintenanceStandardDetailCategory.REPAIRER_MAINTENANCE.name())
+ .orderByAsc("item_code"));
+ if (!maintenanceOrderDetails.isEmpty()){
+ item.setMaintenanceOrderDetails(maintenanceOrderDetails);
+ }
+ //鎿嶄綔浜哄憳淇濆吇鍐呭
+ List<EamSecondMaintenanceOrderDetail> operationOrderDetails=eamSecondMaintenanceOrderDetailService.
+ list(new QueryWrapper<EamSecondMaintenanceOrderDetail>().eq("order_id",item.getId()).
+ eq("item_category",EamMaintenanceStandardDetailCategory.OPERATOR_MAINTENANCE.name())
+ .orderByAsc("item_code"));
+ if (!operationOrderDetails.isEmpty()) {
+ item.setOperationOrderDetails(operationOrderDetails);
+ }
+ });
+ }
+ return eamSecondMaintenanceOrderExports;
+ }
+
private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) {
List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class);
return todoUsers != null && todoUsers.contains(user.getUsername());
--
Gitblit v1.9.3