From fff5ef18854efe6a4eb03049a1ddcc16edb0087e Mon Sep 17 00:00:00 2001 From: qushaowei <qushaowei@163.com> Date: 星期三, 04 六月 2025 14:18:59 +0800 Subject: [PATCH] 台账导入修改 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 246 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 236 insertions(+), 10 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java index 18dfb59..cb0d4f8 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java @@ -1,6 +1,8 @@ package org.jeecg.modules.eam.controller; +import java.time.LocalDate; import java.util.Arrays; +import java.util.Date; import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -19,6 +21,7 @@ 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.common.util.DateUtils; import org.jeecg.modules.base.entity.Constructor; import org.jeecg.modules.base.service.IConstructorService; import org.jeecg.modules.base.service.IFactoryModelService; @@ -35,7 +38,9 @@ import org.jeecg.common.system.base.controller.JeecgController; import org.jeecg.modules.system.entity.SysDepart; +import org.jeecg.modules.system.entity.SysUser; import org.jeecg.modules.system.service.ISysDepartService; +import org.jeecg.modules.system.service.ISysUserService; import org.jeecgframework.poi.excel.ExcelImportUtil; import org.jeecgframework.poi.excel.entity.ImportParams; import org.springframework.beans.factory.annotation.Autowired; @@ -123,7 +128,8 @@ @Autowired private IMaintenanceStandardService maintenanceStandardService; - + @Autowired + private ISysUserService sysUserService; /** @@ -158,6 +164,10 @@ } if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){ queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId()); + } + List<String> userWorkCenterIds = getUserWorkCenterIds(); + if(CollectionUtils.isNotEmpty(userWorkCenterIds)) { + queryWrapper.in("work_center_id",userWorkCenterIds); } if(StringUtils.isNotBlank(equipment.getWorkCenterId())){ queryWrapper.eq("work_center_id",equipment.getWorkCenterId()); @@ -291,6 +301,10 @@ HttpServletRequest req) { QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap()); Page<Equipment> page = new Page<Equipment>(pageNo, pageSize); + List<String> userWorkCenterIds = getUserWorkCenterIds(); + if(userWorkCenterIds != null && userWorkCenterIds.size() > 0){ + equipment.setUserWorkCenterIds(userWorkCenterIds); + } IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment); return Result.OK(pageList); } @@ -305,9 +319,41 @@ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { - QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap()); + //QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap()); Page<Equipment> page = new Page<Equipment>(pageNo, pageSize); IPage<Equipment> pageList = equipmentService.getEquipmentTZList(page, equipment); + List<Equipment> list = pageList.getRecords(); + list.forEach(equip -> { + String id = equip.getId(); + List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery() + .eq(DailyInspectionStandard::getEquipmentId, id) + .eq(DailyInspectionStandard::getVersionStatus, "2") + .list(); + if (dailyInspectionStandards.size() > 0) { + equip.setYseNoInspectionStandard("0"); + } else { + equip.setYseNoInspectionStandard("1"); + } + List<MaintenanceStandard> maintenance2Standards = maintenanceStandardService.lambdaQuery() + .eq(MaintenanceStandard::getEquipmentId, id) + .eq(MaintenanceStandard::getMaintenanceType, "2") + .eq(MaintenanceStandard::getVersionStatus, "2").list(); + if (maintenance2Standards.size() > 0) { + equip.setYseNoMaintenance2Standard("0"); + } else { + equip.setYseNoMaintenance2Standard("1"); + } + + List<MaintenanceStandard> maintenance3Standards = maintenanceStandardService.lambdaQuery() + .eq(MaintenanceStandard::getEquipmentId, id) + .eq(MaintenanceStandard::getMaintenanceType, "3") + .eq(MaintenanceStandard::getVersionStatus, "2").list(); + if (maintenance3Standards.size() > 0) { + equip.setYseNoMaintenance3Standard("0"); + } else { + equip.setYseNoMaintenance3Standard("1"); + } + }); return Result.OK(pageList); } @@ -328,6 +374,20 @@ @PostMapping(value = "/add") @Transactional(rollbackFor = { Exception.class }) public Result<String> add(@RequestBody Equipment equipment) { + //涓嬫涓変繚鏃ユ湡澶勭悊 + if(equipment.getThirdMaintenanceTime() == null && equipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){ + //濡傛灉娌℃湁涓変繚鏃ユ湡 鎸夌収楠屾敹鏃ユ湡璁$畻涓嬫涓変繚鏃ユ湡 + int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1; + LocalDate acceptanceCheckDate = LocalDate.parse(equipment.getAcceptanceCheckDate()); + LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod); + Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get()); + equipment.setNextThirdMaintenanceTime(date); + }else if(equipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){ + //濡傛灉鏈変笁淇濇棩鏈� 鍒欎娇鐢ㄤ笁淇濇棩鏈熻绠� 涓嬫涓変繚鏃ユ湡 + int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1; + Date date = DateUtils.getDayAfter(equipment.getThirdMaintenanceTime(), checkPeriod); + equipment.setNextThirdMaintenanceTime(date); + } equipmentService.save(equipment); //鑾峰彇宸ヨ壓鍙傛暟妯℃澘鏄庣粏 String processParametersTemplateId = equipment.getProcessParametersTemplateId(); @@ -407,6 +467,21 @@ equipmentPrecisionParameters.setEquipmentId(equipment.getId()); equipmentPrecisionParameters.setPrecisionParametersId(precisionParameter.getPrecisionParametersId()); equipmentPrecisionParametersService.save(equipmentPrecisionParameters); + } + + //涓嬫涓変繚鏃ユ湡澶勭悊 + if(equipment.getThirdMaintenanceTime() == null && equipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){ + //濡傛灉娌℃湁涓変繚鏃ユ湡 鎸夌収楠屾敹鏃ユ湡璁$畻涓嬫涓変繚鏃ユ湡 + int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1; + LocalDate acceptanceCheckDate = LocalDate.parse(equipment.getAcceptanceCheckDate()); + LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod); + Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get()); + equipment.setNextThirdMaintenanceTime(date); + }else if(equipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){ + //濡傛灉鏈変笁淇濇棩鏈� 鍒欎娇鐢ㄤ笁淇濇棩鏈熻绠� 涓嬫涓変繚鏃ユ湡 + int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1; + Date date = DateUtils.getDayAfter(equipment.getThirdMaintenanceTime(), checkPeriod); + equipment.setNextThirdMaintenanceTime(date); } equipmentService.updateById(equipment); @@ -667,13 +742,17 @@ EquipmentImportVo equipmentImportVo = list.get(i); String equipmentCategoryName = equipmentImportVo.getEquipmentCategoryName(); String useId = equipmentImportVo.getUseId(); - String areaId = equipmentImportVo.getFactoryModelId(); + String workCenterId = equipmentImportVo.getWorkCenterId();//涓績 + String areaId = equipmentImportVo.getFactoryModelId();//宸ュ尯 + String productionId = equipmentImportVo.getAreaId();//宸ユ String manageId = equipmentImportVo.getManageId(); String constructorId = equipmentImportVo.getConstructorId(); String teamId = equipmentImportVo.getTeamId(); String propertyStatus = equipmentImportVo.getPropertyStatus(); String abc = equipmentImportVo.getEquipmentImportanceId(); - if(StringUtils.isBlank(equipmentImportVo.getNum())){ + Date thirdMaintenanceTime = equipmentImportVo.getThirdMaintenanceTime(); + Date technologyStatusQualificationTime = equipmentImportVo.getTechnologyStatusQualificationTime(); + if(StringUtils.isBlank(equipmentImportVo.getNum())){ exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;"; exceptionNum++; continue; @@ -698,13 +777,18 @@ exceptionNum++; continue; } - else if(StringUtils.isBlank(equipmentImportVo.getModel())){ - exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;"; +// else if(StringUtils.isBlank(equipmentImportVo.getModel())){ +// exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;"; +// exceptionNum++; +// continue; +// } + else if(StringUtils.isBlank(useId)){ + exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;"; exceptionNum++; continue; } - else if(StringUtils.isBlank(useId)){ - exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;"; + else if(StringUtils.isBlank(workCenterId)){ + exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓績缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;"; exceptionNum++; continue; } @@ -790,6 +874,18 @@ exceptionNum++; continue; } + //涓績 + Area workCenterArea = areaService.getOne(new QueryWrapper<Area>().eq("name",workCenterId.trim()).eq("del_flag",0)); + if(ObjectUtils.isNotNull(workCenterArea)){ + equipment.setWorkCenterId(workCenterArea.getId()); +// }else if(ObjectUtils.isNotNull(area1)) { +// equipment.setFactoryModelId(area1.getId()); + }else { + exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ涓績,璇风淮鎶や腑蹇冩暟鎹悗鍐嶅鍏�;"; + exceptionNum++; + continue; + } + //宸ュ尯 Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0)); Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0)); if(ObjectUtils.isNotNull(area)){ @@ -801,6 +897,13 @@ exceptionNum++; continue; } + + //宸ユ + Area productionArea = areaService.getOne(new QueryWrapper<Area>().eq("name",productionId.trim()).eq("del_flag",0)); + if(ObjectUtils.isNotNull(productionArea)){ + equipment.setAreaId(productionArea.getId()); + } + SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0)); if(ObjectUtils.isNotNull(manage)){ equipment.setManageId(manage.getId()); @@ -875,7 +978,7 @@ .setEquipmentUda4(equipmentImportVo.getEquipmentUda4()) .setEquipmentUda5(equipmentImportVo.getEquipmentUda5()) .setLocation(equipmentImportVo.getLocation()) - .setLastVerificationDate(equipmentImportVo.getLeaveFactoryDate()) + .setLeaveFactoryDate(equipmentImportVo.getLeaveFactoryDate()) .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo()) .setFundSource(equipmentImportVo.getFundSource()) .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate()) @@ -884,11 +987,18 @@ .setModel(equipmentImportVo.getModel()) .setSpecification(equipmentImportVo.getSpecification()) .setPropertyStatus(equipmentImportVo.getPropertyStatus()) + .setOperatingSystem(equipmentImportVo.getOperatingSystem()) .setWarrantyStart(equipmentImportVo.getWarrantyStart()) .setWarrantyEnd(equipmentImportVo.getWarrantyEnd()) + .setCreateBy(equipmentImportVo.getCreateBy()) + .setCreateTime(equipmentImportVo.getCreateTime()) + .setUpdateBy(equipmentImportVo.getUpdateBy()) + .setUpdateTime(equipmentImportVo.getUpdateTime()) .setIsLineEquip("no") .setIsLine("no") .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime()) + .setThirdMaintenanceTime(equipmentImportVo.getThirdMaintenanceTime()) + .setTechnologyStatusQualificationTime(equipmentImportVo.getTechnologyStatusQualificationTime()) .setGpo(equipmentImportVo.getGpo()); if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){ equipment.setCheckPeriod(365*3+""); @@ -917,11 +1027,114 @@ } } } - equipmentService.save(equipment); + //涓嬫涓変繚鏃ユ湡澶勭悊 + if(equipment.getThirdMaintenanceTime() == null && equipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){ + //濡傛灉娌℃湁涓変繚鏃ユ湡 鎸夌収楠屾敹鏃ユ湡璁$畻涓嬫涓変繚鏃ユ湡 + int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1; + LocalDate acceptanceCheckDate = LocalDate.parse(equipment.getAcceptanceCheckDate()); + LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod); + Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get()); + equipment.setNextThirdMaintenanceTime(date); + }else if(equipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(equipment.getCheckPeriod())){ + //濡傛灉鏈変笁淇濇棩鏈� 鍒欎娇鐢ㄤ笁淇濇棩鏈熻绠� 涓嬫涓変繚鏃ユ湡 + int checkPeriod = Integer.parseInt(equipment.getCheckPeriod()) - 1; + Date date = DateUtils.getDayAfter(equipment.getThirdMaintenanceTime(), checkPeriod); + equipment.setNextThirdMaintenanceTime(date); + } + equipmentService.saveOrUpdate(equipment); }else { exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;"; exceptionNum++; continue; +// oriEquipment.setUseId(equipment.getUseId()); +// oriEquipment.setWorkCenterId(equipment.getWorkCenterId()); +// oriEquipment.setFactoryModelId(equipment.getFactoryModelId()); +// oriEquipment.setAreaId(equipment.getAreaId()); +// oriEquipment.setManageId(equipment.getManageId()); +// oriEquipment.setEquipmentCategoryId(equipment.getEquipmentCategoryId()); +// oriEquipment.setTeamId(equipment.getTeamId()); +// oriEquipment.setConstructorId(equipment.getConstructorId()); +// oriEquipment.setNum(equipmentImportVo.getNum()) +// .setName(equipmentImportVo.getName()) +// .setTechnologyStatus(equipmentImportVo.getTechnologyStatus()) +// .setEquipmentImportanceId(equipmentImportVo.getEquipmentImportanceId()) +// .setSpecificEquipment(equipmentImportVo.getKeyEquipmentIdentification()) +// .setSecurityConfiguration(equipmentImportVo.getSecurityConfiguration()) +// .setCoolingSystem(equipmentImportVo.getCoolingSystem()) +// .setFireExtinguisher(equipmentImportVo.getFireExtinguisher()) +// .setFireExtinguisherValidityPeriod(equipmentImportVo.getFireExtinguisherValidityPeriod()) +// .setSystem(equipmentImportVo.getSystem()) +// .setPort(equipmentImportVo.getPort()) +// .setCoordinateNum(equipmentImportVo.getCoordinateNum()) +// .setEquipmentStatus(equipmentImportVo.getEquipmentStatus()) +// .setEquipmentUda3(equipmentImportVo.getEquipmentUda3()) +// .setEquipmentUda4(equipmentImportVo.getEquipmentUda4()) +// .setEquipmentUda5(equipmentImportVo.getEquipmentUda5()) +// .setLocation(equipmentImportVo.getLocation()) +// .setLeaveFactoryDate(equipmentImportVo.getLeaveFactoryDate()) +// .setProjectApprovalNo(equipmentImportVo.getProjectApprovalNo()) +// .setFundSource(equipmentImportVo.getFundSource()) +// .setAcceptanceCheckDate(equipmentImportVo.getAcceptanceCheckDate()) +// .setFactoryNumber(equipmentImportVo.getFactoryNumber()) +// .setSourceCountry(equipmentImportVo.getSourceCountry()) +// .setModel(equipmentImportVo.getModel()) +// .setSpecification(equipmentImportVo.getSpecification()) +// .setPropertyStatus(equipmentImportVo.getPropertyStatus()) +// .setOperatingSystem(equipmentImportVo.getOperatingSystem()) +// .setWarrantyStart(equipmentImportVo.getWarrantyStart()) +// .setWarrantyEnd(equipmentImportVo.getWarrantyEnd()) +// .setCreateBy(equipmentImportVo.getCreateBy()) +// .setCreateTime(equipmentImportVo.getCreateTime()) +// .setUpdateBy(equipmentImportVo.getUpdateBy()) +// .setUpdateTime(equipmentImportVo.getUpdateTime()) +// .setIsLineEquip("no") +// .setIsLine("no") +// .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime()) +// .setThirdMaintenanceTime(equipmentImportVo.getThirdMaintenanceTime()) +// .setTechnologyStatusQualificationTime(equipmentImportVo.getTechnologyStatusQualificationTime()) +// .setGpo(equipmentImportVo.getGpo()); +// if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){ +// oriEquipment.setCheckPeriod(365*3+""); +// } +// if(equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")){ +// oriEquipment.setCheckPeriod(365*4+""); +// } +// if(equipmentCategory.getEquipmentCategoryUda1().equals("tester")){ +// oriEquipment.setCheckPeriod(365*1+""); +// } +// if( +// !equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine") +// &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel") +// &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester") +// ){ +// if(StringUtils.isNotBlank(abc)){ +// if(abc.equals("A")){ +// oriEquipment.setCheckPeriod(365*3+""); +// } +// if( +// abc.equals("B") +// ||abc.equals("C") +// ||abc.equals("D") +// ){ +// oriEquipment.setCheckPeriod(365*4+""); +// } +// } +// } +// //涓嬫涓変繚鏃ユ湡澶勭悊 +// if(oriEquipment.getThirdMaintenanceTime() == null && oriEquipment.getAcceptanceCheckDate() != null && StringUtils.isNotBlank(oriEquipment.getCheckPeriod())){ +// //濡傛灉娌℃湁涓変繚鏃ユ湡 鎸夌収楠屾敹鏃ユ湡璁$畻涓嬫涓変繚鏃ユ湡 +// int checkPeriod = Integer.parseInt(oriEquipment.getCheckPeriod()) - 1; +// LocalDate acceptanceCheckDate = LocalDate.parse(oriEquipment.getAcceptanceCheckDate()); +// LocalDate localDate = acceptanceCheckDate.plusDays(checkPeriod); +// Date date = DateUtils.str2Date(localDate.toString(), DateUtils.date_sdf.get()); +// oriEquipment.setNextThirdMaintenanceTime(date); +// }else if(oriEquipment.getThirdMaintenanceTime() != null && StringUtils.isNotBlank(oriEquipment.getCheckPeriod())){ +// //濡傛灉鏈変笁淇濇棩鏈� 鍒欎娇鐢ㄤ笁淇濇棩鏈熻绠� 涓嬫涓変繚鏃ユ湡 +// int checkPeriod = Integer.parseInt(oriEquipment.getCheckPeriod()) - 1; +// Date date = DateUtils.getDayAfter(oriEquipment.getThirdMaintenanceTime(), checkPeriod); +// oriEquipment.setNextThirdMaintenanceTime(date); +// } +// equipmentService.updateById(oriEquipment); } } } @@ -1068,4 +1281,17 @@ return Result.OK(pageList); } + private List<String> getUserWorkCenterIds(){ + LoginUser user= (LoginUser) SecurityUtils.getSubject().getPrincipal(); + SysUser sysUser = sysUserService.getById(user.getId()); + String areaId = sysUser.getAreaId(); + List<String> workCenterIds = null; + if(StringUtils.isNotBlank(areaId)){ +// strings = new ArrayList<>(); + String[] split = areaId.split(","); + workCenterIds = Arrays.asList(split); + } + return workCenterIds; + } + } -- Gitblit v1.9.3