From 6a8e048ed345c93210a2a99989d060b4c7d464f0 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期二, 08 七月 2025 15:21:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java | 9 + lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java | 63 +++++- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java | 11 - lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java | 8 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java | 7 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java | 2 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java | 2 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardDetailController.java | 114 ++---------- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java | 2 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java | 13 + lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationCheckCategoryEnum.java | 8 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java | 113 ++++++++++-- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java | 5 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandardDetail.java | 6 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java | 115 ++++++------ lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java | 13 - lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java | 3 17 files changed, 264 insertions(+), 230 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationCheckCategoryEnum.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationCheckCategoryEnum.java new file mode 100644 index 0000000..2062a6a --- /dev/null +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/TechnicalStatusEvaluationCheckCategoryEnum.java @@ -0,0 +1,8 @@ +package org.jeecg.modules.eam.constant; + +public enum TechnicalStatusEvaluationCheckCategoryEnum { + SAFETY_EQUIPMENT_CHECK, //瀹夊叏瑁呯疆妫�鏌� + PRECISION_CHECK, //绮惧害妫�鏌� + OTHER_CHECK, //鍏朵粬妫�鏌� + ; +} diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java index efed637..de64074 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/util/DateUtils.java @@ -1092,27 +1092,62 @@ * 鑾峰彇鏈懆鐨勭涓�澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd * @return */ - public static Date getFirstDayOfWeek() { - // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛夌殑 LocalDate - LocalDate today = LocalDate.now(); - LocalDate firstDayOfWeek = today.with(DayOfWeek.MONDAY); + public static Date getFirstDayOfWeek(String date) { + // 灏� java.util.Date 杞崲涓� LocalDate + LocalDate localDate = LocalDate.parse(date); - // 濡傛灉闇�瑕佽浆鎹负浼犵粺鐨� Date 绫诲瀷锛堝彲閫夛級 - java.sql.Date sqlDate = java.sql.Date.valueOf(firstDayOfWeek); - return new Date(sqlDate.getTime()); + // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛� + LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY); + + // 杞崲鍥� java.sql.Date 绫诲瀷 + return java.sql.Date.valueOf(firstDayOfWeek); + } + + /** + * 鑾峰彇鏈懆鐨勭涓�澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd + * @return + */ + public static Date getFirstDayOfWeek(Date date) { + // 灏� java.util.Date 杞崲涓� LocalDate + LocalDate localDate = date.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDate(); + + // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛� + LocalDate firstDayOfWeek = localDate.with(DayOfWeek.MONDAY); + + // 杞崲鍥� java.sql.Date 绫诲瀷 + return java.sql.Date.valueOf(firstDayOfWeek); } /** * 鑾峰彇鏈懆鐨勬渶鍚庝竴澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd * @return */ - public static Date getLastDayOfWeek() { - // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛夌殑 LocalDate - LocalDate today = LocalDate.now(); - LocalDate firstDayOfWeek = today.with(DayOfWeek.SUNDAY); + public static Date getLastDayOfWeek(String date) { + // 灏� java.util.Date 杞崲涓� LocalDate + LocalDate localDate = LocalDate.parse(date); - // 濡傛灉闇�瑕佽浆鎹负浼犵粺鐨� Date 绫诲瀷锛堝彲閫夛級 - java.sql.Date sqlDate = java.sql.Date.valueOf(firstDayOfWeek); - return new Date(sqlDate.getTime()); + // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛� + LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY); + + // 杞崲鍥� java.sql.Date 绫诲瀷 + return java.sql.Date.valueOf(firstDayOfWeek); + } + + /** + * 鑾峰彇鏈懆鐨勬渶鍚庝竴澶╂棩鏈燂紝 鏍煎紡涓猴細yyyy-MM-dd + * @return + */ + public static Date getLastDayOfWeek(Date date) { + // 灏� java.util.Date 杞崲涓� LocalDate + LocalDate localDate = date.toInstant() + .atZone(ZoneId.systemDefault()) + .toLocalDate(); + // 鑾峰彇鏈懆绗竴澶╋紙鍛ㄤ竴锛� + LocalDate firstDayOfWeek = localDate.with(DayOfWeek.SUNDAY); + + // 杞崲鍥� java.sql.Date 绫诲瀷 + return java.sql.Date.valueOf(firstDayOfWeek); } } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java index 9697509..0b445f4 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamInspectionOrderController.java @@ -108,8 +108,7 @@ String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE); eamInspectionOrderRequest.setOrderNum(codeSeq); eamInspectionOrderRequest.setCreationMethod(String.valueOf(OrderCreationMethodEnum.MANUAL)); - eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest); - return Result.OK("娣诲姞鎴愬姛锛�"); + return eamInspectionOrderService.addInspectionOrder(eamInspectionOrderRequest); } /** diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardDetailController.java index 9aaf3cd..2845fe7 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardDetailController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamTechnicalStatusEvaluationStandardDetailController.java @@ -1,24 +1,20 @@ package org.jeecg.modules.eam.controller; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.modules.eam.entity.EamTechnicalStatusEvaluationStandardDetail; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardDetailService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.util.Arrays; +import java.util.List; /** * @Description: 鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁� @@ -32,98 +28,24 @@ @RequestMapping("/eam/eamTechnicalStatusEvaluationStandardDetail") public class EamTechnicalStatusEvaluationStandardDetailController extends JeecgController<EamTechnicalStatusEvaluationStandardDetail, IEamTechnicalStatusEvaluationStandardDetailService> { @Autowired - private IEamTechnicalStatusEvaluationStandardDetailService eamTechnicalStatusEvaluationStandardDetailService; + private IEamTechnicalStatusEvaluationStandardDetailService standardDetailService; /** - * 鍒嗛〉鍒楄〃鏌ヨ + * 涓�娆″姞杞� * - * @param eamTechnicalStatusEvaluationStandardDetail - * @param pageNo - * @param pageSize - * @param req + * @param standardId * @return */ - @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-鍒嗛〉鍒楄〃鏌ヨ") - @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-鍒嗛〉鍒楄〃鏌ヨ") - @GetMapping(value = "/list") - public Result<?> queryPageList(EamTechnicalStatusEvaluationStandardDetail eamTechnicalStatusEvaluationStandardDetail, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { - QueryWrapper<EamTechnicalStatusEvaluationStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(eamTechnicalStatusEvaluationStandardDetail, req.getParameterMap()); - Page<EamTechnicalStatusEvaluationStandardDetail> page = new Page<EamTechnicalStatusEvaluationStandardDetail>(pageNo, pageSize); - IPage<EamTechnicalStatusEvaluationStandardDetail> pageList = eamTechnicalStatusEvaluationStandardDetailService.page(page, queryWrapper); - return Result.OK(pageList); + @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-涓嶅垎椤靛垪琛ㄦ煡璇�", notes = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-涓嶅垎椤靛垪琛ㄦ煡璇�") + @GetMapping(value = "/queryList") + public Result<?> queryList(@RequestParam("standardId") String standardId) { + LambdaQueryWrapper<EamTechnicalStatusEvaluationStandardDetail> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EamTechnicalStatusEvaluationStandardDetail::getStandardId, standardId); + queryWrapper.orderByAsc(EamTechnicalStatusEvaluationStandardDetail::getCheckCategory); + queryWrapper.orderByAsc(EamTechnicalStatusEvaluationStandardDetail::getItemCode); + List<EamTechnicalStatusEvaluationStandardDetail> list = standardDetailService.list(queryWrapper); + return Result.OK(list); } - /** - * 娣诲姞 - * - * @param eamTechnicalStatusEvaluationStandardDetail - * @return - */ - @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-娣诲姞") - @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-娣诲姞", notes = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-娣诲姞") - @PostMapping(value = "/add") - public Result<?> add(@RequestBody EamTechnicalStatusEvaluationStandardDetail eamTechnicalStatusEvaluationStandardDetail) { - eamTechnicalStatusEvaluationStandardDetailService.save(eamTechnicalStatusEvaluationStandardDetail); - return Result.OK("娣诲姞鎴愬姛锛�"); - } - - /** - * 缂栬緫 - * - * @param eamTechnicalStatusEvaluationStandardDetail - * @return - */ - @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-缂栬緫") - @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-缂栬緫", notes = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-缂栬緫") - @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST}) - public Result<?> edit(@RequestBody EamTechnicalStatusEvaluationStandardDetail eamTechnicalStatusEvaluationStandardDetail) { - eamTechnicalStatusEvaluationStandardDetailService.updateById(eamTechnicalStatusEvaluationStandardDetail); - return Result.OK("缂栬緫鎴愬姛!"); - } - - /** - * 閫氳繃id鍒犻櫎 - * - * @param id - * @return - */ - @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-閫氳繃id鍒犻櫎") - @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-閫氳繃id鍒犻櫎", notes = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-閫氳繃id鍒犻櫎") - @DeleteMapping(value = "/delete") - public Result<?> delete(@RequestParam(name = "id", required = true) String id) { - eamTechnicalStatusEvaluationStandardDetailService.removeById(id); - return Result.OK("鍒犻櫎鎴愬姛!"); - } - - /** - * 鎵归噺鍒犻櫎 - * - * @param ids - * @return - */ - @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-鎵归噺鍒犻櫎") - @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-鎵归噺鍒犻櫎", notes = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-鎵归噺鍒犻櫎") - @DeleteMapping(value = "/deleteBatch") - public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) { - this.eamTechnicalStatusEvaluationStandardDetailService.removeByIds(Arrays.asList(ids.split(","))); - return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�"); - } - - /** - * 閫氳繃id鏌ヨ - * - * @param id - * @return - */ - @AutoLog(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-閫氳繃id鏌ヨ") - @ApiOperation(value = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-閫氳繃id鏌ヨ", notes = "鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁�-閫氳繃id鏌ヨ") - @GetMapping(value = "/queryById") - public Result<?> queryById(@RequestParam(name = "id", required = true) String id) { - EamTechnicalStatusEvaluationStandardDetail eamTechnicalStatusEvaluationStandardDetail = eamTechnicalStatusEvaluationStandardDetailService.getById(id); - return Result.OK(eamTechnicalStatusEvaluationStandardDetail); - } } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java index 688836a..0b54f4e 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamWeekInspectionDetailController.java @@ -6,14 +6,14 @@ import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.base.controller.JeecgController; -import org.jeecg.modules.eam.constant.InspectionItemCategroyEnum; -import org.jeecg.modules.eam.entity.EamMaintenanceStandardDetail; import org.jeecg.modules.eam.entity.EamWeekInspectionDetail; import org.jeecg.modules.eam.service.IEamWeekInspectionDetailService; import org.jeecg.modules.eam.util.DateUtils; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Date; import java.util.List; /** @@ -39,10 +39,10 @@ */ @ApiOperation(value = "鍛ㄧ偣妫�宸ュ崟鏄庣粏-鏃ョ偣妫�瑙勮寖鍒楄〃鏌ヨ", notes = "鍛ㄧ偣妫�宸ュ崟鏄庣粏-鏃ョ偣妫�瑙勮寖鍒楄〃鏌ヨ") @GetMapping(value = "/queryStandardList") - public Result<?> queryStandardList(@RequestParam("standardId") String standardId) { + public Result<?> queryStandardList(@RequestParam("standardId") String standardId, @RequestParam("inspectionDate") String inspectionDate) { LambdaQueryWrapper<EamWeekInspectionDetail> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(EamWeekInspectionDetail::getStandardId, standardId); - queryWrapper.between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(), DateUtils.getLastDayOfWeek()); + queryWrapper.between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(inspectionDate), DateUtils.getLastDayOfWeek(inspectionDate)); queryWrapper.orderByAsc(EamWeekInspectionDetail::getItemCode); List<EamWeekInspectionDetail> list = eamWeekInspectionDetailService.list(queryWrapper); return Result.OK(list); diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java index 01e1c6b..45016a3 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandard.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecg.common.aspect.annotation.Dict; import org.jeecgframework.poi.excel.annotation.Excel; import java.util.Date; @@ -57,6 +58,7 @@ @ApiModelProperty(value = "璁惧ID") private String equipmentId; /**瑙勮寖鐘舵��;寰呮彁浜ゃ�佸惎鐢ㄣ�佷綔搴�*/ + @Dict(dicCode = "technical_status_evaluation_standard_status") @ApiModelProperty(value = "瑙勮寖鐘舵��;寰呮彁浜ゃ�佸惎鐢ㄣ�佷綔搴�") private String standardStatus; /**鏄惁鏈夊畨鍏ㄨ缃鏌�;鏄惁*/ diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandardDetail.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandardDetail.java index d9dcbbf..76e54de 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandardDetail.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamTechnicalStatusEvaluationStandardDetail.java @@ -12,6 +12,7 @@ import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; import com.fasterxml.jackson.annotation.JsonFormat; +import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; import org.jeecgframework.poi.excel.annotation.Excel; @@ -33,25 +34,22 @@ @ApiModelProperty(value = "涓婚敭") private String id; /**鍒涘缓浜�*/ - @Excel(name = "鍒涘缓浜�", width = 15) @ApiModelProperty(value = "鍒涘缓浜�") private String createBy; /**鍒涘缓鏃堕棿*/ @ApiModelProperty(value = "鍒涘缓鏃堕棿") private Date createTime; /**鏇存柊浜�*/ - @Excel(name = "鏇存柊浜�", width = 15) @ApiModelProperty(value = "鏇存柊浜�") private String updateBy; /**鏇存柊鏃堕棿*/ @ApiModelProperty(value = "鏇存柊鏃堕棿") private Date updateTime; /**瑙勮寖ID*/ - @Excel(name = "瑙勮寖ID", width = 15) @ApiModelProperty(value = "瑙勮寖ID") private String standardId; /**妫�鏌ュ垎绫�;绮惧害妫�鏌ャ�佸畨鍏ㄨ缃鏌ャ�佸叾浠栨鏌�*/ - @Excel(name = "妫�鏌ュ垎绫�;绮惧害妫�鏌ャ�佸畨鍏ㄨ缃鏌ャ�佸叾浠栨鏌�", width = 15) + @Dict(dicCode = "technical_status_evaluation_check_category") @ApiModelProperty(value = "妫�鏌ュ垎绫�;绮惧害妫�鏌ャ�佸畨鍏ㄨ缃鏌ャ�佸叾浠栨鏌�") private String checkCategory; /**椤圭洰搴忓彿*/ diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java index 7f309aa..fd93774 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderExpiredJob.java @@ -59,11 +59,8 @@ return; } for (EamInspectionOrder order : unCompleteOrderList) { - if (InspectionStatus.WAIT_INSPECTION.name().equals(order.getInspectionStatus())) { - order.setInspectionStatus(InspectionStatus.EXPIRED.name()); - } else if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus())) { - //宸茬粡琚帴鍗� 浣嗘湭鎵ц瀹屾垚 - order.setInspectionStatus(InspectionStatus.EXPIRED.name()); + order.setInspectionStatus(InspectionStatus.EXPIRED.name()); + if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus())) { //寮哄埗缁撴潫娴佺▼ 鍒犻櫎鐢ㄦ埛鐨勬寰呭姙浠诲姟 FlowMyBusiness flowMyBusiness = flowMyBusinessService.selectByDataId(order.getId()); if (flowMyBusiness != null) { diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java index c0ada13..bf42deb 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/job/InspectionOrderGenerateJob.java @@ -69,7 +69,7 @@ */ List<EamMaintenanceStandard> standardList = eamMaintenanceStandardService.queryListByCategory(MaintenanceCategoryEnum.POINT_INSPECTION.name()); if (CollectionUtil.isEmpty(standardList)) { - log.warn("娌℃湁閰嶇疆浠讳綍鍛ㄤ繚鏍囧噯锛屼换鍔$粨鏉�"); + log.warn("娌℃湁閰嶇疆浠讳綍鐐规鏍囧噯锛屼换鍔$粨鏉�"); return; } //褰撳墠鏃ユ湡 @@ -85,21 +85,18 @@ standard.setInitialDate(DateUtils.localDateToDate(now.minusDays(1))); } LocalDate generateDate = DateUtils.dateToLocalDate(standard.getInitialDate()); -// if (standard.getLastGenerateTime() != null) { -// generateDate = DateUtils.dateToLocalDate(standard.getLastGenerateTime()); -// } //鍔犲懆鏈� do { //鍒濆鏃ユ湡璁剧疆鐨勬瘮杈冩棭锛屾垨浠诲姟闀挎椂闂存病鎵ц锛屽繀椤诲懆鏈熷埌浠婂ぉ鎵嶄細鐢熸垚宸ュ崟 generateDate = generateDate.plusDays(standard.getMaintenancePeriod()); } while (now.isAfter(generateDate)); - if(!now.isEqual(generateDate)) { + if (!now.isEqual(generateDate)) { //杩樻湭鍒扮敓鎴愭棩鏈燂紝璺宠繃鎵ц continue; } //鑾峰彇淇濆吇椤规槑缁� List<EamMaintenanceStandardDetail> standardDetailList = eamMaintenanceStandardDetailService.selectByStandardId(standard.getId()); - if(CollectionUtil.isEmpty(standardDetailList)) { + if (CollectionUtil.isEmpty(standardDetailList)) { log.error("鐐规鏍囧噯娌℃湁淇濆吇鏄庣粏锛岃鍏堥厤缃繚鍏绘槑缁�, standard:{}", standard); continue; } @@ -112,13 +109,11 @@ request.setCreationMethod(OrderCreationMethodEnum.AUTO.name()); String codeSeq = businessCodeRuleService.generateBusinessCodeSeq(BusinessCodeConst.INSPECTION_ORDER_CODE_RULE); request.setOrderNum(codeSeq); - List<EamInspectionOrderDetail> collect = standardDetailList.stream().map(EamInspectionOrderDetail::new).collect(Collectors.toList()); - request.setTableDetailList(collect); eamInspectionOrderService.addInspectionOrder(request); } quartzLog.setIsSuccess(0); } catch (Exception e) { - log.error("鍛ㄤ繚杩囩敓鎴愭墽琛屽畾鏃朵换鍔″け璐ワ紝{}", e.getMessage(), e); + log.error("鐐规鐢熸垚鎵ц瀹氭椂浠诲姟澶辫触锛寋}", e.getMessage(), e); quartzLog.setIsSuccess(-1); quartzLog.setExceptionDetail(ThrowableUtil.getStackTrace(e)); } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java index 3a71c69..4f035ea 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamInspectionOrderRequest.java @@ -1,19 +1,15 @@ package org.jeecg.modules.eam.request; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; -import org.jeecg.common.api.vo.FileUploadResult; import org.jeecg.common.aspect.annotation.Dict; import org.jeecg.modules.eam.entity.EamInspectionOrderDetail; import org.jeecg.modules.eam.entity.EamWeekInspectionDetail; import org.jeecg.modules.flowable.domain.vo.FlowTaskVo; -import org.jeecgframework.poi.excel.annotation.Excel; import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; @@ -98,13 +94,6 @@ /**澶囨敞*/ @ApiModelProperty(value = "澶囨敞-鐐规宸ュ崟鍒涘缓澶囨敞") private String remark; - /**鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧*/ - @ApiModelProperty(value = "鐓х墖鏂囦欢ids;id浠ラ�楀彿鍒嗛殧") - private String imageFiles; - - /**涓婁紶鏂囦欢瀵圭郴*/ - @ApiModelProperty(value = "涓婁紶鏂囦欢瀵硅薄") - private List<FileUploadResult> fileList; /**鍒楄〃 淇濆吇椤规槑缁�*/ @ApiModelProperty(value = "鍒楄〃 淇濆吇椤规槑缁�") diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java index 5c9e196..358cc2e 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamTechnicalStatusEvaluationStandardRequest.java @@ -30,12 +30,17 @@ /**璁惧ID*/ @ApiModelProperty(value = "璁惧ID") private String equipmentId; + /**鏄惁鏈夊畨鍏ㄨ缃鏌�;鏄惁*/ + @ApiModelProperty(value = "鏄惁鏈夊畨鍏ㄨ缃鏌�;鏄惁") + private String hasSafetyEquipmentCheck; + /**鏄惁鏈夎澶囩簿搴︽鏌�;鏄惁*/ + @ApiModelProperty(value = "鏄惁鏈夎澶囩簿搴︽鏌�;鏄惁") + private String hasPrecisionCheck; + /**鏄惁鏈夊叾浠栨鏌�;鏄惁*/ + @ApiModelProperty(value = "鏄惁鏈夊叾浠栨鏌�;鏄惁") + private String hasOtherCheck; /**鍒楄〃 妫�鏌ラ」鏄庣粏*/ @ApiModelProperty(value = "鍒楄〃 妫�鏌ラ」鏄庣粏") private List<EamTechnicalStatusEvaluationStandardDetail> tableDetailList; - /**鍒犻櫎 妫�鏌ラ」鏄庣粏*/ - @ApiModelProperty(value = "鍒犻櫎 妫�鏌ラ」鏄庣粏") - private List<EamTechnicalStatusEvaluationStandardDetail> removeDetailList; - } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java index a86ae83..669eff0 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamInspectionOrderService.java @@ -27,7 +27,7 @@ * @param eamInspectionOrderRequest * @return */ - boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest); + Result<String> addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest); /** * 缂栬緫鐐规宸ュ崟 diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java index c3afc15..bb8f85b 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/IEamTechnicalStatusEvaluationStandardDetailService.java @@ -11,4 +11,9 @@ */ public interface IEamTechnicalStatusEvaluationStandardDetailService extends IService<EamTechnicalStatusEvaluationStandardDetail> { + /** + * 鏍规嵁瑙勮寖ID鍒犻櫎妫�鏌ラ」 + * @param standardId + */ + void removeByStandardId(String standardId); } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java index df387bf..b22c19d 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamInspectionOrderServiceImpl.java @@ -99,11 +99,11 @@ queryWrapper.in("e.equipment_code", equipArr); } else { //娌℃湁閫夋嫨璁惧锛屾牴鎹腑蹇冭繃婊よ澶� - List<BaseFactoryUser> baseFactoryUserList=baseFactoryUserService. - list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId,sysUser.getId())); - if(!CollectionUtils.isEmpty(baseFactoryUserList)){ + List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService. + list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId())); + if (!CollectionUtils.isEmpty(baseFactoryUserList)) { List<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toList()); - List<String> factoryCode= baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); + List<String> factoryCode = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getFactoryCode).collect(Collectors.toList()); queryWrapper.in("e.factory_code", factoryCode); } } @@ -156,33 +156,50 @@ @Override @Transactional(rollbackFor = Exception.class) - public boolean addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) { + public Result<String> addInspectionOrder(EamInspectionOrderRequest eamInspectionOrderRequest) { + List<EamInspectionOrder> eamInspectionOrders = eamInspectionOrderMapper.selectList(new LambdaQueryWrapper<EamInspectionOrder>().eq(EamInspectionOrder::getStandardId, eamInspectionOrderRequest.getStandardId()).eq(EamInspectionOrder::getInspectionDate, eamInspectionOrderRequest.getInspectionDate()).ne(EamInspectionOrder::getInspectionStatus, InspectionStatus.ABOLISH.name())); + if (CollectionUtils.isNotEmpty(eamInspectionOrders)) { + return Result.error("娣诲姞澶辫触,绯荤粺宸插瓨鍦ㄥ綋鍓嶆棩鏈熷伐鍗曪紒"); + } EamInspectionOrder eamInspectionOrder = new EamInspectionOrder(); BeanUtils.copyProperties(eamInspectionOrderRequest, eamInspectionOrder); //淇敼鐘舵�� - if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) { - eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name()); - } else { - eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name()); - } + eamInspectionOrder.setInspectionStatus(InspectionStatus.WAIT_INSPECTION.name()); eamInspectionOrder.setDelFlag(CommonConstant.DEL_FLAG_0); save(eamInspectionOrder); - //澶勭悊鏄庣粏鏁版嵁 - if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) { - eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> { - tableDetail.setOrderId(eamInspectionOrder.getId()); - tableDetail.setId(null); - }); - eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList()); + //澶勭悊鏃ョ偣妫�鏄庣粏鏁版嵁 + if (StrUtil.isNotBlank(eamInspectionOrderRequest.getStandardId())) { + List<EamMaintenanceStandardDetail> maintenanceStandardDetailList = eamMaintenanceStandardDetailService.list(new LambdaQueryWrapper<EamMaintenanceStandardDetail>().eq(EamMaintenanceStandardDetail::getStandardId, eamInspectionOrderRequest.getStandardId()).eq(EamMaintenanceStandardDetail::getItemCategory, InspectionItemCategroyEnum.DAY_INSPECTION.name())); + if (CollectionUtils.isNotEmpty(maintenanceStandardDetailList)) { + List<EamInspectionOrderDetail> inspectionOrderList = maintenanceStandardDetailList.stream().map(EamInspectionOrderDetail::new).collect(Collectors.toList()); + inspectionOrderList.forEach(tableDetail -> { + tableDetail.setOrderId(eamInspectionOrder.getId()); + tableDetail.setId(null); + }); + eamInspectionOrderDetailService.saveBatch(inspectionOrderList); + } } //澶勭悊鍛ㄧ偣妫�鏄庣粏鏁版嵁 - if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableWeekDetailList())) { - eamWeekInspectionDetailService.saveOrUpdateBatch(eamInspectionOrderRequest.getTableWeekDetailList()); + if (StrUtil.isNotBlank(eamInspectionOrderRequest.getStandardId()) && eamInspectionOrderRequest.getInspectionDate() != null) { + LambdaQueryWrapper<EamWeekInspectionDetail> queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EamWeekInspectionDetail::getStandardId, eamInspectionOrderRequest.getStandardId()); + queryWrapper.between(EamWeekInspectionDetail::getPlanInspectionDate, DateUtils.getFirstDayOfWeek(eamInspectionOrderRequest.getInspectionDate()), DateUtils.getLastDayOfWeek(eamInspectionOrderRequest.getInspectionDate())); + queryWrapper.orderByAsc(EamWeekInspectionDetail::getItemCode); + List<EamWeekInspectionDetail> eamWeekInspectionDetailList = eamWeekInspectionDetailService.list(queryWrapper); + if (CollectionUtil.isEmpty(eamWeekInspectionDetailList)) { + List<EamMaintenanceStandardDetail> maintenanceStandardDetailList = eamMaintenanceStandardDetailService.list(new LambdaQueryWrapper<EamMaintenanceStandardDetail>().eq(EamMaintenanceStandardDetail::getStandardId, eamInspectionOrderRequest.getStandardId()).eq(EamMaintenanceStandardDetail::getItemCategory, InspectionItemCategroyEnum.WEEK_INSPECTION.name())); + if (CollectionUtils.isNotEmpty(maintenanceStandardDetailList)) { + List<EamWeekInspectionDetail> weekInspectionDetailList = maintenanceStandardDetailList.stream().map(EamWeekInspectionDetail::new).collect(Collectors.toList()); + weekInspectionDetailList.forEach(weekInspectionDetail -> { + weekInspectionDetail.setStandardId(eamInspectionOrderRequest.getStandardId()); + // TODO 鍛ㄧ偣妫�鏃ユ湡 + weekInspectionDetail.setPlanInspectionDate(eamInspectionOrderRequest.getInspectionDate()); + }); + eamWeekInspectionDetailService.saveBatch(weekInspectionDetailList); + } + } } - if (StrUtil.isNotBlank(eamInspectionOrderRequest.getOperator())) { - triggerProcess(eamInspectionOrder); - } - return true; + return Result.OK("娣诲姞鎴愬姛锛�"); } /** @@ -196,9 +213,9 @@ if (equipment == null) { return false; } else { - eamInspectionOrder.setEquipmentId(equipment.getEquipmentCode()); + eamInspectionOrder.setEquipmentId(equipment.getId()); } - flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + eamInspectionOrder.getEquipmentId() + ";瀹夎浣嶇疆: " + equipment.getInstallationPosition(), + flowCommonService.initActBusiness("宸ュ崟鍙�: " + eamInspectionOrder.getOrderNum() + ";璁惧缂栧彿: " + equipment.getEquipmentCode() + (equipment.getInstallationPosition() == null ? "" : ";瀹夎浣嶇疆: " + equipment.getInstallationPosition()), eamInspectionOrder.getId(), "IEamInspectionOrderService", "eam_inspection", null); Map<String, Object> variables = new HashMap<>(); variables.put("dataId", eamInspectionOrder.getId()); @@ -226,16 +243,6 @@ eamInspectionOrder.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name()); } super.updateById(eamInspectionOrder); -// //澶勭悊鏄庣粏鏁版嵁 -// if (CollectionUtil.isNotEmpty(eamInspectionOrderRequest.getTableDetailList())) { -// eamInspectionOrderRequest.getTableDetailList().forEach(tableDetail -> { -// tableDetail.setOrderId(eamInspectionOrder.getId()); -// tableDetail.setCreateTime(new Date()); -// }); -// //鍒犻櫎鏄庣粏 -// eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", eamInspectionOrder.getId())); -// eamInspectionOrderDetailService.saveBatch(eamInspectionOrderRequest.getTableDetailList()); -// } return true; } @@ -249,7 +256,7 @@ @Transactional(rollbackFor = Exception.class) public boolean takeInspectionOrder(String id) { LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - if(user == null || !BusinessCodeConst.PCR0001.equals(user.getPost())) { + if (user == null || !BusinessCodeConst.PCR0001.equals(user.getPost())) { throw new JeecgBootException("涓嶆槸鎿嶄綔宸ワ紝鏃犳硶棰嗗彇姝ゅ伐鍗曪紒"); } EamInspectionOrder eamInspectionOrder = this.getById(id); @@ -394,27 +401,19 @@ Map<String, Object> values = new HashMap<>(); if (InspectionStatus.UNDER_INSPECTION.name().equals(order.getInspectionStatus()) && user.getUsername().equals(order.getOperator())) { // 鐐规浜虹偣妫�缁撴潫 -// String manager = Optional.ofNullable(iEamEquipmentService.getById(order.getEquipmentId())) -// .map(EamEquipment::getEquipmentManager) -// .orElse(null); -// if (manager == null) { -// throw new IllegalArgumentException("璁惧绠$悊鍛樻湭閰嶇疆"); -// } -// List<String> usernameList = Collections.singletonList(manager); values.put("dataId", order.getId()); values.put("organization", "鐐规浜虹偣妫�缁撴潫"); values.put("comment", "鐐规浜虹偣妫�缁撴潫"); -// values.put("NextAssignee", usernameList); request.setComment("鐐规浜虹偣妫�缁撴潫"); } else { - // 鐝粍闀跨‘璁� + // 缁翠慨宸ョ‘璁� values.put("dataId", order.getId()); values.put("organization", request.getConfirmComment()); values.put("comment", request.getConfirmComment()); values.put("confirmation", request.getConfirmDealType()); request.setComment(request.getConfirmComment()); if ("2".equals(request.getConfirmDealType())) { - // 鐝粍闀块┏鍥� + // 缁翠慨宸ラ┏鍥� List<String> usernames = new ArrayList<>(); usernames.add(order.getOperator()); order.setInspectionStatus(InspectionStatus.UNDER_INSPECTION.name()); @@ -430,18 +429,14 @@ // 鐐规瀹屾垚 order.setInspectionStatus(InspectionStatus.WAIT_CONFIRM.name()); order.setOperateTime(new Date()); -// if (CollectionUtil.isNotEmpty(request.getFileList())) { -// List<FileUploadResult> fileUploadResultList = request.getFileList(); -// ObjectMapper mapper = new ObjectMapper(); -// try { -// String referenceFile = mapper.writeValueAsString(fileUploadResultList); -// order.setImageFiles(referenceFile); -// } catch (JsonProcessingException e) { -// log.error("JSON杞崲澶辫触锛�" + e.getMessage(), e); -// } -// } eamInspectionOrderDetailService.remove(new QueryWrapper<EamInspectionOrderDetail>().eq("order_id", order.getId())); eamInspectionOrderDetailService.saveBatch(request.getTableDetailList()); + + if (request.getTableWeekDetailList() != null && !request.getTableWeekDetailList().isEmpty()) { + // 璁剧疆鍛ㄧ偣妫� +// eamWeekInspectionDetailService.remove(new QueryWrapper<EamWeekInspectionDetail>().eq("order_id", order.getId())); + eamWeekInspectionDetailService.saveOrUpdateBatch(request.getTableWeekDetailList()); + } } else if (InspectionStatus.WAIT_CONFIRM.name().equals(order.getInspectionStatus()) && StrUtil.isNotEmpty(request.getConfirmDealType())) { // 鐝粍闀跨‘璁や换鍔� order.setInspectionStatus(InspectionStatus.COMPLETE.name()); @@ -545,13 +540,13 @@ } @Override - public List<InspectionVo> findInspectionResult(String equipmentId,String itemDemand,String yearMonth) { - return this.baseMapper.findInspectionResult(equipmentId,itemDemand,yearMonth); + public List<InspectionVo> findInspectionResult(String equipmentId, String itemDemand, String yearMonth) { + return this.baseMapper.findInspectionResult(equipmentId, itemDemand, yearMonth); } @Override - public List<InspectionVo> findInspectionUser(String equipmentId,String yearMonth) { - return this.baseMapper.findInspectionUser(equipmentId,yearMonth); + public List<InspectionVo> findInspectionUser(String equipmentId, String yearMonth) { + return this.baseMapper.findInspectionUser(equipmentId, yearMonth); } @Override diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java index 4084807..bead1bd 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamMaintenanceStandardServiceImpl.java @@ -327,7 +327,7 @@ LambdaQueryWrapper<EamMaintenanceStandard> queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(EamMaintenanceStandard::getDelFlag, CommonConstant.DEL_FLAG_0); queryWrapper.eq(EamMaintenanceStandard::getMaintenanceCategory, maintenanceCategory); - queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.WAIT_SUBMIT.name()); + queryWrapper.eq(EamMaintenanceStandard::getStandardStatus, MaintenanceStandardStatusEnum.START.name()); return eamMaintenanceStandardMapper.selectList(queryWrapper); } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java index 7a8597b..9710cd8 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardDetailServiceImpl.java @@ -1,11 +1,13 @@ package org.jeecg.modules.eam.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandardDetail; import org.jeecg.modules.eam.mapper.EamTechnicalStatusEvaluationStandardDetailMapper; import org.jeecg.modules.eam.service.IEamTechnicalStatusEvaluationStandardDetailService; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import org.springframework.transaction.annotation.Transactional; /** * @Description: 鎶�鏈姸鎬侀壌瀹氳鑼冩槑缁� @@ -16,4 +18,11 @@ @Service public class EamTechnicalStatusEvaluationStandardDetailServiceImpl extends ServiceImpl<EamTechnicalStatusEvaluationStandardDetailMapper, EamTechnicalStatusEvaluationStandardDetail> implements IEamTechnicalStatusEvaluationStandardDetailService { + @Override + @Transactional(rollbackFor = Exception.class) + public void removeByStandardId(String standardId) { + LambdaQueryWrapper<EamTechnicalStatusEvaluationStandardDetail> wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(EamTechnicalStatusEvaluationStandardDetail::getStandardId, standardId); + this.getBaseMapper().delete(wrapper); + } } diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java index a1c6644..1ead9e5 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java +++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamTechnicalStatusEvaluationStandardServiceImpl.java @@ -17,6 +17,7 @@ import org.jeecg.modules.eam.base.entity.BaseFactoryUser; import org.jeecg.modules.eam.base.service.IBaseFactoryService; import org.jeecg.modules.eam.base.service.IBaseFactoryUserService; +import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationCheckCategoryEnum; import org.jeecg.modules.eam.constant.TechnicalStatusEvaluationStandardEnum; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandard; import org.jeecg.modules.eam.entity.EamTechnicalStatusEvaluationStandardDetail; @@ -101,6 +102,10 @@ @Override @Transactional(rollbackFor = Exception.class) public boolean addEamTechnicalStatusEvaluationStandard(EamTechnicalStatusEvaluationStandardRequest request) { + if(!CommonConstant.STATUS_1.equals(request.getHasOtherCheck()) && !CommonConstant.STATUS_1.equals(request.getHasSafetyEquipmentCheck()) && !CommonConstant.STATUS_1.equals(request.getHasPrecisionCheck())) { + //蹇呴』瑕侀�夋嫨涓�涓鏌ュ垎绫� + throw new JeecgBootException("蹇呴』瑕侀�夋嫨涓�涓鏌ュ垎绫伙紒"); + } EamTechnicalStatusEvaluationStandard entity = new EamTechnicalStatusEvaluationStandard(); BeanUtils.copyProperties(request, entity); entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.WAIT_SUBMIT.name()); @@ -121,7 +126,31 @@ request.getTableDetailList().forEach(tableDetail -> { tableDetail.setStandardId(entity.getId()); }); - standardDetailService.saveBatch(request.getTableDetailList()); + //鏍规嵁鍒嗙被鍒ゆ柇鏄惁淇濆瓨 + if(CommonConstant.STATUS_1.equals(entity.getHasOtherCheck())) { + //淇濆瓨鍏朵粬鍒嗙被 + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("鍏朵粬妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); + } + standardDetailService.saveBatch(collect); + } + if(CommonConstant.STATUS_1.equals(entity.getHasSafetyEquipmentCheck())) { + //淇濆瓨瀹夊叏瑁呯疆鍒嗙被 + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("瀹夊叏瑁呯疆妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); + } + standardDetailService.saveBatch(collect); + } + if(CommonConstant.STATUS_1.equals(entity.getHasPrecisionCheck())) { + //淇濆瓨绮惧害妫�楠屽垎绫� + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("绮惧害妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); + } + standardDetailService.saveBatch(collect); + } } return true; } @@ -147,35 +176,50 @@ @Override @Transactional(rollbackFor = Exception.class) public boolean editEamTechnicalStatusEvaluationStandard(EamTechnicalStatusEvaluationStandardRequest request) { + if(!CommonConstant.STATUS_1.equals(request.getHasOtherCheck()) && !CommonConstant.STATUS_1.equals(request.getHasSafetyEquipmentCheck()) && !CommonConstant.STATUS_1.equals(request.getHasPrecisionCheck())) { + //蹇呴』瑕侀�夋嫨涓�涓鏌ュ垎绫� + throw new JeecgBootException("蹇呴』瑕侀�夋嫨涓�涓鏌ュ垎绫伙紒"); + } EamTechnicalStatusEvaluationStandard entity = this.getBaseMapper().selectById(request.getId()); if(entity == null){ throw new JeecgBootException("缂栬緫鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�"); } entity.setStandardName(request.getStandardName()); entity.setEvaluationPeriod(request.getEvaluationPeriod()); + entity.setHasOtherCheck(request.getHasOtherCheck()); + entity.setHasPrecisionCheck(request.getHasPrecisionCheck()); + entity.setHasSafetyEquipmentCheck(request.getHasSafetyEquipmentCheck()); this.getBaseMapper().updateById(entity); //澶勭悊璇︽儏 if(CollectionUtil.isNotEmpty(request.getTableDetailList())) { - List<EamTechnicalStatusEvaluationStandardDetail> addList = new ArrayList<>(); - List<EamTechnicalStatusEvaluationStandardDetail> updateList = new ArrayList<>(); - request.getTableDetailList().forEach(tableDetail -> { - tableDetail.setStandardId(entity.getId()); - if(tableDetail.getId() == null){ - addList.add(tableDetail); - }else { - updateList.add(tableDetail); + //鍏堝垹闄ゆ鏌ラ」 + standardDetailService.removeByStandardId(entity.getId()); + + //鏍规嵁鍒嗙被鍒ゆ柇鏄惁淇濆瓨 + if(CommonConstant.STATUS_1.equals(entity.getHasOtherCheck())) { + //淇濆瓨鍏朵粬鍒嗙被 + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("鍏朵粬妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); } - }); - if(CollectionUtil.isNotEmpty(addList)){ - standardDetailService.saveBatch(addList); + standardDetailService.saveBatch(collect); } - if(CollectionUtil.isNotEmpty(updateList)){ - standardDetailService.updateBatchById(updateList); + if(CommonConstant.STATUS_1.equals(entity.getHasSafetyEquipmentCheck())) { + //淇濆瓨瀹夊叏瑁呯疆鍒嗙被 + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("瀹夊叏瑁呯疆妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); + } + standardDetailService.saveBatch(collect); } - } - if(CollectionUtil.isNotEmpty(request.getRemoveDetailList())) { - List<String> ids = request.getRemoveDetailList().stream().map(EamTechnicalStatusEvaluationStandardDetail::getId).collect(Collectors.toList()); - standardDetailService.removeBatchByIds(ids); + if(CommonConstant.STATUS_1.equals(entity.getHasPrecisionCheck())) { + //淇濆瓨绮惧害妫�楠屽垎绫� + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("绮惧害妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); + } + standardDetailService.saveBatch(collect); + } } return true; } @@ -183,6 +227,10 @@ @Override @Transactional(rollbackFor = Exception.class) public boolean upgrade(EamTechnicalStatusEvaluationStandardRequest request) { + if(!CommonConstant.STATUS_1.equals(request.getHasOtherCheck()) && !CommonConstant.STATUS_1.equals(request.getHasSafetyEquipmentCheck()) && !CommonConstant.STATUS_1.equals(request.getHasPrecisionCheck())) { + //蹇呴』瑕侀�夋嫨涓�涓鏌ュ垎绫� + throw new JeecgBootException("蹇呴』瑕侀�夋嫨涓�涓鏌ュ垎绫伙紒"); + } EamTechnicalStatusEvaluationStandard entity = this.getBaseMapper().selectById(request.getId()); if(entity == null){ throw new JeecgBootException("鍗囩増鐨勬暟鎹凡鍒犻櫎锛岃鍒锋柊閲嶈瘯锛�"); @@ -198,6 +246,9 @@ newEntity.setStandardVersion(SimpleVersionGenerateUtil.addVersion(entity.getStandardVersion())); //璁惧澶勭悊 newEntity.setEquipmentId(request.getEquipmentId()); + newEntity.setHasOtherCheck(request.getHasOtherCheck()); + newEntity.setHasPrecisionCheck(request.getHasPrecisionCheck()); + newEntity.setHasSafetyEquipmentCheck(request.getHasSafetyEquipmentCheck()); //鍒犻櫎鏍囪 newEntity.setDelFlag(CommonConstant.DEL_FLAG_0); //閲嶅鎬ф牎楠� @@ -216,7 +267,31 @@ tableDetail.setUpdateTime(null); tableDetail.setStandardId(newEntity.getId()); }); - standardDetailService.saveBatch(request.getTableDetailList()); + //鏍规嵁鍒嗙被鍒ゆ柇鏄惁淇濆瓨 + if(CommonConstant.STATUS_1.equals(entity.getHasOtherCheck())) { + //淇濆瓨鍏朵粬鍒嗙被 + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.OTHER_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("鍏朵粬妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); + } + standardDetailService.saveBatch(collect); + } + if(CommonConstant.STATUS_1.equals(entity.getHasSafetyEquipmentCheck())) { + //淇濆瓨瀹夊叏瑁呯疆鍒嗙被 + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.SAFETY_EQUIPMENT_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("瀹夊叏瑁呯疆妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); + } + standardDetailService.saveBatch(collect); + } + if(CommonConstant.STATUS_1.equals(entity.getHasPrecisionCheck())) { + //淇濆瓨绮惧害妫�楠屽垎绫� + List<EamTechnicalStatusEvaluationStandardDetail> collect = request.getTableDetailList().stream().filter(item -> TechnicalStatusEvaluationCheckCategoryEnum.PRECISION_CHECK.name().equals(item.getCheckCategory())).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)) { + throw new JeecgBootException("绮惧害妫�鏌ユ槑缁嗕笉鑳戒负绌猴紒"); + } + standardDetailService.saveBatch(collect); + } } //绂佺敤鍘熸潵鐨勭増鏈� entity.setStandardStatus(TechnicalStatusEvaluationStandardEnum.DISABLE.name()); -- Gitblit v1.9.3