diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java index ee5e648..04d3eb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java @@ -37,4 +37,7 @@ @ApiModelProperty("申请结束时间") private String createTimeEnd; + @ApiModelProperty("执行情况(字典code)") + private String executeFlag; + } diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java index ee5e648..04d3eb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java @@ -37,4 +37,7 @@ @ApiModelProperty("申请结束时间") private String createTimeEnd; + @ApiModelProperty("执行情况(字典code)") + private String executeFlag; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 7b00ab4..8f56f7c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -48,6 +48,10 @@ @TableId("id") private Long id; + @ApiModelProperty("外送任务单id") + @TableField("order_id") + private Long orderId; + /** * 证书编号 */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java index ee5e648..04d3eb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java @@ -37,4 +37,7 @@ @ApiModelProperty("申请结束时间") private String createTimeEnd; + @ApiModelProperty("执行情况(字典code)") + private String executeFlag; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 7b00ab4..8f56f7c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -48,6 +48,10 @@ @TableId("id") private Long id; + @ApiModelProperty("外送任务单id") + @TableField("order_id") + private Long orderId; + /** * 证书编号 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index 5fc4e6e..56c0a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -146,6 +146,16 @@ @TableField("contact_number") private String contactNumber; + //新建外送任务单后就是已送检状态，关联的外送证书新建了但是没有上传证书就是待上传证书 + @DictCodeField(cacheName = MeterDictCode.EXECUTE_FLAG) + @ApiModelProperty("执行情况(字典code)") + @TableField("execute_flag") + private String executeFlag; + + @ApiModelProperty("执行情况名称") + @TableField(exist = false) + private String executeFlagName; + /** * 流程实例id */ diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java index ee5e648..04d3eb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java @@ -37,4 +37,7 @@ @ApiModelProperty("申请结束时间") private String createTimeEnd; + @ApiModelProperty("执行情况(字典code)") + private String executeFlag; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 7b00ab4..8f56f7c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -48,6 +48,10 @@ @TableId("id") private Long id; + @ApiModelProperty("外送任务单id") + @TableField("order_id") + private Long orderId; + /** * 证书编号 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index 5fc4e6e..56c0a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -146,6 +146,16 @@ @TableField("contact_number") private String contactNumber; + //新建外送任务单后就是已送检状态，关联的外送证书新建了但是没有上传证书就是待上传证书 + @DictCodeField(cacheName = MeterDictCode.EXECUTE_FLAG) + @ApiModelProperty("执行情况(字典code)") + @TableField("execute_flag") + private String executeFlag; + + @ApiModelProperty("执行情况名称") + @TableField(exist = false) + private String executeFlagName; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java index ee6aa60..25a38c9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java @@ -60,6 +60,10 @@ @TableField(exist = false) private String equipmentName; + @ApiModelProperty(value = "辅助字段") + @TableField(exist = false) + private String helpInstruction; + @ApiModelProperty("规格型号") @TableField(exist = false) private String model; diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java index ee5e648..04d3eb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java @@ -37,4 +37,7 @@ @ApiModelProperty("申请结束时间") private String createTimeEnd; + @ApiModelProperty("执行情况(字典code)") + private String executeFlag; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 7b00ab4..8f56f7c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -48,6 +48,10 @@ @TableId("id") private Long id; + @ApiModelProperty("外送任务单id") + @TableField("order_id") + private Long orderId; + /** * 证书编号 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index 5fc4e6e..56c0a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -146,6 +146,16 @@ @TableField("contact_number") private String contactNumber; + //新建外送任务单后就是已送检状态，关联的外送证书新建了但是没有上传证书就是待上传证书 + @DictCodeField(cacheName = MeterDictCode.EXECUTE_FLAG) + @ApiModelProperty("执行情况(字典code)") + @TableField("execute_flag") + private String executeFlag; + + @ApiModelProperty("执行情况名称") + @TableField(exist = false) + private String executeFlagName; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java index ee6aa60..25a38c9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java @@ -60,6 +60,10 @@ @TableField(exist = false) private String equipmentName; + @ApiModelProperty(value = "辅助字段") + @TableField(exist = false) + private String helpInstruction; + @ApiModelProperty("规格型号") @TableField(exist = false) private String model; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index 0659a9a..7dd7700 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -361,7 +361,7 @@ BoardMessage boardMessage = new BoardMessage(); boardMessage.setMessageModule("工作提醒"); boardMessage.setMessageType("设备到期"); - boardMessage.setMessageTopic(equipmentInfo.getEquipmentName()+equipmentInfo.getEquipmentNo()+"已超有效期"); + boardMessage.setMessageTopic(equipmentInfo.getEquipmentName()+equipmentInfo.getModel()+equipmentInfo.getManufactureNo()+"已超有效期"); boardMessage.setSourceModule("设备台账"); boardMessage.setReadStatus("0"); boardMessage.setNotifyUserId(notifyUser.getId()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java index ee5e648..04d3eb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java @@ -37,4 +37,7 @@ @ApiModelProperty("申请结束时间") private String createTimeEnd; + @ApiModelProperty("执行情况(字典code)") + private String executeFlag; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 7b00ab4..8f56f7c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -48,6 +48,10 @@ @TableId("id") private Long id; + @ApiModelProperty("外送任务单id") + @TableField("order_id") + private Long orderId; + /** * 证书编号 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index 5fc4e6e..56c0a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -146,6 +146,16 @@ @TableField("contact_number") private String contactNumber; + //新建外送任务单后就是已送检状态，关联的外送证书新建了但是没有上传证书就是待上传证书 + @DictCodeField(cacheName = MeterDictCode.EXECUTE_FLAG) + @ApiModelProperty("执行情况(字典code)") + @TableField("execute_flag") + private String executeFlag; + + @ApiModelProperty("执行情况名称") + @TableField(exist = false) + private String executeFlagName; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java index ee6aa60..25a38c9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java @@ -60,6 +60,10 @@ @TableField(exist = false) private String equipmentName; + @ApiModelProperty(value = "辅助字段") + @TableField(exist = false) + private String helpInstruction; + @ApiModelProperty("规格型号") @TableField(exist = false) private String model; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index 0659a9a..7dd7700 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -361,7 +361,7 @@ BoardMessage boardMessage = new BoardMessage(); boardMessage.setMessageModule("工作提醒"); boardMessage.setMessageType("设备到期"); - boardMessage.setMessageTopic(equipmentInfo.getEquipmentName()+equipmentInfo.getEquipmentNo()+"已超有效期"); + boardMessage.setMessageTopic(equipmentInfo.getEquipmentName()+equipmentInfo.getModel()+equipmentInfo.getManufactureNo()+"已超有效期"); boardMessage.setSourceModule("设备台账"); boardMessage.setReadStatus("0"); boardMessage.setNotifyUserId(notifyUser.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index 17907b6..b8e0126 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -18,6 +18,7 @@ import com.casic.missiles.dto.certificate.SubcontractCertificateImportDTO; import com.casic.missiles.dto.equipment.EquipmentCertificateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExecuteFlagEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.listeners.CommonExcelListener; @@ -25,17 +26,20 @@ import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.mapper.subcontract.SubcontractCertificateMapper; +import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.service.subcontract.ISubcontractOrderService; import com.casic.missiles.service.subcontract.ISubcontractorService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.FileUtil; import com.casic.missiles.utils.MinioUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -69,11 +73,11 @@ private final AbstractPermissionContext permissionContext; private final MinioUtil minioUtil; - private final AbstractDictService dictService; private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; private IPlanEquipmentRelationService planEquipmentRelationService; + private ISubcontractOrderService orderService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @@ -436,6 +440,31 @@ } } + @Override + @Transactional + public void saveOrUpdateInfoBatch(List certificateList) { + for (SubcontractCertificate entity : certificateList) { + boolean save = ObjectUtil.isEmpty(entity.getId()); + this.saveOrUpdate(entity); + equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(), entity.getSubcontractorName(), entity.getCheckDate(), entity.getCertificateValid(), entity.getMeterIdentify()); + if (save) { + updatePlanSampleStatus(entity); + } + } + Long orderId = certificateList.get(0).getOrderId(); + SubcontractOrder subcontractOrder = new SubcontractOrder(); + subcontractOrder.setId(orderId); + long count = certificateList.stream().filter(c -> StringUtils.isEmpty(c.getCertificateReport())).count(); + if (count > 0) { + //外送任务单执行情况设置为待上传证书 + subcontractOrder.setExecuteFlag(ExecuteFlagEnum.TO_UPLOADED); + } else { + //外送任务单执行情况设置为已上传证书 + subcontractOrder.setExecuteFlag(ExecuteFlagEnum.ALREADY_UPLOADED); + } + orderService.updateById(subcontractOrder); + } + private void updatePlanSampleStatus(SubcontractCertificate certificate){ SampleStatueUpdate updateInfo = new SampleStatueUpdate(); updateInfo.setSampleId(certificate.getEquipmentId()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java index ee5e648..04d3eb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java @@ -37,4 +37,7 @@ @ApiModelProperty("申请结束时间") private String createTimeEnd; + @ApiModelProperty("执行情况(字典code)") + private String executeFlag; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 7b00ab4..8f56f7c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -48,6 +48,10 @@ @TableId("id") private Long id; + @ApiModelProperty("外送任务单id") + @TableField("order_id") + private Long orderId; + /** * 证书编号 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index 5fc4e6e..56c0a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -146,6 +146,16 @@ @TableField("contact_number") private String contactNumber; + //新建外送任务单后就是已送检状态，关联的外送证书新建了但是没有上传证书就是待上传证书 + @DictCodeField(cacheName = MeterDictCode.EXECUTE_FLAG) + @ApiModelProperty("执行情况(字典code)") + @TableField("execute_flag") + private String executeFlag; + + @ApiModelProperty("执行情况名称") + @TableField(exist = false) + private String executeFlagName; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java index ee6aa60..25a38c9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java @@ -60,6 +60,10 @@ @TableField(exist = false) private String equipmentName; + @ApiModelProperty(value = "辅助字段") + @TableField(exist = false) + private String helpInstruction; + @ApiModelProperty("规格型号") @TableField(exist = false) private String model; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index 0659a9a..7dd7700 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -361,7 +361,7 @@ BoardMessage boardMessage = new BoardMessage(); boardMessage.setMessageModule("工作提醒"); boardMessage.setMessageType("设备到期"); - boardMessage.setMessageTopic(equipmentInfo.getEquipmentName()+equipmentInfo.getEquipmentNo()+"已超有效期"); + boardMessage.setMessageTopic(equipmentInfo.getEquipmentName()+equipmentInfo.getModel()+equipmentInfo.getManufactureNo()+"已超有效期"); boardMessage.setSourceModule("设备台账"); boardMessage.setReadStatus("0"); boardMessage.setNotifyUserId(notifyUser.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index 17907b6..b8e0126 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -18,6 +18,7 @@ import com.casic.missiles.dto.certificate.SubcontractCertificateImportDTO; import com.casic.missiles.dto.equipment.EquipmentCertificateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExecuteFlagEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.listeners.CommonExcelListener; @@ -25,17 +26,20 @@ import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.mapper.subcontract.SubcontractCertificateMapper; +import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.service.subcontract.ISubcontractOrderService; import com.casic.missiles.service.subcontract.ISubcontractorService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.FileUtil; import com.casic.missiles.utils.MinioUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -69,11 +73,11 @@ private final AbstractPermissionContext permissionContext; private final MinioUtil minioUtil; - private final AbstractDictService dictService; private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; private IPlanEquipmentRelationService planEquipmentRelationService; + private ISubcontractOrderService orderService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @@ -436,6 +440,31 @@ } } + @Override + @Transactional + public void saveOrUpdateInfoBatch(List certificateList) { + for (SubcontractCertificate entity : certificateList) { + boolean save = ObjectUtil.isEmpty(entity.getId()); + this.saveOrUpdate(entity); + equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(), entity.getSubcontractorName(), entity.getCheckDate(), entity.getCertificateValid(), entity.getMeterIdentify()); + if (save) { + updatePlanSampleStatus(entity); + } + } + Long orderId = certificateList.get(0).getOrderId(); + SubcontractOrder subcontractOrder = new SubcontractOrder(); + subcontractOrder.setId(orderId); + long count = certificateList.stream().filter(c -> StringUtils.isEmpty(c.getCertificateReport())).count(); + if (count > 0) { + //外送任务单执行情况设置为待上传证书 + subcontractOrder.setExecuteFlag(ExecuteFlagEnum.TO_UPLOADED); + } else { + //外送任务单执行情况设置为已上传证书 + subcontractOrder.setExecuteFlag(ExecuteFlagEnum.ALREADY_UPLOADED); + } + orderService.updateById(subcontractOrder); + } + private void updatePlanSampleStatus(SubcontractCertificate certificate){ SampleStatueUpdate updateInfo = new SampleStatueUpdate(); updateInfo.setSampleId(certificate.getEquipmentId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 4b93d0b..0827d17 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.enums.ApprovalStatusEnum; +import com.casic.missiles.enums.ExecuteFlagEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; import com.casic.missiles.mapper.subcontract.SubcontractOrderRelationMapper; @@ -76,6 +77,7 @@ } // 2. 设置申请状态：草稿箱 form.setApprovalStatus(ApprovalStatusEnum.DRAFT); + form.setExecuteFlag(ExecuteFlagEnum.ALREADY); // 3. 保存扩展表 this.saveOrUpdate(form); relationService.saveByOrder(form.getId(), form.getEquipmentList()); @@ -171,6 +173,7 @@ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateDeptName()), "create_dept_name", queryForm.getCreateDeptName()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateCompanyName()), "create_company_name", queryForm.getCreateCompanyName()); queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCreateCompanyId()), "create_company_id", queryForm.getCreateCompanyId()); + queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getExecuteFlag()), "execute_flag", queryForm.getExecuteFlag()); if (ObjectUtil.isNotEmpty(queryForm.getCreateDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(queryForm.getCreateDeptId()); diff --git a/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java new file mode 100644 index 0000000..c0f6aaf --- /dev/null +++ b/casic-metering-common/src/main/java/com/casic/missiles/enums/ExecuteFlagEnum.java @@ -0,0 +1,15 @@ +package com.casic.missiles.enums; + +/** + * @Description: 外送任务单执行情况 + * @Author: wangpeng + * @Date: 2023/7/21 17:14 + */ +public interface ExecuteFlagEnum { + //已送检 + String ALREADY = "1"; + //待上传证书 + String TO_UPLOADED = "2"; + //已上传证书 + String ALREADY_UPLOADED = "3"; +} diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml index 264f094..9f9b5b4 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -6,6 +6,7 @@ + @@ -18,7 +19,7 @@ - + diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml index b215c51..72859bb 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderMapper.xml @@ -20,6 +20,7 @@ + @@ -46,6 +47,7 @@ create_time as createTime, approval_status as approvalStatus, process_id as processId, + execute_flag as executeFlag, (select count(eqpt_subcontract_order_relation.id) from eqpt_subcontract_order_relation where eqpt_subcontract_order_relation.order_id = eqpt_subcontract_order.id) as equipmentNum FROM eqpt_subcontract_order diff --git a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml index b907752..60c7331 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractOrderRelationMapper.xml @@ -33,7 +33,8 @@ e.check_organization as checkOrganization, e.certificate_valid as certificateValid, e.dept_id as deptId, - e.meter_identify as meterIdentify + e.meter_identify as meterIdentify, + e.help_instruction as helpInstruction FROM eqpt_subcontract_order_relation r INNER JOIN eqpt_equipment_info_view e ON r.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java index 459f20b..46a5772 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/subcontract/SubcontractCertificateController.java @@ -38,6 +38,14 @@ return ReturnUtil.success(); } + @ApiOperation("批量新建/编辑") + @PostMapping("/addOrUpdate/batch") + @ResponseBody + public ReturnDTO addOrUpdate(@RequestBody List certificateList) { + certificateService.saveOrUpdateInfoBatch(certificateList); + return ReturnUtil.success(); + } + @ApiOperation("删除证书") @PostMapping("remove") @ResponseBody diff --git a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java index 64b9c20..2fe7f0e 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/constants/MeterDictCode.java @@ -61,6 +61,8 @@ String HANDLE_STATUS = "handleStatus"; + String EXECUTE_FLAG = "executeFlag"; + /** * 业务管理 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java index ee5e648..04d3eb4 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/subcontract/SubcontractOrderQueryForm.java @@ -37,4 +37,7 @@ @ApiModelProperty("申请结束时间") private String createTimeEnd; + @ApiModelProperty("执行情况(字典code)") + private String executeFlag; + } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java index 7b00ab4..8f56f7c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractCertificate.java @@ -48,6 +48,10 @@ @TableId("id") private Long id; + @ApiModelProperty("外送任务单id") + @TableField("order_id") + private Long orderId; + /** * 证书编号 */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java index 5fc4e6e..56c0a0f 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrder.java @@ -146,6 +146,16 @@ @TableField("contact_number") private String contactNumber; + //新建外送任务单后就是已送检状态，关联的外送证书新建了但是没有上传证书就是待上传证书 + @DictCodeField(cacheName = MeterDictCode.EXECUTE_FLAG) + @ApiModelProperty("执行情况(字典code)") + @TableField("execute_flag") + private String executeFlag; + + @ApiModelProperty("执行情况名称") + @TableField(exist = false) + private String executeFlagName; + /** * 流程实例id */ diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java index ee6aa60..25a38c9 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/subcontract/SubcontractOrderRelation.java @@ -60,6 +60,10 @@ @TableField(exist = false) private String equipmentName; + @ApiModelProperty(value = "辅助字段") + @TableField(exist = false) + private String helpInstruction; + @ApiModelProperty("规格型号") @TableField(exist = false) private String model; diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java index 0659a9a..7dd7700 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/board/BoardMessageServiceImpl.java @@ -361,7 +361,7 @@ BoardMessage boardMessage = new BoardMessage(); boardMessage.setMessageModule("工作提醒"); boardMessage.setMessageType("设备到期"); - boardMessage.setMessageTopic(equipmentInfo.getEquipmentName()+equipmentInfo.getEquipmentNo()+"已超有效期"); + boardMessage.setMessageTopic(equipmentInfo.getEquipmentName()+equipmentInfo.getModel()+equipmentInfo.getManufactureNo()+"已超有效期"); boardMessage.setSourceModule("设备台账"); boardMessage.setReadStatus("0"); boardMessage.setNotifyUserId(notifyUser.getId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java index 17907b6..b8e0126 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractCertificateServiceImpl.java @@ -18,6 +18,7 @@ import com.casic.missiles.dto.certificate.SubcontractCertificateImportDTO; import com.casic.missiles.dto.equipment.EquipmentCertificateDTO; import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.enums.ExecuteFlagEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.listeners.CommonExcelListener; @@ -25,17 +26,20 @@ import com.casic.missiles.model.plan.SampleStatueUpdate; import com.casic.missiles.model.subcontract.SubcontractCertificate; import com.casic.missiles.mapper.subcontract.SubcontractCertificateMapper; +import com.casic.missiles.model.subcontract.SubcontractOrder; import com.casic.missiles.model.subcontract.Subcontractor; import com.casic.missiles.modular.system.model.Dict; import com.casic.missiles.service.equipment.IEquipmentInfoService; import com.casic.missiles.service.plan.IPlanEquipmentRelationService; import com.casic.missiles.service.subcontract.ISubcontractCertificateService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.service.subcontract.ISubcontractOrderService; import com.casic.missiles.service.subcontract.ISubcontractorService; import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.FileUtil; import com.casic.missiles.utils.MinioUtil; import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -69,11 +73,11 @@ private final AbstractPermissionContext permissionContext; private final MinioUtil minioUtil; - private final AbstractDictService dictService; private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; private IPlanEquipmentRelationService planEquipmentRelationService; + private ISubcontractOrderService orderService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @@ -436,6 +440,31 @@ } } + @Override + @Transactional + public void saveOrUpdateInfoBatch(List certificateList) { + for (SubcontractCertificate entity : certificateList) { + boolean save = ObjectUtil.isEmpty(entity.getId()); + this.saveOrUpdate(entity); + equipmentInfoService.updateCertificateInfo(entity.getEquipmentId(), entity.getSubcontractorName(), entity.getCheckDate(), entity.getCertificateValid(), entity.getMeterIdentify()); + if (save) { + updatePlanSampleStatus(entity); + } + } + Long orderId = certificateList.get(0).getOrderId(); + SubcontractOrder subcontractOrder = new SubcontractOrder(); + subcontractOrder.setId(orderId); + long count = certificateList.stream().filter(c -> StringUtils.isEmpty(c.getCertificateReport())).count(); + if (count > 0) { + //外送任务单执行情况设置为待上传证书 + subcontractOrder.setExecuteFlag(ExecuteFlagEnum.TO_UPLOADED); + } else { + //外送任务单执行情况设置为已上传证书 + subcontractOrder.setExecuteFlag(ExecuteFlagEnum.ALREADY_UPLOADED); + } + orderService.updateById(subcontractOrder); + } + private void updatePlanSampleStatus(SubcontractCertificate certificate){ SampleStatueUpdate updateInfo = new SampleStatueUpdate(); updateInfo.setSampleId(certificate.getEquipmentId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java index 4b93d0b..0827d17 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/subcontract/SubcontractOrderServiceImpl.java @@ -12,6 +12,7 @@ import com.casic.missiles.dto.subcontract.SubcontractOrderForm; import com.casic.missiles.dto.subcontract.SubcontractOrderQueryForm; import com.casic.missiles.enums.ApprovalStatusEnum; +import com.casic.missiles.enums.ExecuteFlagEnum; import com.casic.missiles.enums.plan.SampleStatusEnum; import com.casic.missiles.mapper.subcontract.SubcontractOrderMapper; import com.casic.missiles.mapper.subcontract.SubcontractOrderRelationMapper; @@ -76,6 +77,7 @@ } // 2. 设置申请状态：草稿箱 form.setApprovalStatus(ApprovalStatusEnum.DRAFT); + form.setExecuteFlag(ExecuteFlagEnum.ALREADY); // 3. 保存扩展表 this.saveOrUpdate(form); relationService.saveByOrder(form.getId(), form.getEquipmentList()); @@ -171,6 +173,7 @@ queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateDeptName()), "create_dept_name", queryForm.getCreateDeptName()); queryWrapper.like(StrUtil.isNotEmpty(queryForm.getCreateCompanyName()), "create_company_name", queryForm.getCreateCompanyName()); queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getCreateCompanyId()), "create_company_id", queryForm.getCreateCompanyId()); + queryWrapper.eq(ObjectUtil.isNotEmpty(queryForm.getExecuteFlag()), "execute_flag", queryForm.getExecuteFlag()); if (ObjectUtil.isNotEmpty(queryForm.getCreateDeptId())) { List deptIds = new ArrayList<>(); deptIds.add(queryForm.getCreateDeptId()); diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java index 3e549f4..b90815f 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/subcontract/ISubcontractCertificateService.java @@ -40,6 +40,8 @@ void saveOrUpdateInfo(SubcontractCertificate subcontractCertificate); + void saveOrUpdateInfoBatch(List certificateList); + void removeInfo(Long id); Page listScopePage(Page page, String certificateNo, String certificateName,