lxzn-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -710,6 +710,19 @@
    }

    /**
     * èŽ·å–指定时间之后的几年 qsw
     */
    public static Date getYearAfter(Date data,int number) {
        Calendar c = Calendar.getInstance();
        c.setTime(data);
        c.add(Calendar.YEAR, number);
        Date afterTime = c.getTime();
//        SimpleDateFormat f = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
//        String resultDate = f.format(afterTime);
        return afterTime;
    }

    /**
     * èŽ·å–指定时间之后的几天 qsw
     */
    public static Date getDayAfter(Date data,int number) {

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/DailyMaintenanceOrderController.java

@@ -764,6 +764,7 @@
    @RequestMapping(value = "/editTechnologyStatus", method = {RequestMethod.PUT,RequestMethod.POST})
    @Transactional(rollbackFor = { Exception.class })
    public Result<String> editTechnologyStatus(@RequestBody Equipment equipment) {
        equipment.setTechnologyStatusVerificationType("1");
        equipmentService.updateById(equipment);

        DailyMaintenanceOrder dailyMaintenanceOrder = dailyMaintenanceOrderService.getById(equipment.getMaintenanceOrderId());

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java

@@ -18,6 +18,9 @@
import org.jeecg.common.system.base.entity.SysUpload;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.base.entity.Constructor;
import org.jeecg.modules.base.service.IConstructorService;
import org.jeecg.modules.base.service.IFactoryModelService;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.model.DepartVo;
import org.jeecg.modules.eam.service.*;
@@ -29,6 +32,8 @@

import org.jeecg.common.system.base.controller.JeecgController;

import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.ISysDepartService;
import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.entity.ImportParams;
import org.springframework.beans.factory.annotation.Autowired;
@@ -74,8 +79,6 @@
     @Autowired
     private IProcessParametersTemplateService processParametersTemplateService;



     @Autowired
     private ISysBaseAPI sysBaseApi;

@@ -99,6 +102,22 @@

     @Autowired
     private IEquipmentCategoryService equipmentCategoryService;

     @Autowired
     private ISysDepartService departService;

     @Autowired
     private ITeamService teamService;

     @Autowired
     private IConstructorService constructorService;

     @Autowired
     private IAreaService areaService;




    /**
     * åˆ†é¡µåˆ—表查询
     *
@@ -543,119 +562,181 @@
             try {
                 List<EquipmentImportVo> list = ExcelImportUtil.importExcel(file.getInputStream(), EquipmentImportVo.class, params);
                 for(int i = 0;i<list.size();i++){
                     Equipment equipment = new Equipment();
                     EquipmentImportVo equipmentImportVo = list.get(i);
                     EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentImportVo.getEquipmentCategoryName()),false);
                     String equipmentCategoryName = equipmentImportVo.getEquipmentCategoryName();
                     String useId = equipmentImportVo.getUseId();
                     String areaId = equipmentImportVo.getFactoryModelId();
                     String manageId = equipmentImportVo.getManageId();
                     String constructorId = equipmentImportVo.getConstructorId();
                     String teamId = equipmentImportVo.getTeamId();
                     if(StringUtils.isBlank(equipmentImportVo.getNum())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:统一编码缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getName())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备名称缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getUseId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:使用部门缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda1())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:工区缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getManageId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:维护部门缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getTeamId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:维修班组缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentImportanceId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:ABC标识缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentCategoryName())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备分类缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentStatus())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备状态缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getTechnologyStatus())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备技术缺失,请填写必填项后再导入;";
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备技术状态缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getFactoryModelId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:车间缺失,请填写必填项后再导入;";
                     else if(StringUtils.isBlank(equipmentImportVo.getModel())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备型号缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getWorkCenterId())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:产线缺失,请填写必填项后再导入;";
                     else if(StringUtils.isBlank(useId)){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:使用部门缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyStart())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:质保开始日期缺失,请填写必填项后再导入;";
                     else if(StringUtils.isBlank(areaId)){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:工区缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getPropertyStatus())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:资产状态缺失,请填写必填项后再导入;";
                     else if(StringUtils.isBlank(manageId)){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:维护部门缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     //非必填项
//                     else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
                     else if(StringUtils.isBlank(equipmentCategoryName)){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备分类缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     else if(StringUtils.isBlank(teamId)){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:维修班组缺失,请填写必填项后再导入;";
                         exceptionNum++;
                         continue;
                     }
                     //非必填项
                     // else if(ObjectUtils.isNotNull(equipmentImportVo.getWarrantyStart())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:质保开始日期缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getPropertyStatus())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:资产状态缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                   else if(StringUtils.isBlank(equipmentImportVo.getEquipmentUda5())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:功能位置缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getLocation())){
//                   else if(StringUtils.isBlank(equipmentImportVo.getLocation())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:安装位置缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
//                   else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:出厂日期缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())){
//                   else if(StringUtils.isBlank(equipmentImportVo.getProjectApprovalNo())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:立项卡号缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getFundSource())){
//                   else if(StringUtils.isBlank(equipmentImportVo.getFundSource())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:资金来源缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())){
//                   else if(StringUtils.isBlank(equipmentImportVo.getAcceptanceCheckDate())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:验收日期缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
//                   else if(StringUtils.isBlank(equipmentImportVo.getLeaveFactoryDate())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:出厂日期缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getFactoryNo())){
//                   else if(StringUtils.isBlank(equipmentImportVo.getFactoryNo())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:出厂编号缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if( StringUtils.isBlank(equipmentImportVo.getConstructorId())){
//                   else if( StringUtils.isBlank(equipmentImportVo.getConstructorId())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:资产制造商缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getModel())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备型号缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
                     else if(StringUtils.isBlank(equipmentImportVo.getSpecification())){
                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备规格缺失,请填写必填项后再导入;";
                         exceptionNum++;
                     }
//                   else if(StringUtils.isBlank(equipmentImportVo.getSpecification())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备规格缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
//                     else if(StringUtils.isBlank(equipmentImportVo.getGpo())){
//                         exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:设备功率缺失,请填写必填项后再导入;";
//                         exceptionNum++;
//                     }
                     else if(ObjectUtils.isNull(equipmentCategory))
                           {
                              exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:该设备所属类别不存在，请先维护设备类别;";
                              exceptionNum++;
                           }
                     else{
                         SysDepart use = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",useId.trim()),false);
                         if(ObjectUtils.isNull(useId)){
                             equipment.setUseId(use.getId());
                         }else {
                             exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该使用部门,请维护部门数据后再导入;";
                             exceptionNum++;
                             continue;
                         }
                         Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()));
                         if(ObjectUtils.isNotNull(area)){
                             equipment.setFactoryModelId(area.getId());
                         }else {
                             exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该工区,请维护工区数据后再导入;";
                             exceptionNum++;
                             continue;
                         }
                         SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()));
                         if(ObjectUtils.isNotNull(manage)){
                             equipment.setManageId(manage.getId());
                         }else{
                             exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该维护部门,请先维护部门数据后再导入;";
                             exceptionNum++;
                             continue;
                         }
                         EquipmentCategory equipmentCategory = equipmentCategoryService.getOne(new QueryWrapper<EquipmentCategory>().eq("name",equipmentCategoryName.trim()),false);
                         if(ObjectUtils.isNotNull(equipmentCategory)){
                             equipment.setEquipmentCategoryId(equipmentCategory.getId());
                         }
                         else {
                             exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该设备分类,请先维护设备分类数据后再导入;";
                             exceptionNum++;
                             continue;
                         }
                         Team team = teamService.getOne(new QueryWrapper<Team>().eq("name",teamId.trim()),false);
                         if(ObjectUtils.isNotNull(team)){
                             equipment.setTeamId(team.getId());
                         }else {
                             exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败,原因:不存在该班组,请先维护班组数据后再导入;";
                             exceptionNum++;
                             continue;
                         }
                         if(StringUtils.isNotBlank(constructorId)){
                             Constructor constructor = constructorService.getByName(constructorId.trim());
                             if(ObjectUtils.isNotNull(constructor)){
                                 equipment.setConstructorId(constructor.getId());
                             }else {
                                 constructor = new Constructor();
                                 constructor.setName(constructorId);
                                 constructor.setDelFlag(0);
                                 constructorService.save(constructor);
                                 equipment.setConstructorId(constructor.getId());
                             }
                         }
                         if(equipmentImportVo.getPropertyStatus().equals("warranty")){
                             if(
                                     ObjectUtils.isNull(equipmentImportVo.getWarrantyStart())
@@ -666,24 +747,19 @@
                             }

                         }else{
                             Equipment oriEquipment = equipmentService.getOne(new QueryWrapper<Equipment>().eq("num",equipmentImportVo.getNum()),false);
                             Equipment oriEquipment = equipmentService
                                     .getOne(new QueryWrapper<Equipment>()
                                             .eq("num",equipmentImportVo.getNum()),false);
                             if(ObjectUtils.isNull(oriEquipment)){
                                 Equipment equipment = new Equipment();
                                 equipment.setNum(equipmentImportVo.getNum())
                                         .setName(equipmentImportVo.getName())
                                         .setUseId(equipmentImportVo.getUseId())
                                         .setEquipmentUda1(equipmentImportVo.getEquipmentUda1())
                                         .setManageId(equipmentImportVo.getManageId())
                                         .setTeamId(equipmentImportVo.getTeamId())
                                         .setTechnologyStatus(equipmentImportVo.getTechnologyStatus())
                                         .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId())
                                         .setEquipmentCategoryId(equipmentCategory.getId())
                                         .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification())
                                         .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration())
                                         .setCoolingSystem(equipmentImportVo.getCoolingSystem())
                                         .setFireExtinguisher(equipmentImportVo.getFireExtinguisher())
                                         .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod())
                                         .setOperatingSystem(equipmentImportVo.getOperatingSystem())
                                         .setSystem(equipmentImportVo.getSystem())
                                         .setPort(equipmentImportVo.getPort())
                                         .setCoordinateNum(equipmentImportVo.getCoordinateNum())
@@ -697,12 +773,9 @@
                                         .setFundSource(equipmentImportVo.getFundSource())
                                         .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate())
                                         .setFactoryNumber(equipmentImportVo.getFactoryNumber())
                                         .setConstructorId(equipmentImportVo.getConstructorId())
                                         .setSourceCountry(equipmentImportVo.getSourceCountry())
                                         .setModel(equipmentImportVo.getModel())
                                         .setSpecification(equipmentImportVo.getSpecification())
                                         .setFactoryModelId(equipmentImportVo.getFactoryModelId())
                                         .setWorkCenterId(equipmentImportVo.getWorkCenterId())
                                         .setPropertyStatus(equipmentImportVo.getPropertyStatus())
                                         .setWarrantyStart(equipmentImportVo.getWarrantyStart())
                                         .setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
@@ -737,9 +810,9 @@
                             }else {
                                 exceptionInfo = exceptionInfo+"第"+(i+2)+"行导入失败，原因：统一编码已存在，数据重复导入;";
                                 exceptionNum++;
                                 continue;
                             }
                         }

                     }
                 }
                 if(exceptionNum!=0){

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/MaintenanceThreeAcceptanceController.java

@@ -15,10 +15,13 @@
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.DateUtils;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.eam.entity.DailyMaintenanceOrder;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.MaintenanceThreeAcceptance;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.eam.service.IMaintenanceThreeAcceptanceService;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -58,6 +61,9 @@

     @Autowired
    private IDailyMaintenanceOrderService dailyMaintenanceOrderService;

     @Autowired
     private IEamEquipmentService equipmentService;
    
    /**
     * åˆ†é¡µåˆ—表查询
@@ -95,6 +101,8 @@
        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
        String userId = sysUser.getId();
        String maintenanceOrderId = maintenanceThreeAcceptance.getMaintenanceOrderId();
        String equipmentId = maintenanceThreeAcceptance.getEquipmentId();
        int maintenanceCycle = Integer.parseInt(maintenanceThreeAcceptance.getMaintenanceCycle());
        List<MaintenanceThreeAcceptance> maintenanceThreeAcceptances = maintenanceThreeAcceptance.getMaintenanceThreeAcceptances();
        String checkStatus = "1";//三级保养验收状态（1通过，2未通过）
        for (MaintenanceThreeAcceptance threeAcceptance : maintenanceThreeAcceptances) {
@@ -115,9 +123,18 @@
        maintenanceOrder.setInspectDate(new Date());
//        maintenanceOrder.setStatus("8");
        dailyMaintenanceOrderService.updateById(maintenanceOrder);

        if("1".equals(checkStatus)){
            Equipment equipment = equipmentService.getById(equipmentId);
            Date dayAfter = DateUtils.getYearAfter(new Date(), maintenanceCycle);
            equipment.setNextThirdMaintenanceTime(dayAfter);
            equipment.setThirdMaintenanceTime(new Date());
            equipmentService.updateById(equipment);
        }

        return Result.OK("添加成功！");
    }
	

    /**
     *  ç¼–辑
     *

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/PrecisionInspectionController.java

@@ -13,10 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.eam.entity.*;
import org.jeecg.modules.eam.service.IDailyMaintenanceOrderService;
import org.jeecg.modules.eam.service.IPrecisionInspectionDetailService;
import org.jeecg.modules.eam.service.IPrecisionInspectionService;
import org.jeecg.modules.eam.service.IPrecisionParametersService;
import org.jeecg.modules.eam.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
@@ -49,6 +46,9 @@

    @Autowired
    private IPrecisionParametersService precisionParametersService;

    @Autowired
    private IEamEquipmentService equipmentService;
    
    /**
     * åˆ†é¡µåˆ—表查询
@@ -205,6 +205,7 @@

        PrecisionInspection preInspection = precisionInspectionService.getById(precisionInspection.getId());
        DailyMaintenanceOrder maintenanceOrder = dailyMaintenanceOrderService.getById(preInspection.getMaintenanceOrderId());
        Equipment equipment = equipmentService.getById(maintenanceOrder.getEquipmentId());
        String precisionInspectionStatus = maintenanceOrder.getPrecisionInspectionStatus();

        if ("0".equals(precisionInspectionStatus)){
@@ -238,12 +239,14 @@

            maintenanceOrder.setPrecisionInspectionStatus("5");
//            maintenanceOrder.setStatus("8");
            //更新设备技术状态
            equipment.setTechnologyStatus(precisionInspection.getJudgmentResult());
        }

        preInspection.setRemark(precisionInspection.getRemark());
        dailyMaintenanceOrderService.updateById(maintenanceOrder);
        precisionInspectionService.updateById(preInspection);

        equipmentService.updateById(equipment);
        return Result.OK("审批成功!");
    }


 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/Equipment.java

@@ -201,6 +201,13 @@
    @Dict(dicCode = "id",dictTable = "mom_eam_precision_parameters_template",dicText = "name")
    private String precisionParametersTemplateId;

    @ApiModelProperty(value = "技术状态鉴定类型（字典technology_status_verification_type）")
    @Dict(dicCode = "technology_status_verification_type")
    private String technologyStatusVerificationType;

    @ApiModelProperty(value = "技术状态鉴定单据")
    private String technologyStatusVerificationBill;

    @TableField(exist = false)
    private String processParametersTemplateName;

@@ -299,8 +306,8 @@
    private List<EquipmentProcessParameters> processEditTableList;
    @TableField(exist = false)
    private List<EquipmentPrecisionParameters> precisionEditTableList;
    @Dict(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name")
    @Excel(width = 15,dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name",orderNum = "39", name = "车间")
    @Dict(dicCode = "id",dictTable = "mom_base_area",dicText = "name")
    @Excel(width = 15,dicCode = "id",dictTable = "mom_base_area",dicText = "name",orderNum = "39", name = "工区")
    private String factoryModelId;
    @Excel(width = 15,dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "产线",orderNum = "40")
    @Dict(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name")

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EquipmentImportVo.java

@@ -14,37 +14,49 @@
@Data
@Accessors(chain = true)
public class EquipmentImportVo {
    @Excel(name = "设备所属分类")
    private String equipmentCategoryName;

    @Excel(name="统一编码")
    private String num;

    @Excel(name = "设备名称")
    private String name;

    @Excel(name = "使用部门",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
    @Excel(name = "型号")
    private String model;

//    @Excel(name = "使用部门",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
    private String useId;

    @Excel(name = "工区")
    private String equipmentUda1;
//    @Excel(name = "工区",dicCode = "id",dictTable = "mom_base_area",dicText = "name")
    private String factoryModelId;

    @Excel(name = "维护部门",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
//    @Excel(name = "维护部门",dictTable = "sys_depart",dicCode = "id",dicText = "depart_name")
    private String manageId;

    @Excel(name = "维修班组",dictTable = "mom_base_team",dicCode = "id",dicText = "name")
//    @Excel(name = "维修班组",dictTable = "mom_base_team",dicCode = "id"2,dicText = "name")
    private String teamId;

    @Excel(name = "ABC标识",dicCode = "id",dictTable="mom_eam_equipment_importance",dicText="name")
//    @Excel(name = "资产制造商",dicCode = "id",dictTable="mom_base_constructor",dicText="name")
    private String constructorId;

    @Excel(name = "ABC标识",dicCode = "ABC-standard-result")
    private String equipmentImportanceId;

    @Excel(name = "设备所属分类")
    private String equipmentCategoryName;
    @Excel(name = "设备状态",dicCode = "equipment_status")
    private String equipmentStatus;

    @Excel(name = "关键设备标识")
    @Excel(name = "技术状态",dicCode = "technology_status")
    private String technologyStatus;

    @Excel(name = "关键设备标识",dicCode = "specific_equipment")
    private String keyEquipmentIdentification;

    @Excel(name = "安全配置")
    private String securityConfiguration;
    @Excel(name = "资产状态",dicCode = "property_status")
    private String     propertyStatus;

    @Excel(name = "冷却系统")
    @Excel(name = "冷却系统",dicCode = "cooling_system")
    private String coolingSystem;

    @Excel(name = "灭火器")
@@ -52,9 +64,6 @@

    @Excel(name = "灭火器有效期")
    private String fireExtinguisherValidityPeriod;

    @Excel(name = "操作系统")
    private String operatingSystem;

    @Excel(name = "系统")
    private String system;
@@ -64,9 +73,6 @@

    @Excel(name = "坐标数量")
    private BigDecimal coordinateNum;

    @Excel(name = "设备状态",dicCode = "equipment_status")
    private String equipmentStatus;

    @Excel(name = "重量")
    private String equipmentUda3;
@@ -95,14 +101,11 @@
    @Excel(name = "出厂编号")
    private String factoryNumber;

    @Excel(name = "资产制造商",dicCode = "id",dictTable="mom_base_constructor",dicText="name")
    private String constructorId;

    @Excel(name = "资产的来源国家")
    private String sourceCountry;

    @Excel(name = "型号")
    private String model;
    @Excel(name = "安全配置")
    private String securityConfiguration;

    @Excel(name = "规格")
    private String specification;
@@ -110,31 +113,14 @@
    @Excel(name = "总功率")
    private String gpo;

    @Excel(name = "技术状态",dicCode = "technology_status")
    private String technologyStatus;

    @Excel(dicCode = "id",dictTable = "mom_base_factory_model",dicText = "name", name = "车间")
    private String factoryModelId;

    @Excel(dicCode = "id",dictTable = "mom_base_work_center",dicText = "name",name = "产线")
    private String workCenterId;

    @Excel(name = "质保开始日期",format = "yyyyMMdd")
    private Date warrantyStart;

    @Excel(name = "质保结束日期",format = "yyyyMMdd")
    private Date warrantyEnd;

    @Excel(dicCode = "property_status",name = "资产状态")
    private String     propertyStatus;

    @Excel(name = "下次技术状态鉴定时间", width = 20, format = "yyyyMMdd")
    private Date  nextTechnologyStatusQualificationTime;







}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/InspectionOrderDetail.java

@@ -52,7 +52,7 @@
    /**点检项目id*/
    @Excel(name = "点检项目id", width = 15)
    @ApiModelProperty(value = "点检项目id")
    @Dict(dictTable = "mom_eam_inspection_project", dicCode = "id", dicText = "num")
    @Dict(dictTable = "mom_eam_inspection_project", dicCode = "id", dicText = "name")
    private String inspectionProjectId;
    /**序号*/
    @Excel(name = "序号", width = 15)

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/MaintenanceThreeAcceptance.java

@@ -71,4 +71,10 @@

    @TableField(exist = false)
    private String notPassReason;

    @TableField(exist = false)
    private String maintenanceCycle;

    @TableField(exist = false)
    private String equipmentId;
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/ThirdMaintenaceAlart.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
package org.jeecg.modules.eam.job;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.hibernate.annotations.Source;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.vo.DictModel;
import org.jeecg.modules.eam.entity.Equipment;
import org.jeecg.modules.eam.entity.EquipmentReportRepair;
import org.jeecg.modules.eam.service.IEamEquipmentService;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.service.*;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
import org.springframework.beans.factory.annotation.Autowired;

import javax.annotation.Resource;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.List;

public class ThirdMaintenaceAlart implements Job {

    @Resource
    private IEamEquipmentService equipmentService;
    @Resource
    private ISysBaseAPI sysBaseApi;
    @Resource
    private ISysRoleService sysRoleService;
    @Resource
    private ISysDictService sysDictService;
    @Resource
    private ISysDictItemService sysDictItemService;
    @Resource
    private ISysUserRoleService sysUserRoleService;
    @Resource
    private ISysUserService sysUserService;
    @Override
    public void execute(JobExecutionContext context) throws JobExecutionException {
        LocalDateTime currentDateTime = LocalDateTime.now();
        LocalDateTime dateBefore2Months = currentDateTime.plusMonths(2);
        Date result = Date.from(dateBefore2Months.atZone(ZoneId.systemDefault()).toInstant());
        List<Equipment> needAlerts = equipmentService.list(new QueryWrapper<Equipment>().lt("next_third_maintenance_time",result).eq("property_status","normal").eq("del_flag",0));
        SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
        SysDictItem sysDictItem = sysDictItemService.getOne(new QueryWrapper<SysDictItem>().eq("item_text","三保消息").eq("dict_id",sysDict.getId()),false);
        String roleCode = sysDictItem.getItemValue();
        SysRole sysRole = sysRoleService.getOne(new QueryWrapper<SysRole>().eq("role_code",roleCode),false);
        List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("role_id",sysRole.getId()));
        for(SysUserRole sysUserRole:sysUserRoles){
            SysUser sysUser = sysUserService.getById(sysUserRole.getUserId());
            String title = "设备下次三保到期提醒!";
            String msg = "统一编码为：";
            for(Equipment equipment:needAlerts){
                msg = msg+"【"+equipment.getNum()+"】";
            }
            msg = msg+"的设备离下次三保的日期不足两个月，请及时处理";
            MessageDTO messageDTO = new MessageDTO();
            messageDTO.setTitle(title);
            messageDTO.setContent(msg);
            messageDTO.setCategory("三保消息");
            messageDTO.setFromUser("admin");
            messageDTO.setToUser(sysUser.getUsername());
            if(needAlerts.size()!=0){
                sysBaseApi.sendSysAnnouncement(messageDTO);
            }
        }
    }
}

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml

@@ -16,7 +16,8 @@
            t3.maintenance_require as maintenanceRequire,
            concat(t6.code, '/', t6.name) as maintenanceCycleName,
            t5.name as maintenanceSpecialtyName,
            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1
            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            t1.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
        FROM
            mom_eam_daily_maintenance_order_detail t1
        LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderMapper.xml

@@ -10,6 +10,7 @@
            t1.photo,
            t1.maintenance_project_id as maintenanceProjectId,
            t3.num as maintenanceProjectNum,
            t3.name as maintenanceProjectName,
            t3.standard,
            t4.item_text as maintenanceMethod,
            t3.maintenance_tool as maintenanceTool
@@ -45,9 +46,11 @@
            t1.status,
            t5.item_text as statusName,
            t1.num,
            t1.num as technologyStatusVerificationBill,
            t4.id as maintenanceCycleId,
            t4.maintenance_type as maintenanceType,
            t10.item_text as maintenanceTypeName,
            t4.cycle as maintenanceCycle,
            concat(t4.code, '/', t4.name) as maintenanceCycleName,
            t3.id as equipmentId,
            t3.num as equipmentNum,
@@ -112,11 +115,15 @@
            t1.location,
            t1.photo,
            t1.maintenance_project_id AS maintenanceProjectId,
            case t1.maintenance_role when 'operator' then '操作人员保养内容' else '维修人员保养内容' end as maintenanceRole,
            t3.num AS maintenanceProjectNum,
            t3.name as maintenanceProjectName,
            t3.standard,
            t4.item_text AS maintenanceMethod,
            t3.maintenance_tool AS maintenanceTool,
            t3.working_hour_quota AS workingHourQuota
            t3.working_hour_quota AS workingHourQuota,
            tt.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
            tt.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
        FROM
            mom_eam_daily_maintenance_order_detail tt
                LEFT JOIN mom_eam_maintenance_standard_detail t1 ON tt.maintenance_standard_detail_id = t1.id

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml

@@ -247,7 +247,8 @@
        t1.property_status propertyStatus,
        t1.check_period checkPeriod,
        t1.next_technology_status_qualification_time nextTechnologyStatusQualificationTime,
        t1.technology_status_qualification_time technologyStatusQualificationTime
        t1.technology_status_qualification_time technologyStatusQualificationTime,
        t1.technology_status_verification_type technologyStatusVerificationType
    from mom_eam_equipment t1
    left join (select * from mom_eam_equipment_category where del_flag = 0) t2 on t1.equipment_category_id = t2.id
    where t1.del_flag  = 0

 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/InspectionOrderMapper.xml

@@ -81,6 +81,7 @@
            t1.photo,
            t1.inspection_project_id as inspectionProjectId,
            t3.num as inspectionProjectNum,
            t3.name as inspectionProjectName,
            t3.detection_standard as detectionStandard,
            t3.acceptability_limit AS acceptabilityLimit,
            t3.inspection_method as inspectionMethod,
@@ -111,6 +112,7 @@
            t1.photo,
            t1.inspection_project_id AS inspectionProjectId,
            t3.num AS inspectionProjectNum,
            t3.name as inspectionProjectName,
            t3.detection_standard AS detectionStandard,
            t3.acceptability_limit AS acceptabilityLimit,
            t3.inspection_method AS inspectionMethod,

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementSendController.java

@@ -2,7 +2,10 @@

import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import org.apache.shiro.SecurityUtils;
@@ -14,9 +17,9 @@
import org.jeecg.common.util.SqlInjectionUtil;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.message.websocket.WebSocket;
import org.jeecg.modules.system.entity.SysAnnouncementSend;
import org.jeecg.modules.system.entity.*;
import org.jeecg.modules.system.model.AnnouncementSendModel;
import org.jeecg.modules.system.service.ISysAnnouncementSendService;
import org.jeecg.modules.system.service.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -51,7 +54,16 @@
    private ISysAnnouncementSendService sysAnnouncementSendService;
    @Autowired
    private WebSocket webSocket;

     @Autowired
     private ISysRoleService sysRoleService;
     @Autowired
     private ISysDictService sysDictService;
     @Autowired
     private ISysDictItemService sysDictItemService;
     @Autowired
     private ISysUserRoleService sysUserRoleService;
     @Autowired
     private ISysUserService sysUserService;
    /**
      * åˆ†é¡µåˆ—表查询
     * @param sysAnnouncementSend
@@ -92,7 +104,7 @@
        result.setResult(pageList);
        return result;
    }
	

    /**
      *   æ·»åŠ 
     * @param sysAnnouncementSend
@@ -110,7 +122,7 @@
        }
        return result;
    }
	

    /**
      *  ç¼–辑
     * @param sysAnnouncementSend
@@ -129,10 +141,10 @@
                result.success("操作成功!");
            }
        }
		

        return result;
    }
	

    /**
      *   é€šè¿‡id删除
     * @param id
@@ -150,10 +162,10 @@
                result.success("删除成功!");
            }
        }
		

        return result;
    }
	

    /**
      *  æ‰¹é‡åˆ é™¤
     * @param ids
@@ -170,7 +182,7 @@
        }
        return result;
    }
	

    /**
      * é€šè¿‡id查询
     * @param id
@@ -188,7 +200,7 @@
        }
        return result;
    }
	

    /**
     * @功能：更新用户系统消息阅读状态
     * @param json
@@ -209,7 +221,7 @@
        result.setSuccess(true);
        return result;
    }
	

    /**
     * @功能：获取我的消息
     * @return
@@ -265,4 +277,20 @@
         AnnouncementSendModel model = sysAnnouncementSendService.getOne(sendId);
         return Result.ok(model);
     }
     @GetMapping("getPrimaryInfo")
     public Result<?> getPrimaryInfo(@RequestParam(name="userId",required=true) String userId){
         SysDict sysDict = sysDictService.getOne(new QueryWrapper<SysDict>().eq("dict_code","info_type"),false);
         List<SysDictItem> sysDictItemList = sysDictItemService.list(new QueryWrapper<SysDictItem>().eq("dict_id",sysDict.getId()));
//         List<String> rollCodeList = sysDictItemList.stream().map(SysDictItem::getItemValue).collect(Collectors.toList());
//         List<SysUserRole> sysUserRoles = sysUserRoleService.list(new QueryWrapper<SysUserRole>().eq("user_id",userId));
//         List<String> roleIds = sysUserRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
//         List<SysRole> sysRoles = sysRoleService.list(new QueryWrapper<SysRole>().in("role_code",rollCodeList).in("id",roleIds));
         List<String> msgCategoryList = sysDictItemList.stream().map(SysDictItem::getItemText).collect(Collectors.toList());
          List<SysAnnouncementSend> list = sysAnnouncementSendService.getPrimaryInfo(userId,msgCategoryList);
         for(SysAnnouncementSend sysAnnouncementSend:list){
             sysAnnouncementSend.setReadFlag("1");
             sysAnnouncementSendService.updateById(sysAnnouncementSend);
        }
        return Result.OK(list);
     }
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/entity/SysAnnouncementSend.java

@@ -3,6 +3,7 @@
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
@@ -19,7 +20,7 @@
@TableName("sys_announcement_send")
public class SysAnnouncementSend implements Serializable {
    private static final long serialVersionUID = 1L;
    

    /**id*/
    @TableId(type = IdType.ASSIGN_ID)
    private java.lang.String id;
@@ -50,4 +51,9 @@
     * æ˜¯å¦æ ‡æ˜Ÿ å½“值为1是标星消息
     */
    private String starFlag;
    @TableField(exist = false)
    private String msgCategory;
    @TableField(exist = false)
    private String msgContent;

}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysAnnouncementSendMapper.java

@@ -44,4 +44,8 @@
     * ä¿®æ”¹ä¸ºå·²è¯»æ¶ˆæ¯
     */
    void updateReaded(@Param("userId") String userId, @Param("annoceIdList") List<String> annoceIdList);
    /**
     * èŽ·å–首页消息
     */
    List<SysAnnouncementSend> getPrimaryInfo(@Param("userId") String userId,@Param("msgCategoryList")List<String> msgCategoryList);
}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysAnnouncementSendMapper.xml

@@ -1,7 +1,7 @@
<?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.system.mapper.SysAnnouncementSendMapper">
	

    <resultMap id="AnnouncementSendModel" type="org.jeecg.modules.system.model.AnnouncementSendModel" >
        <result column="id" property="id" jdbcType="VARCHAR"/>
        <result column="annt_id" property="anntId" jdbcType="VARCHAR"/>
@@ -17,12 +17,12 @@
        <result column="open_type" property="openType" jdbcType="VARCHAR"/>
        <result column="open_page" property="openPage" jdbcType="VARCHAR"/>
    </resultMap>
	

    <select id="queryByUserId" parameterType="String"  resultType="String">
       select sas.annt_id from sys_announcement_send sas 
       select sas.annt_id from sys_announcement_send sas
       where sas.user_id = #{userId}
    </select>
	

    <select id="getMyAnnouncementSendList" parameterType="Object"  resultMap="AnnouncementSendModel">
       select
               sas.id,
@@ -96,12 +96,33 @@
    <!-- ä¿®æ”¹ä¸ºå·²è¯»æ¶ˆæ¯ -->
    <update id="updateReaded">
        update sys_announcement_send set read_flag = '1'
         where user_id = #{userId} 
         where user_id = #{userId}
            and annt_id in
        <foreach collection="annoceIdList" index="index" item="id" open="(" separator="," close=")">
            #{id}
        </foreach>
    </update>
	
    <select id="getPrimaryInfo" resultType="org.jeecg.modules.system.entity.SysAnnouncementSend">
        select
        t1.id id,
        t1.annt_id anntId,
        t1.user_id userId,
        t1.read_flag readFlag,
        t2.msg_content msgContent,
        t2.msg_category msgCategory
        from
        sys_announcement_send t1
        left join sys_announcement t2
        on t1.annt_id = t2.id
        where  t1.read_flag = '0'
        and t1.user_id = #{userId}
            <if test="msgCategoryList.size != 0">
                and t2.msg_category in (
                <foreach item="msgCategory" collection="msgCategoryList" separator=",">
                    #{msgCategory}
                </foreach>
                    )
            </if>
    </select>

</mapper>
</mapper>

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/ISysAnnouncementSendService.java

@@ -2,6 +2,7 @@

import java.util.List;

import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.system.entity.SysAnnouncementSend;
import org.jeecg.modules.system.model.AnnouncementSendModel;

@@ -22,7 +23,7 @@
     * @return
     */
    public List<String> queryByUserId(String userId);
	

    /**
     * èŽ·å–我的消息
     * @param announcementSendModel
@@ -36,6 +37,8 @@
     * @return
     */
    AnnouncementSendModel getOne(String sendId);
	

    List<SysAnnouncementSend> getPrimaryInfo(String userId,List<String> msgCategoryList);


}

 lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysAnnouncementSendServiceImpl.java

@@ -24,7 +24,7 @@

    @Resource
    private SysAnnouncementSendMapper sysAnnouncementSendMapper;
	

    @Override
    public List<String> queryByUserId(String userId) {
        return sysAnnouncementSendMapper.queryByUserId(userId);
@@ -41,4 +41,9 @@
        return sysAnnouncementSendMapper.getOne(sendId);
    }

    @Override
    public List<SysAnnouncementSend> getPrimaryInfo(String userId, List<String> msgCategoryList) {
        return baseMapper.getPrimaryInfo(userId,msgCategoryList);
    }

}