代码合并终
This commit is contained in:
@@ -0,0 +1,27 @@
|
||||
package com.njcn.process.constant;
|
||||
|
||||
import com.google.common.collect.Maps;
|
||||
import com.njcn.device.pq.pojo.po.DataV;
|
||||
import org.springframework.cglib.beans.BeanMap;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* Description:
|
||||
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
|
||||
* Date: 2022/12/7 15:18【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
public class Test {
|
||||
public static void main(String[] args) {
|
||||
|
||||
Map<String, Object> map = Maps.newHashMap ( );
|
||||
DataV d = new DataV ( );
|
||||
BeanMap beanMap = BeanMap.create (d);
|
||||
for (Object key : beanMap.keySet ( )) {
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
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 lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
|
||||
* Date: 2023/2/1 14:17【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* 台区测点问题表
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "r_stat_distribution_problem")
|
||||
public class RStatDistributionProblemPO {
|
||||
/**
|
||||
* 问题编号(有生成规则，看文档)
|
||||
*/
|
||||
@MppMultiId(value = "problem_no")
|
||||
private String problemNo;
|
||||
|
||||
@TableField(value = "org_no")
|
||||
private String orgNo;
|
||||
|
||||
/**
|
||||
* 问题类型(字典，两种类型：谐波电压越限、谐波电流越限)
|
||||
*/
|
||||
@TableField(value = "problem_type")
|
||||
private String problemType;
|
||||
|
||||
/**
|
||||
* 问题发生时间
|
||||
*/
|
||||
@TableField(value = "occur_time")
|
||||
private Date occurTime;
|
||||
|
||||
/**
|
||||
* 台区ID
|
||||
*/
|
||||
@TableField(value = "distribution_id")
|
||||
private String distributionId;
|
||||
|
||||
/**
|
||||
* 最新超标时间(超标连续大于4小时)
|
||||
*/
|
||||
@TableField(value = "last_time")
|
||||
private Date lastTime;
|
||||
|
||||
/**
|
||||
* 审核状态(字典，两种类型：待审核/已审核)
|
||||
*/
|
||||
@TableField(value = "check_status")
|
||||
private String checkStatus;
|
||||
|
||||
/**
|
||||
* 审核处理(字典，三种情况：“-”“生成工单”“无需处理”，待审核状态的审核结果为“-”，另外两种根据审核弹窗选择结果显示.这边字典存两个生成工单、无需处理，为空是替换成“-”)
|
||||
*/
|
||||
@TableField(value = "check_result")
|
||||
private String checkResult;
|
||||
|
||||
/**
|
||||
* 问题处理时间
|
||||
*/
|
||||
@TableField(value = "handle_time")
|
||||
private Date handleTime;
|
||||
|
||||
/**
|
||||
* 监测点ID
|
||||
*/
|
||||
@TableField(value = "measurement_point_id")
|
||||
private String measurementPointId;
|
||||
|
||||
/**
|
||||
* 问题描述
|
||||
*/
|
||||
@TableField(value = "problem_describe")
|
||||
private String problemDescribe;
|
||||
|
||||
/**
|
||||
* 补充描述
|
||||
*/
|
||||
@TableField(value = "supply_describe")
|
||||
private String supplyDescribe;
|
||||
}
|
||||
@@ -0,0 +1,194 @@
|
||||
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 lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
/**
|
||||
*
|
||||
* Description:
|
||||
* 接口文档访问地址：http://serverIP:port/swagger-ui.html
|
||||
* Date: 2023/2/1 14:13【需求编号】
|
||||
*
|
||||
* @author clam
|
||||
* @version V1.0.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* 工单详情表
|
||||
*/
|
||||
@Data
|
||||
@TableName(value = "r_stat_work_order_detail")
|
||||
public class RStatWorkOrderDetailPO {
|
||||
/**
|
||||
* 问题编号(台区测点问题表的problem_no)
|
||||
*/
|
||||
@MppMultiId(value = "problem_no")
|
||||
private String problemNo;
|
||||
@TableField(value = "org_no")
|
||||
private String orgNo;
|
||||
/**
|
||||
* 工单状态(字典，待派单、已派单、已关闭)
|
||||
*/
|
||||
@TableField(value = "work_order_status")
|
||||
private String workOrderStatus;
|
||||
|
||||
/**
|
||||
* 工单类型(字典，目前一个，整改单)
|
||||
*/
|
||||
@TableField(value = "work_order_type")
|
||||
private String workOrderType;
|
||||
|
||||
/**
|
||||
* 一级业务类型(字典，目前一个，运检业务)
|
||||
*/
|
||||
@TableField(value = "primary_business_type")
|
||||
private String primaryBusinessType;
|
||||
|
||||
/**
|
||||
* 二级业务类型(字典，两种类型：谐波电压越限、谐波电流越限)
|
||||
*/
|
||||
@TableField(value = "two_business_type")
|
||||
private String twoBusinessType;
|
||||
|
||||
/**
|
||||
* 供电所
|
||||
*/
|
||||
@TableField(value = "power_supply_station")
|
||||
private String powerSupplyStation;
|
||||
|
||||
/**
|
||||
* 工单流程(字典，生成工单、派单、反馈、审核、整改、评估、归档，默认生成工单)
|
||||
*/
|
||||
@TableField(value = "work_order_process")
|
||||
private String workOrderProcess;
|
||||
|
||||
/**
|
||||
* 维护班组
|
||||
*/
|
||||
@TableField(value = "whbz")
|
||||
private String whbz;
|
||||
|
||||
/**
|
||||
* 工单负责人
|
||||
*/
|
||||
@TableField(value = "work_order_leader")
|
||||
private String workOrderLeader;
|
||||
|
||||
/**
|
||||
* 工单完成时间
|
||||
*/
|
||||
@TableField(value = "work_order_over_time")
|
||||
private Date workOrderOverTime;
|
||||
|
||||
/**
|
||||
* 要求反馈时间
|
||||
*/
|
||||
@TableField(value = "expect_ask_feedback_time")
|
||||
private Date expectAskFeedbackTime;
|
||||
|
||||
/**
|
||||
* 接单人ID
|
||||
*/
|
||||
@TableField(value = "pick_up_person")
|
||||
private String pickUpPerson;
|
||||
|
||||
/**
|
||||
* 下发时间
|
||||
*/
|
||||
@TableField(value = "distribution_time")
|
||||
private Date distributionTime;
|
||||
|
||||
/**
|
||||
* 预期到期时间
|
||||
*/
|
||||
@TableField(value = "expiration_time")
|
||||
private Date expirationTime;
|
||||
|
||||
/**
|
||||
* 关联设备主人
|
||||
*/
|
||||
@TableField(value = "relation_device")
|
||||
private String relationDevice;
|
||||
|
||||
/**
|
||||
* 附件
|
||||
*/
|
||||
@TableField(value = "enclosure")
|
||||
private String enclosure;
|
||||
|
||||
/**
|
||||
* 抄送
|
||||
*/
|
||||
@TableField(value = "copy_for")
|
||||
private String copyFor;
|
||||
|
||||
/**
|
||||
* 反馈时间
|
||||
*/
|
||||
@TableField(value = "ask_feedback_time")
|
||||
private Date askFeedbackTime;
|
||||
|
||||
/**
|
||||
* 计划完成时间
|
||||
*/
|
||||
@TableField(value = "planned_completion_time")
|
||||
private Date plannedCompletionTime;
|
||||
|
||||
/**
|
||||
* 原因反馈
|
||||
*/
|
||||
@TableField(value = "cause_feedback")
|
||||
private String causeFeedback;
|
||||
|
||||
/**
|
||||
* 审核状态(字典，两种类型：审核通过/审核不通过)
|
||||
*/
|
||||
@TableField(value = "check_status")
|
||||
private String checkStatus;
|
||||
|
||||
/**
|
||||
* 审核意见(审核通过可为空，审核不通过时必填)
|
||||
*/
|
||||
@TableField(value = "check_comments")
|
||||
private String checkComments;
|
||||
|
||||
/**
|
||||
* 计划完成时间
|
||||
*/
|
||||
@TableField(value = "rectify_complete_time")
|
||||
private Date rectifyCompleteTime;
|
||||
|
||||
/**
|
||||
* 整改人ID
|
||||
*/
|
||||
@TableField(value = "rectify_person")
|
||||
private String rectifyPerson;
|
||||
|
||||
/**
|
||||
* 整改描述
|
||||
*/
|
||||
@TableField(value = "rectify_describe")
|
||||
private String rectifyDescribe;
|
||||
|
||||
/**
|
||||
* 评估完成时间
|
||||
*/
|
||||
@TableField(value = "assess_complete_time")
|
||||
private Date assessCompleteTime;
|
||||
|
||||
/**
|
||||
* 评估结果（字典，评估合格、评估不合格）
|
||||
*/
|
||||
@TableField(value = "assess_result")
|
||||
private String assessResult;
|
||||
|
||||
/**
|
||||
* 评估描述
|
||||
*/
|
||||
@TableField(value = "assess_describe")
|
||||
private String assessDescribe;
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.njcn.process.pojo.vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
/**
|
||||
* @Description: 工单统计类
|
||||
* @Param:
|
||||
* @return:
|
||||
* @Author: clam
|
||||
* @Date: 2023/1/5
|
||||
*/
|
||||
@Data
|
||||
public class OrderCountVO implements Serializable {
|
||||
|
||||
private static final long serialVersionUID = -8022287041427540079L;
|
||||
|
||||
@ApiModelProperty("单位id")
|
||||
private String id;
|
||||
|
||||
@ApiModelProperty("工单数量")
|
||||
private Integer orderCount;
|
||||
|
||||
@ApiModelProperty("已完成工单数量")
|
||||
private Integer compelteOrderCount;
|
||||
|
||||
}
|
||||
@@ -1,48 +0,0 @@
|
||||
<?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>
|
||||
Reference in New Issue
Block a user