diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") 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 183f5af..59af42c 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 @@ -55,7 +55,7 @@ @ApiOperation("现场检测记录表详情") @PostMapping("/detail") - public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") 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 183f5af..59af42c 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 @@ -55,7 +55,7 @@ @ApiOperation("现场检测记录表详情") @PostMapping("/detail") - public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 6027f35..b0d6d83 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,10 +27,14 @@ diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") 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 183f5af..59af42c 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 @@ -55,7 +55,7 @@ @ApiOperation("现场检测记录表详情") @PostMapping("/detail") - public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 6027f35..b0d6d83 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,10 +27,14 @@ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java new file mode 100644 index 0000000..1a1ca66 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -0,0 +1,188 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 现场检测记录表 + *

+ * + * @author zt + * @since 2023-03-23 + */ +@Data +@TableName("business_site_executive_log") +public class BusinessSiteExecutiveLogDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 现场检测记录单编号 + */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测id", dataType = "String") + @TableField("site_executive_id") + private String siteExecutiveId; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** + * 联系人 + */ + @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("print_file_name") + private String printFileName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(value = "删除标记", dataType = "String") + @TableField("is_del") + private String isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + + @ApiModelProperty(value = "委托方地址", dataType = "String") + private String CustomerAddress; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "委托方手机", dataType = "String") + private String customerPhone; + + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + + @ApiModelProperty(value = "委托方编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托书编号", dataType = "String") + private String orderCode; + + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private Long laboratoryId; + + + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; +} diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") 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 183f5af..59af42c 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 @@ -55,7 +55,7 @@ @ApiOperation("现场检测记录表详情") @PostMapping("/detail") - public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 6027f35..b0d6d83 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,10 +27,14 @@ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java new file mode 100644 index 0000000..1a1ca66 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -0,0 +1,188 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 现场检测记录表 + *

+ * + * @author zt + * @since 2023-03-23 + */ +@Data +@TableName("business_site_executive_log") +public class BusinessSiteExecutiveLogDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 现场检测记录单编号 + */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测id", dataType = "String") + @TableField("site_executive_id") + private String siteExecutiveId; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** + * 联系人 + */ + @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("print_file_name") + private String printFileName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(value = "删除标记", dataType = "String") + @TableField("is_del") + private String isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + + @ApiModelProperty(value = "委托方地址", dataType = "String") + private String CustomerAddress; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "委托方手机", dataType = "String") + private String customerPhone; + + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + + @ApiModelProperty(value = "委托方编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托书编号", dataType = "String") + private String orderCode; + + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private Long laboratoryId; + + + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; +} diff --git a/casic-metering-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 eaa8d65..393eebc 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 @@ -47,6 +47,13 @@ private Long equipmentId; /** + * 测量设备id + */ + @ApiModelProperty(value = "测量设备名称", dataType = "Long") + @TableField(exist = false) + private String equipmentName; + + /** * 测量设备编号 */ @ApiModelProperty(value = "测量设备编号", dataType = "String") @@ -61,6 +68,13 @@ private String equipmentModel; /** + * 测量设备型号 + */ + @ApiModelProperty(value = "测量设备型号名称", dataType = "String") + @TableField(exist = false) + private String equipmentModelName; + + /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") 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 183f5af..59af42c 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 @@ -55,7 +55,7 @@ @ApiOperation("现场检测记录表详情") @PostMapping("/detail") - public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 6027f35..b0d6d83 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,10 +27,14 @@ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java new file mode 100644 index 0000000..1a1ca66 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -0,0 +1,188 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 现场检测记录表 + *

+ * + * @author zt + * @since 2023-03-23 + */ +@Data +@TableName("business_site_executive_log") +public class BusinessSiteExecutiveLogDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 现场检测记录单编号 + */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测id", dataType = "String") + @TableField("site_executive_id") + private String siteExecutiveId; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** + * 联系人 + */ + @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("print_file_name") + private String printFileName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(value = "删除标记", dataType = "String") + @TableField("is_del") + private String isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + + @ApiModelProperty(value = "委托方地址", dataType = "String") + private String CustomerAddress; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "委托方手机", dataType = "String") + private String customerPhone; + + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + + @ApiModelProperty(value = "委托方编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托书编号", dataType = "String") + private String orderCode; + + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private Long laboratoryId; + + + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; +} diff --git a/casic-metering-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 eaa8d65..393eebc 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 @@ -47,6 +47,13 @@ private Long equipmentId; /** + * 测量设备id + */ + @ApiModelProperty(value = "测量设备名称", dataType = "Long") + @TableField(exist = false) + private String equipmentName; + + /** * 测量设备编号 */ @ApiModelProperty(value = "测量设备编号", dataType = "String") @@ -61,6 +68,13 @@ private String equipmentModel; /** + * 测量设备型号 + */ + @ApiModelProperty(value = "测量设备型号名称", dataType = "String") + @TableField(exist = false) + private String equipmentModelName; + + /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") 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 58a7cac..ece0d75 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 @@ -1,5 +1,12 @@ package com.casic.missiles.model.business; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,6 +24,11 @@ * @author zt * @since 2023-03-23 */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @TableName("business_site_executive_log") public class BusinessSiteExecutiveLog implements Serializable { @@ -29,6 +41,7 @@ /** * 现场检测记录单编号 */ + @ExcelProperty("现场检测记录单编号") @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; @@ -41,6 +54,13 @@ private String siteExecutiveId; /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** * 联系人 */ @ApiModelProperty(value = "联系人", dataType = "String") @@ -58,6 +78,7 @@ * 现场工作地点 */ @ApiModelProperty(value = "现场工作地点", dataType = "String") + @ExcelProperty("现场工作地点") @TableField("executive_address") private String executiveAddress; @@ -114,6 +135,7 @@ * 创建时间 */ @TableField("create_time") + @ExcelProperty("创建时间") private String createTime; /** @@ -123,6 +145,7 @@ private String updateTime; @ApiModelProperty(hidden = true) + @TableField("create_user") private Long createUser; @@ -147,15 +170,18 @@ @TableField("laboratory_id") private Long laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") private List siteExecutiveEquipmentRelationList; @TableField(exist = false) @ApiModelProperty(value = "记录人名称", dataType = "String") + @ExcelProperty("记录人") private String recorderName; @TableField(exist = false) @ApiModelProperty(value = "实验室名称", dataType = "String") + @ExcelProperty("专业组") private String laboratoryName; } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") 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 183f5af..59af42c 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 @@ -55,7 +55,7 @@ @ApiOperation("现场检测记录表详情") @PostMapping("/detail") - public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 6027f35..b0d6d83 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,10 +27,14 @@ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java new file mode 100644 index 0000000..1a1ca66 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -0,0 +1,188 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 现场检测记录表 + *

+ * + * @author zt + * @since 2023-03-23 + */ +@Data +@TableName("business_site_executive_log") +public class BusinessSiteExecutiveLogDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 现场检测记录单编号 + */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测id", dataType = "String") + @TableField("site_executive_id") + private String siteExecutiveId; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** + * 联系人 + */ + @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("print_file_name") + private String printFileName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(value = "删除标记", dataType = "String") + @TableField("is_del") + private String isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + + @ApiModelProperty(value = "委托方地址", dataType = "String") + private String CustomerAddress; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "委托方手机", dataType = "String") + private String customerPhone; + + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + + @ApiModelProperty(value = "委托方编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托书编号", dataType = "String") + private String orderCode; + + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private Long laboratoryId; + + + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; +} diff --git a/casic-metering-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 eaa8d65..393eebc 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 @@ -47,6 +47,13 @@ private Long equipmentId; /** + * 测量设备id + */ + @ApiModelProperty(value = "测量设备名称", dataType = "Long") + @TableField(exist = false) + private String equipmentName; + + /** * 测量设备编号 */ @ApiModelProperty(value = "测量设备编号", dataType = "String") @@ -61,6 +68,13 @@ private String equipmentModel; /** + * 测量设备型号 + */ + @ApiModelProperty(value = "测量设备型号名称", dataType = "String") + @TableField(exist = false) + private String equipmentModelName; + + /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") 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 58a7cac..ece0d75 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 @@ -1,5 +1,12 @@ package com.casic.missiles.model.business; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,6 +24,11 @@ * @author zt * @since 2023-03-23 */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @TableName("business_site_executive_log") public class BusinessSiteExecutiveLog implements Serializable { @@ -29,6 +41,7 @@ /** * 现场检测记录单编号 */ + @ExcelProperty("现场检测记录单编号") @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; @@ -41,6 +54,13 @@ private String siteExecutiveId; /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** * 联系人 */ @ApiModelProperty(value = "联系人", dataType = "String") @@ -58,6 +78,7 @@ * 现场工作地点 */ @ApiModelProperty(value = "现场工作地点", dataType = "String") + @ExcelProperty("现场工作地点") @TableField("executive_address") private String executiveAddress; @@ -114,6 +135,7 @@ * 创建时间 */ @TableField("create_time") + @ExcelProperty("创建时间") private String createTime; /** @@ -123,6 +145,7 @@ private String updateTime; @ApiModelProperty(hidden = true) + @TableField("create_user") private Long createUser; @@ -147,15 +170,18 @@ @TableField("laboratory_id") private Long laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") private List siteExecutiveEquipmentRelationList; @TableField(exist = false) @ApiModelProperty(value = "记录人名称", dataType = "String") + @ExcelProperty("记录人") private String recorderName; @TableField(exist = false) @ApiModelProperty(value = "实验室名称", dataType = "String") + @ExcelProperty("专业组") private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 2ba58e2..56003d1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -27,6 +27,7 @@ import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IUserService; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; @@ -63,6 +64,8 @@ private IBaseApprovalService baseApprovalService; @Resource private AbstractDictService dictService; + @Autowired + private IUserService userService; @Resource private RuntimeService runtimeService; @Autowired @@ -195,17 +198,19 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.DRAFT); + if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getDirectorId())) { + siteExecutiveInfo.setDirectorName(userService.getById(siteExecutiveInfo.getDirectorId()).getName()); + } siteExecutiveInfo.setCreateUser(authUser.getId()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } @Override - public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception { + public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) throws Exception { BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail(); BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id); if (siteExecutiveInfo != null) { - //查询是否有关联的检测人员 siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id)); //查询是否有关联的监测设备 @@ -215,15 +220,15 @@ } } businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class); - BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId()); - populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder); + BusinessOrder businessOrder = orderService.orderDetail(businessSiteExecutiveDetail.getOrderId()); + populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail, businessOrder); for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) { DictCodeUtils.convertDictCodeToName(equipmentFixedAssets); } return businessSiteExecutiveDetail; } - private void populateBusinessSiteExecutiveDetail(BusinessSiteExecutiveDetail businessSiteExecutiveDetail,BusinessOrder businessOrder){ + private void populateBusinessSiteExecutiveDetail(BusinessSiteExecutiveDetail businessSiteExecutiveDetail, BusinessOrder businessOrder) { businessSiteExecutiveDetail.setCustomerAddress(businessOrder.getCustomerAddress()); businessSiteExecutiveDetail.setCustomerName(businessOrder.getCustomerName()); businessSiteExecutiveDetail.setCustomerPhone(businessOrder.getCustomerPhone()); @@ -323,7 +328,7 @@ return approvalList; } - private List handleApprovalListResponse(List approvalList, String status) { + private List handleApprovalListResponse(List approvalList, String status) { // approvalList = ConvertUtils.sourceToTarget(list, SiteExecutiveApprovalListResponse.class); approvalList.stream().forEach(result -> { //审批状态两种获取方式:1、在此处设置,2、在flowable中设置业务状态,暂采取1 @@ -332,7 +337,7 @@ return approvalList; } - private List handleAllApprovalListResponse(List approvalList,List allApproveList) { + private List handleAllApprovalListResponse(List approvalList, List allApproveList) { Map taskMap = new HashMap<>(); // approvalList = ConvertUtils.sourceToTarget(list, SiteExecutiveApprovalListResponse.class); allApproveList.forEach(allApprove -> { diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") 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 183f5af..59af42c 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 @@ -55,7 +55,7 @@ @ApiOperation("现场检测记录表详情") @PostMapping("/detail") - public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 6027f35..b0d6d83 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,10 +27,14 @@ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java new file mode 100644 index 0000000..1a1ca66 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -0,0 +1,188 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 现场检测记录表 + *

+ * + * @author zt + * @since 2023-03-23 + */ +@Data +@TableName("business_site_executive_log") +public class BusinessSiteExecutiveLogDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 现场检测记录单编号 + */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测id", dataType = "String") + @TableField("site_executive_id") + private String siteExecutiveId; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** + * 联系人 + */ + @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("print_file_name") + private String printFileName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(value = "删除标记", dataType = "String") + @TableField("is_del") + private String isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + + @ApiModelProperty(value = "委托方地址", dataType = "String") + private String CustomerAddress; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "委托方手机", dataType = "String") + private String customerPhone; + + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + + @ApiModelProperty(value = "委托方编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托书编号", dataType = "String") + private String orderCode; + + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private Long laboratoryId; + + + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; +} diff --git a/casic-metering-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 eaa8d65..393eebc 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 @@ -47,6 +47,13 @@ private Long equipmentId; /** + * 测量设备id + */ + @ApiModelProperty(value = "测量设备名称", dataType = "Long") + @TableField(exist = false) + private String equipmentName; + + /** * 测量设备编号 */ @ApiModelProperty(value = "测量设备编号", dataType = "String") @@ -61,6 +68,13 @@ private String equipmentModel; /** + * 测量设备型号 + */ + @ApiModelProperty(value = "测量设备型号名称", dataType = "String") + @TableField(exist = false) + private String equipmentModelName; + + /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") 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 58a7cac..ece0d75 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 @@ -1,5 +1,12 @@ package com.casic.missiles.model.business; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,6 +24,11 @@ * @author zt * @since 2023-03-23 */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @TableName("business_site_executive_log") public class BusinessSiteExecutiveLog implements Serializable { @@ -29,6 +41,7 @@ /** * 现场检测记录单编号 */ + @ExcelProperty("现场检测记录单编号") @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; @@ -41,6 +54,13 @@ private String siteExecutiveId; /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** * 联系人 */ @ApiModelProperty(value = "联系人", dataType = "String") @@ -58,6 +78,7 @@ * 现场工作地点 */ @ApiModelProperty(value = "现场工作地点", dataType = "String") + @ExcelProperty("现场工作地点") @TableField("executive_address") private String executiveAddress; @@ -114,6 +135,7 @@ * 创建时间 */ @TableField("create_time") + @ExcelProperty("创建时间") private String createTime; /** @@ -123,6 +145,7 @@ private String updateTime; @ApiModelProperty(hidden = true) + @TableField("create_user") private Long createUser; @@ -147,15 +170,18 @@ @TableField("laboratory_id") private Long laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") private List siteExecutiveEquipmentRelationList; @TableField(exist = false) @ApiModelProperty(value = "记录人名称", dataType = "String") + @ExcelProperty("记录人") private String recorderName; @TableField(exist = false) @ApiModelProperty(value = "实验室名称", dataType = "String") + @ExcelProperty("专业组") private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 2ba58e2..56003d1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -27,6 +27,7 @@ import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IUserService; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; @@ -63,6 +64,8 @@ private IBaseApprovalService baseApprovalService; @Resource private AbstractDictService dictService; + @Autowired + private IUserService userService; @Resource private RuntimeService runtimeService; @Autowired @@ -195,17 +198,19 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.DRAFT); + if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getDirectorId())) { + siteExecutiveInfo.setDirectorName(userService.getById(siteExecutiveInfo.getDirectorId()).getName()); + } siteExecutiveInfo.setCreateUser(authUser.getId()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } @Override - public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception { + public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) throws Exception { BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail(); BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id); if (siteExecutiveInfo != null) { - //查询是否有关联的检测人员 siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id)); //查询是否有关联的监测设备 @@ -215,15 +220,15 @@ } } businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class); - BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId()); - populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder); + BusinessOrder businessOrder = orderService.orderDetail(businessSiteExecutiveDetail.getOrderId()); + populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail, businessOrder); for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) { DictCodeUtils.convertDictCodeToName(equipmentFixedAssets); } return businessSiteExecutiveDetail; } - private void populateBusinessSiteExecutiveDetail(BusinessSiteExecutiveDetail businessSiteExecutiveDetail,BusinessOrder businessOrder){ + private void populateBusinessSiteExecutiveDetail(BusinessSiteExecutiveDetail businessSiteExecutiveDetail, BusinessOrder businessOrder) { businessSiteExecutiveDetail.setCustomerAddress(businessOrder.getCustomerAddress()); businessSiteExecutiveDetail.setCustomerName(businessOrder.getCustomerName()); businessSiteExecutiveDetail.setCustomerPhone(businessOrder.getCustomerPhone()); @@ -323,7 +328,7 @@ return approvalList; } - private List handleApprovalListResponse(List approvalList, String status) { + private List handleApprovalListResponse(List approvalList, String status) { // approvalList = ConvertUtils.sourceToTarget(list, SiteExecutiveApprovalListResponse.class); approvalList.stream().forEach(result -> { //审批状态两种获取方式:1、在此处设置,2、在flowable中设置业务状态,暂采取1 @@ -332,7 +337,7 @@ return approvalList; } - private List handleAllApprovalListResponse(List approvalList,List allApproveList) { + private List handleAllApprovalListResponse(List approvalList, List allApproveList) { Map taskMap = new HashMap<>(); // approvalList = ConvertUtils.sourceToTarget(list, SiteExecutiveApprovalListResponse.class); allApproveList.forEach(allApprove -> { 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 869ad37..45f825d 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 @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; @@ -13,6 +14,8 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.siteExecutive.BusinessSiteExecutiveDetail; +import com.casic.missiles.dto.business.siteExecutive.BusinessSiteExecutiveLogDetail; import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; @@ -20,19 +23,19 @@ import com.casic.missiles.enums.business.FilePrintTypeEnum; import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper; import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper; -import com.casic.missiles.model.business.BusinessOriginalRecord; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; -import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import com.casic.missiles.model.business.*; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.MinioUtil; -import com.casic.missiles.utils.NumberGeneratorUtil; -import com.casic.missiles.utils.SpringContextUtil; +import com.casic.missiles.utils.*; import lombok.extern.slf4j.Slf4j; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.omg.CORBA.PUBLIC_MEMBER; @@ -44,8 +47,10 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** *

@@ -65,6 +70,13 @@ private MinioUtil minioUtill; @Autowired private IBaseExportService iBaseExportService; + @Autowired + private IEquipmentFixedAssetsService equipmentFixedAssetsService; + @Autowired + private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IBusinessOrderService orderService; + @Override public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { @@ -113,13 +125,26 @@ } @Override - public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) { + public BusinessSiteExecutiveLogDetail siteExecutiveLogDetail(Long id) throws Exception { BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id); - if (businessSiteExecutiveLog != null) { + BusinessSiteExecutiveLogDetail businessSiteExecutiveLogDetail = ConvertUtils.sourceToTarget(businessSiteExecutiveLog, BusinessSiteExecutiveLogDetail.class); + if (businessSiteExecutiveLogDetail != null) { + BusinessSiteExecutiveInfo businessSiteExecutiveInfo = siteExecutiveInfoService.getById(businessSiteExecutiveLogDetail.getSiteExecutiveId()); + BusinessOrder businessOrder = orderService.getById(businessSiteExecutiveInfo.getOrderId()); + populateBusinessSiteExecutiveLogDetail(businessOrder, businessSiteExecutiveLogDetail); //查询是否有关联的监测设备 - businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id)); + List businessSiteExecutiveEquipments = siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id); + List equipmentFixedAssets = equipmentFixedAssetsService.list(); + Map equipmentFixedAssetMap = equipmentFixedAssets.stream().collect( + Collectors.toMap(EquipmentFixedAssets::getId, EquipmentFixedAssets::getEquipmentName) + ); + for (BusinessSiteExecutiveEquipmentRelation siteExecutiveLog : businessSiteExecutiveEquipments) { + DictCodeUtils.convertDictCodeToName(siteExecutiveLog); + siteExecutiveLog.setEquipmentName(equipmentFixedAssetMap.get(siteExecutiveLog.getEquipmentId())); + } + businessSiteExecutiveLogDetail.setSiteExecutiveEquipmentRelationList(businessSiteExecutiveEquipments); } - return businessSiteExecutiveLog; + return businessSiteExecutiveLogDetail; } @Override @@ -136,27 +161,37 @@ public void exportExecuteLog(SiteExecuteLogRequest request, HttpServletResponse response) { try { Page page = PageFactory.defaultPage(); - List siteExecutiveLogList=new ArrayList<>(); - if(CollectionUtils.isEmpty(request.getIds())){ + List siteExecutiveLogList = new ArrayList<>(); + if (CollectionUtils.isEmpty(request.getIds())) { page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); // 获取列表 - Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request); - siteExecutiveLogList=siteExecutiveLogListPage.getRecords(); - }else { - siteExecutiveLogList=this.listByIds(request.getIds()); + Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request); + siteExecutiveLogList = siteExecutiveLogListPage.getRecords(); + } else { + siteExecutiveLogList = this.listByIds(request.getIds()); } - for (BusinessSiteExecutiveLog siteExecutiveLog :siteExecutiveLogList) { + for (BusinessSiteExecutiveLog siteExecutiveLog : siteExecutiveLogList) { DictCodeUtils.convertDictCodeToName(siteExecutiveLog); } - iBaseExportService.exportExcel(response, BusinessSiteExecutiveLog.class,siteExecutiveLogList, ExportEnum.ENVIRONMENTAL_RECORD.getSheetName()); + iBaseExportService.exportExcel(response, BusinessSiteExecutiveLog.class, siteExecutiveLogList, ExportEnum.ENVIRONMENTAL_RECORD.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常,异常信息为{}", e); } } + private void populateBusinessSiteExecutiveLogDetail(BusinessOrder businessOrder, BusinessSiteExecutiveLogDetail businessSiteExecutiveLogDetail) { + businessSiteExecutiveLogDetail.setCustomerAddress(businessOrder.getCustomerAddress()); + businessSiteExecutiveLogDetail.setCustomerName(businessOrder.getCustomerName()); + businessSiteExecutiveLogDetail.setCustomerPhone(businessOrder.getCustomerPhone()); + businessSiteExecutiveLogDetail.setDelivererTel(businessOrder.getDelivererTel()); + businessSiteExecutiveLogDetail.setOrderCode(businessOrder.getOrderCode()); + businessSiteExecutiveLogDetail.setCustomerNo(businessOrder.getCustomerNo()); + } + + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { Long maxNo = this.baseMapper.selectMaxCode(); String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); @@ -173,7 +208,6 @@ /** * 增加,修改环境审批单需要进行 - * */ private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { //获取证书报告信息 diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java index a527b9a..0580ec3 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/business/BusinessSiteExecutiveInfoController.java @@ -14,6 +14,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.modular.system.service.IDeptService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.utils.DictCodeUtils; import io.swagger.annotations.Api; @@ -43,6 +44,8 @@ public class BusinessSiteExecutiveInfoController extends ExportController { @Autowired private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IDeptService deptService; @ApiOperation("现场检测审批列表(分页)") @PostMapping("/approval/listPage") 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 183f5af..59af42c 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 @@ -55,7 +55,7 @@ @ApiOperation("现场检测记录表详情") @PostMapping("/detail") - public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) { + public ReturnDTO originalDetail(@RequestBody @Valid IdDTO idDTO) throws Exception{ Assert.isFalse(Objects.isNull(idDTO.getId()), () -> { throw new BusinessException(BusinessExceptionEnum.ID_NULL); }); diff --git a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml index 6027f35..b0d6d83 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BusinessSiteExecutiveLogMapper.xml @@ -27,10 +27,14 @@ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java new file mode 100644 index 0000000..1a1ca66 --- /dev/null +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/business/siteExecutive/BusinessSiteExecutiveLogDetail.java @@ -0,0 +1,188 @@ +package com.casic.missiles.dto.business.siteExecutive; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.casic.missiles.model.business.BusinessSiteExecutiveEquipmentRelation; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + *

+ * 现场检测记录表 + *

+ * + * @author zt + * @since 2023-03-23 + */ +@Data +@TableName("business_site_executive_log") +public class BusinessSiteExecutiveLogDetail implements Serializable { + + private static final long serialVersionUID = 1L; + + @TableId("id") + private Long id; + + /** + * 现场检测记录单编号 + */ + @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") + @TableField("log_no") + private String logNo; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测id", dataType = "String") + @TableField("site_executive_id") + private String siteExecutiveId; + + /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** + * 联系人 + */ + @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("print_file_name") + private String printFileName; + + /** + * 备注 + */ + @ApiModelProperty(value = "备注", dataType = "String") + @TableField("remark") + private String remark; + + /** + * 删除标记 + */ + @ApiModelProperty(value = "删除标记", dataType = "String") + @TableField("is_del") + private String isDel; + + /** + * 创建时间 + */ + @TableField("create_time") + private String createTime; + + /** + * 更新时间 + */ + @TableField("update_time") + private String updateTime; + + @ApiModelProperty(hidden = true) + @TableField("create_user") + private Long createUser; + + @ApiModelProperty(value = "委托方地址", dataType = "String") + private String CustomerAddress; + + @ApiModelProperty(value = "委托方名称", dataType = "String") + private String customerName; + + @ApiModelProperty(value = "委托方手机", dataType = "String") + private String customerPhone; + + @ApiModelProperty(value = "送检人电话", dataType = "String") + private String delivererTel; + + @ApiModelProperty(value = "委托方编号", dataType = "String") + private String customerNo; + + @ApiModelProperty(value = "委托书编号", dataType = "String") + private String orderCode; + + /** + * 记录人 + */ + @ApiModelProperty(value = "记录人", dataType = "Long") + @TableField("recorder") + private Long recorder; + + /** + * 记录时间 + */ + @ApiModelProperty(value = "记录时间", dataType = "String") + @TableField("record_time") + private String recordTime; + + /** + * 实验室 + */ + @ApiModelProperty(value = "实验室", dataType = "String") + @TableField("laboratory_id") + private Long laboratoryId; + + + @TableField(exist = false) + @ApiModelProperty(value = "携带仪器设备", dataType = "List") + private List siteExecutiveEquipmentRelationList; + + @TableField(exist = false) + @ApiModelProperty(value = "记录人名称", dataType = "String") + private String recorderName; + + @TableField(exist = false) + @ApiModelProperty(value = "实验室名称", dataType = "String") + private String laboratoryName; +} diff --git a/casic-metering-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 eaa8d65..393eebc 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 @@ -47,6 +47,13 @@ private Long equipmentId; /** + * 测量设备id + */ + @ApiModelProperty(value = "测量设备名称", dataType = "Long") + @TableField(exist = false) + private String equipmentName; + + /** * 测量设备编号 */ @ApiModelProperty(value = "测量设备编号", dataType = "String") @@ -61,6 +68,13 @@ private String equipmentModel; /** + * 测量设备型号 + */ + @ApiModelProperty(value = "测量设备型号名称", dataType = "String") + @TableField(exist = false) + private String equipmentModelName; + + /** * 工作开始前外观及功能检查 */ @ApiModelProperty(value = "工作开始前外观及功能检查", dataType = "String") 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 58a7cac..ece0d75 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 @@ -1,5 +1,12 @@ package com.casic.missiles.model.business; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; @@ -17,6 +24,11 @@ * @author zt * @since 2023-03-23 */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@ExcelIgnoreUnannotated @Data @TableName("business_site_executive_log") public class BusinessSiteExecutiveLog implements Serializable { @@ -29,6 +41,7 @@ /** * 现场检测记录单编号 */ + @ExcelProperty("现场检测记录单编号") @ApiModelProperty(value = "现场检测记录单编号", dataType = "String") @TableField("log_no") private String logNo; @@ -41,6 +54,13 @@ private String siteExecutiveId; /** + * 现场检测id + */ + @ApiModelProperty(value = "现场检测编号", dataType = "String") + @TableField("site_executive_no") + private String siteExecutiveNo; + + /** * 联系人 */ @ApiModelProperty(value = "联系人", dataType = "String") @@ -58,6 +78,7 @@ * 现场工作地点 */ @ApiModelProperty(value = "现场工作地点", dataType = "String") + @ExcelProperty("现场工作地点") @TableField("executive_address") private String executiveAddress; @@ -114,6 +135,7 @@ * 创建时间 */ @TableField("create_time") + @ExcelProperty("创建时间") private String createTime; /** @@ -123,6 +145,7 @@ private String updateTime; @ApiModelProperty(hidden = true) + @TableField("create_user") private Long createUser; @@ -147,15 +170,18 @@ @TableField("laboratory_id") private Long laboratoryId; + @TableField(exist = false) @ApiModelProperty(value = "携带仪器设备", dataType = "List") private List siteExecutiveEquipmentRelationList; @TableField(exist = false) @ApiModelProperty(value = "记录人名称", dataType = "String") + @ExcelProperty("记录人") private String recorderName; @TableField(exist = false) @ApiModelProperty(value = "实验室名称", dataType = "String") + @ExcelProperty("专业组") private String laboratoryName; } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java index 2ba58e2..56003d1 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BusinessSiteExecutiveInfoServiceImpl.java @@ -27,6 +27,7 @@ import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.service.IUserService; import com.casic.missiles.service.IBaseApprovalService; import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoEquipmentRelationService; @@ -63,6 +64,8 @@ private IBaseApprovalService baseApprovalService; @Resource private AbstractDictService dictService; + @Autowired + private IUserService userService; @Resource private RuntimeService runtimeService; @Autowired @@ -195,17 +198,19 @@ String siteExecutiveNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_PREFIX, maxNo); AuthUser authUser = ShiroKit.getUser(); siteExecutiveInfo.setApprovalStatus(ApprovalStatusEnum.DRAFT); + if (ObjectUtil.isNotEmpty(siteExecutiveInfo.getDirectorId())) { + siteExecutiveInfo.setDirectorName(userService.getById(siteExecutiveInfo.getDirectorId()).getName()); + } siteExecutiveInfo.setCreateUser(authUser.getId()); siteExecutiveInfo.setSiteExecutiveNo(siteExecutiveNo); siteExecutiveInfo.setCreateTime(DateUtil.formatDateTime(new Date())); } @Override - public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id)throws Exception { + public BusinessSiteExecutiveDetail siteExecutiveInfoDetail(Long id) throws Exception { BusinessSiteExecutiveDetail businessSiteExecutiveDetail = new BusinessSiteExecutiveDetail(); BusinessSiteExecutiveInfo siteExecutiveInfo = this.baseMapper.selectById(id); if (siteExecutiveInfo != null) { - //查询是否有关联的检测人员 siteExecutiveInfo.setMeterStaffList(siteExecutiveStaffRelationService.getStaffsByExecutiveInfoId(id)); //查询是否有关联的监测设备 @@ -215,15 +220,15 @@ } } businessSiteExecutiveDetail = ConvertUtils.sourceToTarget(siteExecutiveInfo, BusinessSiteExecutiveDetail.class); - BusinessOrder businessOrder=orderService.orderDetail(businessSiteExecutiveDetail.getOrderId()); - populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail,businessOrder); + BusinessOrder businessOrder = orderService.orderDetail(businessSiteExecutiveDetail.getOrderId()); + populateBusinessSiteExecutiveDetail(businessSiteExecutiveDetail, businessOrder); for (EquipmentFixedAssets equipmentFixedAssets : businessSiteExecutiveDetail.getEquipmentInfoList()) { DictCodeUtils.convertDictCodeToName(equipmentFixedAssets); } return businessSiteExecutiveDetail; } - private void populateBusinessSiteExecutiveDetail(BusinessSiteExecutiveDetail businessSiteExecutiveDetail,BusinessOrder businessOrder){ + private void populateBusinessSiteExecutiveDetail(BusinessSiteExecutiveDetail businessSiteExecutiveDetail, BusinessOrder businessOrder) { businessSiteExecutiveDetail.setCustomerAddress(businessOrder.getCustomerAddress()); businessSiteExecutiveDetail.setCustomerName(businessOrder.getCustomerName()); businessSiteExecutiveDetail.setCustomerPhone(businessOrder.getCustomerPhone()); @@ -323,7 +328,7 @@ return approvalList; } - private List handleApprovalListResponse(List approvalList, String status) { + private List handleApprovalListResponse(List approvalList, String status) { // approvalList = ConvertUtils.sourceToTarget(list, SiteExecutiveApprovalListResponse.class); approvalList.stream().forEach(result -> { //审批状态两种获取方式:1、在此处设置,2、在flowable中设置业务状态,暂采取1 @@ -332,7 +337,7 @@ return approvalList; } - private List handleAllApprovalListResponse(List approvalList,List allApproveList) { + private List handleAllApprovalListResponse(List approvalList, List allApproveList) { Map taskMap = new HashMap<>(); // approvalList = ConvertUtils.sourceToTarget(list, SiteExecutiveApprovalListResponse.class); allApproveList.forEach(allApprove -> { 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 869ad37..45f825d 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 @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.base.service.IBaseExportService; @@ -13,6 +14,8 @@ import com.casic.missiles.core.shiro.ShiroKit; import com.casic.missiles.dto.ReturnDTO; import com.casic.missiles.dto.ReturnUtil; +import com.casic.missiles.dto.business.siteExecutive.BusinessSiteExecutiveDetail; +import com.casic.missiles.dto.business.siteExecutive.BusinessSiteExecutiveLogDetail; import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.enums.ExportEnum; @@ -20,19 +23,19 @@ import com.casic.missiles.enums.business.FilePrintTypeEnum; import com.casic.missiles.enums.notifyevent.PrintFileDataBeanNameAliasEnum; import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.mapper.MeterFixedAssetsMapper; import com.casic.missiles.mapper.business.BusinessSiteExecutiveInfoMapper; import com.casic.missiles.mapper.business.BusinessSiteExecutiveLogMapper; -import com.casic.missiles.model.business.BusinessOriginalRecord; -import com.casic.missiles.model.business.BusinessSiteExecutiveInfo; -import com.casic.missiles.model.business.BusinessSiteExecutiveLog; +import com.casic.missiles.model.business.*; +import com.casic.missiles.model.equipment.EquipmentFixedAssets; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; +import com.casic.missiles.service.business.IBusinessOrderService; import com.casic.missiles.service.business.IBusinessSiteExecutiveEquipmentRelationService; +import com.casic.missiles.service.business.IBusinessSiteExecutiveInfoService; import com.casic.missiles.service.business.IBusinessSiteExecutiveLogService; +import com.casic.missiles.service.equipment.IEquipmentFixedAssetsService; import com.casic.missiles.service.listeners.register.PrintFileRegister; -import com.casic.missiles.utils.DictCodeUtils; -import com.casic.missiles.utils.MinioUtil; -import com.casic.missiles.utils.NumberGeneratorUtil; -import com.casic.missiles.utils.SpringContextUtil; +import com.casic.missiles.utils.*; import lombok.extern.slf4j.Slf4j; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.omg.CORBA.PUBLIC_MEMBER; @@ -44,8 +47,10 @@ import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Map; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.TimeUnit; +import java.util.stream.Collectors; /** *

@@ -65,6 +70,13 @@ private MinioUtil minioUtill; @Autowired private IBaseExportService iBaseExportService; + @Autowired + private IEquipmentFixedAssetsService equipmentFixedAssetsService; + @Autowired + private IBusinessSiteExecutiveInfoService siteExecutiveInfoService; + @Autowired + private IBusinessOrderService orderService; + @Override public ReturnDTO addSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { @@ -113,13 +125,26 @@ } @Override - public BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id) { + public BusinessSiteExecutiveLogDetail siteExecutiveLogDetail(Long id) throws Exception { BusinessSiteExecutiveLog businessSiteExecutiveLog = this.baseMapper.selectById(id); - if (businessSiteExecutiveLog != null) { + BusinessSiteExecutiveLogDetail businessSiteExecutiveLogDetail = ConvertUtils.sourceToTarget(businessSiteExecutiveLog, BusinessSiteExecutiveLogDetail.class); + if (businessSiteExecutiveLogDetail != null) { + BusinessSiteExecutiveInfo businessSiteExecutiveInfo = siteExecutiveInfoService.getById(businessSiteExecutiveLogDetail.getSiteExecutiveId()); + BusinessOrder businessOrder = orderService.getById(businessSiteExecutiveInfo.getOrderId()); + populateBusinessSiteExecutiveLogDetail(businessOrder, businessSiteExecutiveLogDetail); //查询是否有关联的监测设备 - businessSiteExecutiveLog.setSiteExecutiveEquipmentRelationList(siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id)); + List businessSiteExecutiveEquipments = siteExecutiveEquipmentRelationService.getEquipmentsByExecutiveLogId(id); + List equipmentFixedAssets = equipmentFixedAssetsService.list(); + Map equipmentFixedAssetMap = equipmentFixedAssets.stream().collect( + Collectors.toMap(EquipmentFixedAssets::getId, EquipmentFixedAssets::getEquipmentName) + ); + for (BusinessSiteExecutiveEquipmentRelation siteExecutiveLog : businessSiteExecutiveEquipments) { + DictCodeUtils.convertDictCodeToName(siteExecutiveLog); + siteExecutiveLog.setEquipmentName(equipmentFixedAssetMap.get(siteExecutiveLog.getEquipmentId())); + } + businessSiteExecutiveLogDetail.setSiteExecutiveEquipmentRelationList(businessSiteExecutiveEquipments); } - return businessSiteExecutiveLog; + return businessSiteExecutiveLogDetail; } @Override @@ -136,27 +161,37 @@ public void exportExecuteLog(SiteExecuteLogRequest request, HttpServletResponse response) { try { Page page = PageFactory.defaultPage(); - List siteExecutiveLogList=new ArrayList<>(); - if(CollectionUtils.isEmpty(request.getIds())){ + List siteExecutiveLogList = new ArrayList<>(); + if (CollectionUtils.isEmpty(request.getIds())) { page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); // 获取列表 - Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request); - siteExecutiveLogList=siteExecutiveLogListPage.getRecords(); - }else { - siteExecutiveLogList=this.listByIds(request.getIds()); + Page siteExecutiveLogListPage = this.baseMapper.siteExecutiveLogListPage(page, request); + siteExecutiveLogList = siteExecutiveLogListPage.getRecords(); + } else { + siteExecutiveLogList = this.listByIds(request.getIds()); } - for (BusinessSiteExecutiveLog siteExecutiveLog :siteExecutiveLogList) { + for (BusinessSiteExecutiveLog siteExecutiveLog : siteExecutiveLogList) { DictCodeUtils.convertDictCodeToName(siteExecutiveLog); } - iBaseExportService.exportExcel(response, BusinessSiteExecutiveLog.class,siteExecutiveLogList, ExportEnum.ENVIRONMENTAL_RECORD.getSheetName()); + iBaseExportService.exportExcel(response, BusinessSiteExecutiveLog.class, siteExecutiveLogList, ExportEnum.ENVIRONMENTAL_RECORD.getSheetName()); } catch (Exception e) { log.error("样品导出出现异常,异常信息为{}", e); } } + private void populateBusinessSiteExecutiveLogDetail(BusinessOrder businessOrder, BusinessSiteExecutiveLogDetail businessSiteExecutiveLogDetail) { + businessSiteExecutiveLogDetail.setCustomerAddress(businessOrder.getCustomerAddress()); + businessSiteExecutiveLogDetail.setCustomerName(businessOrder.getCustomerName()); + businessSiteExecutiveLogDetail.setCustomerPhone(businessOrder.getCustomerPhone()); + businessSiteExecutiveLogDetail.setDelivererTel(businessOrder.getDelivererTel()); + businessSiteExecutiveLogDetail.setOrderCode(businessOrder.getOrderCode()); + businessSiteExecutiveLogDetail.setCustomerNo(businessOrder.getCustomerNo()); + } + + private void initBusinessSiteExecutiveLog(BusinessSiteExecutiveLog siteExecutiveLog) { Long maxNo = this.baseMapper.selectMaxCode(); String originNo = NumberGeneratorUtil.getContactNo(PrefixCodeEnum.SITE_EXECUTIVE_LOG_PREFIX, maxNo); @@ -173,7 +208,6 @@ /** * 增加,修改环境审批单需要进行 - * */ private void registerPrintFile(BusinessSiteExecutiveLog siteExecutiveLog) { //获取证书报告信息 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 f657fbe..b2c3914 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 @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.casic.missiles.dto.ReturnDTO; +import com.casic.missiles.dto.business.siteExecutive.BusinessSiteExecutiveLogDetail; import com.casic.missiles.dto.business.siteExecutive.SiteExecuteLogRequest; import com.casic.missiles.dto.customer.Info.CustomerListRequest; import com.casic.missiles.model.business.BusinessSiteExecutiveLog; @@ -25,7 +26,7 @@ ReturnDTO updateSiteExecutiveLog(BusinessSiteExecutiveLog businessSiteExecutiveLog); - BusinessSiteExecutiveLog siteExecutiveLogDetail(Long id); + BusinessSiteExecutiveLogDetail siteExecutiveLogDetail(Long id)throws Exception; Page siteExecutiveLogListPage(Page page, SiteExecuteLogRequest request) throws Exception;