diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml index 84be5d8..75357be 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml @@ -13,6 +13,7 @@ + diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml index 84be5d8..75357be 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml @@ -13,6 +13,7 @@ + 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 9f9b5b4..9a36359 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -57,7 +57,8 @@ c.update_time as updateTime, c.create_user_id as createUserId, c.create_user_name as createUserName, - c.create_dept_id as createDeptId + c.create_dept_id as createDeptId, + c.order_id as orderId FROM eqpt_subcontract_certificate c LEFT JOIN eqpt_equipment_info_view e ON c.equipment_id = e.id diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml index 84be5d8..75357be 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml @@ -13,6 +13,7 @@ + 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 9f9b5b4..9a36359 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -57,7 +57,8 @@ c.update_time as updateTime, c.create_user_id as createUserId, c.create_user_name as createUserName, - c.create_dept_id as createDeptId + c.create_dept_id as createDeptId, + c.order_id as orderId FROM eqpt_subcontract_certificate c LEFT JOIN eqpt_equipment_info_view e ON c.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java index c8c3063..8b0a1e4 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java @@ -55,7 +55,7 @@ @ApiOperation("设备检查") @PostMapping("/check") - public ReturnDTO orderChcek(@RequestBody InspectionApprovalForm approvalForm) { + public ReturnDTO orderCheck(@RequestBody InspectionApprovalForm approvalForm) { return ReturnUtil.success(service.checkApproval(approvalForm)); } diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml index 84be5d8..75357be 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml @@ -13,6 +13,7 @@ + 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 9f9b5b4..9a36359 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -57,7 +57,8 @@ c.update_time as updateTime, c.create_user_id as createUserId, c.create_user_name as createUserName, - c.create_dept_id as createDeptId + c.create_dept_id as createDeptId, + c.order_id as orderId FROM eqpt_subcontract_certificate c LEFT JOIN eqpt_equipment_info_view e ON c.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java index c8c3063..8b0a1e4 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java @@ -55,7 +55,7 @@ @ApiOperation("设备检查") @PostMapping("/check") - public ReturnDTO orderChcek(@RequestBody InspectionApprovalForm approvalForm) { + public ReturnDTO orderCheck(@RequestBody InspectionApprovalForm approvalForm) { return ReturnUtil.success(service.checkApproval(approvalForm)); } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 14e80d1..d7bf569 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -47,7 +47,7 @@ return ReturnUtil.success(super.packForBT(responsePage)); } - @ApiOperation("委托方满意度调查表提交") + @ApiOperation("委托方满意度调查表提交(使用该接口进行填写状态draft的更新)") @PostMapping("/submit") @ResponseBody public ReturnDTO questionnaireSubmit(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { @@ -58,12 +58,12 @@ return ReturnUtil.success(); } - @ApiOperation("委托方满意度调查表新增") - @PostMapping("/add") - @ResponseBody - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { - return questionnaireService.questionnaireAdd(questionnaire); - } +// @ApiOperation("委托方满意度调查表新增") +// @PostMapping("/add") +// @ResponseBody +// public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { +// return questionnaireService.questionnaireAdd(questionnaire); +// } } diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml index 84be5d8..75357be 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml @@ -13,6 +13,7 @@ + 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 9f9b5b4..9a36359 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -57,7 +57,8 @@ c.update_time as updateTime, c.create_user_id as createUserId, c.create_user_name as createUserName, - c.create_dept_id as createDeptId + c.create_dept_id as createDeptId, + c.order_id as orderId FROM eqpt_subcontract_certificate c LEFT JOIN eqpt_equipment_info_view e ON c.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java index c8c3063..8b0a1e4 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java @@ -55,7 +55,7 @@ @ApiOperation("设备检查") @PostMapping("/check") - public ReturnDTO orderChcek(@RequestBody InspectionApprovalForm approvalForm) { + public ReturnDTO orderCheck(@RequestBody InspectionApprovalForm approvalForm) { return ReturnUtil.success(service.checkApproval(approvalForm)); } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 14e80d1..d7bf569 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -47,7 +47,7 @@ return ReturnUtil.success(super.packForBT(responsePage)); } - @ApiOperation("委托方满意度调查表提交") + @ApiOperation("委托方满意度调查表提交(使用该接口进行填写状态draft的更新)") @PostMapping("/submit") @ResponseBody public ReturnDTO questionnaireSubmit(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { @@ -58,12 +58,12 @@ return ReturnUtil.success(); } - @ApiOperation("委托方满意度调查表新增") - @PostMapping("/add") - @ResponseBody - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { - return questionnaireService.questionnaireAdd(questionnaire); - } +// @ApiOperation("委托方满意度调查表新增") +// @PostMapping("/add") +// @ResponseBody +// public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { +// return questionnaireService.questionnaireAdd(questionnaire); +// } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java index bd807d9..75e6540 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java @@ -12,12 +12,13 @@ @ApiModel @Data public class CustomerQuestionnaireListRequest { - + @ApiModelProperty(value = "填写人id（草稿箱tab页必传）", dataType = "String") + private Long writerId; + @ApiModelProperty(value = "是否为草稿箱，也是未提交和已提交(1/2)", dataType = "int") + private Integer draft; @ApiModelProperty(value = "发送时间开始", dataType = "String") private String sendTimeStart; @ApiModelProperty(value = "发送时间结束", dataType = "String") private String sendTimeEnd; - @ApiModelProperty(value = "填写状态（未提交/已提交）", dataType = "String") - private String writeStatus; } diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml index 84be5d8..75357be 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml @@ -13,6 +13,7 @@ + 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 9f9b5b4..9a36359 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -57,7 +57,8 @@ c.update_time as updateTime, c.create_user_id as createUserId, c.create_user_name as createUserName, - c.create_dept_id as createDeptId + c.create_dept_id as createDeptId, + c.order_id as orderId FROM eqpt_subcontract_certificate c LEFT JOIN eqpt_equipment_info_view e ON c.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java index c8c3063..8b0a1e4 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java @@ -55,7 +55,7 @@ @ApiOperation("设备检查") @PostMapping("/check") - public ReturnDTO orderChcek(@RequestBody InspectionApprovalForm approvalForm) { + public ReturnDTO orderCheck(@RequestBody InspectionApprovalForm approvalForm) { return ReturnUtil.success(service.checkApproval(approvalForm)); } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 14e80d1..d7bf569 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -47,7 +47,7 @@ return ReturnUtil.success(super.packForBT(responsePage)); } - @ApiOperation("委托方满意度调查表提交") + @ApiOperation("委托方满意度调查表提交(使用该接口进行填写状态draft的更新)") @PostMapping("/submit") @ResponseBody public ReturnDTO questionnaireSubmit(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { @@ -58,12 +58,12 @@ return ReturnUtil.success(); } - @ApiOperation("委托方满意度调查表新增") - @PostMapping("/add") - @ResponseBody - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { - return questionnaireService.questionnaireAdd(questionnaire); - } +// @ApiOperation("委托方满意度调查表新增") +// @PostMapping("/add") +// @ResponseBody +// public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { +// return questionnaireService.questionnaireAdd(questionnaire); +// } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java index bd807d9..75e6540 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java @@ -12,12 +12,13 @@ @ApiModel @Data public class CustomerQuestionnaireListRequest { - + @ApiModelProperty(value = "填写人id（草稿箱tab页必传）", dataType = "String") + private Long writerId; + @ApiModelProperty(value = "是否为草稿箱，也是未提交和已提交(1/2)", dataType = "int") + private Integer draft; @ApiModelProperty(value = "发送时间开始", dataType = "String") private String sendTimeStart; @ApiModelProperty(value = "发送时间结束", dataType = "String") private String sendTimeEnd; - @ApiModelProperty(value = "填写状态（未提交/已提交）", dataType = "String") - private String writeStatus; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java index f40a621..bc88184 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java @@ -11,6 +11,7 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Objects; /** *

@@ -89,6 +90,10 @@ @TableField("send_time") private String sendTime; + @ApiModelProperty(value = "是否已发送(1/2)(发送后受检系统中才会查到)", dataType = "int") + @TableField("send_flag") + private int sendFlag; + /** * 填写人id */ @@ -103,6 +108,10 @@ @TableField("writer_name") private String writerName; + @ApiModelProperty(value = "是否为草稿箱(1/2),也是填写状态(1未填写2已填写) (受检系统使用)", dataType = "int") + @TableField("draft") + private Integer draft; + /** * 填写时间 */ @@ -197,4 +206,13 @@ @ApiModelProperty(value = "填写状态", dataType = "String") @TableField(exist = false) private String writeStatus; + + public String getWriteStatus() { + if (Objects.nonNull(this.draft) && 2 == this.draft) { + return "已提交"; + } else { + return "未提交"; + } + } + } diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml index 84be5d8..75357be 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml @@ -13,6 +13,7 @@ + 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 9f9b5b4..9a36359 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -57,7 +57,8 @@ c.update_time as updateTime, c.create_user_id as createUserId, c.create_user_name as createUserName, - c.create_dept_id as createDeptId + c.create_dept_id as createDeptId, + c.order_id as orderId FROM eqpt_subcontract_certificate c LEFT JOIN eqpt_equipment_info_view e ON c.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java index c8c3063..8b0a1e4 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java @@ -55,7 +55,7 @@ @ApiOperation("设备检查") @PostMapping("/check") - public ReturnDTO orderChcek(@RequestBody InspectionApprovalForm approvalForm) { + public ReturnDTO orderCheck(@RequestBody InspectionApprovalForm approvalForm) { return ReturnUtil.success(service.checkApproval(approvalForm)); } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 14e80d1..d7bf569 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -47,7 +47,7 @@ return ReturnUtil.success(super.packForBT(responsePage)); } - @ApiOperation("委托方满意度调查表提交") + @ApiOperation("委托方满意度调查表提交(使用该接口进行填写状态draft的更新)") @PostMapping("/submit") @ResponseBody public ReturnDTO questionnaireSubmit(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { @@ -58,12 +58,12 @@ return ReturnUtil.success(); } - @ApiOperation("委托方满意度调查表新增") - @PostMapping("/add") - @ResponseBody - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { - return questionnaireService.questionnaireAdd(questionnaire); - } +// @ApiOperation("委托方满意度调查表新增") +// @PostMapping("/add") +// @ResponseBody +// public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { +// return questionnaireService.questionnaireAdd(questionnaire); +// } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java index bd807d9..75e6540 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java @@ -12,12 +12,13 @@ @ApiModel @Data public class CustomerQuestionnaireListRequest { - + @ApiModelProperty(value = "填写人id（草稿箱tab页必传）", dataType = "String") + private Long writerId; + @ApiModelProperty(value = "是否为草稿箱，也是未提交和已提交(1/2)", dataType = "int") + private Integer draft; @ApiModelProperty(value = "发送时间开始", dataType = "String") private String sendTimeStart; @ApiModelProperty(value = "发送时间结束", dataType = "String") private String sendTimeEnd; - @ApiModelProperty(value = "填写状态（未提交/已提交）", dataType = "String") - private String writeStatus; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java index f40a621..bc88184 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java @@ -11,6 +11,7 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Objects; /** *

@@ -89,6 +90,10 @@ @TableField("send_time") private String sendTime; + @ApiModelProperty(value = "是否已发送(1/2)(发送后受检系统中才会查到)", dataType = "int") + @TableField("send_flag") + private int sendFlag; + /** * 填写人id */ @@ -103,6 +108,10 @@ @TableField("writer_name") private String writerName; + @ApiModelProperty(value = "是否为草稿箱(1/2),也是填写状态(1未填写2已填写) (受检系统使用)", dataType = "int") + @TableField("draft") + private Integer draft; + /** * 填写时间 */ @@ -197,4 +206,13 @@ @ApiModelProperty(value = "填写状态", dataType = "String") @TableField(exist = false) private String writeStatus; + + public String getWriteStatus() { + if (Objects.nonNull(this.draft) && 2 == this.draft) { + return "已提交"; + } else { + return "未提交"; + } + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java index f5c8c94..c17b0bb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java @@ -54,29 +54,29 @@ QueryWrapper wrapper = new QueryWrapper<>(); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); wrapper.eq("writer_id",authUser.getId()); - wrapper.isNull("未提交".equals(request.getWriteStatus()),"item_one"); - wrapper.isNotNull("已提交".equals(request.getWriteStatus()),"item_one"); + if (Objects.nonNull(request.getDraft()) && (2 == request.getDraft())) { + wrapper.eq("draft", request.getDraft()); + } + //查询未提交的包括draft为空的 + if (Objects.nonNull(request.getDraft()) && (1 == request.getDraft())) { + wrapper.and(QueryWrapper -> QueryWrapper.eq("draft", request.getDraft()) + .or().isNull("draft")); + } + wrapper.eq("send_flag",1);//业务系统已发送过来的 wrapper.apply(StringUtils.isNotBlank(request.getSendTimeStart()), "{0} <= DATE_FORMAT(send_time,'%Y-%m-%d')", request.getSendTimeStart().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getSendTimeEnd()), "{0} >= DATE_FORMAT(send_time,'%Y-%m-%d')", request.getSendTimeEnd().split(" ")[0]); wrapper.orderByDesc("create_time"); Page questionnairePage = this.baseMapper.selectPage(page, wrapper); - if(!CollectionUtils.isEmpty(questionnairePage.getRecords())){ - questionnairePage.getRecords().forEach(questionnaire -> { - if(StringUtils.isNotEmpty(questionnaire.getItemOne())){ - questionnaire.setWriteStatus("已提交"); - }else{ - questionnaire.setWriteStatus("未提交"); - } - }); - } return questionnairePage; } @Override public void questionnaireSubmit(BizResourceCustomerQuestionnaire questionnaire) { - questionnaire.setWriteTime(DateUtil.formatDateTime(new Date())); + if (2 == questionnaire.getDraft()) { + questionnaire.setWriteTime(DateUtil.formatDateTime(new Date())); + } this.updateById(questionnaire); } diff --git a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml index 84be5d8..75357be 100644 --- a/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/resource/BizResourceCustomerQuestionnaireMapper.xml @@ -13,6 +13,7 @@ + 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 9f9b5b4..9a36359 100644 --- a/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/subcontract/SubcontractCertificateMapper.xml @@ -57,7 +57,8 @@ c.update_time as updateTime, c.create_user_id as createUserId, c.create_user_name as createUserName, - c.create_dept_id as createDeptId + c.create_dept_id as createDeptId, + c.order_id as orderId FROM eqpt_subcontract_certificate c LEFT JOIN eqpt_equipment_info_view e ON c.equipment_id = e.id diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java index c8c3063..8b0a1e4 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/plan/InspectionController.java @@ -55,7 +55,7 @@ @ApiOperation("设备检查") @PostMapping("/check") - public ReturnDTO orderChcek(@RequestBody InspectionApprovalForm approvalForm) { + public ReturnDTO orderCheck(@RequestBody InspectionApprovalForm approvalForm) { return ReturnUtil.success(service.checkApproval(approvalForm)); } diff --git a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java index 14e80d1..d7bf569 100644 --- a/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java +++ b/casic-metering-eqpt-api/src/main/java/com/casic/missiles/controller/resource/BizResourceCustomerQuestionnaireController.java @@ -47,7 +47,7 @@ return ReturnUtil.success(super.packForBT(responsePage)); } - @ApiOperation("委托方满意度调查表提交") + @ApiOperation("委托方满意度调查表提交(使用该接口进行填写状态draft的更新)") @PostMapping("/submit") @ResponseBody public ReturnDTO questionnaireSubmit(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire, BindingResult bindingResult) { @@ -58,12 +58,12 @@ return ReturnUtil.success(); } - @ApiOperation("委托方满意度调查表新增") - @PostMapping("/add") - @ResponseBody - public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { - return questionnaireService.questionnaireAdd(questionnaire); - } +// @ApiOperation("委托方满意度调查表新增") +// @PostMapping("/add") +// @ResponseBody +// public ReturnDTO questionnaireAdd(@RequestBody @Valid BizResourceCustomerQuestionnaire questionnaire) { +// return questionnaireService.questionnaireAdd(questionnaire); +// } } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java index bd807d9..75e6540 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/resource/CustomerQuestionnaireListRequest.java @@ -12,12 +12,13 @@ @ApiModel @Data public class CustomerQuestionnaireListRequest { - + @ApiModelProperty(value = "填写人id（草稿箱tab页必传）", dataType = "String") + private Long writerId; + @ApiModelProperty(value = "是否为草稿箱，也是未提交和已提交(1/2)", dataType = "int") + private Integer draft; @ApiModelProperty(value = "发送时间开始", dataType = "String") private String sendTimeStart; @ApiModelProperty(value = "发送时间结束", dataType = "String") private String sendTimeEnd; - @ApiModelProperty(value = "填写状态（未提交/已提交）", dataType = "String") - private String writeStatus; } diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java index f40a621..bc88184 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/resource/BizResourceCustomerQuestionnaire.java @@ -11,6 +11,7 @@ import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import java.io.Serializable; +import java.util.Objects; /** *

@@ -89,6 +90,10 @@ @TableField("send_time") private String sendTime; + @ApiModelProperty(value = "是否已发送(1/2)(发送后受检系统中才会查到)", dataType = "int") + @TableField("send_flag") + private int sendFlag; + /** * 填写人id */ @@ -103,6 +108,10 @@ @TableField("writer_name") private String writerName; + @ApiModelProperty(value = "是否为草稿箱(1/2),也是填写状态(1未填写2已填写) (受检系统使用)", dataType = "int") + @TableField("draft") + private Integer draft; + /** * 填写时间 */ @@ -197,4 +206,13 @@ @ApiModelProperty(value = "填写状态", dataType = "String") @TableField(exist = false) private String writeStatus; + + public String getWriteStatus() { + if (Objects.nonNull(this.draft) && 2 == this.draft) { + return "已提交"; + } else { + return "未提交"; + } + } + } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java index f5c8c94..c17b0bb 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/impl/resource/BizResourceCustomerQuestionnaireServiceImpl.java @@ -54,29 +54,29 @@ QueryWrapper wrapper = new QueryWrapper<>(); AuthUser authUser = permissionContext.getAuthService().getLoginUser(); wrapper.eq("writer_id",authUser.getId()); - wrapper.isNull("未提交".equals(request.getWriteStatus()),"item_one"); - wrapper.isNotNull("已提交".equals(request.getWriteStatus()),"item_one"); + if (Objects.nonNull(request.getDraft()) && (2 == request.getDraft())) { + wrapper.eq("draft", request.getDraft()); + } + //查询未提交的包括draft为空的 + if (Objects.nonNull(request.getDraft()) && (1 == request.getDraft())) { + wrapper.and(QueryWrapper -> QueryWrapper.eq("draft", request.getDraft()) + .or().isNull("draft")); + } + wrapper.eq("send_flag",1);//业务系统已发送过来的 wrapper.apply(StringUtils.isNotBlank(request.getSendTimeStart()), "{0} <= DATE_FORMAT(send_time,'%Y-%m-%d')", request.getSendTimeStart().split(" ")[0]); wrapper.apply(StringUtils.isNotBlank(request.getSendTimeEnd()), "{0} >= DATE_FORMAT(send_time,'%Y-%m-%d')", request.getSendTimeEnd().split(" ")[0]); wrapper.orderByDesc("create_time"); Page questionnairePage = this.baseMapper.selectPage(page, wrapper); - if(!CollectionUtils.isEmpty(questionnairePage.getRecords())){ - questionnairePage.getRecords().forEach(questionnaire -> { - if(StringUtils.isNotEmpty(questionnaire.getItemOne())){ - questionnaire.setWriteStatus("已提交"); - }else{ - questionnaire.setWriteStatus("未提交"); - } - }); - } return questionnairePage; } @Override public void questionnaireSubmit(BizResourceCustomerQuestionnaire questionnaire) { - questionnaire.setWriteTime(DateUtil.formatDateTime(new Date())); + if (2 == questionnaire.getDraft()) { + questionnaire.setWriteTime(DateUtil.formatDateTime(new Date())); + } this.updateById(questionnaire); } 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 b8e0126..2cc3597 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 @@ -38,6 +38,7 @@ import com.casic.missiles.utils.DictCodeUtils; import com.casic.missiles.utils.FileUtil; import com.casic.missiles.utils.MinioUtil; +import com.casic.missiles.utils.SpringContextUtil; import lombok.RequiredArgsConstructor; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -77,7 +78,6 @@ private IEquipmentInfoService equipmentInfoService; private ISubcontractorService subcontractorService; private IPlanEquipmentRelationService planEquipmentRelationService; - private ISubcontractOrderService orderService; @Value("${casic.role.operator: user}") private String operatorRoleTip; @@ -462,6 +462,7 @@ //外送任务单执行情况设置为已上传证书 subcontractOrder.setExecuteFlag(ExecuteFlagEnum.ALREADY_UPLOADED); } + ISubcontractOrderService orderService = SpringContextUtil.getBean(SubcontractOrderServiceImpl.class); orderService.updateById(subcontractOrder); }