diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java index 828f690..f796007 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ * 现场检测记录表 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Data @@ -121,7 +119,36 @@ @TableField("create_user") private Long createUser; + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private String laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") - private List equipmentFixedAssetsDTOList; + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java index 828f690..f796007 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ * 现场检测记录表 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Data @@ -121,7 +119,36 @@ @TableField("create_user") private Long createUser; + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private String laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") - private List equipmentFixedAssetsDTOList; + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 47a2d06..64e11f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -2,11 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; @@ -14,7 +11,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -32,64 +28,47 @@ private IEquipmentFixedAssetsService equipmentFixedAssetsService; @Override - public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + public boolean saveBatch(Long siteExecutiveLogId, List equipmentInfoList) { //先删除所有的绑定关系 - deleteBySiteExecutiveId(siteExecutiveId); + deleteBySiteExecutiveLogId(siteExecutiveLogId); //新写入绑定关系 List list = new ArrayList<>(); equipmentInfoList.forEach(assets -> { BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation(); - siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId); + siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); + siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); + siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); } @Override - public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_log_id", siteExecutiveLogIds); return this.baseMapper.delete(queryWrapper) > 0 ? true : false; } @Override - public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + public List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - List list = this.baseMapper.selectList(queryWrapper); - if (list != null && list.size() > 0) { - return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList())); - } - return null; - } - - @Override - public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("site_executive_id", siteExecutiveIds); - return this.baseMapper.delete(queryWrapper) > 0 ? true : false; - } - - @Override - public Boolean updateBySiteExecutiveId(Long siteExecutiveId, List equipmentFixedAssetsDTOList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - queryWrapper.in("equipment_id", equipmentFixedAssetsDTOList.stream().map(EquipmentFixedAssetsDTO::getId).collect(Collectors.toList())); - List list = this.baseMapper.selectList(queryWrapper); - list.forEach(listObj -> { - equipmentFixedAssetsDTOList.forEach(equipmentInfo -> { - if (listObj.getEquipmentId().equals(equipmentInfo.getId())) { - listObj.setBeforeWorkCheck(equipmentInfo.getBeforeWorkCheck()); - listObj.setBeforeWorkRecorderDate(equipmentInfo.getBeforeWorkRecorderDate()); - listObj.setBeforeWorkRecorderId(equipmentInfo.getBeforeWorkRecorderId()); - listObj.setAfterWorkCheck(equipmentInfo.getAfterWorkCheck()); - listObj.setAfterWorkRecorderDate(equipmentInfo.getAfterWorkRecorderDate()); - listObj.setAfterWorkRecorderId(equipmentInfo.getAfterWorkRecorderId()); - } - }); - }); - return this.updateBatchById(list); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.selectList(queryWrapper); } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java index 828f690..f796007 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ * 现场检测记录表 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Data @@ -121,7 +119,36 @@ @TableField("create_user") private Long createUser; + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private String laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") - private List equipmentFixedAssetsDTOList; + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 47a2d06..64e11f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -2,11 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; @@ -14,7 +11,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -32,64 +28,47 @@ private IEquipmentFixedAssetsService equipmentFixedAssetsService; @Override - public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + public boolean saveBatch(Long siteExecutiveLogId, List equipmentInfoList) { //先删除所有的绑定关系 - deleteBySiteExecutiveId(siteExecutiveId); + deleteBySiteExecutiveLogId(siteExecutiveLogId); //新写入绑定关系 List list = new ArrayList<>(); equipmentInfoList.forEach(assets -> { BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation(); - siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId); + siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); + siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); + siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); } @Override - public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_log_id", siteExecutiveLogIds); return this.baseMapper.delete(queryWrapper) > 0 ? true : false; } @Override - public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + public List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - List list = this.baseMapper.selectList(queryWrapper); - if (list != null && list.size() > 0) { - return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList())); - } - return null; - } - - @Override - public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("site_executive_id", siteExecutiveIds); - return this.baseMapper.delete(queryWrapper) > 0 ? true : false; - } - - @Override - public Boolean updateBySiteExecutiveId(Long siteExecutiveId, List equipmentFixedAssetsDTOList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - queryWrapper.in("equipment_id", equipmentFixedAssetsDTOList.stream().map(EquipmentFixedAssetsDTO::getId).collect(Collectors.toList())); - List list = this.baseMapper.selectList(queryWrapper); - list.forEach(listObj -> { - equipmentFixedAssetsDTOList.forEach(equipmentInfo -> { - if (listObj.getEquipmentId().equals(equipmentInfo.getId())) { - listObj.setBeforeWorkCheck(equipmentInfo.getBeforeWorkCheck()); - listObj.setBeforeWorkRecorderDate(equipmentInfo.getBeforeWorkRecorderDate()); - listObj.setBeforeWorkRecorderId(equipmentInfo.getBeforeWorkRecorderId()); - listObj.setAfterWorkCheck(equipmentInfo.getAfterWorkCheck()); - listObj.setAfterWorkRecorderDate(equipmentInfo.getAfterWorkRecorderDate()); - listObj.setAfterWorkRecorderId(equipmentInfo.getAfterWorkRecorderId()); - } - }); - }); - return this.updateBatchById(list); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.selectList(queryWrapper); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java index f8bd8eb..361b98c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java @@ -1,11 +1,20 @@ package com.casic.missiles.service.Impl.business; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; -import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; -import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** *

* 服务实现类 @@ -17,4 +26,47 @@ @Service public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveInfoEquipmentRelationService { + @Resource + private IEquipmentFixedAssetsService equipmentFixedAssetsService; + + @Override + public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + //先删除所有的绑定关系 + deleteBySiteExecutiveId(siteExecutiveId); + //新写入绑定关系 + List list = new ArrayList<>(); + equipmentInfoList.forEach(assets -> { + BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation(); + siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId); + siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId()); + list.add(siteExecutiveInfoEquipmentRelation); + }); + return this.saveBatch(list); + } + + @Override + public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_info_id", siteExecutiveIds); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + @Override + public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + List list = this.baseMapper.selectList(queryWrapper); + if (list != null && list.size() > 0) { + return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList())); + } + return null; + } } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java index 828f690..f796007 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ * 现场检测记录表 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Data @@ -121,7 +119,36 @@ @TableField("create_user") private Long createUser; + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private String laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") - private List equipmentFixedAssetsDTOList; + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 47a2d06..64e11f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -2,11 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; @@ -14,7 +11,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -32,64 +28,47 @@ private IEquipmentFixedAssetsService equipmentFixedAssetsService; @Override - public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + public boolean saveBatch(Long siteExecutiveLogId, List equipmentInfoList) { //先删除所有的绑定关系 - deleteBySiteExecutiveId(siteExecutiveId); + deleteBySiteExecutiveLogId(siteExecutiveLogId); //新写入绑定关系 List list = new ArrayList<>(); equipmentInfoList.forEach(assets -> { BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation(); - siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId); + siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); + siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); + siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); } @Override - public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_log_id", siteExecutiveLogIds); return this.baseMapper.delete(queryWrapper) > 0 ? true : false; } @Override - public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + public List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - List list = this.baseMapper.selectList(queryWrapper); - if (list != null && list.size() > 0) { - return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList())); - } - return null; - } - - @Override - public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("site_executive_id", siteExecutiveIds); - return this.baseMapper.delete(queryWrapper) > 0 ? true : false; - } - - @Override - public Boolean updateBySiteExecutiveId(Long siteExecutiveId, List equipmentFixedAssetsDTOList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - queryWrapper.in("equipment_id", equipmentFixedAssetsDTOList.stream().map(EquipmentFixedAssetsDTO::getId).collect(Collectors.toList())); - List list = this.baseMapper.selectList(queryWrapper); - list.forEach(listObj -> { - equipmentFixedAssetsDTOList.forEach(equipmentInfo -> { - if (listObj.getEquipmentId().equals(equipmentInfo.getId())) { - listObj.setBeforeWorkCheck(equipmentInfo.getBeforeWorkCheck()); - listObj.setBeforeWorkRecorderDate(equipmentInfo.getBeforeWorkRecorderDate()); - listObj.setBeforeWorkRecorderId(equipmentInfo.getBeforeWorkRecorderId()); - listObj.setAfterWorkCheck(equipmentInfo.getAfterWorkCheck()); - listObj.setAfterWorkRecorderDate(equipmentInfo.getAfterWorkRecorderDate()); - listObj.setAfterWorkRecorderId(equipmentInfo.getAfterWorkRecorderId()); - } - }); - }); - return this.updateBatchById(list); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.selectList(queryWrapper); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java index f8bd8eb..361b98c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java @@ -1,11 +1,20 @@ package com.casic.missiles.service.Impl.business; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; -import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; -import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** *

* 服务实现类 @@ -17,4 +26,47 @@ @Service public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveInfoEquipmentRelationService { + @Resource + private IEquipmentFixedAssetsService equipmentFixedAssetsService; + + @Override + public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + //先删除所有的绑定关系 + deleteBySiteExecutiveId(siteExecutiveId); + //新写入绑定关系 + List list = new ArrayList<>(); + equipmentInfoList.forEach(assets -> { + BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation(); + siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId); + siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId()); + list.add(siteExecutiveInfoEquipmentRelation); + }); + return this.saveBatch(list); + } + + @Override + public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_info_id", siteExecutiveIds); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + @Override + public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + List list = this.baseMapper.selectList(queryWrapper); + if (list != null && list.size() > 0) { + return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList())); + } + return null; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 319cbad..48ff287 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -25,7 +25,7 @@ import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; -import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; import com.casic.missiles.service.flowable.ApprovalOperateService; @@ -64,7 +64,7 @@ @Autowired private ApprovalOperateService approvalOperateService; @Autowired - private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService; @Autowired private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService; @@ -203,8 +203,8 @@ siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id)); //查询是否有关联的监测设备 siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id)); - if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){ - siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource())); + if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) { + siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource())); } } return siteExecutiveInfo; diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java index 828f690..f796007 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ * 现场检测记录表 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Data @@ -121,7 +119,36 @@ @TableField("create_user") private Long createUser; + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private String laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") - private List equipmentFixedAssetsDTOList; + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 47a2d06..64e11f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -2,11 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; @@ -14,7 +11,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -32,64 +28,47 @@ private IEquipmentFixedAssetsService equipmentFixedAssetsService; @Override - public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + public boolean saveBatch(Long siteExecutiveLogId, List equipmentInfoList) { //先删除所有的绑定关系 - deleteBySiteExecutiveId(siteExecutiveId); + deleteBySiteExecutiveLogId(siteExecutiveLogId); //新写入绑定关系 List list = new ArrayList<>(); equipmentInfoList.forEach(assets -> { BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation(); - siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId); + siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); + siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); + siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); } @Override - public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_log_id", siteExecutiveLogIds); return this.baseMapper.delete(queryWrapper) > 0 ? true : false; } @Override - public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + public List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - List list = this.baseMapper.selectList(queryWrapper); - if (list != null && list.size() > 0) { - return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList())); - } - return null; - } - - @Override - public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("site_executive_id", siteExecutiveIds); - return this.baseMapper.delete(queryWrapper) > 0 ? true : false; - } - - @Override - public Boolean updateBySiteExecutiveId(Long siteExecutiveId, List equipmentFixedAssetsDTOList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - queryWrapper.in("equipment_id", equipmentFixedAssetsDTOList.stream().map(EquipmentFixedAssetsDTO::getId).collect(Collectors.toList())); - List list = this.baseMapper.selectList(queryWrapper); - list.forEach(listObj -> { - equipmentFixedAssetsDTOList.forEach(equipmentInfo -> { - if (listObj.getEquipmentId().equals(equipmentInfo.getId())) { - listObj.setBeforeWorkCheck(equipmentInfo.getBeforeWorkCheck()); - listObj.setBeforeWorkRecorderDate(equipmentInfo.getBeforeWorkRecorderDate()); - listObj.setBeforeWorkRecorderId(equipmentInfo.getBeforeWorkRecorderId()); - listObj.setAfterWorkCheck(equipmentInfo.getAfterWorkCheck()); - listObj.setAfterWorkRecorderDate(equipmentInfo.getAfterWorkRecorderDate()); - listObj.setAfterWorkRecorderId(equipmentInfo.getAfterWorkRecorderId()); - } - }); - }); - return this.updateBatchById(list); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.selectList(queryWrapper); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java index f8bd8eb..361b98c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java @@ -1,11 +1,20 @@ package com.casic.missiles.service.Impl.business; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; -import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; -import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** *

* 服务实现类 @@ -17,4 +26,47 @@ @Service public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveInfoEquipmentRelationService { + @Resource + private IEquipmentFixedAssetsService equipmentFixedAssetsService; + + @Override + public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + //先删除所有的绑定关系 + deleteBySiteExecutiveId(siteExecutiveId); + //新写入绑定关系 + List list = new ArrayList<>(); + equipmentInfoList.forEach(assets -> { + BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation(); + siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId); + siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId()); + list.add(siteExecutiveInfoEquipmentRelation); + }); + return this.saveBatch(list); + } + + @Override + public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_info_id", siteExecutiveIds); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + @Override + public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + List list = this.baseMapper.selectList(queryWrapper); + if (list != null && list.size() > 0) { + return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList())); + } + return null; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 319cbad..48ff287 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -25,7 +25,7 @@ import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; -import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; import com.casic.missiles.service.flowable.ApprovalOperateService; @@ -64,7 +64,7 @@ @Autowired private ApprovalOperateService approvalOperateService; @Autowired - private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService; @Autowired private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService; @@ -203,8 +203,8 @@ siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id)); //查询是否有关联的监测设备 siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id)); - if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){ - siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource())); + if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) { + siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource())); } } return siteExecutiveInfo; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 623ae17..bee53cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,22 +1,30 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; /** *

@@ -36,10 +44,9 @@ public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { initBusinessSiteExecutiveLog(siteExecutiveLog); if (baseMapper.insert(siteExecutiveLog) > 0) { - //加入所用设备绑定 工作前、后信息 - if (ObjectUtil.isNotEmpty(siteExecutiveLog.getEquipmentFixedAssetsDTOList()) && siteExecutiveLog.getEquipmentFixedAssetsDTOList().size() > 0) { - if (StringUtils.isNotEmpty(siteExecutiveLog.getSiteExecutiveId())) - siteExecutiveEquipmentRelationService.updateBySiteExecutiveId(siteExecutiveLog.getId(), siteExecutiveLog.getEquipmentFixedAssetsDTOList()); + //加入所用设备绑定关系 + if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { + siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } return ReturnUtil.success(); } @@ -49,13 +56,46 @@ @Override public ReturnDTO deleteSiteExecutiveLog(Long id) { if (this.baseMapper.deleteById(id) > 0) { - //清除监测设备绑定关系中检测前后信息 -// siteExecutiveEquipmentRelationService.deleteByOriginId(id); + //清除监测设备绑定关系 + siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) { + if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) { + + //加入所用设备绑定修改 + if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { + siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); + } + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) { + BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id); + if (businessSiteExecutiveLog != null) { + //查询是否有关联的监测设备 + businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id)); + } + return businessSiteExecutiveLog; + } + + @Override + public Page siteExecutiveLogListPage(Page page, SiteExecuteLogRequest request) { + // 获取列表 + Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request); + if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) { + + } + return siteExecutiveLogListPage; + } + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { Long maxNo = this.baseMapper.selectMaxCode(); String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java index 828f690..f796007 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ * 现场检测记录表 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Data @@ -121,7 +119,36 @@ @TableField("create_user") private Long createUser; + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private String laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") - private List equipmentFixedAssetsDTOList; + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 47a2d06..64e11f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -2,11 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; @@ -14,7 +11,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -32,64 +28,47 @@ private IEquipmentFixedAssetsService equipmentFixedAssetsService; @Override - public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + public boolean saveBatch(Long siteExecutiveLogId, List equipmentInfoList) { //先删除所有的绑定关系 - deleteBySiteExecutiveId(siteExecutiveId); + deleteBySiteExecutiveLogId(siteExecutiveLogId); //新写入绑定关系 List list = new ArrayList<>(); equipmentInfoList.forEach(assets -> { BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation(); - siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId); + siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); + siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); + siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); } @Override - public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_log_id", siteExecutiveLogIds); return this.baseMapper.delete(queryWrapper) > 0 ? true : false; } @Override - public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + public List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - List list = this.baseMapper.selectList(queryWrapper); - if (list != null && list.size() > 0) { - return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList())); - } - return null; - } - - @Override - public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("site_executive_id", siteExecutiveIds); - return this.baseMapper.delete(queryWrapper) > 0 ? true : false; - } - - @Override - public Boolean updateBySiteExecutiveId(Long siteExecutiveId, List equipmentFixedAssetsDTOList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - queryWrapper.in("equipment_id", equipmentFixedAssetsDTOList.stream().map(EquipmentFixedAssetsDTO::getId).collect(Collectors.toList())); - List list = this.baseMapper.selectList(queryWrapper); - list.forEach(listObj -> { - equipmentFixedAssetsDTOList.forEach(equipmentInfo -> { - if (listObj.getEquipmentId().equals(equipmentInfo.getId())) { - listObj.setBeforeWorkCheck(equipmentInfo.getBeforeWorkCheck()); - listObj.setBeforeWorkRecorderDate(equipmentInfo.getBeforeWorkRecorderDate()); - listObj.setBeforeWorkRecorderId(equipmentInfo.getBeforeWorkRecorderId()); - listObj.setAfterWorkCheck(equipmentInfo.getAfterWorkCheck()); - listObj.setAfterWorkRecorderDate(equipmentInfo.getAfterWorkRecorderDate()); - listObj.setAfterWorkRecorderId(equipmentInfo.getAfterWorkRecorderId()); - } - }); - }); - return this.updateBatchById(list); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.selectList(queryWrapper); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java index f8bd8eb..361b98c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java @@ -1,11 +1,20 @@ package com.casic.missiles.service.Impl.business; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; -import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; -import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** *

* 服务实现类 @@ -17,4 +26,47 @@ @Service public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveInfoEquipmentRelationService { + @Resource + private IEquipmentFixedAssetsService equipmentFixedAssetsService; + + @Override + public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + //先删除所有的绑定关系 + deleteBySiteExecutiveId(siteExecutiveId); + //新写入绑定关系 + List list = new ArrayList<>(); + equipmentInfoList.forEach(assets -> { + BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation(); + siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId); + siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId()); + list.add(siteExecutiveInfoEquipmentRelation); + }); + return this.saveBatch(list); + } + + @Override + public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_info_id", siteExecutiveIds); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + @Override + public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + List list = this.baseMapper.selectList(queryWrapper); + if (list != null && list.size() > 0) { + return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList())); + } + return null; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 319cbad..48ff287 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -25,7 +25,7 @@ import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; -import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; import com.casic.missiles.service.flowable.ApprovalOperateService; @@ -64,7 +64,7 @@ @Autowired private ApprovalOperateService approvalOperateService; @Autowired - private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService; @Autowired private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService; @@ -203,8 +203,8 @@ siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id)); //查询是否有关联的监测设备 siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id)); - if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){ - siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource())); + if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) { + siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource())); } } return siteExecutiveInfo; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 623ae17..bee53cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,22 +1,30 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; /** *

@@ -36,10 +44,9 @@ public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { initBusinessSiteExecutiveLog(siteExecutiveLog); if (baseMapper.insert(siteExecutiveLog) > 0) { - //加入所用设备绑定 工作前、后信息 - if (ObjectUtil.isNotEmpty(siteExecutiveLog.getEquipmentFixedAssetsDTOList()) && siteExecutiveLog.getEquipmentFixedAssetsDTOList().size() > 0) { - if (StringUtils.isNotEmpty(siteExecutiveLog.getSiteExecutiveId())) - siteExecutiveEquipmentRelationService.updateBySiteExecutiveId(siteExecutiveLog.getId(), siteExecutiveLog.getEquipmentFixedAssetsDTOList()); + //加入所用设备绑定关系 + if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { + siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } return ReturnUtil.success(); } @@ -49,13 +56,46 @@ @Override public ReturnDTO deleteSiteExecutiveLog(Long id) { if (this.baseMapper.deleteById(id) > 0) { - //清除监测设备绑定关系中检测前后信息 -// siteExecutiveEquipmentRelationService.deleteByOriginId(id); + //清除监测设备绑定关系 + siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) { + if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) { + + //加入所用设备绑定修改 + if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { + siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); + } + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) { + BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id); + if (businessSiteExecutiveLog != null) { + //查询是否有关联的监测设备 + businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id)); + } + return businessSiteExecutiveLog; + } + + @Override + public Page siteExecutiveLogListPage(Page page, SiteExecuteLogRequest request) { + // 获取列表 + Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request); + if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) { + + } + return siteExecutiveLogListPage; + } + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { Long maxNo = this.baseMapper.selectMaxCode(); String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java index 9d021c5..247920b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import java.util.List; @@ -17,13 +15,12 @@ */ public interface IBusinessSiteExecutiveEquipmentRelationService extends IService { - boolean saveBatch(Long siteExecutiveId, List equipmentInfoList); + boolean saveBatch(Long siteExecutiveLogId, List siteExecutiveEquipmentRelationList); - List getEquipmentsByExecutiveInfoId(Long siteExecutiveId); + Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId); - Boolean deleteBySiteExecutiveId(Long siteExecutiveId); + Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds); - Boolean deleteBySiteExecutiveIds(List siteExecutiveIds); + List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId); - Boolean updateBySiteExecutiveId (Long siteExecutiveId, List equipmentInfoList); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java index 828f690..f796007 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ * 现场检测记录表 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Data @@ -121,7 +119,36 @@ @TableField("create_user") private Long createUser; + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private String laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") - private List equipmentFixedAssetsDTOList; + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 47a2d06..64e11f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -2,11 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; @@ -14,7 +11,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -32,64 +28,47 @@ private IEquipmentFixedAssetsService equipmentFixedAssetsService; @Override - public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + public boolean saveBatch(Long siteExecutiveLogId, List equipmentInfoList) { //先删除所有的绑定关系 - deleteBySiteExecutiveId(siteExecutiveId); + deleteBySiteExecutiveLogId(siteExecutiveLogId); //新写入绑定关系 List list = new ArrayList<>(); equipmentInfoList.forEach(assets -> { BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation(); - siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId); + siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); + siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); + siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); } @Override - public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_log_id", siteExecutiveLogIds); return this.baseMapper.delete(queryWrapper) > 0 ? true : false; } @Override - public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + public List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - List list = this.baseMapper.selectList(queryWrapper); - if (list != null && list.size() > 0) { - return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList())); - } - return null; - } - - @Override - public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("site_executive_id", siteExecutiveIds); - return this.baseMapper.delete(queryWrapper) > 0 ? true : false; - } - - @Override - public Boolean updateBySiteExecutiveId(Long siteExecutiveId, List equipmentFixedAssetsDTOList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - queryWrapper.in("equipment_id", equipmentFixedAssetsDTOList.stream().map(EquipmentFixedAssetsDTO::getId).collect(Collectors.toList())); - List list = this.baseMapper.selectList(queryWrapper); - list.forEach(listObj -> { - equipmentFixedAssetsDTOList.forEach(equipmentInfo -> { - if (listObj.getEquipmentId().equals(equipmentInfo.getId())) { - listObj.setBeforeWorkCheck(equipmentInfo.getBeforeWorkCheck()); - listObj.setBeforeWorkRecorderDate(equipmentInfo.getBeforeWorkRecorderDate()); - listObj.setBeforeWorkRecorderId(equipmentInfo.getBeforeWorkRecorderId()); - listObj.setAfterWorkCheck(equipmentInfo.getAfterWorkCheck()); - listObj.setAfterWorkRecorderDate(equipmentInfo.getAfterWorkRecorderDate()); - listObj.setAfterWorkRecorderId(equipmentInfo.getAfterWorkRecorderId()); - } - }); - }); - return this.updateBatchById(list); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.selectList(queryWrapper); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java index f8bd8eb..361b98c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java @@ -1,11 +1,20 @@ package com.casic.missiles.service.Impl.business; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; -import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; -import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** *

* 服务实现类 @@ -17,4 +26,47 @@ @Service public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveInfoEquipmentRelationService { + @Resource + private IEquipmentFixedAssetsService equipmentFixedAssetsService; + + @Override + public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + //先删除所有的绑定关系 + deleteBySiteExecutiveId(siteExecutiveId); + //新写入绑定关系 + List list = new ArrayList<>(); + equipmentInfoList.forEach(assets -> { + BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation(); + siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId); + siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId()); + list.add(siteExecutiveInfoEquipmentRelation); + }); + return this.saveBatch(list); + } + + @Override + public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_info_id", siteExecutiveIds); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + @Override + public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + List list = this.baseMapper.selectList(queryWrapper); + if (list != null && list.size() > 0) { + return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList())); + } + return null; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 319cbad..48ff287 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -25,7 +25,7 @@ import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; -import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; import com.casic.missiles.service.flowable.ApprovalOperateService; @@ -64,7 +64,7 @@ @Autowired private ApprovalOperateService approvalOperateService; @Autowired - private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService; @Autowired private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService; @@ -203,8 +203,8 @@ siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id)); //查询是否有关联的监测设备 siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id)); - if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){ - siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource())); + if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) { + siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource())); } } return siteExecutiveInfo; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 623ae17..bee53cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,22 +1,30 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; /** *

@@ -36,10 +44,9 @@ public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { initBusinessSiteExecutiveLog(siteExecutiveLog); if (baseMapper.insert(siteExecutiveLog) > 0) { - //加入所用设备绑定 工作前、后信息 - if (ObjectUtil.isNotEmpty(siteExecutiveLog.getEquipmentFixedAssetsDTOList()) && siteExecutiveLog.getEquipmentFixedAssetsDTOList().size() > 0) { - if (StringUtils.isNotEmpty(siteExecutiveLog.getSiteExecutiveId())) - siteExecutiveEquipmentRelationService.updateBySiteExecutiveId(siteExecutiveLog.getId(), siteExecutiveLog.getEquipmentFixedAssetsDTOList()); + //加入所用设备绑定关系 + if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { + siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } return ReturnUtil.success(); } @@ -49,13 +56,46 @@ @Override public ReturnDTO deleteSiteExecutiveLog(Long id) { if (this.baseMapper.deleteById(id) > 0) { - //清除监测设备绑定关系中检测前后信息 -// siteExecutiveEquipmentRelationService.deleteByOriginId(id); + //清除监测设备绑定关系 + siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) { + if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) { + + //加入所用设备绑定修改 + if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { + siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); + } + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) { + BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id); + if (businessSiteExecutiveLog != null) { + //查询是否有关联的监测设备 + businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id)); + } + return businessSiteExecutiveLog; + } + + @Override + public Page siteExecutiveLogListPage(Page page, SiteExecuteLogRequest request) { + // 获取列表 + Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request); + if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) { + + } + return siteExecutiveLogListPage; + } + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { Long maxNo = this.baseMapper.selectMaxCode(); String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java index 9d021c5..247920b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import java.util.List; @@ -17,13 +15,12 @@ */ public interface IBusinessSiteExecutiveEquipmentRelationService extends IService { - boolean saveBatch(Long siteExecutiveId, List equipmentInfoList); + boolean saveBatch(Long siteExecutiveLogId, List siteExecutiveEquipmentRelationList); - List getEquipmentsByExecutiveInfoId(Long siteExecutiveId); + Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId); - Boolean deleteBySiteExecutiveId(Long siteExecutiveId); + Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds); - Boolean deleteBySiteExecutiveIds(List siteExecutiveIds); + List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId); - Boolean updateBySiteExecutiveId (Long siteExecutiveId, List equipmentInfoList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java index 1da43da..5238c18 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java @@ -1,16 +1,26 @@ package com.casic.missiles.service.business; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; + +import java.util.List; /** *

* 服务类 *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ public interface IBusinessSiteExecutiveInfoEquipmentRelationService extends IService { + boolean saveBatch(Long siteExecutiveId, List equipmentInfoList); + + Boolean deleteBySiteExecutiveId(Long siteExecutiveId); + + Boolean deleteBySiteExecutiveIds(List siteExecutiveIds); + + List getEquipmentsByExecutiveInfoId(Long siteExecutiveId); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java index d839754..2084f55 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveLogController.java @@ -2,19 +2,19 @@ import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.page.PageInfoBT; import com.casic.missiles.dto.IdDTO; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; -import com.casic.missiles.dto.business.originRecord.OriginRecordRequest; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; -import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; -import com.casic.missiles.service.business.IBusinessOriginalRecordService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.PostMapping; @@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.util.Objects; @@ -35,43 +34,44 @@ * @author zt * @since 2023-03-25 */ +@Api(tags = "现场检测记录模块") @RestController @RequestMapping("/business/siteExecutive/log") -public class BusinessSiteExecutiveLogController { +public class BusinessSiteExecutiveLogController extends ExportController { @Resource private IBusinessSiteExecutiveLogService siteExecutiveLogService; -// @ApiOperation("现场检测记录表查询") -// @PostMapping("/listPage") -// public ReturnDTO> originalListPage(@RequestBody @Valid OriginRecordRequest request, BindingResult bindingResult) throws Exception { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// Page page = PageFactory.defaultPage(); -// return ReturnUtil.success(super.packForBT(siteExecutiveLogService.originListPage(page, request))); -// } -// -// -// @ApiOperation("现场检测记录表详情") -// @PostMapping("/detail") -// public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(businessOriginalRecordService.originalDetail(idDTO.getId())); -// } -// -// @ApiOperation("现场检测记录表更新") -// @PostMapping("/update") -// public ReturnDTO updateOriginal(@RequestBody @Valid BusinessOriginalRecord businessOriginalRecord, BindingResult bindingResult) { -// Assert.isFalse(Objects.isNull(businessOriginalRecord.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); -// } + @ApiOperation("现场检测记录表查询") + @PostMapping("/listPage") + public ReturnDTO> siteExecuteLogListPage(@RequestBody @Valid SiteExecuteLogRequest request, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + Page page = PageFactory.defaultPage(); + return ReturnUtil.success(super.packForBT(siteExecutiveLogService.siteExecutiveLogListPage(page, request))); + } + + + @ApiOperation("现场检测记录表详情") + @PostMapping("/detail") + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.siteExecutiveLogDetail(idDTO.getId())); + } + + @ApiOperation("现场检测记录表更新") + @PostMapping("/update") + public ReturnDTO updateSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(Objects.isNull(businessSiteExecutiveLog.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.updateSiteExecutiveLog(businessSiteExecutiveLog)); + } @ApiOperation("现场检测记录表新增") @PostMapping("/add") diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java index da37fd6..3701d42 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BusinessSiteExecutiveLogMapper.java @@ -1,7 +1,10 @@ package com.casic.missiles.mapper.business; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; /** @@ -17,4 +20,5 @@ @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") Long selectMaxCode(); + Page siteExecutiveLogListPage(Page page, @Param("request") SiteExecuteLogRequest request); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 7babc7d..fd336aa 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -25,4 +25,24 @@ id, log_no, site_executive_id, contacts, contact_hone, executive_address, output_voltage, zero_ground_voltage, temperature, humidity, remark, is_del, create_time, update_time + + + diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java index f6b2bd6..1915916 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/SiteExecuteLogRequest.java @@ -10,17 +10,14 @@ @ApiModel public class SiteExecuteLogRequest { - @ApiModelProperty(value = "现场检测编号", dataType = "String") - private String siteExecutiveNo; + @ApiModelProperty(value = "记录编号", dataType = "String") + private String logNo; - @ApiModelProperty(value = "委托方名称", dataType = "String") - private String customerName; + @ApiModelProperty(value = "记录人", dataType = "String") + private String recorderName; - @ApiModelProperty(value = "负责人", dataType = "String") - private String directorName; - - @ApiModelProperty(value = "委托书id", dataType = "Long") - private Long id; + @ApiModelProperty(value = "实验室", dataType = "String") + private String laboratoryName; @ApiModelProperty(value = "导出ids(查询不用传)", dataType = "List") private List ids; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java index aca42d8..eaa8d65 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveEquipmentRelation.java @@ -28,6 +28,13 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测记录id", dataType = "Long") + @TableField("site_executive_log_id") + private Long siteExecutiveLogId; + + /** + * 外场检测id + */ @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java index 7c266af..b05af2a 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveInfoEquipmentRelation.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -14,7 +15,7 @@ * *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ @Data @@ -29,12 +30,14 @@ /** * 现场检测审批id */ + @ApiModelProperty(value = "现场检测审批id", dataType = "Long") @TableField("site_executive_info_id") private Long siteExecutiveInfoId; /** * 检测设备id */ + @ApiModelProperty(value = "检测设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java index 828f690..f796007 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveLog.java @@ -3,8 +3,6 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,7 +14,7 @@ * 现场检测记录表 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Data @@ -121,7 +119,36 @@ @TableField("create_user") private Long createUser; + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private String laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") - private List equipmentFixedAssetsDTOList; + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java index 47a2d06..64e11f7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveEquipmentRelationServiceImpl.java @@ -2,11 +2,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; -import com.casic.missiles.dto.flowable.ToBeApprovedDTO; import com.casic.missiles.mapper.business.BusinessSiteExecutiveEquipmentRelationMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; @@ -14,7 +11,6 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; -import java.util.stream.Collectors; /** *

@@ -32,64 +28,47 @@ private IEquipmentFixedAssetsService equipmentFixedAssetsService; @Override - public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + public boolean saveBatch(Long siteExecutiveLogId, List equipmentInfoList) { //先删除所有的绑定关系 - deleteBySiteExecutiveId(siteExecutiveId); + deleteBySiteExecutiveLogId(siteExecutiveLogId); //新写入绑定关系 List list = new ArrayList<>(); equipmentInfoList.forEach(assets -> { BusinessSiteExecutiveEquipmentRelation siteExecutiveEquipmentRelation = new BusinessSiteExecutiveEquipmentRelation(); - siteExecutiveEquipmentRelation.setSiteExecutiveId(siteExecutiveId); + siteExecutiveEquipmentRelation.setSiteExecutiveLogId(siteExecutiveLogId); + siteExecutiveEquipmentRelation.setSiteExecutiveId(assets.getSiteExecutiveId()); siteExecutiveEquipmentRelation.setEquipmentNo(assets.getEquipmentNo()); siteExecutiveEquipmentRelation.setEquipmentId(assets.getId()); + siteExecutiveEquipmentRelation.setBeforeWorkCheck(assets.getBeforeWorkCheck()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderDate(assets.getBeforeWorkRecorderDate()); + siteExecutiveEquipmentRelation.setBeforeWorkRecorderId(assets.getBeforeWorkRecorderId()); + siteExecutiveEquipmentRelation.setAfterWorkCheck(assets.getAfterWorkCheck()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderDate(assets.getAfterWorkRecorderDate()); + siteExecutiveEquipmentRelation.setAfterWorkRecorderId(assets.getAfterWorkRecorderId()); list.add(siteExecutiveEquipmentRelation); }); return this.saveBatch(list); } @Override - public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + public Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_log_id", siteExecutiveLogIds); return this.baseMapper.delete(queryWrapper) > 0 ? true : false; } @Override - public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + public List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId) { QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - List list = this.baseMapper.selectList(queryWrapper); - if (list != null && list.size() > 0) { - return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveEquipmentRelation::getEquipmentId).collect(Collectors.toList())); - } - return null; - } - - @Override - public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.in("site_executive_id", siteExecutiveIds); - return this.baseMapper.delete(queryWrapper) > 0 ? true : false; - } - - @Override - public Boolean updateBySiteExecutiveId(Long siteExecutiveId, List equipmentFixedAssetsDTOList) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("site_executive_id", siteExecutiveId); - queryWrapper.in("equipment_id", equipmentFixedAssetsDTOList.stream().map(EquipmentFixedAssetsDTO::getId).collect(Collectors.toList())); - List list = this.baseMapper.selectList(queryWrapper); - list.forEach(listObj -> { - equipmentFixedAssetsDTOList.forEach(equipmentInfo -> { - if (listObj.getEquipmentId().equals(equipmentInfo.getId())) { - listObj.setBeforeWorkCheck(equipmentInfo.getBeforeWorkCheck()); - listObj.setBeforeWorkRecorderDate(equipmentInfo.getBeforeWorkRecorderDate()); - listObj.setBeforeWorkRecorderId(equipmentInfo.getBeforeWorkRecorderId()); - listObj.setAfterWorkCheck(equipmentInfo.getAfterWorkCheck()); - listObj.setAfterWorkRecorderDate(equipmentInfo.getAfterWorkRecorderDate()); - listObj.setAfterWorkRecorderId(equipmentInfo.getAfterWorkRecorderId()); - } - }); - }); - return this.updateBatchById(list); + queryWrapper.eq("site_executive_log_id", siteExecutiveLogId); + return this.baseMapper.selectList(queryWrapper); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java index f8bd8eb..361b98c 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoEquipmentRelationServiceImpl.java @@ -1,11 +1,20 @@ package com.casic.missiles.service.Impl.business; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; -import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; -import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoEquipmentRelationMapper; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; +import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + /** *

* 服务实现类 @@ -17,4 +26,47 @@ @Service public class BusinessSiteExecutiveInfoEquipmentRelationServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveInfoEquipmentRelationService { + @Resource + private IEquipmentFixedAssetsService equipmentFixedAssetsService; + + @Override + public boolean saveBatch(Long siteExecutiveId, List equipmentInfoList) { + //先删除所有的绑定关系 + deleteBySiteExecutiveId(siteExecutiveId); + //新写入绑定关系 + List list = new ArrayList<>(); + equipmentInfoList.forEach(assets -> { + BusinessSiteExecutiveInfoEquipmentRelation siteExecutiveInfoEquipmentRelation = new BusinessSiteExecutiveInfoEquipmentRelation(); + siteExecutiveInfoEquipmentRelation.setSiteExecutiveInfoId(siteExecutiveId); + siteExecutiveInfoEquipmentRelation.setEquipmentId(assets.getId()); + list.add(siteExecutiveInfoEquipmentRelation); + }); + return this.saveBatch(list); + } + + @Override + public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + + @Override + public Boolean deleteBySiteExecutiveIds(List siteExecutiveIds) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.in("site_executive_info_id", siteExecutiveIds); + return this.baseMapper.delete(queryWrapper) > 0 ? true : false; + } + + @Override + public List getEquipmentsByExecutiveInfoId(Long siteExecutiveId) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("site_executive_info_id", siteExecutiveId); + List list = this.baseMapper.selectList(queryWrapper); + if (list != null && list.size() > 0) { + return equipmentFixedAssetsService.list(list.stream().map(BusinessSiteExecutiveInfoEquipmentRelation::getEquipmentId).collect(Collectors.toList())); + } + return null; + } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 319cbad..48ff287 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -25,7 +25,7 @@ import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.response.ResponseData; import com.casic.missiles.service.IBaseApprovalService; -import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; import com.casic.missiles.service.flowable.ApprovalOperateService; @@ -64,7 +64,7 @@ @Autowired private ApprovalOperateService approvalOperateService; @Autowired - private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + private IBusinessSiteExecutiveInfoEquipmentRelationService siteExecutiveEquipmentRelationService; @Autowired private IBusinessSiteExecutiveStaffRelationService siteExecutiveStaffRelationService; @@ -203,8 +203,8 @@ siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id)); //查询是否有关联的监测设备 siteExecutiveInfo.setEquipmentInfoList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveInfoId(id)); - if(StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())){ - siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE,siteExecutiveInfo.getTaskSource())); + if (StringUtils.isNotEmpty(siteExecutiveInfo.getTaskSource())) { + siteExecutiveInfo.setTaskSourceName(dictService.getDictNameByCode(MeterDictEnum.TASK_SOURCE, siteExecutiveInfo.getTaskSource())); } } return siteExecutiveInfo; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java index 623ae17..bee53cc 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveLogServiceImpl.java @@ -1,22 +1,30 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.PrefixCodeEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper; +import com.casic.missiles.model.business.BusinessOriginalRecord; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.NumberGeneratorUtil; -import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; /** *

@@ -36,10 +44,9 @@ public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { initBusinessSiteExecutiveLog(siteExecutiveLog); if (baseMapper.insert(siteExecutiveLog) > 0) { - //加入所用设备绑定 工作前、后信息 - if (ObjectUtil.isNotEmpty(siteExecutiveLog.getEquipmentFixedAssetsDTOList()) && siteExecutiveLog.getEquipmentFixedAssetsDTOList().size() > 0) { - if (StringUtils.isNotEmpty(siteExecutiveLog.getSiteExecutiveId())) - siteExecutiveEquipmentRelationService.updateBySiteExecutiveId(siteExecutiveLog.getId(), siteExecutiveLog.getEquipmentFixedAssetsDTOList()); + //加入所用设备绑定关系 + if (ObjectUtil.isNotEmpty(siteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && siteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { + siteExecutiveEquipmentRelationService.saveBatch(siteExecutiveLog.getId(), siteExecutiveLog.getSiteExecutiveEquipmentRelationList()); } return ReturnUtil.success(); } @@ -49,13 +56,46 @@ @Override public ReturnDTO deleteSiteExecutiveLog(Long id) { if (this.baseMapper.deleteById(id) > 0) { - //清除监测设备绑定关系中检测前后信息 -// siteExecutiveEquipmentRelationService.deleteByOriginId(id); + //清除监测设备绑定关系 + siteExecutiveEquipmentRelationService.deleteBySiteExecutiveLogId(id); return ReturnUtil.success(); } throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); } + @Override + public ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog) { + if (this.baseMapper.updateById(businessSiteExecutiveLog) > 0) { + + //加入所用设备绑定修改 + if (ObjectUtil.isNotEmpty(businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()) && businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList().size() > 0) { + siteExecutiveEquipmentRelationService.saveBatch(businessSiteExecutiveLog.getId(), businessSiteExecutiveLog.getSiteExecutiveEquipmentRelationList()); + } + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) { + BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id); + if (businessSiteExecutiveLog != null) { + //查询是否有关联的监测设备 + businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id)); + } + return businessSiteExecutiveLog; + } + + @Override + public Page siteExecutiveLogListPage(Page page, SiteExecuteLogRequest request) { + // 获取列表 + Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request); + if (!CollectionUtils.isEmpty(siteExecutiveLogListPage.getRecords())) { + + } + return siteExecutiveLogListPage; + } + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { Long maxNo = this.baseMapper.selectMaxCode(); String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java index 9d021c5..247920b 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveEquipmentRelationService.java @@ -1,9 +1,7 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.service.IService; -import com.casic.missiles.dto.business.siteExecutive.EquipmentFixedAssetsDTO; import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; -import com.casic.missiles.model.equipment.EquipmentFixedAssets; import java.util.List; @@ -17,13 +15,12 @@ */ public interface IBusinessSiteExecutiveEquipmentRelationService extends IService { - boolean saveBatch(Long siteExecutiveId, List equipmentInfoList); + boolean saveBatch(Long siteExecutiveLogId, List siteExecutiveEquipmentRelationList); - List getEquipmentsByExecutiveInfoId(Long siteExecutiveId); + Boolean deleteBySiteExecutiveLogId(Long siteExecutiveLogId); - Boolean deleteBySiteExecutiveId(Long siteExecutiveId); + Boolean deleteBySiteExecutiveLogIds(List siteExecutiveLogIds); - Boolean deleteBySiteExecutiveIds(List siteExecutiveIds); + List getEquipmentsByExecutiveLogId(Long siteExecutiveLogId); - Boolean updateBySiteExecutiveId (Long siteExecutiveId, List equipmentInfoList); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java index 1da43da..5238c18 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveInfoEquipmentRelationService.java @@ -1,16 +1,26 @@ package com.casic.missiles.service.business; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.model.business.BusinessSiteExecutiveInfoEquipmentRelation; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; + +import java.util.List; /** *

* 服务类 *

* - * @author wangpeng + * @author zt * @since 2023-04-03 */ public interface IBusinessSiteExecutiveInfoEquipmentRelationService extends IService { + boolean saveBatch(Long siteExecutiveId, List equipmentInfoList); + + Boolean deleteBySiteExecutiveId(Long siteExecutiveId); + + Boolean deleteBySiteExecutiveIds(List siteExecutiveIds); + + List getEquipmentsByExecutiveInfoId(Long siteExecutiveId); } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java index 9b67162..e5acc79 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/business/IBusinessSiteExecutiveLogService.java @@ -1,7 +1,9 @@ package com.casic.missiles.service.business; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; /** @@ -17,4 +19,10 @@ ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog); ReturnDTO deleteSiteExecutiveLog(Long id); + + ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog); + + BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id); + + Page siteExecutiveLogListPage(Page page, SiteExecuteLogRequest request); }