From 7c19a21d92b22ecb4776c8d0b82bd1327d6aabc1 Mon Sep 17 00:00:00 2001
From: chendaofei <857448963@qq.com>
Date: Fri, 25 Oct 2024 16:30:34 +0800
Subject: [PATCH] =?UTF-8?q?1.pms=E5=85=A8=E8=BF=87=E7=A8=8B=E7=94=A8?=
=?UTF-8?q?=E6=88=B7=E4=B8=B4=E6=97=B6=E6=A1=A3=E6=A1=88=E6=9C=88=E6=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/njcn/web/enums/GWSendEnum.java | 1 +
.../upload/PmsTemProcessApprovalParam.java | 18 ++++------
.../pojo/po/upload/PmsTemProcessApproval.java | 33 +++++++++----------
.../harmonic/pojo/po/upload/PmsTemUserPO.java | 4 +++
.../PmsTemProcessApprovalController.java | 13 +++++++-
.../upload/PmsTemProcessReportController.java | 24 ++++++++++++++
.../upload/PmsTemUserController.java | 10 ++++++
.../upload/IPmsTemProcessReportService.java | 9 +++++
.../service/upload/IPmsTemUserService.java | 2 ++
.../impl/PmsTemProcessReportServiceImpl.java | 23 +++++++++++++
.../impl/PmsTemProcessTrackServiceImpl.java | 2 +-
.../upload/impl/PmsTemUserServiceImpl.java | 24 +++++++++++++-
12 files changed, 132 insertions(+), 31 deletions(-)
diff --git a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
index 913fd3a17..5e3a4bde0 100644
--- a/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
+++ b/pqs-common/common-web/src/main/java/com/njcn/web/enums/GWSendEnum.java
@@ -52,6 +52,7 @@ public enum GWSendEnum {
COMM_POINT("commPoint","/powerQuality/publicConnection/pqBusMonitorDataStatisticalCreate"),
MAIN_MONITOR("mainMonitor","/powerQuality/runStatistics/monitorStatisticsCreate"),
TEMP_USER_CREATE("tempUserCreate","/powerQuality/process/tempUserCreate"),
+ TEMP_PROCESS_TRACK_CREATE("tempProcessTrackCreate","/powerQuality/process/processFollowCreate"),
MONTH_REPORT_CREATE("monthReportCreate","/powerQuality/process/monthReportCreate"),
PROCESS_APPROVAL_CREATE("processApprovalCreate","powerQuality/process/processApprovalCreate")
;
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java
index 4fdc804e2..b1ae99d09 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
+import javax.validation.constraints.NotBlank;
import java.time.LocalDateTime;
/**
@@ -31,11 +32,15 @@ public class PmsTemProcessApprovalParam {
/**
* 关联临时用户档案主键
*/
+ @NotBlank(message = "关联临时用户档案不可为空")
private String tempUserDossierId;
+ private String tempUserDossierName;
+
/**
* 验收参与人
*/
+ @NotBlank(message = "验收参与人不可为空")
private String approvalJoinUserId;
/**
@@ -48,26 +53,17 @@ public class PmsTemProcessApprovalParam {
*/
private String approvalAdvise;
- /**
- * 新增时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime createTime;
-
- /**
- * 更新时间
- */
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
- private LocalDateTime updateTime;
/**
* 遗留问题
*/
+ @NotBlank(message = "遗留问题不可为空")
private String legacyProblem;
/**
* 整改状态(是否整改)
*/
+ @NotBlank(message = "整改状态不可为空")
private String rectificationStatus;
/**
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java
index 870f21794..d05d5979f 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemProcessApproval.java
@@ -1,10 +1,11 @@
package com.njcn.harmonic.pojo.po.upload;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.time.LocalDateTime;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.db.bo.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -21,7 +22,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "pms_tem_process_approval")
-public class PmsTemProcessApproval {
+public class PmsTemProcessApproval extends BaseEntity {
/**
* 主键
*/
@@ -34,6 +35,14 @@ public class PmsTemProcessApproval {
@TableField(value = "temp_user_dossier_id")
private String tempUserDossierId;
+ private String tempUserDossierName;
+
+ @TableField(exist = false)
+ private String maintOrg;
+
+ @TableField(exist = false)
+ private String maintOrgName;
+
/**
* 验收参与人
*/
@@ -52,17 +61,6 @@ public class PmsTemProcessApproval {
@TableField(value = "approval_advise")
private String approvalAdvise;
- /**
- * 新增时间
- */
- @TableField(value = "create_time")
- private LocalDateTime createTime;
-
- /**
- * 更新时间
- */
- @TableField(value = "update_time")
- private LocalDateTime updateTime;
/**
* 遗留问题
@@ -79,7 +77,8 @@ public class PmsTemProcessApproval {
/**
* 整改时间
*/
- @TableField(value = "rectification_time")
+ @TableField(value = "rectification_time",updateStrategy = FieldStrategy.IGNORED)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime rectificationTime;
/**
diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java
index c4dddb29c..d6a8b89bd 100644
--- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/upload/PmsTemUserPO.java
@@ -1,5 +1,7 @@
package com.njcn.harmonic.pojo.po.upload;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -142,12 +144,14 @@ public class PmsTemUserPO extends BaseEntity {
* 投运日期
*/
@JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDate operateTime;
/**
* 发布时间
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(updateStrategy = FieldStrategy.IGNORED)
private LocalDateTime releaseTime;
/**
diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java
index c496c068f..5ebddc797 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java
@@ -8,18 +8,22 @@ import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.harmonic.mapper.upload.PmsTemUserMapper;
import com.njcn.harmonic.pojo.param.upload.PmsTemProcessApprovalParam;
import com.njcn.harmonic.pojo.param.upload.PmsTemProcessTrackParam;
import com.njcn.harmonic.pojo.po.upload.PmsTemProcessApproval;
import com.njcn.harmonic.pojo.po.upload.PmsTemProcessTrackPO;
+import com.njcn.harmonic.pojo.po.upload.PmsTemUserPO;
import com.njcn.harmonic.service.upload.PmsTemProcessApprovalService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
+import java.util.Objects;
/**
*
@@ -36,10 +40,12 @@ public class PmsTemProcessApprovalController extends BaseController {
private final PmsTemProcessApprovalService pmsTemProcessApprovalService;
+ private final PmsTemUserMapper pmsTemUserMapper;
+
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/create")
@ApiOperation("新增电能质量评估问题整改数据")
- public HttpResult