diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 88c0548..bf75438 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -46,7 +46,7 @@ @ApiOperation("列表查询") @GetMapping(value = "/list") - public ReturnDTO> list(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO) { + public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 88c0548..bf75438 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -46,7 +46,7 @@ @ApiOperation("列表查询") @GetMapping(value = "/list") - public ReturnDTO> list(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO) { + public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationScheduleMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationScheduleMapper.xml index cf57542..c5e950a 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationScheduleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationScheduleMapper.xml @@ -22,7 +22,7 @@ work_registration_id as workRegistrationId , schedule_time as scheduleTime , is_completed as isCompleted , - conference_record_id as conferenceRecordId + conference_record_id as conferenceRecordId,remarks diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index 63b8f42..3bcea0b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -21,52 +21,31 @@ public class BizQualityWorkRegistrationSchedule extends Model { private static final long serialVersionUID = 1L; - /** - * 主键 - */ @ApiModelProperty(value = "主键", dataType = "Long") @TableField("id") private Long id; - /** - * 创建时间 - */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; - /** - * 修改时间 - */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; - /** - * 工作记录ID - */ @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") private Long workRegistrationId; - /** - * 进度时间 - */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "进度时间", dataType = "Date") @TableField("schedule_time") private Date scheduleTime; - /** - * 是否完成(0 未完成 1 完成) - */ @ApiModelProperty(value = "是否完成(0 未完成 1 完成)", dataType = "Long") @TableField("is_completed") private Long isCompleted; - /** - * 会议ID - */ @ApiModelProperty(value = "会议ID", dataType = "Long") @TableField("conference_record_id") private Long conferenceRecordId; @@ -75,6 +54,9 @@ @TableField("stage_type") private Integer stageType; + @ApiModelProperty(value = "当前内审阶段", dataType = "String") + private String remarks; + @ApiModelProperty(value = "当前内审阶段名称", dataType = "String") @TableField(exist = false) private String stageTypeName; @@ -88,7 +70,6 @@ private List scheduleFileList; @Override - public String toString() { return "BizQualityWorkRegistrationSchedule{" + "id=" + id diff --git a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java index 88c0548..bf75438 100644 --- a/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java +++ b/casic-metering-api/src/main/java/com/casic/missiles/controller/quality/BizQualityManagementReviewController.java @@ -46,7 +46,7 @@ @ApiOperation("列表查询") @GetMapping(value = "/list") - public ReturnDTO> list(@RequestBody BizQualityManagementReviewVO bizQualityManagementReviewVO) { + public ReturnDTO> list(BizQualityManagementReviewVO bizQualityManagementReviewVO) { QueryWrapper query = bizQualityManagementReviewVO.genQuery(); return ReturnUtil.success(bizQualityManagementReviewService.list(query)); } diff --git a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationScheduleMapper.xml b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationScheduleMapper.xml index cf57542..c5e950a 100644 --- a/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationScheduleMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/quality/BizQualityWorkRegistrationScheduleMapper.xml @@ -22,7 +22,7 @@ work_registration_id as workRegistrationId , schedule_time as scheduleTime , is_completed as isCompleted , - conference_record_id as conferenceRecordId + conference_record_id as conferenceRecordId,remarks diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java index 63b8f42..3bcea0b 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/quality/BizQualityWorkRegistrationSchedule.java @@ -21,52 +21,31 @@ public class BizQualityWorkRegistrationSchedule extends Model { private static final long serialVersionUID = 1L; - /** - * 主键 - */ @ApiModelProperty(value = "主键", dataType = "Long") @TableField("id") private Long id; - /** - * 创建时间 - */ @ApiModelProperty(value = "创建时间", dataType = "Date") @TableField("create_time") private Date createTime; - /** - * 修改时间 - */ @ApiModelProperty(value = "修改时间", dataType = "Date") @TableField("update_time") private Date updateTime; - /** - * 工作记录ID - */ @ApiModelProperty(value = "工作记录ID", dataType = "Long") @TableField("work_registration_id") private Long workRegistrationId; - /** - * 进度时间 - */ @JsonFormat(pattern = "yyyy-MM-dd") @ApiModelProperty(value = "进度时间", dataType = "Date") @TableField("schedule_time") private Date scheduleTime; - /** - * 是否完成(0 未完成 1 完成) - */ @ApiModelProperty(value = "是否完成(0 未完成 1 完成)", dataType = "Long") @TableField("is_completed") private Long isCompleted; - /** - * 会议ID - */ @ApiModelProperty(value = "会议ID", dataType = "Long") @TableField("conference_record_id") private Long conferenceRecordId; @@ -75,6 +54,9 @@ @TableField("stage_type") private Integer stageType; + @ApiModelProperty(value = "当前内审阶段", dataType = "String") + private String remarks; + @ApiModelProperty(value = "当前内审阶段名称", dataType = "String") @TableField(exist = false) private String stageTypeName; @@ -88,7 +70,6 @@ private List scheduleFileList; @Override - public String toString() { return "BizQualityWorkRegistrationSchedule{" + "id=" + id diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileCodeService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileCodeService.java index e53624b..801988e 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileCodeService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileCodeService.java @@ -54,7 +54,7 @@ String labCode = entity.getBizLabCode(); String newCode = QualityNoUtil.genMaxNo(labCode, groupNo, tableEnum, func); entity.setSysCode(newCode); - if (StrUtil.isNotEmpty(entity.getFileCode())) { + if (StrUtil.isEmpty(entity.getFileCode())) { entity.setFileCode(newCode); } } diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileService.java b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileService.java index 3b48086..cbf13b4 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileService.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/quality/base/IBaseFileService.java @@ -27,7 +27,7 @@ String newCode = QualityNoUtil.genMaxNo(labCode, null, tableEnum, func); entity.setSysCode(newCode); entity.setYearNo(QualityNoUtil.convertToYearNo(entity.getBizLabCode(), entity.getYearTime(), entity.getYearNum())); - if (StrUtil.isNotEmpty(entity.getFileCode())) { + if (StrUtil.isEmpty(entity.getFileCode())) { entity.setFileCode(newCode); } }