pms过程监督代码合并

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanDetail.java

@@ -8,7 +8,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/11  11:28【需求编号】
@@ -16,6 +16,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 普测计划详情表
     */
@@ -106,4 +107,4 @@ public class RGeneralSurveyPlanDetail {
      */
     @TableField(value = "is_problem")
     private Integer isProblem;
-}
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java

@@ -9,7 +9,7 @@ import lombok.Data;
 import java.util.Date;
 
 /**
- * 
+ *
  * Description:
  * 接口文档访问地址：http://serverIP:port/swagger-ui.html
  * Date: 2022/11/11  11:24【需求编号】
@@ -17,6 +17,7 @@ import java.util.Date;
  * @author clam
  * @version V1.0.0
  */
+
 /**
     * 普测计划表
     */
@@ -111,4 +112,4 @@ public class RGeneralSurveyPlanPO {
     @TableField(value = "upload_time")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date uploadTime;
-}
+}

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpElectricQualityProblemFlowDetails.java

@@ -1,12 +1,10 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpGeneralSurveyOverproofProblem.java

@@ -1,12 +1,10 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java

@@ -1,12 +1,10 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOperationMonitorAbnormal.java

@@ -1,12 +1,10 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpUserComplaint.java

@@ -1,12 +1,10 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RStatElectricQualityProblemFlow.java

@@ -1,12 +1,10 @@
 package com.njcn.process.pojo.po;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.TableId;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.time.LocalDateTime;
 
 /**
  * <p>

pqs-process/process-api/src/main/java/com/njcn/process/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>pqs-process</artifactId>
+        <groupId>com.njcn</groupId>
+        <version>1.0.0</version>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <name>技术监督管理</name>
+    <artifactId>process-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-db</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-microservice</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-poi</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.github.jeffreyning</groupId>
+            <artifactId>mybatisplus-plus</artifactId>
+            <version>1.5.1-RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+</project>

pqs-process/process-boot/pom.xml

@@ -45,6 +45,12 @@
             <artifactId>pq-device-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>pms-device-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>system-api</artifactId>

pqs-process/process-boot/src/main/java/com/njcn/process/mapper/RStatElectricQualityProblemFlowMapper.java

@@ -18,5 +18,5 @@ import java.util.List;
  */
 public interface RStatElectricQualityProblemFlowMapper extends BaseMapper<RStatElectricQualityProblemFlow> {
 
-    List<IssuesVO> getIssues(@Param("deptIds") List<String> deptIds, @Param("param") QueryIssuesParam param, @Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd);
+    List<IssuesVO> getIssues(@Param("deptIds") List<String>deptIds,@Param("param") QueryIssuesParam param, @Param("dateBegin") String dateBegin, @Param("dateEnd") String dateEnd);
 }