“linengliang”
2023-10-17 be5874cff6e319d9f9c7e84cd19f778b8fa3e93b
保养计划
已修改6个文件
89 ■■■■■ 文件已修改
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java 59 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanMapper.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanService.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EquipmentMaintenancePlanController.java
@@ -1,6 +1,8 @@
package org.jeecg.modules.eam.controller;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -8,6 +10,8 @@
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -16,10 +20,6 @@
import org.springframework.web.servlet.ModelAndView;
import java.util.Arrays;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.EquipmentMaintenancePlanDetail;
import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan;
import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanService;
import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanDetailService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
@@ -54,6 +54,21 @@
    @Autowired
    private IEquipmentMaintenancePlanDetailService equipmentMaintenancePlanDetailService;
    @Autowired
    private IDailyMaintenanceOrderService dailyMaintenanceOrderService;
    @Autowired
    private IEamEquipmentService equipmentService;
    @Autowired
    private IMaintenanceStandardService maintenanceStandardService;
    @Autowired
    private IdentityService sysIdentityService;
     @Autowired
     private ISysBaseAPI sysBaseApi;
    /*---------------------------------主表处理-begin-------------------------------------*/
@@ -195,8 +210,42 @@
    }
    @PutMapping("distrbute")
    public Result<?> distrbute(@RequestBody EquipmentMaintenancePlan equipmentMaintenancePlan) {
         LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal();
         equipmentMaintenancePlan.setStatus("distributed");
         equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan);
         //生成工单
         List<EquipmentMaintenancePlanDetail> equipmentMaintenancePlanDetails = equipmentMaintenancePlanDetailService.selectByMainId(equipmentMaintenancePlan.getId());
         for(EquipmentMaintenancePlanDetail equipmentMaintenancePlanDetail:equipmentMaintenancePlanDetails){
             MaintenanceStandard maintenanceStandard = maintenanceStandardService.getById(equipmentMaintenancePlanDetail.getStandardId());
             String num = sysIdentityService.getNumByTypeAndLength("DailyMaintenanceOrder",4);
             DailyMaintenanceOrder dailyMaintenanceOrder = new DailyMaintenanceOrder();
             dailyMaintenanceOrder.setNum(num);
             dailyMaintenanceOrder.setEquipmentId(maintenanceStandard.getEquipmentId());
             dailyMaintenanceOrder.setPlanStartTime(equipmentMaintenancePlanDetail.getPlanStartTime());
             dailyMaintenanceOrder.setPlanEndTime(equipmentMaintenancePlanDetail.getPlanEndTime());
             dailyMaintenanceOrder.setStatus(CommonConstant.STATUS_1);
             dailyMaintenanceOrder.setMaintenanceStandardId(maintenanceStandard.getId());
             dailyMaintenanceOrder.setCreateType(CommonConstant.ANNOUNCEMENT_SEND_STATUS_2);
             List<MaintenanceStandardDetail> maintenanceStandardDetailList = equipmentMaintenancePlanService.getCycle(maintenanceStandard.getId(),equipmentMaintenancePlan.getType());
             if(maintenanceStandardDetailList.size()>0){
                 dailyMaintenanceOrder.setMaintenanceCycleId(maintenanceStandardDetailList.get(0).getMaintenanceCycleId());
             }
             dailyMaintenanceOrder.setMaintenanceOrderUda1(equipmentMaintenancePlan.getId());
             dailyMaintenanceOrder.setDelFlag(CommonConstant.DEL_FLAG_0);
             dailyMaintenanceOrder.setPrecisionInspectionStatus(CommonConstant.STATUS_0);
             dailyMaintenanceOrder.setStoveExemptStatus(CommonConstant.STATUS_0);
             dailyMaintenanceOrderService.save(dailyMaintenanceOrder);
         }
         equipmentMaintenancePlanService.updateById(equipmentMaintenancePlan);
         String msg  = "单据号为【"+equipmentMaintenancePlan.getNum()+"】的保养计划已生成保养工单";
         MessageDTO messageDTO = new MessageDTO();
         messageDTO.setTitle("有新的保养工单");
         messageDTO.setContent(msg);
         messageDTO.setCategory("系统消息");
         messageDTO.setFromUser(user.getUsername());
         messageDTO.setToUser("admin");
         if(equipmentMaintenancePlanDetails.size()!=0){
             sysBaseApi.sendSysAnnouncement(messageDTO);
         }
         return Result.OK("操作成功");
    }
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/DailyMaintenanceOrder.java
@@ -126,6 +126,8 @@
    @ApiModelProperty(value = "问题及相应处理措施描述")
    private String description;
    private String stoveExemptStatus;
    @TableField(exist = false)
    private List<DailyMaintenanceOrderDetail> dailyMaintenanceOrderDetails;
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/EquipmentMaintenancePlanMapper.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.eam.mapper;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import java.util.List;
/**
 * @Description: 保养计划
@@ -10,5 +14,5 @@
 * @Version: V1.0
 */
public interface EquipmentMaintenancePlanMapper extends BaseMapper<EquipmentMaintenancePlan> {
    List<MaintenanceStandardDetail> getCycle(@Param("mainId") String mainId,@Param("type") String type);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentMaintenancePlanMapper.xml
@@ -1,5 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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.EquipmentMaintenancePlanMapper">
    <select id="getCycle" resultType="org.jeecg.modules.eam.entity.MaintenanceStandardDetail">
        select
        t1.id id,
        t2.id maintenanceCycleId
        from mom_eam_maintenance_standard_detail t1
        left join mom_eam_maintenance_cycle t2 on t2.id = t1.maintenance_cycle_id
        where t1.maintenance_standard_id = #{mainId}
        and t2.maintenance_type = #{type}
        and t1.del_flag = 0
    </select>
</mapper>
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEquipmentMaintenancePlanService.java
@@ -1,10 +1,13 @@
package org.jeecg.modules.eam.service;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
/**
 * @Description: 保养计划
@@ -28,5 +31,7 @@
     */
    public void delBatchMain (Collection<? extends Serializable> idList);
    List<MaintenanceStandardDetail> getCycle(String mainId,String type);
}
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EquipmentMaintenancePlanServiceImpl.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.service.impl;
import org.jeecg.modules.eam.entity.EquipmentMaintenancePlan;
import org.jeecg.modules.eam.entity.MaintenanceStandardDetail;
import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanDetailMapper;
import org.jeecg.modules.eam.mapper.EquipmentMaintenancePlanMapper;
import org.jeecg.modules.eam.service.IEquipmentMaintenancePlanService;
@@ -10,6 +11,7 @@
import org.springframework.transaction.annotation.Transactional;
import java.io.Serializable;
import java.util.Collection;
import java.util.List;
/**
 * @Description: 保养计划
@@ -41,4 +43,9 @@
        }
    }
    @Override
    public List<MaintenanceStandardDetail> getCycle(String mainId, String type) {
        return baseMapper.getCycle(mainId,type);
    }
}