From 146e0e440801ec66993bb07e4f705c73b4953d4d Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Fri, 25 Oct 2024 11:33:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E7=BD=91=E4=B8=8A=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../upload/PmsTemProcessApprovalParam.java | 109 ++++++++++++++++++
.../PmsTemProcessApprovalController.java | 90 +++++++++++++++
.../upload/PmsTemProcessReportController.java | 1 -
.../upload/PmsTemProcessTrackController.java | 1 -
.../upload/PmsTemUserController.java | 1 -
5 files changed, 199 insertions(+), 3 deletions(-)
create mode 100644 pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java
create mode 100644 pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java
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
new file mode 100644
index 000000000..4fdc804e2
--- /dev/null
+++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/param/upload/PmsTemProcessApprovalParam.java
@@ -0,0 +1,109 @@
+package com.njcn.harmonic.pojo.param.upload;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.time.LocalDateTime;
+
+/**
+ *
+ * 电能质量全过程跟踪数据
+ *
+ *
+ * @author cdf
+ * @since 2024-10-09
+ */
+@Getter
+@Setter
+public class PmsTemProcessApprovalParam {
+
+
+ /**
+ * 主键
+ */
+ private String objId;
+
+ /**
+ * 关联临时用户档案主键
+ */
+ private String tempUserDossierId;
+
+ /**
+ * 验收参与人
+ */
+ private String approvalJoinUserId;
+
+ /**
+ * 验收参与人名称
+ */
+ private String approvalJoinUserName;
+
+ /**
+ * 验收建议
+ */
+ 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;
+
+ /**
+ * 遗留问题
+ */
+ private String legacyProblem;
+
+ /**
+ * 整改状态（是否整改）
+ */
+ private String rectificationStatus;
+
+ /**
+ * 整改时间
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private LocalDateTime rectificationTime;
+
+ /**
+ * 整改人
+ */
+ private String rectificationUserId;
+
+ /**
+ * 整改人名称
+ */
+ private String rectificationUserName;
+
+ /**
+ * 整改措施
+ */
+ private String rectificationMeasure;
+
+ @Data
+ @EqualsAndHashCode(callSuper = true)
+ public static class QueryPmsTemProcessApprovalParam extends BaseParam {
+
+ private String objId;
+
+ private String tempUserDossierId;
+
+ /**
+ * 运维单位
+ */
+ private String maintOrg;
+ }
+
+
+}
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
new file mode 100644
index 000000000..c496c068f
--- /dev/null
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/upload/PmsTemProcessApprovalController.java
@@ -0,0 +1,90 @@
+package com.njcn.harmonic.controller.upload;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+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.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.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.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ *
+ * 电能质量全过程月报 前端控制器
+ *
+ *
+ * @author cdf
+ * @since 2024-10-09
+ */
+@RestController
+@RequestMapping("/process/processApproval")
+@RequiredArgsConstructor
+public class PmsTemProcessApprovalController extends BaseController {
+
+ private final PmsTemProcessApprovalService pmsTemProcessApprovalService;
+
+ @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+ @PostMapping("/create")
+ @ApiOperation("新增电能质量评估问题整改数据")
+ public HttpResult