Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

1.技术监督台账管理-台账管理，监测点终端数量bug解决

Browse Source 
2.干扰源常态化用户，编辑新增功能流程
This commit is contained in:
wr
2024-06-28 17:32:37 +08:00
parent dbee4ca31d
commit 87c60206f0
17 changed files with 699 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/param/user/UserReportParam.java
View File

@@ -16,7 +16,6 @@ import java.util.List;
import java.util.Map;
/**
*
* Description:
* Date: 2024/4/25 10:07【需求编号】
*
@@ -40,7 +39,7 @@ public class UserReportParam {
* 填报日期
*/
@ApiModelProperty(value = "填报日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate reportDate;
/**
@@ -53,7 +52,7 @@ public class UserReportParam {
* 工程预期投产日期
*/
@ApiModelProperty(value = "工程预期投产日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private LocalDate expectedProductionDate;
/**
@@ -112,11 +111,12 @@ public class UserReportParam {
@ApiModelProperty("发起人自选审批人 Map")
private Map<String, List<String>> startUserSelectAssignees;
@ApiModelProperty(value = "保存1,提交审批2")
private String saveOrCheckflag;
@ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入")
@ApiModelProperty(value = "数据来源类型 0：正常审核流程 1：批量导入")
private Integer dataType;
private UserReportProjectPO userReportProjectPO;
@@ -137,13 +137,9 @@ public class UserReportParam {
private String historyInstanceId;
@Data
@EqualsAndHashCode(callSuper = true)
public static class UserReportUpdate extends UserReportParam {
public static class UserReportUpdate extends UserReportParam {
@ApiModelProperty("id")
private String id;
@@ -157,14 +153,14 @@ public class UserReportParam {
@EqualsAndHashCode(callSuper = true)
public static class UserReportQueryParam extends BaseParam {
@ApiModelProperty(value="所属区域")
@ApiModelProperty(value = "所属区域")
private String city;
@ApiModelProperty(value = "工程名称")
private String projectName;
@ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入")
@ApiModelProperty(value = "数据来源类型 0：正常审核流程 1：批量导入")
private Integer dataType;
@ApiModelProperty(value = "审核状态")

67
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportRenewalPO.java Normal file
View File

@@ -0,0 +1,67 @@
package com.njcn.supervision.pojo.po.user;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.njcn.db.bo.BaseEntity;
import com.njcn.supervision.pojo.param.user.UserReportParam;
import lombok.Data;
/**
* <p>
* 用户档案信息表
* </p>
*
* @author wr
* @since 2024-06-26
*/
@Data
@TableName("supervision_user_report_renewal")
public class UserReportRenewalPO extends BaseEntity {
private static final long serialVersionUID = 1L;
/**
* id
*/
private String id;
/**
* 常态化用户跟新后信息
*/
private String userReportMessage;
/**
* 常态化用户跟新后信息
*/
@TableField(exist = false)
private UserReportParam userReportMessageJson;
/**
* 流程实例的编号
*/
private String processInstanceId;
/**
* 历史流程实列
*/
private String historyInstanceId;
/**
* 1:审批中；2：审批通过；3：审批不通过；4：已取消
*/
private Integer status;
/**
* 状态：0-删除 1-正常
*/
private Integer state;
public void setUserReportMessage(String userReportMessage) {
if(StrUtil.isNotBlank(userReportMessage)){
this.userReportMessageJson= JSONObject.parseObject(userReportMessage,UserReportParam.class);
}
this.userReportMessage = userReportMessage;
}
}