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

冀北台账管理接口开发

Browse Source
This commit is contained in:
cdf
2024-05-16 13:47:20 +08:00
parent 2e6ac4f07e
commit 3ef85be49d
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,6 +141,9 @@ public class UserReportParam extends BaseEntity {
@ApiModelProperty(value="所属区域")
private String city;
@ApiModelProperty(value="数据来源类型 0：正常审核流程 1：批量导入")
private Integer dataType;
}

6
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/pojo/po/user/UserReportPO.java
View File

@@ -114,6 +114,12 @@ public class UserReportPO extends BaseEntity {
@TableField(value = "process_instance_id")
private String processInstanceId;
/**
* 数据来源类型 0.正常流程审核入库 1.批量导入
*/
@TableField(value = "data_type")
private Integer dataType;
/**
* 审批状态：1:审批中；2：审批通过；3：审批不通过；4：已取消

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

@@ -75,6 +75,7 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
BeanUtils.copyProperties(userReportParam, userReportPO);
userReportPO.setState(DataStateEnum.ENABLE.getCode());
userReportPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
userReportPO.setDataType(0);
this.save(userReportPO);
if (
CollectionUtil.newArrayList(
@@ -259,13 +260,18 @@ public class UserReportPOServiceImpl extends ServiceImpl<UserReportPOMapper, Use
public Page<UserReportVO> getInterferenceUserPage(UserReportParam.UserReportQueryParam userReportQueryParam) {
QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
userReportVOQueryWrapper
.eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode()).eq("supervision_user_report.status",FlowStatusEnum.APPROVE.getCode());
.eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode())
.eq("supervision_user_report.status",FlowStatusEnum.APPROVE.getCode())
;
//TODO
if (Objects.nonNull(userReportQueryParam)) {
if (StrUtil.isNotBlank(userReportQueryParam.getCity())) {
//查询所有区域下的数据
userReportVOQueryWrapper.in("supervision_user_report.city", userReportQueryParam.getCity());
}
if(Objects.nonNull(userReportQueryParam.getDataType())){
userReportVOQueryWrapper.eq("data_type",userReportQueryParam.getDataType());
}
}
userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time");
return this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper);