【DAOP-1.0】企业认证

【功能点】联调问题处理

@@ -34,6 +34,9 @@ public class EnterpriseQueryVO extends FlowBizGuidQueryDTO {
     @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中；】")
     @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中；】")
     private String bizApproveState;
     private String bizApproveState;
 
 
+    @Schema(description = "排除业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中；】")
+    private List<String> bizApproveStateNotList;
+
     /******** 自定义扩展 *****/
     /******** 自定义扩展 *****/
     
     
     /**
     /**

@@ -38,7 +38,7 @@ public class ServicerMaintainRQVO extends FlowRQBaseVO {
      * 提交时间
      * 提交时间
      */
      */
     @Schema(description = "提交时间")
     @Schema(description = "提交时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date submitTime;
     private Date submitTime;
     
     
     /**
     /**

@@ -44,7 +44,7 @@ public class ServicerMaintainRSVO {
      * 提交时间
      * 提交时间
      */
      */
     @Schema(description = "提交时间")
     @Schema(description = "提交时间")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date submitTime;
     private Date submitTime;
     
     
     /**
     /**

@@ -83,8 +83,8 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
         beforeQuery(queryVO);
         beforeQuery(queryVO);
         if (queryVO.getIsNeedQuery()) {
         if (queryVO.getIsNeedQuery()) {
             LambdaQueryWrapper<MfEnterprise> queryWrapper = mfEnterpriseService.csbrQueryWrapper(queryVO, MfEnterprise.class);
             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);
             queryWrapper.orderByDesc(MfEnterprise::getCreateTime);
             PageListVO<MfEnterprise> pageList = mfEnterpriseService.csbrPageList(queryVO, queryWrapper);
             PageListVO<MfEnterprise> pageList = mfEnterpriseService.csbrPageList(queryVO, queryWrapper);
             PageListVO<EnterpriseRSVO> rsPageList = csbrBeanUtil.convert(pageList, PageListVO.class);
             PageListVO<EnterpriseRSVO> rsPageList = csbrBeanUtil.convert(pageList, PageListVO.class);