From 1e11335a5ccfadb59489e1528d8d2bba10fbdb10 Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Mon, 12 Dec 2022 08:56:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=99=AE=E6=B5=8B=E8=AE=A1=E5=88=92=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E8=81=94=E8=B0=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/param/RGeneralSurveyPlanAddParm.java | 5 +++++ .../pojo/po/RGeneralSurveyPlanDetail.java | 21 +++++-------------- .../process/pojo/po/RGeneralSurveyPlanPO.java | 20 +----------------- .../process/pojo/vo/RGeneralSurveyPlanVO.java | 5 +++++ .../impl/RGeneralSurveyPlanPOServiceImpl.java | 12 +++++++---- 5 files changed, 24 insertions(+), 39 deletions(-) diff --git a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java index dbecf23ec..187c936b7 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java +++ b/process-api/src/main/java/com/njcn/process/pojo/param/RGeneralSurveyPlanAddParm.java @@ -47,6 +47,11 @@ public class RGeneralSurveyPlanAddParm { @ApiModel(value="计划详细情况母线相关") public static class RGeneralSurveyPlanDetailAddParm{ + @ApiModelProperty(value = "组织id") + private String orgNo; + @ApiModelProperty(value = "组织名") + private String orgName; + @ApiModelProperty(value="变电站ID") private String subId; diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java index a6f7bdc91..2e503281f 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java @@ -3,8 +3,6 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -21,7 +19,6 @@ import java.util.Date; /** * 普测计划详情表 */ -@ApiModel(value="com-njcn-process-pojo-po-RGeneralSurveyPlanDetail") @Data @TableName(value = "r_general_survey_plan_detail") public class RGeneralSurveyPlanDetail { @@ -29,63 +26,59 @@ public class RGeneralSurveyPlanDetail { * 普测计划编号 */ @MppMultiId(value = "plan_no") - @ApiModelProperty(value="普测计划编号") private String planNo; + + @TableField(value = "org_no") + private String orgNo; + @TableField(value = "org_name") + private String orgName; /** * 母线ID */ @MppMultiId(value = "busbar_id") - @ApiModelProperty(value="母线ID") private String busbarId; /** * 测试开始时间 */ @TableField(value = "general_survey_start_time") - @ApiModelProperty(value="测试开始时间") private Date generalSurveyStartTime; /** * 测试结束时间 */ @TableField(value = "general_survey_end_time") - @ApiModelProperty(value="测试结束时间") private Date generalSurveyEndTime; /** * 测试日期 */ @TableField(value = "general_survey_time") - @ApiModelProperty(value="测试日期") private Date generalSurveyTime; /** * 测试负责人 */ @TableField(value = "general_survey_leader") - @ApiModelProperty(value="测试负责人") private String generalSurveyLeader; /** * 变电站ID */ @TableField(value = "sub_id") - @ApiModelProperty(value="变电站ID") private String subId; /** * 变电站名称 */ @TableField(value = "sub_name") - @ApiModelProperty(value="变电站名称") private String subName; /** * 变电站电压等级 */ @TableField(value = "voltage_level") - @ApiModelProperty(value="变电站电压等级") private String voltageLevel; @@ -94,27 +87,23 @@ public class RGeneralSurveyPlanDetail { * 母线名称 */ @TableField(value = "busbar_name") - @ApiModelProperty(value="母线名称") private String busbarName; /** * 离线监测点id */ @TableField(value = "measurement_point_id") - @ApiModelProperty(value="离线监测点id") private String measurementPointId; /** * 是否实现监测(0:否 1:是) */ @TableField(value = "is_survey") - @ApiModelProperty(value="是否生成问题(0:否 1:是)") private Integer isSurvey; /** * 是否生成问题(0:否 1:是) */ @TableField(value = "is_problem") - @ApiModelProperty(value="是否生成问题(0:否 1:是)") private Integer isProblem; } \ No newline at end of file diff --git a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java index 32b72c376..1c8ea8f29 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java @@ -1,12 +1,9 @@ package com.njcn.process.pojo.po; import com.baomidou.mybatisplus.annotation.TableField; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @@ -23,7 +20,6 @@ import java.util.Date; /** * 普测计划表 */ -@ApiModel(value="com-njcn-process-pojo-po-RGeneralSurveyPlanPO") @Data @TableName(value = "r_general_survey_plan") public class RGeneralSurveyPlanPO { @@ -31,21 +27,18 @@ public class RGeneralSurveyPlanPO { * 单位ID */ @TableField(value = "org_no") - @ApiModelProperty(value="单位ID") private String orgNo; /** * 普测计划编号 */ @MppMultiId(value = "plan_no") - @ApiModelProperty(value="普测计划编号") private String planNo; /** * 普测计划名称 */ - @TableId(value = "plan_name") - @ApiModelProperty(value="普测计划名称") + @TableField(value = "plan_name") private String planName; /** @@ -53,7 +46,6 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "plan_create_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="计划生成时间") private Date planCreateTime = new Date(); /** @@ -61,7 +53,6 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "plan_start_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="计划开始时间") private Date planStartTime; /** @@ -69,7 +60,6 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "plan_end_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="计划结束时间") private Date planEndTime; /** @@ -77,49 +67,42 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "plan_complate_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="实际完成时间") private Date planComplateTime; /** * 计划负责人 */ @TableField(value = "leader") - @ApiModelProperty(value="计划负责人") private String leader; /** * 计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成) */ @TableField(value = "status") - @ApiModelProperty(value="计划状态(0:新建 1:待审核 2:审核未通过 3:已发布 4:已完成)") private int status; /** * 详情 */ @TableField(value = "description") - @ApiModelProperty(value="详情") private String description; /** * 文件是否上传(0:否 1:是) */ @TableField(value = "is_file_upload") - @ApiModelProperty(value="文件是否上传(0:否 1:是)") private Integer isFileUpload; /** * 上传文件数量 */ @TableField(value = "file_count") - @ApiModelProperty(value="上传文件数量") private Integer fileCount ; /** * 文件路径 */ @TableField(value = "file_path") - @ApiModelProperty(value="文件路径") private String filePath; /** @@ -127,6 +110,5 @@ public class RGeneralSurveyPlanPO { */ @TableField(value = "upload_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @ApiModelProperty(value="上传时间") private Date uploadTime; } \ No newline at end of file diff --git a/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java index 407fabdb1..401cf8feb 100644 --- a/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java +++ b/process-api/src/main/java/com/njcn/process/pojo/vo/RGeneralSurveyPlanVO.java @@ -80,6 +80,11 @@ public class RGeneralSurveyPlanVO { @ApiModel(value="计划详细情况母线相关") public static class RGeneralSurveyPlanDetailVO{ + @ApiModelProperty(value = "组织id") + private String orgNo; + @ApiModelProperty(value = "组织名") + private String orgName; + @ApiModelProperty(value="变电站ID") private String subId; diff --git a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index 1427686ba..65a458745 100644 --- a/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -86,23 +86,27 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl rGeneralSurveyPlanDetailAddParm = rGeneralSurveyPlanAddParm.getRGeneralSurveyPlanDetailAddParm ( ); QueryWrapper queryWrapper = new QueryWrapper (); queryWrapper.lambda ().eq (RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo ()); - boolean remove = rGeneralSurveyPlanDetailService.remove (queryWrapper); + rGeneralSurveyPlanDetailService.remove (queryWrapper); List rGeneralSurveyPlanDetailList = new ArrayList<> (); rGeneralSurveyPlanDetailAddParm.forEach (temp->{ RGeneralSurveyPlanDetail rGeneralSurveyPlanDetail = new RGeneralSurveyPlanDetail(); BeanUtils.copyProperties (temp, rGeneralSurveyPlanDetail); + /*目前时间与计划开始时间，结束时间一致*/ + rGeneralSurveyPlanDetail.setGeneralSurveyStartTime (rGeneralSurveyPlanAddParm.getPlanStartTime ()); + rGeneralSurveyPlanDetail.setGeneralSurveyTime (rGeneralSurveyPlanAddParm.getPlanStartTime ()); + rGeneralSurveyPlanDetail.setGeneralSurveyEndTime (rGeneralSurveyPlanAddParm.getPlanEndTime ()); rGeneralSurveyPlanDetail.setPlanNo (rGeneralSurveyPlanAddParm.getPlanNo ()); rGeneralSurveyPlanDetail.setGeneralSurveyLeader(rGeneralSurveyPlanAddParm.getLeader ()); rGeneralSurveyPlanDetailList.add (rGeneralSurveyPlanDetail); }); boolean b1 = rGeneralSurveyPlanDetailService.saveOrUpdateBatchByMultiId (rGeneralSurveyPlanDetailList, 5); - return b&&remove&&b1; + return b&&b1; } /** @@ -201,7 +205,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl