lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -19,6 +19,8 @@ String SECOND_MAINTENANCE_CODE_RULE = "SecondMaintenanceCodeRule"; //ä¸ä¿ç¼ç è§å String THIRD_MAINTENANCE_CODE_RULE = "ThirdMaintenanceCodeRule"; //ä¸ä¿åæ´ç¼ç è§å String THIRD_MAINTENANCE_CHANGE_CODE_RULE = "ThirdMaintenanceChangeCodeRule"; //设å¤ååºå½è¿ String LEAN_OUT_CODE_RULE = "EquipmentLeanOutCodeRule"; //设å¤å°åå¯å° lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/HfTemplateCategoryEnum.java
@@ -5,6 +5,7 @@ SECOND_MAINTENANCE, //äºä¿ THIRD_MAINTENANCE_HANDOVER, //ä¸ä¿ç§»äº¤å THIRD_MAINTENANCE_ACCEPTANCE, //ä¸ä¿éªæ¶å THIRD_MAINTENANCE_CHANGE, //ä¸ä¿åæ´å TECHNICAL_STATUS_EVALUATION, //ææ¯ç¶æé´å®è¡¨ TECHNICAL_STATUS_EVALUATION_SAFETY_CHECK, //设å¤å®å ¨è£ ç½®æ£æ¥å TECHNICAL_STATUS_EVALUATION_OTHER_CHECK, //å ¶ä»æ£æ¥é¡¹ç® lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ThirdMaintenanceChangeReasonEnum.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,10 @@ package org.jeecg.modules.eam.constant; public enum ThirdMaintenanceChangeReasonEnum { PRODUCTION_WORK_ORDER_EXPEDITED, //çäº§ä»»å¡æ¥æ æ³åæº EQUIPMENT_BREAKDOWN_REPAIR, //è®¾å¤æ 鿣å¤äºç»´ä¿®ç¶æ EQUIPMENT_SCRAPPED, //设å¤å·²æ¥åº EQUIPMENT_MAJOR, //设å¤å¤§ä¿®ã项修 EQUIPMENT_RETROFITTING, //è®¾å¤æ¹é ; } lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/ThirdMaintenanceChangeStatusEnum.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,22 @@ package org.jeecg.modules.eam.constant; public enum ThirdMaintenanceChangeStatusEnum { WAIT_SUBMIT, //å¾ æäº¤ EQUIPMENT_MANAGER_SIGNING, //主管é¢å¯¼ç¾åä¸ DEPART_MANAGER_SIGNING, //é¨é¨é¢å¯¼ç¾åä¸ PRODUCTION_SUPPORT_SIGNING, //ä¿éé¨é¢å¯¼ç¾åä¸ ABOLISH, //å·²ä½åº REJECTED, //已驳å COMPLETED, //已宿 ; public static ThirdMaintenanceChangeStatusEnum getInstance(String code) { ThirdMaintenanceChangeStatusEnum[] values = ThirdMaintenanceChangeStatusEnum.values(); for (ThirdMaintenanceChangeStatusEnum value : values) { if (value.name().equals(code)) { return value; } } return null; } } lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceChange.java
@@ -1,5 +1,6 @@ package org.jeecg.modules.eam.entity; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModel; @@ -41,6 +42,7 @@ */ @Excel(name = "ä¸ä¿å·¥åID", width = 15) @ApiModelProperty(value = "ä¸ä¿å·¥åID") @Dict(dictTable = "eam_third_maintenance_order", dicCode = "id", dicText = "order_num") private String orderId; /** * åæ´åå· @@ -53,13 +55,14 @@ */ @Excel(name = "ç³è¯·äºº", width = 15) @ApiModelProperty(value = "ç³è¯·äºº") @Dict(dicCode = "sys_user, realname, username") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String applicant; /** * ç³è¯·é¨é¨ */ @Excel(name = "ç³è¯·é¨é¨", width = 15) @ApiModelProperty(value = "ç³è¯·é¨é¨") @Dict(dictTable = "eam_base_factory",dicText = "factory_name",dicCode = "org_code") private String factoryOrgCode; /** * ç³è¯·æ¥æ @@ -74,18 +77,21 @@ */ @Excel(name = "ç³è¯·ç±»å;æ¥åºãå»¶ä¿", width = 15) @ApiModelProperty(value = "ç³è¯·ç±»å;æ¥åºãå»¶ä¿") @Dict(dicCode = "third_maintenance_change_category") private String applyCategory; /** * åæ´ç¶æ;å¾ æäº¤ãå¾ ä¸»ç®¡å®¡æ ¸ãå¾ é¨é¨ç¡®è®¤ãå¾ ä¿éé¨ç¡®è®¤ãå·²ä½åºã已宿 */ @Excel(name = "åæ´ç¶æ;å¾ æäº¤ãå¾ ä¸»ç®¡å®¡æ ¸ãå¾ é¨é¨ç¡®è®¤ãå¾ ä¿éé¨ç¡®è®¤ãå·²ä½åºã已宿", width = 15) @ApiModelProperty(value = "åæ´ç¶æ;å¾ æäº¤ãå¾ ä¸»ç®¡å®¡æ ¸ãå¾ é¨é¨ç¡®è®¤ãå¾ ä¿éé¨ç¡®è®¤ãå·²ä½åºã已宿") @Dict(dicCode = "third_maintenance_change_status") private String changeStatus; /** * å»¶ä¿åå ç±»å;ç产任å¡ãè®¾å¤æ éãæ¥åºãå¤§ä¿®é¡¹ä¿®ãæ¬è¿ */ @Excel(name = "å»¶ä¿åå ç±»å;ç产任å¡ãè®¾å¤æ éãæ¥åºãå¤§ä¿®é¡¹ä¿®ãæ¬è¿", width = 15) @ApiModelProperty(value = "å»¶ä¿åå ç±»å;ç产任å¡ãè®¾å¤æ éãæ¥åºãå¤§ä¿®é¡¹ä¿®ãæ¬è¿") @Dict(dicCode = "third_maintenance_change_reason") private String applyReasonType; /** * å»¶ä¿(åæ´)åå @@ -106,7 +112,7 @@ */ @Excel(name = "主管é¢å¯¼ç¾å", width = 15) @ApiModelProperty(value = "主管é¢å¯¼ç¾å") @Dict(dicCode = "sys_user, realname, username") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String equipmentManagerSignature; /** * 主管é¢å¯¼ç¾åæ¶é´ @@ -121,7 +127,7 @@ */ @Excel(name = "é¨é¨é¢å¯¼ç¾å;æ ¹æ®å»¶ä¿åå ç±»ååºåä¸åç人审æ¹", width = 15) @ApiModelProperty(value = "é¨é¨é¢å¯¼ç¾å;æ ¹æ®å»¶ä¿åå ç±»ååºåä¸åç人审æ¹") @Dict(dicCode = "sys_user, realname, username") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String departManagerSignature; /** * é¨é¨é¢å¯¼ç¾åæ¶é´ @@ -142,7 +148,7 @@ */ @Excel(name = "ç产ä¿éé¨é¢å¯¼ç¾å", width = 15) @ApiModelProperty(value = "ç产ä¿éé¨é¢å¯¼ç¾å") @Dict(dicCode = "sys_user, realname, username") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String productionSupportSignature; /** * ç产ä¿éé¨é¢å¯¼ç¾åæ¶é´ @@ -164,4 +170,12 @@ @Excel(name = "HFç¼ç ", width = 15) @ApiModelProperty(value = "HFç¼ç ") private String hfCode; //å表å±ç¤º @TableField(exist = false) private String equipmentCode; @TableField(exist = false) private String equipmentName; @TableField(exist = false) private String equipmentModel; } lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java
@@ -243,4 +243,6 @@ private String equipmentCode; @TableField(exist = false) private String equipmentName; @TableField(exist = false) private String equipmentModel; } lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/request/EamWeekInsDetailUserResponse.java
@@ -28,7 +28,7 @@ @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "ç¹æ£æ¥æ") private Date inspectionDate; private Date planInspectionDate; /**ç¹æ£äºº*/ @ApiModelProperty(value = "ç¹æ£äºº-æ¯é¢å人") lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java
@@ -305,31 +305,6 @@ } /** * 导åºexcel * * @param request * @param eamInspectionOrder */ //@RequiresPermissions("org.jeecg.modules:ç¹æ£å·¥å:exportXls") @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, EamInspectionOrder eamInspectionOrder) { return super.exportXls(request, eamInspectionOrder, EamInspectionOrder.class, "ç¹æ£å·¥å"); } /** * éè¿excelå¯¼å ¥æ°æ® * * @param request * @param response * @return */ //@RequiresPermissions("ç¹æ£å·¥å:importExcel") @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, EamInspectionOrder.class); } /** * 导åºè·ååºæ¬ä¿¡æ¯ * @param equipmentCode ç»ä¸ç¼ç * @param inspectionDate æ¥æ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamThirdMaintenanceChangeController.java
@@ -1,23 +1,30 @@ package org.jeecg.modules.eam.controller; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.Feature; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.TranslateDictTextUtils; import org.jeecg.modules.eam.constant.ThirdMaintenanceChangeStatusEnum; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationOrderChange; import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange; import org.jeecg.modules.eam.request.EamTechnicalStatusEvaluationOrderChangeRequest; import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery; import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest; import org.jeecg.modules.eam.service.IEamThirdMaintenanceChangeService; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.util.Arrays; /** @@ -34,11 +41,15 @@ @Resource private IEamThirdMaintenanceChangeService eamThirdMaintenanceChangeService; @Resource private ObjectMapper objectMapper; @Resource private TranslateDictTextUtils translateDictTextUtils; /** * å页å表æ¥è¯¢ * * @param eamThirdMaintenanceChange * @param query * @param pageNo * @param pageSize * @param req @@ -47,41 +58,52 @@ @AutoLog(value = "ä¸ä¿åæ´-å页å表æ¥è¯¢") @ApiOperation(value = "ä¸ä¿åæ´-å页å表æ¥è¯¢", notes = "ä¸ä¿åæ´-å页å表æ¥è¯¢") @GetMapping(value = "/list") public Result<?> queryPageList(EamThirdMaintenanceChange eamThirdMaintenanceChange, public Result<?> queryPageList(EamThirdMaintenanceChangeQuery query, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper<EamThirdMaintenanceChange> queryWrapper = QueryGenerator.initQueryWrapper(eamThirdMaintenanceChange, req.getParameterMap()); Page<EamThirdMaintenanceChange> page = new Page<EamThirdMaintenanceChange>(pageNo, pageSize); IPage<EamThirdMaintenanceChange> pageList = eamThirdMaintenanceChangeService.page(page, queryWrapper); IPage<EamThirdMaintenanceChange> pageList = eamThirdMaintenanceChangeService.queryPageList(page, query); return Result.OK(pageList); } /** * æ·»å * * @param eamThirdMaintenanceChange * @param request * @return */ @AutoLog(value = "ä¸ä¿åæ´-æ·»å ") @ApiOperation(value = "ä¸ä¿åæ´-æ·»å ", notes = "ä¸ä¿åæ´-æ·»å ") @PostMapping(value = "/add") public Result<?> add(@RequestBody EamThirdMaintenanceChange eamThirdMaintenanceChange) { eamThirdMaintenanceChangeService.save(eamThirdMaintenanceChange); return Result.OK("æ·»å æåï¼"); public Result<?> add(@RequestBody EamThirdMaintenanceChange request) { if (request == null) { return Result.error("æ·»å ç对象ä¸è½ä¸ºç©ºï¼"); } boolean b = eamThirdMaintenanceChangeService.saveThirdMaintenanceChange(request); if (!b) { return Result.error("åæ´å¤±è´¥ï¼"); } return Result.OK("åæ´æåï¼"); } /** * ç¼è¾ * * @param eamThirdMaintenanceChange * @param request * @return */ @AutoLog(value = "ä¸ä¿åæ´-ç¼è¾") @ApiOperation(value = "ä¸ä¿åæ´-ç¼è¾", notes = "ä¸ä¿åæ´-ç¼è¾") @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) public Result<?> edit(@RequestBody EamThirdMaintenanceChange eamThirdMaintenanceChange) { eamThirdMaintenanceChangeService.updateById(eamThirdMaintenanceChange); public Result<?> edit(@RequestBody EamThirdMaintenanceChange request) { if (request == null) { return Result.error("ç¼è¾ç对象ä¸è½ä¸ºç©ºï¼"); } boolean b = eamThirdMaintenanceChangeService.editThirdMaintenanceChange(request); if (!b) { return Result.error("ç¼è¾å¤±è´¥ï¼"); } return Result.OK("ç¼è¾æå!"); } @@ -113,6 +135,51 @@ return Result.OK("æ¹éå 餿åï¼"); } @AutoLog(value = "ä¸ä¿åæ´-æäº¤") @ApiOperation(value = "ä¸ä¿åæ´-æäº¤", notes = "ä¸ä¿åæ´-æäº¤") @GetMapping("/submit") public Result<?> submit(@RequestParam(name = "id") String id) { boolean b = eamThirdMaintenanceChangeService.submit(id); if (!b) { return Result.error("æäº¤å¤±è´¥ï¼"); } return Result.OK("æäº¤æå!"); } @AutoLog(value = "ä¸ä¿åæ´-ä½åº") @ApiOperation(value = "ä¸ä¿åæ´-ä½åº", notes = "ä¸ä¿åæ´-ä½åº") @GetMapping("/abolish") public Result<?> abolish(@RequestParam(name = "id") String id) { EamThirdMaintenanceChange entity = eamThirdMaintenanceChangeService.getById(id); if (entity == null) { return Result.error("è¦ä½åºçæ°æ®ä¸åå¨ï¼è¯·å·æ°éè¯ï¼"); } if (!ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) { return Result.error("è¯¥ç¶æçæ°æ®ä¸å 许è¿è¡ä½åºï¼"); } entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.ABOLISH.name()); eamThirdMaintenanceChangeService.updateById(entity); return Result.OK("ä½åºæå!"); } @AutoLog(value = "ä¸ä¿åæ´-审æ¹") @ApiOperation(value = "ä¸ä¿åæ´-审æ¹", notes = "ä¸ä¿åæ´-审æ¹") @PostMapping("/approval") public Result<?> approval(@RequestBody EamThirdMaintenanceChangeRequest request) { if (request == null) { return Result.error("审æ¹ç对象ä¸è½ä¸ºç©ºï¼"); } // æ£æ¥è¯·æ±åæ° if (StrUtil.isBlank(request.getTaskId()) || StrUtil.isBlank(request.getDataId()) || StrUtil.isBlank(request.getInstanceId())) { return Result.error("审æ¹ä»»å¡é误æä¸åå¨ï¼"); } EamThirdMaintenanceChange b = eamThirdMaintenanceChangeService.approval(request); if (b == null) { return Result.error("æä½å¤±è´¥ï¼"); } return Result.ok("æä½æåï¼"); } /** * éè¿idæ¥è¯¢ * @@ -123,31 +190,24 @@ @ApiOperation(value = "ä¸ä¿åæ´-éè¿idæ¥è¯¢", notes = "ä¸ä¿åæ´-éè¿idæ¥è¯¢") @GetMapping(value = "/queryById") public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { EamThirdMaintenanceChange eamThirdMaintenanceChange = eamThirdMaintenanceChangeService.getById(id); return Result.OK(eamThirdMaintenanceChange); } /** * 导åºexcel * * @param request * @param eamThirdMaintenanceChange */ @RequestMapping(value = "/exportXls") public ModelAndView exportXls(HttpServletRequest request, EamThirdMaintenanceChange eamThirdMaintenanceChange) { return super.exportXls(request, eamThirdMaintenanceChange, EamThirdMaintenanceChange.class, "ä¸ä¿åæ´"); } /** * éè¿excelå¯¼å ¥æ°æ® * * @param request * @param response * @return */ @RequestMapping(value = "/importExcel", method = RequestMethod.POST) public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { return super.importExcel(request, response, EamThirdMaintenanceChange.class); EamThirdMaintenanceChange entity = eamThirdMaintenanceChangeService.getById(id); if (entity == null) { return Result.error("æªæ¾å°å¯¹åºæ°æ®"); } try { String json = objectMapper.writeValueAsString(entity); JSONObject item = JSONObject.parseObject(json, Feature.OrderedField); translateDictTextUtils.translateField("orderId", entity.getOrderId(), item, "eam_third_maintenance_order,order_num,id"); translateDictTextUtils.translateField("applicant", entity.getApplicant(), item, "sys_user,realname,username"); translateDictTextUtils.translateField("changeStatus", entity.getChangeStatus(), item, "third_maintenance_change_status"); translateDictTextUtils.translateField("applyReasonType", entity.getApplyReasonType(), item, "third_maintenance_change_reason"); translateDictTextUtils.translateField("equipmentManagerSignature", entity.getEquipmentManagerSignature(), item, "sys_user,realname,username"); translateDictTextUtils.translateField("departManagerSignature", entity.getDepartManagerSignature(), item, "sys_user,realname,username"); translateDictTextUtils.translateField("productionSupportSignature", entity.getProductionSupportSignature(), item, "sys_user,realname,username"); return Result.OK(item); } catch (JsonProcessingException e) { return Result.error("æ°æ®è½¬è¯å¤±è´¥ï¼"); } } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java
@@ -8,7 +8,6 @@ import org.jeecg.modules.eam.constant.MaintenanceCategoryEnum; import org.jeecg.modules.eam.constant.OrderCreationMethodEnum; import org.jeecg.modules.eam.entity.EamInspectionOrder; import org.jeecg.modules.eam.entity.EamInspectionOrderDetail; import org.jeecg.modules.eam.entity.EamMaintenanceStandard; import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail; import org.jeecg.modules.eam.request.EamInspectionOrderRequest; lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamThirdMaintenanceChangeMapper.java
@@ -1,6 +1,11 @@ package org.jeecg.modules.eam.mapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange; /** @@ -11,4 +16,5 @@ */ public interface EamThirdMaintenanceChangeMapper extends BaseMapper<EamThirdMaintenanceChange> { IPage<EamThirdMaintenanceChange> queryPageList(Page<EamThirdMaintenanceChange> page, @Param(Constants.WRAPPER) QueryWrapper<EamThirdMaintenanceChange> queryWrapper); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceChangeMapper.xml
@@ -2,4 +2,16 @@ <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="org.jeecg.modules.eam.mapper.EamThirdMaintenanceChangeMapper"> <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceChange"> SELECT tmc.*, e.equipment_code, e.equipment_name, e.equipment_model FROM eam_third_maintenance_change tmc INNER JOIN eam_third_maintenance_order tmo ON tmc.order_id = tmo.id INNER JOIN eam_equipment e ON tmo.equipment_id = e.id ${ew.customSqlSegment} </select> </mapper> lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
@@ -3,7 +3,7 @@ <mapper namespace="org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper"> <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder"> select wmo.*, e.equipment_code, e.equipment_name select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model from eam_third_maintenance_order wmo inner join eam_equipment e on wmo.equipment_id = e.id lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceChangeQuery.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,28 @@ package org.jeecg.modules.eam.request; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** * @Author: Lius * @CreateTime: 2025-07-21 * @Description: */ @Data public class EamThirdMaintenanceChangeQuery { private String equipmentId; private String changeOrderNum; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date applyDateBegin; @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") private Date applyDateEnd; private String changeStatus; private String column; private String order; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamThirdMaintenanceChangeRequest.java
¶Ô±ÈÐÂÎļþ @@ -0,0 +1,36 @@ package org.jeecg.modules.eam.request; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import org.jeecg.modules.flowable.domain.vo.FlowTaskVo; import java.io.Serializable; /** * @Author: Lius * @CreateTime: 2025-07-21 * @Description: */ @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) @ApiModel(value = "ä¸ä¿åæ´å¯¹è±¡", description = "ä¸ä¿åæ´") public class EamThirdMaintenanceChangeRequest extends FlowTaskVo implements Serializable { private static final long serialVersionUID = 80020193253190375L; /** * ä¸»é® */ @ApiModelProperty(value = "主é®") private String id; /** * å·¥åå· */ @ApiModelProperty(value = "å·¥åå·") private String orderNum; } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceChangeService.java
@@ -1,7 +1,12 @@ package org.jeecg.modules.eam.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.eam.entity.EamThirdMaintenanceChange; import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery; import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest; /** * @Description: ä¸ä¿åæ´ @@ -11,4 +16,40 @@ */ public interface IEamThirdMaintenanceChangeService extends IService<EamThirdMaintenanceChange> { /** * å页æ¥è¯¢ * @param page * @param query * @return */ IPage<EamThirdMaintenanceChange> queryPageList(Page<EamThirdMaintenanceChange> page, EamThirdMaintenanceChangeQuery query); /** * æ·»å * @param request * @return */ boolean saveThirdMaintenanceChange(EamThirdMaintenanceChange request); /** * ç¼è¾ * @param request * @return */ boolean editThirdMaintenanceChange(EamThirdMaintenanceChange request); /** * æäº¤ å¼å¯æµç¨å®¡æ¹ * @param id * @return */ boolean submit(String id); /** * æµç¨å®¡æ¹ * @param request * @return */ EamThirdMaintenanceChange approval(EamThirdMaintenanceChangeRequest request); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamThirdMaintenanceOrderService.java
@@ -58,4 +58,12 @@ * @return */ Result<?> selectVoById(String id); /** * æ´æ°ä¸ä¿å·¥åç¶æ * @param orderId * @param maintenanceStatus * @return */ boolean updateMaintenanceStatus(String orderId, String maintenanceStatus); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java
@@ -371,17 +371,19 @@ resultMap.put("itemCode", weekInsDetailResultResponse.getItemCode()); resultMap.put("itemName", weekInsDetailResultResponse.getItemName()); resultMap.put("itemDemand", weekInsDetailResultResponse.getItemDemand()); // 使ç¨AtomicIntegerä½ä¸ºè®¡æ°å¨ï¼ä»1å¼å§ AtomicInteger counter = new AtomicInteger(1); Map<Integer, EamWeekInsDetailResultResponse> collect = weekInsDetailResultResponseList .stream() .collect(Collectors.toMap( // åç»é®ï¼ä½¿ç¨èªå¢åºå·ï¼ä»1å¼å§ï¼ item -> counter.getAndIncrement(), // åç»é®ï¼ä½¿ç¨planInspectionDateåæ®µè½å¨æ¬æç卿° item -> { Calendar calendar = Calendar.getInstance(); calendar.setTime(item.getPlanInspectionDate()); return calendar.get(Calendar.WEEK_OF_MONTH); }, // å¼ï¼ç´æ¥ä½¿ç¨å½å对象 item -> item, // å并彿°ï¼å½åä¸åºå·æå¤ä¸ªå¯¹è±¡æ¶ï¼ç论ä¸ä¸ä¼åçï¼ï¼å¦ä½å¤ç (existing, replacement) -> existing, // è¥æéå¤é®ï¼ä¿çå·²åå¨ç对象 // å并彿°ï¼å½åä¸å¨æå¤ä¸ªå¯¹è±¡æ¶ï¼æ ¹æ®éæ±ä¸ä¼åçï¼ä½ä»éæä¾ï¼ (existing, replacement) -> existing, // æå®Mapçå ·ä½å®ç°ï¼å¯éï¼ LinkedHashMap::new // ä¿ææå ¥é¡ºåº )); @@ -442,12 +444,18 @@ Map<Integer, EamWeekInsDetailUserResponse> groupMap = eamWeekInsDetailUserResponseList .stream() .collect(Collectors.toMap( // åç»é®ï¼ä½¿ç¨èªå¢åºå·ï¼ä»1å¼å§ï¼ item -> counter.getAndIncrement(), // å¼ï¼ç´æ¥ä½¿ç¨å½å对象ï¼ä½ä¸ºåå§å¼ï¼ // åç»é®ï¼ä½¿ç¨ planInspectionDate åæ®µè½å¨æ¬æç卿° item -> { Calendar calendar = Calendar.getInstance(); calendar.setTime(item.getPlanInspectionDate()); return calendar.get(Calendar.WEEK_OF_MONTH); }, // å¼ï¼ç´æ¥ä½¿ç¨å½å对象 item -> item, // å并彿°ï¼å½åä¸â天âæå¤ä¸ªå¯¹è±¡æ¶ï¼å¦ä½å¤çï¼è¿é示ä¾å第ä¸ä¸ªï¼ (existing, replacement) -> existing // è¥æéå¤é®ï¼ä¿çå·²åå¨ç对象 // å并彿°ï¼å½åä¸å¨æå¤ä¸ªå¯¹è±¡æ¶ï¼æ ¹æ®éæ±ä¸ä¼åçï¼ (existing, replacement) -> existing, // ä½¿ç¨ LinkedHashMap ä¿ææå ¥é¡ºåº LinkedHashMap::new )); Map<String, Object> resultMap = new LinkedHashMap<>(); for (int i = 1; i <= 5; i++) { lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceChangeServiceImpl.java
@@ -1,10 +1,56 @@ package org.jeecg.modules.eam.service.impl; 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.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.shiro.SecurityUtils; import org.flowable.engine.TaskService; import org.flowable.task.api.Task; import org.jeecg.common.api.vo.Result; 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.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.mapper.EamThirdMaintenanceChangeMapper; import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeQuery; import org.jeecg.modules.eam.request.EamThirdMaintenanceChangeRequest; import org.jeecg.modules.eam.service.IEamBaseHFCodeService; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.service.IEamThirdMaintenanceChangeService; 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.FlowCommonService; import org.jeecg.modules.flowable.service.IFlowDefinitionService; import org.jeecg.modules.flowable.service.IFlowTaskService; import org.jeecg.modules.system.entity.BaseFactory; import org.jeecg.modules.system.entity.BaseFactoryUser; import org.jeecg.modules.system.service.IBaseFactoryService; import org.jeecg.modules.system.service.IBaseFactoryUserService; import org.jeecg.modules.system.service.ISysBusinessCodeRuleService; import org.jeecg.modules.system.service.ISysUserService; import org.jeecg.modules.system.vo.UserSelector; 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: ä¸ä¿åæ´ @@ -15,4 +61,287 @@ @Service public class EamThirdMaintenanceChangeServiceImpl extends ServiceImpl<EamThirdMaintenanceChangeMapper, EamThirdMaintenanceChange> implements IEamThirdMaintenanceChangeService { @Resource private EamThirdMaintenanceChangeMapper eamThirdMaintenanceChangeMapper; @Resource private IBaseFactoryUserService baseFactoryUserService; @Resource private IBaseFactoryService baseFactoryService; @Resource private IEamThirdMaintenanceOrderService thirdMaintenanceOrderService; @Resource private IEamEquipmentService equipmentService; @Resource private ISysBusinessCodeRuleService businessCodeRuleService; @Resource private IEamBaseHFCodeService hfCodeService; @Resource private ISysUserService sysUserService; @Resource private FlowCommonService flowCommonService; @Resource private TranslateDictTextUtils translateDictTextUtils; @Resource private IFlowDefinitionService flowDefinitionService; @Resource private IFlowMyBusinessService flowMyBusinessService; @Resource private TaskService taskService; @Resource private IEamEquipmentService eamEquipmentService; @Resource private IFlowTaskService flowTaskService; @Override public IPage<EamThirdMaintenanceChange> queryPageList(Page<EamThirdMaintenanceChange> page, EamThirdMaintenanceChangeQuery query) { QueryWrapper<EamThirdMaintenanceChange> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("tmc.del_flag", CommonConstant.DEL_FLAG_0); //ç¨æ·æ°æ®æé 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 { //没æéæ©è®¾å¤ï¼æ ¹æ®ä¸å¿è¿æ»¤è®¾å¤ 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 page; } } //æ¥è¯¢æ¡ä»¶è¿æ»¤ if (query != null) { if (StringUtils.isNotBlank(query.getEquipmentId())) { queryWrapper.eq("tmc.equipment_id", query.getEquipmentId()); } if (StringUtils.isNotBlank(query.getChangeOrderNum())) { queryWrapper.like("tmc.order_num", query.getChangeOrderNum()); } if (StringUtils.isNotBlank(query.getChangeStatus())) { queryWrapper.eq("tmc.change_status", query.getChangeStatus()); } if (query.getApplyDateBegin() != null && query.getApplyDateEnd() != null) { queryWrapper.between("tmc.apply_date", query.getApplyDateBegin(), query.getApplyDateEnd()); } //æåº 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("tmc." + oConvertUtils.camelToUnderline(column)); } else { queryWrapper.orderByDesc("tmc." + oConvertUtils.camelToUnderline(column)); } } else { queryWrapper.orderByDesc("tmc.create_time"); } } else { queryWrapper.orderByDesc("tmc.create_time"); } return eamThirdMaintenanceChangeMapper.queryPageList(page, queryWrapper); } @Override @Transactional(rollbackFor = Exception.class) public boolean saveThirdMaintenanceChange(EamThirdMaintenanceChange request) { //æ¥è¯¢å·¥å EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(request.getOrderId()); if (order == null) { throw new JeecgBootException("ä¸ä¿å·¥åä¸åå¨ï¼æä½å¤±è´¥ï¼"); } //æ¥è¯¢è®¾å¤ EamEquipment equipment = equipmentService.getById(order.getEquipmentId()); if (equipment == null) { throw new JeecgBootException("设å¤ä¿¡æ¯ä¸åå¨ï¼æä½å¤±è´¥ï¼"); } //ç¨æ·æ°æ®æé LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (sysUser == null) { throw new JeecgBootException("ç»å½ç¨æ·ä¿¡æ¯ä¸ºç©ºï¼æä½å¤±è´¥ï¼"); } String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.THIRD_MAINTENANCE_CHANGE_CODE_RULE); request.setChangeOrderNum(codeSeq); request.setId(null); request.setChangeStatus(ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name()); request.setDelFlag(CommonConstant.DEL_FLAG_0); request.setApplicant(sysUser.getUsername()); request.setApplyDate(new Date()); request.setFactoryOrgCode(equipment.getFactoryOrgCode()); // ä¸ä¿åæ´å·¥åHF EamBaseHFCode eamBaseHFCode = hfCodeService.selectByCategory(HfTemplateCategoryEnum.THIRD_MAINTENANCE_CHANGE.name()); if (eamBaseHFCode == null) { throw new JeecgBootException("æªé ç½®ææ¯ç¶æé´å®åæ´çHFç¼ç ï¼æ·»å 失败ï¼"); } request.setHfCode(eamBaseHFCode.getHfCode()); this.getBaseMapper().insert(request); boolean b = thirdMaintenanceOrderService.updateMaintenanceStatus(request.getOrderId(), ThirdMaintenanceStatusEnum.CHANGE.name()); if (!b) { throw new JeecgBootException("ä¸ä¿å·¥åç¶æåæ´å¤±è´¥ï¼æ æ³åæ´ï¼"); } return true; } @Override @Transactional(rollbackFor = Exception.class) public boolean editThirdMaintenanceChange(EamThirdMaintenanceChange request) { EamThirdMaintenanceChange entity = this.getBaseMapper().selectById(request); if(entity == null) { throw new JeecgBootException("ç¼è¾çæ°æ®å·²å é¤ï¼è¯·å·æ°éè¯ï¼"); } if(!ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) { throw new JeecgBootException("åªæå¾ æäº¤ç¶ææå¯ç¼è¾ï¼"); } entity.setApplyReasonType(request.getApplyReasonType()); entity.setApplyReason(request.getApplyReason()); this.getBaseMapper().updateById(entity); return true; } @Override @Transactional(rollbackFor = Exception.class) public boolean submit(String id) { EamThirdMaintenanceChange entity = this.getBaseMapper().selectById(id); if (entity == null) { throw new JeecgBootException("è¦æäº¤çå·¥åä¸åå¨ï¼è¯·å·æ°éè¯ï¼"); } if (!ThirdMaintenanceChangeStatusEnum.WAIT_SUBMIT.name().equals(entity.getChangeStatus())) { throw new JeecgBootException("该工åå·²è¿è¡è¿æäº¤ï¼"); } EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(entity.getOrderId()); if(order == null) { throw new JeecgBootException("è¦åæ´çä¸ä¿å·¥åä¸åå¨ï¼è¯·å·æ°éè¯ï¼"); } EamEquipment equipment = equipmentService.getById(order.getEquipmentId()); if (equipment == null) { throw new JeecgBootException("设å¤ä¸åå¨ï¼æäº¤å¤±è´¥ï¼"); } LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if(sysUser == null || !sysUser.getUsername().equals(entity.getApplicant())) { throw new JeecgBootException("䏿¯æ¬äººï¼ä¸è½æäº¤æ¤å·¥åï¼"); } entity.setChangeStatus(ThirdMaintenanceChangeStatusEnum.EQUIPMENT_MANAGER_SIGNING.name()); //æ¥è¯¢ä¸çº§å®¡æ¹äººå List<UserSelector> userSelectors = sysUserService.selectOperatorList(equipment.getEquipmentCode(), equipment.getFactoryOrgCode(), BusinessCodeConst.PCR0011); if (CollectionUtil.isEmpty(userSelectors)) { throw new JeecgBootException("è®¾å¤æªåé ç»ä½¿ç¨åä½ä¸»ç®¡å®¤çº§é¢å¯¼ï¼æ æ³æäº¤ï¼"); } List<String> userApprovalList = userSelectors.stream().map(UserSelector::getUsername).collect(Collectors.toList()); //æ´æ°å®ä½ this.getBaseMapper().updateById(entity); //å¯å¨æµç¨ flowCommonService.initActBusiness("å·¥åå·: " + entity.getChangeOrderNum() + ";设å¤ç¼å·: " + equipment.getEquipmentCode(), entity.getId(), "IEamThirdMaintenanceChangeService", "third_maintenance_change", null); Map<String, Object> variables = new HashMap<>(); variables.put("dataId", entity.getId()); String applyReasonTypeText = translateDictTextUtils.translateField("applyReasonType", entity.getApplyReasonType(), "third_maintenance_change_reason"); if (StrUtil.isEmpty(applyReasonTypeText)) { variables.put("organization", "æ°å¢ä¸ä¿å·¥ååæ´é»è®¤å¯å¨æµç¨"); variables.put("comment", "æ°å¢ä¸ä¿å·¥ååæ´é»è®¤å¯å¨æµç¨"); } else { variables.put("organization", applyReasonTypeText); variables.put("comment", applyReasonTypeText); } Result<?> result = flowDefinitionService.startProcessInstanceByKey("third_maintenance_change", variables); if(result == null || !result.isSuccess()) { throw new JeecgBootException("å¯å¨æµç¨å¤±è´¥ï¼"); } //æ´æ°å·¥åç¶æä¸ºåæ´ä¸ order.setMaintenanceStatus(ThirdMaintenanceStatusEnum.CHANGE.name()); boolean b = thirdMaintenanceOrderService.updateById(order); if(!b) { throw new JeecgBootException("ä¸ä¿å·¥åç¶ææ´æ°å¤±è´¥ï¼"); } return true; } @Override @Transactional(rollbackFor = Exception.class) public EamThirdMaintenanceChange approval(EamThirdMaintenanceChangeRequest request) { EamThirdMaintenanceChange entity = this.getBaseMapper().selectById(request.getId()); if (entity == null) { throw new JeecgBootException("审æ¹çæ°æ®å·²å é¤ï¼è¯·å·æ°éè¯ï¼"); } EamThirdMaintenanceOrder order = thirdMaintenanceOrderService.getById(entity.getOrderId()); if(order == null) { throw new JeecgBootException("è¦åæ´çä¸ä¿å·¥åä¸åå¨ï¼è¯·å·æ°éè¯ï¼"); } // è·åå½åç»å½ç¨æ· LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (user == null || StrUtil.isBlank(user.getId())) { throw new JeecgBootException("æªè·åå°ç»å½ç¨æ·ï¼è¯·éæ°ç»å½ååè¯ï¼"); } request.setAssignee(user.getUsername()); // è·åæµç¨ä¸å¡è®°å½ FlowMyBusiness flowMyBusiness = flowMyBusinessService.getFlowMyBusiness(request.getInstanceId(), request.getTaskId()); if (flowMyBusiness == null) { throw new JeecgBootException("æµç¨å®ä¾ä¸åå¨ï¼è¯·å·æ°åéè¯ï¼"); } if (!isUserAuthorized(flowMyBusiness, user)) { throw new JeecgBootException("ç¨æ·æ ææä½æ¤ä»»å¡ï¼è¯·å·æ°åéè¯ï¼"); } // 认é¢ä»»å¡ if (!claimTask(flowMyBusiness.getTaskId(), user)) { throw new JeecgBootException("ä»»å¡ä¸åå¨ã已宿æå·²è¢«ä»äººè®¤é¢ï¼"); } EamEquipment equipment = eamEquipmentService.getById(order.getEquipmentId()); if (equipment == null) { throw new JeecgBootException("设å¤ä¸åå¨ï¼è¯·æ£æ¥ï¼"); } // 设置æµç¨åé setupProcessVariables(request, order, user, equipment); // 宿æµç¨ä»»å¡ Result result = flowTaskService.complete(request); // æ ¹æ®ä»»å¡å®æç»ææ´æ°å·¥åç¶æ updateOrderStatus(result, request, order, user); //æ´æ°å·¥åä¿¡æ¯ this.getBaseMapper().updateById(entity); return entity; } /** * 设置æµç¨åé */ private void setupProcessVariables(EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceOrder order, LoginUser user, EamEquipment equipment) { } /** * æ´æ°å·¥åç¶æ */ private void updateOrderStatus(Result result, EamThirdMaintenanceChangeRequest request, EamThirdMaintenanceOrder order, LoginUser user) { } private boolean isUserAuthorized(FlowMyBusiness flowMyBusiness, LoginUser user) { List<String> todoUsers = JSON.parseArray(flowMyBusiness.getTodoUsers(), String.class); return todoUsers != null && todoUsers.contains(user.getUsername()); } private boolean claimTask(String taskId, LoginUser user) { Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); if (task == null) { return false; } if (task.getAssignee() != null && !task.getAssignee().equals(user.getUsername())) { return false; } taskService.claim(taskId, user.getUsername()); return true; } } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -5,6 +5,7 @@ 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.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -22,12 +23,8 @@ 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.entity.EamBaseHFCode; import org.jeecg.modules.eam.entity.EamEquipment; import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder; import org.jeecg.modules.eam.entity.EamThirdMaintenanceOrderDetail; import org.jeecg.modules.eam.entity.*; import org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper; import org.jeecg.modules.eam.request.EamInspectionOrderRequest; import org.jeecg.modules.eam.request.EamThirdMaintenanceQuery; import org.jeecg.modules.eam.request.EamThirdMaintenanceRequest; import org.jeecg.modules.eam.service.*; @@ -360,6 +357,18 @@ return Result.ok(eamThirdMaintenanceRequestList); } @Override @Transactional(rollbackFor = Exception.class) public boolean updateMaintenanceStatus(String orderId, String maintenanceStatus) { LambdaUpdateWrapper<EamThirdMaintenanceOrder> updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.eq(EamThirdMaintenanceOrder::getId, orderId); updateWrapper.set(EamThirdMaintenanceOrder::getMaintenanceStatus, maintenanceStatus); updateWrapper.eq(EamThirdMaintenanceOrder::getDelFlag, CommonConstant.DEL_FLAG_0); updateWrapper.in(EamThirdMaintenanceOrder::getMaintenanceStatus, Arrays.asList(ThirdMaintenanceStatusEnum.WAIT_MAINTENANCE.name(), ThirdMaintenanceStatusEnum.FREEZE.name())); int update = this.getBaseMapper().update(null, updateWrapper); return update > 0; } /** * 设置æµç¨åé */