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

非线性用户建档列表管理

Browse Source
This commit is contained in:
hongawen
2024-05-13 11:31:25 +08:00
parent a486670563
commit eeeae803a6
3 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/vo/user/UserReportVO.java
View File

@@ -1,7 +1,12 @@
package com.njcn.supervision.pojo.vo.user; package com.njcn.supervision.pojo.vo.user;
import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import com.njcn.supervision.pojo.po.user.UserReportProjectPO; import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
import com.njcn.supervision.pojo.po.user.UserReportSensitivePO; import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
import com.njcn.supervision.pojo.po.user.UserReportSubstationPO; import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
@@ -9,6 +14,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import java.time.LocalDate; import java.time.LocalDate;
import java.time.LocalDateTime;
/** /**
* *
@@ -108,12 +114,27 @@ public class UserReportVO {
@ApiModelProperty(value = "预测评估结论") @ApiModelProperty(value = "预测评估结论")
private String evaluationConclusion; private String evaluationConclusion;
/**
* 流程实例的编号
*/
@ApiModelProperty(value = "流程实例的编号")
private String processInstanceId;
/** /**
* 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消 * 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消
*/ */
@TableField(value = "`status`") @TableField(value = "`status`")
private Integer status; private Integer status;
/**
* 创建时间
*/
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonDeserialize(using = LocalDateTimeDeserializer.class)
@JsonSerialize(using = LocalDateTimeSerializer.class)
private LocalDateTime createTime;
private UserReportProjectPO userReportProjectPO; private UserReportProjectPO userReportProjectPO;

1
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/mapper/user/mapping/UserReportPOMapper.xml
View File

@@ -48,6 +48,7 @@
supervision_user_report.evaluation_dept, supervision_user_report.evaluation_dept,
supervision_user_report.evaluation_conclusion, supervision_user_report.evaluation_conclusion,
supervision_user_report.process_instance_id, supervision_user_report.process_instance_id,
supervision_user_report.create_time,
supervision_user_report.status supervision_user_report.status
FROM supervision_user_report supervision_user_report FROM supervision_user_report supervision_user_report
WHERE ${ew.sqlSegment} WHERE ${ew.sqlSegment}

1
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/user/impl/UserReportPOServiceImpl.java
View File

@@ -170,7 +170,6 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
userReportProjectPOService.lambdaUpdate().set(UserReportProjectPO::getState, 0).in(UserReportProjectPO::getId, ids).update(); userReportProjectPOService.lambdaUpdate().set(UserReportProjectPO::getState, 0).in(UserReportProjectPO::getId, ids).update();
userReportSubstationPOService.lambdaUpdate().set(UserReportSubstationPO::getState, 0).in(UserReportSubstationPO::getId, ids).update(); userReportSubstationPOService.lambdaUpdate().set(UserReportSubstationPO::getState, 0).in(UserReportSubstationPO::getId, ids).update();
userReportSensitivePOService.lambdaUpdate().set(UserReportSensitivePO::getState, 0).in(UserReportSensitivePO::getId, ids).update(); userReportSensitivePOService.lambdaUpdate().set(UserReportSensitivePO::getState, 0).in(UserReportSensitivePO::getId, ids).update();
return true; return true;
} }