1.技术监督台账管理-台账管理,监测点终端数量bug解决
2.干扰源常态化用户,编辑新增功能流程
This commit is contained in:
@@ -17,7 +17,9 @@ public enum SupervisionKeyEnum {
|
||||
USER_GO_NET("user_go_net","user","入网设计方案流程","UserReportNormalServiceImpl"),
|
||||
USER_TREAT_CHECK("user_treat_check","user","治理工程流程","UserReportNormalServiceImpl"),
|
||||
BUILD_USER_INFO("build_user_info","user","干扰源建档流程","UserReportPOServiceImpl"),
|
||||
TIMING_CHECK_DEVICE("timing_check_device","device","终端周期检测","CheckDeviceServiceImpl");
|
||||
TIMING_CHECK_DEVICE("timing_check_device","device","终端周期检测","CheckDeviceServiceImpl"),
|
||||
USER_REPORT_RENEWAL("user_report_update","user","干扰源常态化信息编辑流程","UserReportRenewalServiceImpl"),
|
||||
USER_REPORT_DELETE("user_report_delete","user","干扰源常态化信息删除流程","UserReportDeleteServiceImpl");
|
||||
|
||||
private final String key;
|
||||
|
||||
|
||||
@@ -20,7 +20,8 @@ public enum SupervisionResponseEnum {
|
||||
IMPORT_SENSITIVE_REPORT_ERROR("A00550","导入干扰源用户失败"),
|
||||
SUPERVISION_SERVICE_NOT_FOUND("A00550","业务实现类丢失,清查看类路径配置"),
|
||||
DATA_NOT_EXISTS("A00550","数据不存在"),
|
||||
NO_POWER("A00550","不能操作非自己创建的任务!")
|
||||
NO_POWER("A00550","不能操作非自己创建的任务!"),
|
||||
NO_USER_REPORT_UPDATE("A00550","常态化干扰源用户管理信息更新失败,不存在该条信息"),
|
||||
;
|
||||
|
||||
private final String code;
|
||||
|
||||
@@ -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 = "审核状态")
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user