Skip to content

csbr-daop / ms-data-circulation-portal-service

Go to a project
Toggle navigation
Toggle navigation pinning
f7e81cfd by 肖初晴
Options

【DAOP-1.0】企业认证 

【功能点】联调问题处理
1 parent c3b59ab4
Inline Side-by-side
Showing 4 changed files with 7 additions and 4 deletions
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseQueryVO.java
......@@ -34,6 +34,9 @@ public class EnterpriseQueryVO extends FlowBizGuidQueryDTO {
@Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中；】")
private String bizApproveState;
@Schema(description = "排除业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中；】")
private List<String> bizApproveStateNotList;
/******** 自定义扩展 *****/
/**
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/ServicerMaintainRQVO.java
......@@ -38,7 +38,7 @@ public class ServicerMaintainRQVO extends FlowRQBaseVO {
* 提交时间
*/
@Schema(description = "提交时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date submitTime;
/**
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/ServicerMaintainRSVO.java
......@@ -44,7 +44,7 @@ public class ServicerMaintainRSVO {
* 提交时间
*/
@Schema(description = "提交时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date submitTime;
/**
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
......@@ -83,8 +83,8 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
beforeQuery(queryVO);
if (queryVO.getIsNeedQuery()) {
LambdaQueryWrapper<MfEnterprise> queryWrapper = mfEnterpriseService.csbrQueryWrapper(queryVO, MfEnterprise.class);
queryWrapper.in(CollectionUtils.isNotEmpty(queryVO.getGuidList()), MfEnterprise::getGuid,
queryVO.getGuidList());
queryWrapper.in(CollectionUtils.isNotEmpty(queryVO.getGuidList()), MfEnterprise::getGuid,queryVO.getGuidList());
queryWrapper.notIn(CollectionUtils.isNotEmpty(queryVO.getBizApproveStateNotList()), MfEnterprise::getBizApproveState,queryVO.getBizApproveStateNotList());
queryWrapper.orderByDesc(MfEnterprise::getCreateTime);
PageListVO<MfEnterprise> pageList = mfEnterpriseService.csbrPageList(queryVO, queryWrapper);
PageListVO<EnterpriseRSVO> rsPageList = csbrBeanUtil.convert(pageList, PageListVO.class);
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!