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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 186526f..aca42d8 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,72 +28,84 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 测量设备id */ + @ApiModelProperty(value = "测量设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; /** * 测量设备编号 */ + @ApiModelProperty(value = "测量设备编号", dataType = "String") @TableField("equipment_no") private String equipmentNo; /** * 测量设备型号 */ + @ApiModelProperty(value = "测量设备型号", dataType = "String") @TableField("equipment_model") private String equipmentModel; /** * 工作开始前外观及功能检查 */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") @TableField("before_work_check") private String beforeWorkCheck; /** * 工作开始前指标测试结果 */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") @TableField("before_work_result") private String beforeWorkResult; /** * 工作开始前记录人-计量人员id */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") @TableField("before_work_recorder_id") private Long beforeWorkRecorderId; /** * 工作开始前记录日期 */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") @TableField("before_work_recorder_date") private String beforeWorkRecorderDate; /** * 工作完成后外观及功能检查 */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") @TableField("after_work_check") private String afterWorkCheck; /** * 工作完成后指标测试结果 */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") @TableField("after_work_result") private String afterWorkResult; /** * 工作完成后记录人-计量人员id */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") @TableField("after_work_recorder_id") private Long afterWorkRecorderId; /** * 工作完成后记录日期 */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") @TableField("after_work_recorder_date") private String afterWorkRecorderDate; 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 186526f..aca42d8 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,72 +28,84 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 测量设备id */ + @ApiModelProperty(value = "测量设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; /** * 测量设备编号 */ + @ApiModelProperty(value = "测量设备编号", dataType = "String") @TableField("equipment_no") private String equipmentNo; /** * 测量设备型号 */ + @ApiModelProperty(value = "测量设备型号", dataType = "String") @TableField("equipment_model") private String equipmentModel; /** * 工作开始前外观及功能检查 */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") @TableField("before_work_check") private String beforeWorkCheck; /** * 工作开始前指标测试结果 */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") @TableField("before_work_result") private String beforeWorkResult; /** * 工作开始前记录人-计量人员id */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") @TableField("before_work_recorder_id") private Long beforeWorkRecorderId; /** * 工作开始前记录日期 */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") @TableField("before_work_recorder_date") private String beforeWorkRecorderDate; /** * 工作完成后外观及功能检查 */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") @TableField("after_work_check") private String afterWorkCheck; /** * 工作完成后指标测试结果 */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") @TableField("after_work_result") private String afterWorkResult; /** * 工作完成后记录人-计量人员id */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") @TableField("after_work_recorder_id") private Long afterWorkRecorderId; /** * 工作完成后记录日期 */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") @TableField("after_work_recorder_date") private String afterWorkRecorderDate; 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 351ee29..828f690 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,9 +3,13 @@ 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; import java.io.Serializable; +import java.util.List; /** *

@@ -27,66 +31,77 @@ /** * 现场检测记录单编号 */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; /** * 现场检测id */ + @ApiModelProperty(value = "现场检测id", dataType = "String") @TableField("site_executive_id") private String siteExecutiveId; /** * 联系人 */ + @ApiModelProperty(value = "联系人", dataType = "String") @TableField("contacts") private String contacts; /** * 电话 */ + @ApiModelProperty(value = "电话", dataType = "String") @TableField("contact_hone") private String contactHone; /** * 现场工作地点 */ + @ApiModelProperty(value = "现场工作地点", dataType = "String") @TableField("executive_address") private String executiveAddress; /** * 输出电压 */ + @ApiModelProperty(value = "输出电压", dataType = "String") @TableField("output_voltage") private String outputVoltage; /** * 零地电压 */ + @ApiModelProperty(value = "零地电压", dataType = "String") @TableField("zero_ground_voltage") private String zeroGroundVoltage; /** * 温度 */ + @ApiModelProperty(value = "温度", dataType = "String") @TableField("temperature") private String temperature; /** * 湿度 */ + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(value = "删除标记", dataType = "String") @TableField("is_del") private String isDel; @@ -102,5 +117,11 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List equipmentFixedAssetsDTOList; } 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 186526f..aca42d8 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,72 +28,84 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 测量设备id */ + @ApiModelProperty(value = "测量设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; /** * 测量设备编号 */ + @ApiModelProperty(value = "测量设备编号", dataType = "String") @TableField("equipment_no") private String equipmentNo; /** * 测量设备型号 */ + @ApiModelProperty(value = "测量设备型号", dataType = "String") @TableField("equipment_model") private String equipmentModel; /** * 工作开始前外观及功能检查 */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") @TableField("before_work_check") private String beforeWorkCheck; /** * 工作开始前指标测试结果 */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") @TableField("before_work_result") private String beforeWorkResult; /** * 工作开始前记录人-计量人员id */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") @TableField("before_work_recorder_id") private Long beforeWorkRecorderId; /** * 工作开始前记录日期 */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") @TableField("before_work_recorder_date") private String beforeWorkRecorderDate; /** * 工作完成后外观及功能检查 */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") @TableField("after_work_check") private String afterWorkCheck; /** * 工作完成后指标测试结果 */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") @TableField("after_work_result") private String afterWorkResult; /** * 工作完成后记录人-计量人员id */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") @TableField("after_work_recorder_id") private Long afterWorkRecorderId; /** * 工作完成后记录日期 */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") @TableField("after_work_recorder_date") private String afterWorkRecorderDate; 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 351ee29..828f690 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,9 +3,13 @@ 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; import java.io.Serializable; +import java.util.List; /** *

@@ -27,66 +31,77 @@ /** * 现场检测记录单编号 */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; /** * 现场检测id */ + @ApiModelProperty(value = "现场检测id", dataType = "String") @TableField("site_executive_id") private String siteExecutiveId; /** * 联系人 */ + @ApiModelProperty(value = "联系人", dataType = "String") @TableField("contacts") private String contacts; /** * 电话 */ + @ApiModelProperty(value = "电话", dataType = "String") @TableField("contact_hone") private String contactHone; /** * 现场工作地点 */ + @ApiModelProperty(value = "现场工作地点", dataType = "String") @TableField("executive_address") private String executiveAddress; /** * 输出电压 */ + @ApiModelProperty(value = "输出电压", dataType = "String") @TableField("output_voltage") private String outputVoltage; /** * 零地电压 */ + @ApiModelProperty(value = "零地电压", dataType = "String") @TableField("zero_ground_voltage") private String zeroGroundVoltage; /** * 温度 */ + @ApiModelProperty(value = "温度", dataType = "String") @TableField("temperature") private String temperature; /** * 湿度 */ + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(value = "删除标记", dataType = "String") @TableField("is_del") private String isDel; @@ -102,5 +117,11 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List equipmentFixedAssetsDTOList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java index 2aff98d..2acfbeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,12 +28,14 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 计量人员id */ + @ApiModelProperty(value = "计量人员id", dataType = "Long") @TableField("staff_id") private Long staffId; 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 186526f..aca42d8 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,72 +28,84 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 测量设备id */ + @ApiModelProperty(value = "测量设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; /** * 测量设备编号 */ + @ApiModelProperty(value = "测量设备编号", dataType = "String") @TableField("equipment_no") private String equipmentNo; /** * 测量设备型号 */ + @ApiModelProperty(value = "测量设备型号", dataType = "String") @TableField("equipment_model") private String equipmentModel; /** * 工作开始前外观及功能检查 */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") @TableField("before_work_check") private String beforeWorkCheck; /** * 工作开始前指标测试结果 */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") @TableField("before_work_result") private String beforeWorkResult; /** * 工作开始前记录人-计量人员id */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") @TableField("before_work_recorder_id") private Long beforeWorkRecorderId; /** * 工作开始前记录日期 */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") @TableField("before_work_recorder_date") private String beforeWorkRecorderDate; /** * 工作完成后外观及功能检查 */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") @TableField("after_work_check") private String afterWorkCheck; /** * 工作完成后指标测试结果 */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") @TableField("after_work_result") private String afterWorkResult; /** * 工作完成后记录人-计量人员id */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") @TableField("after_work_recorder_id") private Long afterWorkRecorderId; /** * 工作完成后记录日期 */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") @TableField("after_work_recorder_date") private String afterWorkRecorderDate; 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 351ee29..828f690 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,9 +3,13 @@ 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; import java.io.Serializable; +import java.util.List; /** *

@@ -27,66 +31,77 @@ /** * 现场检测记录单编号 */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; /** * 现场检测id */ + @ApiModelProperty(value = "现场检测id", dataType = "String") @TableField("site_executive_id") private String siteExecutiveId; /** * 联系人 */ + @ApiModelProperty(value = "联系人", dataType = "String") @TableField("contacts") private String contacts; /** * 电话 */ + @ApiModelProperty(value = "电话", dataType = "String") @TableField("contact_hone") private String contactHone; /** * 现场工作地点 */ + @ApiModelProperty(value = "现场工作地点", dataType = "String") @TableField("executive_address") private String executiveAddress; /** * 输出电压 */ + @ApiModelProperty(value = "输出电压", dataType = "String") @TableField("output_voltage") private String outputVoltage; /** * 零地电压 */ + @ApiModelProperty(value = "零地电压", dataType = "String") @TableField("zero_ground_voltage") private String zeroGroundVoltage; /** * 温度 */ + @ApiModelProperty(value = "温度", dataType = "String") @TableField("temperature") private String temperature; /** * 湿度 */ + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(value = "删除标记", dataType = "String") @TableField("is_del") private String isDel; @@ -102,5 +117,11 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List equipmentFixedAssetsDTOList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java index 2aff98d..2acfbeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,12 +28,14 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 计量人员id */ + @ApiModelProperty(value = "计量人员id", dataType = "Long") @TableField("staff_id") private Long staffId; 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 10759c0..47a2d06 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,6 +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; @@ -45,7 +47,6 @@ return this.saveBatch(list); } - @Override public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -70,4 +71,25 @@ 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); + } } 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 186526f..aca42d8 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,72 +28,84 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 测量设备id */ + @ApiModelProperty(value = "测量设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; /** * 测量设备编号 */ + @ApiModelProperty(value = "测量设备编号", dataType = "String") @TableField("equipment_no") private String equipmentNo; /** * 测量设备型号 */ + @ApiModelProperty(value = "测量设备型号", dataType = "String") @TableField("equipment_model") private String equipmentModel; /** * 工作开始前外观及功能检查 */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") @TableField("before_work_check") private String beforeWorkCheck; /** * 工作开始前指标测试结果 */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") @TableField("before_work_result") private String beforeWorkResult; /** * 工作开始前记录人-计量人员id */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") @TableField("before_work_recorder_id") private Long beforeWorkRecorderId; /** * 工作开始前记录日期 */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") @TableField("before_work_recorder_date") private String beforeWorkRecorderDate; /** * 工作完成后外观及功能检查 */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") @TableField("after_work_check") private String afterWorkCheck; /** * 工作完成后指标测试结果 */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") @TableField("after_work_result") private String afterWorkResult; /** * 工作完成后记录人-计量人员id */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") @TableField("after_work_recorder_id") private Long afterWorkRecorderId; /** * 工作完成后记录日期 */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") @TableField("after_work_recorder_date") private String afterWorkRecorderDate; 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 351ee29..828f690 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,9 +3,13 @@ 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; import java.io.Serializable; +import java.util.List; /** *

@@ -27,66 +31,77 @@ /** * 现场检测记录单编号 */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; /** * 现场检测id */ + @ApiModelProperty(value = "现场检测id", dataType = "String") @TableField("site_executive_id") private String siteExecutiveId; /** * 联系人 */ + @ApiModelProperty(value = "联系人", dataType = "String") @TableField("contacts") private String contacts; /** * 电话 */ + @ApiModelProperty(value = "电话", dataType = "String") @TableField("contact_hone") private String contactHone; /** * 现场工作地点 */ + @ApiModelProperty(value = "现场工作地点", dataType = "String") @TableField("executive_address") private String executiveAddress; /** * 输出电压 */ + @ApiModelProperty(value = "输出电压", dataType = "String") @TableField("output_voltage") private String outputVoltage; /** * 零地电压 */ + @ApiModelProperty(value = "零地电压", dataType = "String") @TableField("zero_ground_voltage") private String zeroGroundVoltage; /** * 温度 */ + @ApiModelProperty(value = "温度", dataType = "String") @TableField("temperature") private String temperature; /** * 湿度 */ + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(value = "删除标记", dataType = "String") @TableField("is_del") private String isDel; @@ -102,5 +117,11 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List equipmentFixedAssetsDTOList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java index 2aff98d..2acfbeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,12 +28,14 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 计量人员id */ + @ApiModelProperty(value = "计量人员id", dataType = "Long") @TableField("staff_id") private Long staffId; 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 10759c0..47a2d06 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,6 +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; @@ -45,7 +47,6 @@ return this.saveBatch(list); } - @Override public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -70,4 +71,25 @@ 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); + } } 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 85b919a..623ae17 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,9 +1,21 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +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.BusinessSiteExecutiveLog; +import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -11,10 +23,46 @@ * 现场检测记录表 服务实现类 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Service public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveLogService { + @Autowired + private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + + @Override + 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()); + } + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO deleteSiteExecutiveLog(Long id) { + if (this.baseMapper.deleteById(id) > 0) { + //清除监测设备绑定关系中检测前后信息 +// siteExecutiveEquipmentRelationService.deleteByOriginId(id); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { + Long maxNo = this.baseMapper.selectMaxCode(); + String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); + AuthUser authUser = ShiroKit.getUser(); + siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setLogNo(originNo); + } + + } 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 186526f..aca42d8 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,72 +28,84 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 测量设备id */ + @ApiModelProperty(value = "测量设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; /** * 测量设备编号 */ + @ApiModelProperty(value = "测量设备编号", dataType = "String") @TableField("equipment_no") private String equipmentNo; /** * 测量设备型号 */ + @ApiModelProperty(value = "测量设备型号", dataType = "String") @TableField("equipment_model") private String equipmentModel; /** * 工作开始前外观及功能检查 */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") @TableField("before_work_check") private String beforeWorkCheck; /** * 工作开始前指标测试结果 */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") @TableField("before_work_result") private String beforeWorkResult; /** * 工作开始前记录人-计量人员id */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") @TableField("before_work_recorder_id") private Long beforeWorkRecorderId; /** * 工作开始前记录日期 */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") @TableField("before_work_recorder_date") private String beforeWorkRecorderDate; /** * 工作完成后外观及功能检查 */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") @TableField("after_work_check") private String afterWorkCheck; /** * 工作完成后指标测试结果 */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") @TableField("after_work_result") private String afterWorkResult; /** * 工作完成后记录人-计量人员id */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") @TableField("after_work_recorder_id") private Long afterWorkRecorderId; /** * 工作完成后记录日期 */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") @TableField("after_work_recorder_date") private String afterWorkRecorderDate; 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 351ee29..828f690 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,9 +3,13 @@ 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; import java.io.Serializable; +import java.util.List; /** *

@@ -27,66 +31,77 @@ /** * 现场检测记录单编号 */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; /** * 现场检测id */ + @ApiModelProperty(value = "现场检测id", dataType = "String") @TableField("site_executive_id") private String siteExecutiveId; /** * 联系人 */ + @ApiModelProperty(value = "联系人", dataType = "String") @TableField("contacts") private String contacts; /** * 电话 */ + @ApiModelProperty(value = "电话", dataType = "String") @TableField("contact_hone") private String contactHone; /** * 现场工作地点 */ + @ApiModelProperty(value = "现场工作地点", dataType = "String") @TableField("executive_address") private String executiveAddress; /** * 输出电压 */ + @ApiModelProperty(value = "输出电压", dataType = "String") @TableField("output_voltage") private String outputVoltage; /** * 零地电压 */ + @ApiModelProperty(value = "零地电压", dataType = "String") @TableField("zero_ground_voltage") private String zeroGroundVoltage; /** * 温度 */ + @ApiModelProperty(value = "温度", dataType = "String") @TableField("temperature") private String temperature; /** * 湿度 */ + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(value = "删除标记", dataType = "String") @TableField("is_del") private String isDel; @@ -102,5 +117,11 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List equipmentFixedAssetsDTOList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java index 2aff98d..2acfbeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,12 +28,14 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 计量人员id */ + @ApiModelProperty(value = "计量人员id", dataType = "Long") @TableField("staff_id") private Long staffId; 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 10759c0..47a2d06 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,6 +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; @@ -45,7 +47,6 @@ return this.saveBatch(list); } - @Override public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -70,4 +71,25 @@ 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); + } } 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 85b919a..623ae17 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,9 +1,21 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +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.BusinessSiteExecutiveLog; +import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -11,10 +23,46 @@ * 现场检测记录表 服务实现类 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Service public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveLogService { + @Autowired + private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + + @Override + 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()); + } + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO deleteSiteExecutiveLog(Long id) { + if (this.baseMapper.deleteById(id) > 0) { + //清除监测设备绑定关系中检测前后信息 +// siteExecutiveEquipmentRelationService.deleteByOriginId(id); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { + Long maxNo = this.baseMapper.selectMaxCode(); + String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); + AuthUser authUser = ShiroKit.getUser(); + siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setLogNo(originNo); + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java index 7869717..ad1cc40 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.business.BusinessSiteExecutiveStaffRelationMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation; import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; @@ -20,7 +19,7 @@ * 外场检测-计量人员关联表 服务实现类 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Service 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 186526f..aca42d8 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,72 +28,84 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 测量设备id */ + @ApiModelProperty(value = "测量设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; /** * 测量设备编号 */ + @ApiModelProperty(value = "测量设备编号", dataType = "String") @TableField("equipment_no") private String equipmentNo; /** * 测量设备型号 */ + @ApiModelProperty(value = "测量设备型号", dataType = "String") @TableField("equipment_model") private String equipmentModel; /** * 工作开始前外观及功能检查 */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") @TableField("before_work_check") private String beforeWorkCheck; /** * 工作开始前指标测试结果 */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") @TableField("before_work_result") private String beforeWorkResult; /** * 工作开始前记录人-计量人员id */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") @TableField("before_work_recorder_id") private Long beforeWorkRecorderId; /** * 工作开始前记录日期 */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") @TableField("before_work_recorder_date") private String beforeWorkRecorderDate; /** * 工作完成后外观及功能检查 */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") @TableField("after_work_check") private String afterWorkCheck; /** * 工作完成后指标测试结果 */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") @TableField("after_work_result") private String afterWorkResult; /** * 工作完成后记录人-计量人员id */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") @TableField("after_work_recorder_id") private Long afterWorkRecorderId; /** * 工作完成后记录日期 */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") @TableField("after_work_recorder_date") private String afterWorkRecorderDate; 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 351ee29..828f690 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,9 +3,13 @@ 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; import java.io.Serializable; +import java.util.List; /** *

@@ -27,66 +31,77 @@ /** * 现场检测记录单编号 */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; /** * 现场检测id */ + @ApiModelProperty(value = "现场检测id", dataType = "String") @TableField("site_executive_id") private String siteExecutiveId; /** * 联系人 */ + @ApiModelProperty(value = "联系人", dataType = "String") @TableField("contacts") private String contacts; /** * 电话 */ + @ApiModelProperty(value = "电话", dataType = "String") @TableField("contact_hone") private String contactHone; /** * 现场工作地点 */ + @ApiModelProperty(value = "现场工作地点", dataType = "String") @TableField("executive_address") private String executiveAddress; /** * 输出电压 */ + @ApiModelProperty(value = "输出电压", dataType = "String") @TableField("output_voltage") private String outputVoltage; /** * 零地电压 */ + @ApiModelProperty(value = "零地电压", dataType = "String") @TableField("zero_ground_voltage") private String zeroGroundVoltage; /** * 温度 */ + @ApiModelProperty(value = "温度", dataType = "String") @TableField("temperature") private String temperature; /** * 湿度 */ + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(value = "删除标记", dataType = "String") @TableField("is_del") private String isDel; @@ -102,5 +117,11 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List equipmentFixedAssetsDTOList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java index 2aff98d..2acfbeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,12 +28,14 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 计量人员id */ + @ApiModelProperty(value = "计量人员id", dataType = "Long") @TableField("staff_id") private Long staffId; 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 10759c0..47a2d06 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,6 +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; @@ -45,7 +47,6 @@ return this.saveBatch(list); } - @Override public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -70,4 +71,25 @@ 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); + } } 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 85b919a..623ae17 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,9 +1,21 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +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.BusinessSiteExecutiveLog; +import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -11,10 +23,46 @@ * 现场检测记录表 服务实现类 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Service public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveLogService { + @Autowired + private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + + @Override + 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()); + } + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO deleteSiteExecutiveLog(Long id) { + if (this.baseMapper.deleteById(id) > 0) { + //清除监测设备绑定关系中检测前后信息 +// siteExecutiveEquipmentRelationService.deleteByOriginId(id); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { + Long maxNo = this.baseMapper.selectMaxCode(); + String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); + AuthUser authUser = ShiroKit.getUser(); + siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setLogNo(originNo); + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java index 7869717..ad1cc40 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.business.BusinessSiteExecutiveStaffRelationMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation; import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; @@ -20,7 +19,7 @@ * 外场检测-计量人员关联表 服务实现类 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Service 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 aa58548..9d021c5 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,6 +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; @@ -23,4 +24,6 @@ Boolean deleteBySiteExecutiveId(Long siteExecutiveId); Boolean deleteBySiteExecutiveIds(List siteExecutiveIds); + + 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 79d3d6f..d839754 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 @@ -73,23 +73,23 @@ // return ReturnUtil.success(businessOriginalRecordService.updateOriginal(businessOriginalRecord)); // } -// @ApiOperation("现场检测记录表新增") -// @PostMapping("/add") -// public ReturnDTO addOriginal(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { -// Assert.isFalse(bindingResult.hasErrors(), () -> { -// throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); -// }); -// return ReturnUtil.success(siteExecutiveLogService.addOriginal(businessSiteExecutiveLog)); -// } + @ApiOperation("现场检测记录表新增") + @PostMapping("/add") + public ReturnDTO addSiteExecutiveLog(@RequestBody @Valid BusinessSiteExecutiveLog businessSiteExecutiveLog, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ReturnUtil.success(siteExecutiveLogService.addSiteExecutiveLog(businessSiteExecutiveLog)); + } -// @ApiOperation("现场检测记录表删除") -// @PostMapping("/delete") -// public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { -// Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { -// throw new BusinessException(BusinessExceptionEnum.ID_NULL); -// }); -// return ReturnUtil.success(siteExecutiveLogService.deleteOriginal(idDTO.getId())); -// } + @ApiOperation("现场检测记录表删除") + @PostMapping("/delete") + public ReturnDTO deleteOriginal(@RequestBody @Valid IdDTO idDTO) { + Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { + throw new BusinessException(BusinessExceptionEnum.ID_NULL); + }); + return ReturnUtil.success(siteExecutiveLogService.deleteSiteExecutiveLog(idDTO.getId())); + } // // @ApiOperation("现场检测记录表导出") // @PostMapping("/export") diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java index c817d6a..a7f20b8 100644 --- a/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/PrefixCodeEnum.java @@ -53,5 +53,7 @@ String OUTSOURCE_PROJECT_PREFIX = "fbxm"; //现场检测 String SITE_EXECUTIVE_PREFIX = "xcjc"; + //现场登记 + String SITE_EXECUTIVE_LOG_PREFIX = "xcdj"; } 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 fcccbc7..da37fd6 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 @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import org.apache.ibatis.annotations.Select; /** *

@@ -13,4 +14,7 @@ */ public interface BusinessSiteExecutiveLogMapper extends BaseMapper { + @Select("SELECT IFNULL(max(RIGHT(log_no, 12)), 0) from business_site_executive_log") + Long selectMaxCode(); + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java new file mode 100644 index 0000000..4bbe0b0 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/EquipmentFixedAssetsDTO.java @@ -0,0 +1,110 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.alibaba.excel.annotation.ExcelProperty; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + *

+ * + *

+ * + * @author zt + * @since 2023-3-07 + */ + +@ApiModel +@Data +public class EquipmentFixedAssetsDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long", required = true) + private Long id; + + /** + * 资产编号 + */ + @ExcelProperty("固定资产编号") + @ApiModelProperty(value = "资产编号", dataType = "String", required = true) + private String assetNo; + + /** + * 设备编号 + */ + @ApiModelProperty(value = "设备编号", dataType = "String", required = true) + private String equipmentNo; + + /** + * 设备名称 + */ + @ExcelProperty("设备名称") + @ApiModelProperty(value = "设备名称", dataType = "String", required = true) + private String equipmentName; + + + /** + * 型号 + */ + @ExcelProperty("型号") + @NotBlank(message = "型号不能为空") + @ApiModelProperty(value = "型号", dataType = "String", required = true) + private String modelNo; + + /** + * 工作开始前外观及功能检查 + */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") + private String beforeWorkCheck; + + /** + * 工作开始前指标测试结果 + */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") + private String beforeWorkResult; + + /** + * 工作开始前记录人-计量人员id + */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") + private Long beforeWorkRecorderId; + + /** + * 工作开始前记录日期 + */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") + private String beforeWorkRecorderDate; + + /** + * 工作完成后外观及功能检查 + */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") + private String afterWorkCheck; + + /** + * 工作完成后指标测试结果 + */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") + private String afterWorkResult; + + /** + * 工作完成后记录人-计量人员id + */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") + private Long afterWorkRecorderId; + + /** + * 工作完成后记录日期 + */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") + private String afterWorkRecorderDate; + + +} 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 186526f..aca42d8 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,72 +28,84 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 测量设备id */ + @ApiModelProperty(value = "测量设备id", dataType = "Long") @TableField("equipment_id") private Long equipmentId; /** * 测量设备编号 */ + @ApiModelProperty(value = "测量设备编号", dataType = "String") @TableField("equipment_no") private String equipmentNo; /** * 测量设备型号 */ + @ApiModelProperty(value = "测量设备型号", dataType = "String") @TableField("equipment_model") private String equipmentModel; /** * 工作开始前外观及功能检查 */ + @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") @TableField("before_work_check") private String beforeWorkCheck; /** * 工作开始前指标测试结果 */ + @ApiModelProperty(value = "工作开始前指标测试结果", dataType = "String") @TableField("before_work_result") private String beforeWorkResult; /** * 工作开始前记录人-计量人员id */ + @ApiModelProperty(value = "工作开始前记录人-计量人员id", dataType = "Long") @TableField("before_work_recorder_id") private Long beforeWorkRecorderId; /** * 工作开始前记录日期 */ + @ApiModelProperty(value = "工作开始前记录日期", dataType = "String") @TableField("before_work_recorder_date") private String beforeWorkRecorderDate; /** * 工作完成后外观及功能检查 */ + @ApiModelProperty(value = "工作完成后外观及功能检查", dataType = "String") @TableField("after_work_check") private String afterWorkCheck; /** * 工作完成后指标测试结果 */ + @ApiModelProperty(value = "工作完成后指标测试结果", dataType = "String") @TableField("after_work_result") private String afterWorkResult; /** * 工作完成后记录人-计量人员id */ + @ApiModelProperty(value = "工作完成后记录人-计量人员id", dataType = "Long") @TableField("after_work_recorder_id") private Long afterWorkRecorderId; /** * 工作完成后记录日期 */ + @ApiModelProperty(value = "工作完成后记录日期", dataType = "String") @TableField("after_work_recorder_date") private String afterWorkRecorderDate; 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 351ee29..828f690 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,9 +3,13 @@ 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; import java.io.Serializable; +import java.util.List; /** *

@@ -27,66 +31,77 @@ /** * 现场检测记录单编号 */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; /** * 现场检测id */ + @ApiModelProperty(value = "现场检测id", dataType = "String") @TableField("site_executive_id") private String siteExecutiveId; /** * 联系人 */ + @ApiModelProperty(value = "联系人", dataType = "String") @TableField("contacts") private String contacts; /** * 电话 */ + @ApiModelProperty(value = "电话", dataType = "String") @TableField("contact_hone") private String contactHone; /** * 现场工作地点 */ + @ApiModelProperty(value = "现场工作地点", dataType = "String") @TableField("executive_address") private String executiveAddress; /** * 输出电压 */ + @ApiModelProperty(value = "输出电压", dataType = "String") @TableField("output_voltage") private String outputVoltage; /** * 零地电压 */ + @ApiModelProperty(value = "零地电压", dataType = "String") @TableField("zero_ground_voltage") private String zeroGroundVoltage; /** * 温度 */ + @ApiModelProperty(value = "温度", dataType = "String") @TableField("temperature") private String temperature; /** * 湿度 */ + @ApiModelProperty(value = "湿度", dataType = "String") @TableField("humidity") private String humidity; /** * 备注 */ + @ApiModelProperty(value = "备注", dataType = "String") @TableField("remark") private String remark; /** * 删除标记 */ + @ApiModelProperty(value = "删除标记", dataType = "String") @TableField("is_del") private String isDel; @@ -102,5 +117,11 @@ @TableField("update_time") private String updateTime; + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List equipmentFixedAssetsDTOList; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java index 2aff98d..2acfbeb 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BusinessSiteExecutiveStaffRelation.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.io.Serializable; @@ -27,12 +28,14 @@ /** * 外场检测id */ + @ApiModelProperty(value = "外场检测id", dataType = "Long") @TableField("site_executive_id") private Long siteExecutiveId; /** * 计量人员id */ + @ApiModelProperty(value = "计量人员id", dataType = "Long") @TableField("staff_id") private Long staffId; 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 10759c0..47a2d06 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,6 +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; @@ -45,7 +47,6 @@ return this.saveBatch(list); } - @Override public Boolean deleteBySiteExecutiveId(Long siteExecutiveId) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -70,4 +71,25 @@ 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); + } } 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 85b919a..623ae17 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,9 +1,21 @@ package com.casic.missiles.service.Impl.business; +import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.core.shiro.ShiroKit; +import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.ReturnUtil; +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.BusinessSiteExecutiveLog; +import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.utils.NumberGeneratorUtil; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** @@ -11,10 +23,46 @@ * 现场检测记录表 服务实现类 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Service public class BusinessSiteExecutiveLogServiceImpl extends ServiceImpl implements IBusinessSiteExecutiveLogService { + @Autowired + private IBusinessSiteExecutiveEquipmentRelationService siteExecutiveEquipmentRelationService; + + @Override + 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()); + } + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + @Override + public ReturnDTO deleteSiteExecutiveLog(Long id) { + if (this.baseMapper.deleteById(id) > 0) { + //清除监测设备绑定关系中检测前后信息 +// siteExecutiveEquipmentRelationService.deleteByOriginId(id); + return ReturnUtil.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { + Long maxNo = this.baseMapper.selectMaxCode(); + String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); + AuthUser authUser = ShiroKit.getUser(); + siteExecutiveLog.setCreateUser(authUser.getId()); + siteExecutiveLog.setLogNo(originNo); + } + + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java index 7869717..ad1cc40 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveStaffRelationServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.mapper.business.BusinessSiteExecutiveStaffRelationMapper; import com.casic.missiles.mapper.meter.MeterStaffMapper; -import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; import com.casic.missiles.model.business.BusinessSiteExecutiveStaffRelation; import com.casic.missiles.model.meter.MeterStaff; import com.casic.missiles.service.business.IBusinessSiteExecutiveStaffRelationService; @@ -20,7 +19,7 @@ * 外场检测-计量人员关联表 服务实现类 *

* - * @author wangpeng + * @author zt * @since 2023-03-23 */ @Service 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 aa58548..9d021c5 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,6 +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; @@ -23,4 +24,6 @@ Boolean deleteBySiteExecutiveId(Long siteExecutiveId); Boolean deleteBySiteExecutiveIds(List siteExecutiveIds); + + Boolean updateBySiteExecutiveId (Long siteExecutiveId, List equipmentInfoList); } 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 3902009..9b67162 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,6 +1,7 @@ package com.casic.missiles.service.business; import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; /** @@ -13,4 +14,7 @@ */ public interface IBusinessSiteExecutiveLogService extends IService { + ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog); + + ReturnDTO deleteSiteExecutiveLog(Long id); }