Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

技术监督代码提交

Browse Source
This commit is contained in:
wr
2023-08-02 09:17:04 +08:00
parent e6c64531e1
commit 453f4f9d2c
4 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/SupvPlanParam.java
View File

@@ -108,14 +108,14 @@ public class SupvPlanParam extends BaseParam {
* 计划执行开始时间 * 计划执行开始时间
*/ */
@ApiModelProperty(value = "计划执行开始时间",required = true) @ApiModelProperty(value = "计划执行开始时间",required = true)
@DateTimeStrValid(message = "计划执行开始时间格式有误") @DateTimeStrValid(format = "yyyy-MM-dd HH:mm:ss",message = "计划执行开始时间格式有误")
private String effectStartTime; private String effectStartTime;
/** /**
* 计划执行结束时间 * 计划执行结束时间
*/ */
@ApiModelProperty(value = "计划执行结束时间",required = true) @ApiModelProperty(value = "计划执行结束时间",required = true)
@DateTimeStrValid(message = "计划执行结束时间格式有误") @DateTimeStrValid(format = "yyyy-MM-dd HH:mm:ss",message = "计划执行结束时间格式有误")
private String effectEndTime; private String effectEndTime;
/** /**

8
pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/SupvPlan.java
View File

@@ -104,16 +104,16 @@ public class SupvPlan extends BaseEntity {
/** /**
* 计划执行开始时间 * 计划执行开始时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDate effectStartTime; private LocalDateTime effectStartTime;
/** /**
* 计划执行结束时间 * 计划执行结束时间
*/ */
@JsonFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@TableField(updateStrategy = FieldStrategy.IGNORED) @TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDate effectEndTime; private LocalDateTime effectEndTime;
/** /**

6
pqs-process/process-api/src/main/java/com/njcn/process/pojo/vo/SupvPlanVO.java
View File

@@ -112,13 +112,15 @@ public class SupvPlanVO {
* 计划执行开始时间 * 计划执行开始时间
*/ */
@ApiModelProperty(value = "计划执行开始时间",required = true) @ApiModelProperty(value = "计划执行开始时间",required = true)
private String effectStartTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime effectStartTime;
/** /**
* 计划执行结束时间 * 计划执行结束时间
*/ */
@ApiModelProperty(value = "计划执行结束时间",required = true) @ApiModelProperty(value = "计划执行结束时间",required = true)
private String effectEndTime; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime effectEndTime;
/** /**
* 报告出具时间 * 报告出具时间

8
pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/SupvPlanServiceImpl.java
View File

@@ -82,10 +82,10 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
supvPlan.setPlanSupvDate(PubUtils.localDateFormat(supvPlanParam.getPlanSupvDate())); supvPlan.setPlanSupvDate(PubUtils.localDateFormat(supvPlanParam.getPlanSupvDate()));
if(StrUtil.isNotBlank(supvPlanParam.getEffectEndTime())) { if(StrUtil.isNotBlank(supvPlanParam.getEffectEndTime())) {
supvPlan.setEffectEndTime(PubUtils.localDateFormat(supvPlanParam.getEffectEndTime())); supvPlan.setEffectEndTime(PubUtils.localDateTimeFormat(supvPlanParam.getEffectEndTime()));
} }
if(StrUtil.isNotBlank(supvPlanParam.getEffectStartTime())) { if(StrUtil.isNotBlank(supvPlanParam.getEffectStartTime())) {
supvPlan.setEffectStartTime(PubUtils.localDateFormat(supvPlanParam.getEffectStartTime())); supvPlan.setEffectStartTime(PubUtils.localDateTimeFormat(supvPlanParam.getEffectStartTime()));
} }
if(StrUtil.isNotBlank(supvPlanParam.getProblemOcTime())) { if(StrUtil.isNotBlank(supvPlanParam.getProblemOcTime())) {
supvPlan.setProblemOcTime(PubUtils.localDateTimeFormat(supvPlanParam.getProblemOcTime())); supvPlan.setProblemOcTime(PubUtils.localDateTimeFormat(supvPlanParam.getProblemOcTime()));
@@ -113,10 +113,10 @@ public class SupvPlanServiceImpl extends ServiceImpl<SupvPlanMapper, SupvPlan> i
BeanUtil.copyProperties(supvPlanParam, supvPlan); BeanUtil.copyProperties(supvPlanParam, supvPlan);
supvPlan.setPlanSupvDate(PubUtils.localDateFormat(supvPlanParam.getPlanSupvDate())); supvPlan.setPlanSupvDate(PubUtils.localDateFormat(supvPlanParam.getPlanSupvDate()));
if(StrUtil.isNotBlank(supvPlanParam.getEffectEndTime())) { if(StrUtil.isNotBlank(supvPlanParam.getEffectEndTime())) {
supvPlan.setEffectEndTime(PubUtils.localDateFormat(supvPlanParam.getEffectEndTime())); supvPlan.setEffectEndTime(PubUtils.localDateTimeFormat(supvPlanParam.getEffectEndTime()));
} }
if(StrUtil.isNotBlank(supvPlanParam.getEffectStartTime())) { if(StrUtil.isNotBlank(supvPlanParam.getEffectStartTime())) {
supvPlan.setEffectStartTime(PubUtils.localDateFormat(supvPlanParam.getEffectStartTime())); supvPlan.setEffectStartTime(PubUtils.localDateTimeFormat(supvPlanParam.getEffectStartTime()));
} }
if(StrUtil.isNotBlank(supvPlanParam.getProblemOcTime())) { if(StrUtil.isNotBlank(supvPlanParam.getProblemOcTime())) {
supvPlan.setProblemOcTime(PubUtils.localDateTimeFormat(supvPlanParam.getProblemOcTime())); supvPlan.setProblemOcTime(PubUtils.localDateTimeFormat(supvPlanParam.getProblemOcTime()));