lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamRepairOrder.java
@@ -97,6 +97,7 @@ */ @Excel(name = "维修负责人", width = 15) @ApiModelProperty(value = "维修负责人") @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String repairer; /** * 是否委外 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamRepairOrderController.java
@@ -8,19 +8,23 @@ import com.alibaba.fastjson.parser.Feature; import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.StringUtils; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.TranslateDictTextUtils; import org.jeecg.modules.eam.constant.BusinessCodeConst; import org.jeecg.modules.eam.entity.EamRepairOrder; import org.jeecg.modules.eam.request.EamRepairOrderQuery; import org.jeecg.modules.eam.request.EamRepairOrderRequest; import org.jeecg.modules.eam.request.EamRepairOrderResponse; import org.jeecg.modules.eam.service.IEamEquipmentService; import org.jeecg.modules.eam.service.IEamRepairOrderService; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.system.base.controller.JeecgController; import org.springframework.beans.factory.annotation.Autowired; import org.jeecg.modules.system.service.ISysUserService; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; import io.swagger.annotations.Api; @@ -45,6 +49,12 @@ @Resource private TranslateDictTextUtils translateDictTextUtils; @Resource private IEamEquipmentService equipmentService; @Resource private ISysUserService sysUserService; /** * 分页列表查询 @@ -76,6 +86,11 @@ public Result<?> add(@RequestBody EamRepairOrder eamRepairOrder) { if (StringUtils.isBlank(eamRepairOrder.getReportId())) { return Result.error("领取失败,请选择维修记录！"); } // 校验领取权限 LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); if (!BusinessCodeConst.PCR0002.equals(user.getPost())) { return Result.error("领取失败,没有领取权限！"); } eamRepairOrderService.saveRepairOrder(eamRepairOrder); return Result.OK("添加成功！"); @@ -128,7 +143,7 @@ translateDictTextUtils.translateField("reportStatus", eamRepairOrder.getReportStatus(), item, "report_repair_status"); translateDictTextUtils.translateField("equipmentId", eamRepairOrder.getEquipmentId(), item, "eam_equipment,id,equipment_code"); translateDictTextUtils.translateField("repairStatus", eamRepairOrder.getRepairStatus(), item, "report_repair_status"); translateDictTextUtils.translateField("repairer", eamRepairOrder.getRepairer(), item, "sys_user,realname,username"); translateDictTextUtils.translateField("repairer", eamRepairOrder.getRepairer(), item, "sys_user,username,realname"); return Result.OK(item); } catch (Exception e) { return Result.error("数据转译失败！"); lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EamRepairOrderMapper.java
@@ -25,5 +25,5 @@ * @param equipmentIds * @return */ IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, @Param("eamRepairOrder") EamRepairOrderQuery eamRepairOrderQuery, @Param("userId") String userId, @Param("equipmentIds") List<String> equipmentIds); IPage<EamRepairOrder> pageList(Page<EamRepairOrder> page, @Param("eamRepairOrder") EamRepairOrderQuery eamRepairOrder, @Param("userId") String userId, @Param("equipmentIds") List<String> equipmentIds); } lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
@@ -39,6 +39,9 @@ <if test="eamRepairOrder.repairCode != null and eamRepairOrder.repairCode != ''"> AND t1.repair_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.repairCode }),'%') </if> <if test="eamRepairOrder.sparePartDescription != null and eamRepairOrder.sparePartDescription != ''"> AND t1.spare_part_description LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.sparePartDescription }),'%') </if> </where> ORDER BY t1.create_time DESC </select> lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamRepairOrderServiceImpl.java
@@ -37,10 +37,7 @@ import org.jeecg.modules.flowable.service.IFlowTaskService; import org.jeecg.modules.mdc.util.DateUtils; 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.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -82,9 +79,6 @@ private IFlowTaskService flowTaskService; @Resource private ISysUserService sysUserService; @Resource private IEamEquipmentExtendService eamEquipmentExtendService; /** @@ -121,7 +115,7 @@ eamRepairOrder.setActualStartTime(DateUtils.getNow()); eamRepairOrder.setIsUseSpare(0); LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); eamRepairOrder.setRepairer(user.getRealname()); eamRepairOrder.setRepairer(user.getUsername()); super.save(eamRepairOrder); EamEquipment eamEquipment = eamEquipmentService.getById(eamReportRepair.getEquipmentId()); // 启动维修流程
