Merge branch 'develop' into 'master'

合并代码

See merge request !4

@@ -36,11 +36,11 @@
             <artifactId>csbr-cloud-base</artifactId>
             <version>${cabr-package.version}</version>
         </dependency>
-        <dependency>
+       <!-- <dependency>
             <groupId>com.csbr.qingcloud</groupId>
             <artifactId>csbr-cloud-log</artifactId>
             <version>${cabr-package.version}</version>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>com.csbr.qingcloud</groupId>
             <artifactId>csbr-cloud-mybatis</artifactId>
@@ -92,6 +92,8 @@
                     <exclude>release/*</exclude>
                     <exclude>develop/*</exclude>
                     <exclude>release-test/*</exclude>
+                    <exclude>zq-release/*</exclude>
+                    <exclude>enterprise-release/*</exclude>
                 </excludes>
                 <!--开启过滤器，此处不能忽略！-->
                 <filtering>true</filtering>
@@ -207,6 +209,78 @@
                 <subPath>project</subPath>
             </properties>
         </profile>
+        <profile>
+            <id>zq-production-daop-master</id>
+            <properties>
+                <profileActive>zq-release</profileActive>
+                <subPath></subPath>
+            </properties>
+        </profile>
+        <profile>
+            <id>zq-production-daop-lt</id>
+            <properties>
+                <profileActive>zq-release</profileActive>
+                <subPath>lt</subPath>
+            </properties>
+        </profile>
+        <profile>
+            <id>zq-production-daop-zcgl</id>
+            <properties>
+                <profileActive>zq-release</profileActive>
+                <subPath>zcgl</subPath>
+            </properties>
+        </profile>
+        <profile>
+            <id>zq-production-daop-jgjf</id>
+            <properties>
+                <profileActive>zq-release</profileActive>
+                <subPath>jgjf</subPath>
+            </properties>
+        </profile>
+        <profile>
+            <id>zq-production-daop-project</id>
+            <properties>
+                <profileActive>zq-release</profileActive>
+                <subPath>project</subPath>
+            </properties>
+        </profile>
+
+        <profile>
+            <id>enterprise-production-daop-master</id>
+            <properties>
+                <profileActive>enterprise-release</profileActive>
+                <subPath></subPath>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-production-daop-lt</id>
+            <properties>
+                <profileActive>enterprise-release</profileActive>
+                <subPath>lt</subPath>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-production-daop-zcgl</id>
+            <properties>
+                <profileActive>enterprise-release</profileActive>
+                <subPath>zcgl</subPath>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-production-daop-jgjf</id>
+            <properties>
+                <profileActive>enterprise-release</profileActive>
+                <subPath>jgjf</subPath>
+            </properties>
+        </profile>
+        <profile>
+            <id>enterprise-production-daop-project</id>
+            <properties>
+                <profileActive>enterprise-release</profileActive>
+                <subPath>project</subPath>
+            </properties>
+        </profile>
+
     </profiles>
 
 </project>

+package com.csbr.qingcloud.portal.controller;
+
+import com.csbr.cloud.common.entity.CsbrUpdate;
+import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.*;
+import csbr.cloud.entity.annotation.SystemLog;
+import csbr.cloud.entity.domain.base.vo.PageListVO;
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.qingcloud.portal.service.DemandService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求-控制器
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@RestController
+@RequestMapping("/demand")
+@Tag(name = "数据需求-控制器")
+public class DemandController {
+    
+    @Resource
+    private DemandService demandService;
+    
+    //region 基本操作
+
+    @PostMapping("/save")
+    @SystemLog(value = "数据需求-新增")
+    @Operation(summary = "数据需求-新增")
+    public CommonRes<Boolean> saveDemand(@RequestBody @Valid DemandRQVO vo) {
+        demandService.saveDemand(vo);
+        return CommonRes.success(true);
+    }
+
+    @PutMapping("/update")
+    @SystemLog(value = "数据需求-修改")
+    @Operation(summary = "数据需求-修改")
+    public CommonRes<Boolean> updateDemand(@RequestBody @Valid DemandRQVO vo) {
+        demandService.updateDemand(vo);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/update-grounding-pick")
+    @Operation(summary= "数据需求-修改上架状态")
+    public CommonRes<Boolean> updateGroundingPick(@Validated(value = {CsbrUpdate.class})@RequestBody @Valid DemandRQVO vo) {
+        return CommonRes.success(demandService.updateGroundingPick(vo));
+    }
+    
+    @DeleteMapping("/delete")
+    @SystemLog(value = "数据需求-批量删除")
+    @Operation(summary = "数据需求-批量删除")
+    public CommonRes<Boolean> removeByGuids(@RequestBody List<String> guids) {
+        demandService.removeByGuids(guids);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/page-list")
+    @SystemLog(value = "数据需求-分页")
+    @Operation(summary = "数据需求-分页")
+    public CommonRes<PageListVO<DemandRSVO>> pageList(@RequestBody @Valid DemandQueryVO queryVO) {
+        PageListVO<DemandRSVO> pageVO = demandService.pageList(queryVO);
+        return CommonRes.success(pageVO);
+     }
+
+    @PostMapping("/portal/page-list")
+    @SystemLog(value = "数据需求-门户分页")
+    @Operation(summary = "数据需求-门户分页")
+    public CommonRes<PageListVO<DemandPortalRSVO>> portalPageList(@RequestBody @Valid DemandPortalQueryVO queryVO) {
+        PageListVO<DemandPortalRSVO> pageVO = demandService.portalPageList(queryVO);
+        return CommonRes.success(pageVO);
+    }
+     
+    @GetMapping("/detail")
+    @SystemLog(value = "数据需求-详情")
+    @Operation(summary = "数据需求-详情",parameters = {
+                    @Parameter(name = "guid", description = "数据需求唯一标识", required = true)})
+    public CommonRes<DemandRSVO> getDemandDetail(@RequestParam String guid) {
+        DemandRSVO vo = demandService.getDemandDetail(guid);
+        return CommonRes.success(vo);
+    }
+
+    @GetMapping("/detail-by-process")
+    @SystemLog(value = "按加工单查数据需求详情")
+    @Operation(summary = "按加工单查数据需求详情",parameters = {
+            @Parameter(name = "processOrderNo", description = "加工单单号", required = true)})
+    public CommonRes<DemandRSVO> getDemandDetailByProcess(@RequestParam String processOrderNo) {
+        DemandRSVO vo = demandService.getDemandDetailByProcess(processOrderNo);
+        return CommonRes.success(vo);
+    }
+
+    @PostMapping("/flow-call-back")
+    @SystemLog(value = "数据需求-流程结束后进行业务回调")
+    @Operation(summary = "数据需求-流程结束后进行业务回调", hidden = true)
+    public CommonRes<Boolean> flowCallBack(@RequestBody @Valid BizCallbackDTO dto) {
+        demandService.flowCallBack(dto);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/cross-flow-call-back")
+    @SystemLog(value = "数据需求-流程结束后进行业务回调(跨服务审批)")
+    @Operation(summary = "数据需求-流程结束后进行业务回调(跨服务审批)", hidden = true)
+    public CommonRes<Boolean> crossFlowCallBack(@RequestBody @Valid BizCallbackDTO dto) {
+        demandService.crossFlowCallBack(dto);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/last-approve")
+    @SystemLog(value = "数据需求审批")
+    @Operation(summary = "数据需求审批-最后一个节点时调用")
+    public CommonRes<Boolean> lastApprove(@RequestBody DemandApproveVO dto) {
+        Boolean vo = demandService.lastApprove(dto);
+        return CommonRes.success(vo);
+    }
+
+    @PostMapping("/process-order-list")
+    @Operation(summary = "查询加工单列表")
+    public CommonRes<List<ProcessOrderProcessDtlRSVO>> listByProcessOrderNo() {
+        List<ProcessOrderProcessDtlRSVO> pageVO = demandService.listByProcessOrderNo();
+        return CommonRes.success(pageVO);
+    }
+    
+    //endregion
+    
+}

+package com.csbr.qingcloud.portal.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
+import com.csbr.qingcloud.portal.domain.vo.*;
+import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
+import csbr.cloud.entity.annotation.SystemLog;
+import csbr.cloud.entity.domain.base.vo.PageListVO;
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.qingcloud.portal.service.EnterpriseService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息-控制器
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+@RestController
+@RequestMapping("/enterprise")
+@Tag(name = "企业信息-控制器")
+public class EnterpriseController {
+    
+    @Resource
+    private EnterpriseService enterpriseService;
+
+    @Resource
+    private EnterpriseChangeApproveService enterpriseChangeApproveService;
+    
+    //region 基本操作
+
+    @PostMapping("/save")
+    @SystemLog(value = "企业信息-新增")
+    @Operation(summary = "企业信息-新增")
+    public CommonRes<Boolean> saveEnterprise(@RequestBody @Valid EnterpriseRQVO vo) {
+        enterpriseService.saveEnterprise(vo);
+        return CommonRes.success(true);
+    }
+
+    @PutMapping("/update")
+    @SystemLog(value = "企业信息-修改")
+    @Operation(summary = "企业信息-修改")
+    public CommonRes<Boolean> updateEnterprise(@RequestBody @Valid EnterpriseRQVO vo) {
+        enterpriseService.updateEnterprise(vo);
+        return CommonRes.success(true);
+    }
+    
+    @DeleteMapping("/delete")
+    @SystemLog(value = "企业信息-批量删除")
+    @Operation(summary = "企业信息-批量删除")
+    public CommonRes<Boolean> removeByGuids(@RequestBody List<String> guids) {
+        enterpriseService.removeByGuids(guids);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/page-list")
+    @SystemLog(value = "企业信息-分页")
+    @Operation(summary = "企业信息-分页")
+    public CommonRes<PageListVO<EnterpriseRSVO>> pageList(@RequestBody @Valid EnterpriseQueryVO queryVO) {
+        PageListVO<EnterpriseRSVO> pageVO = enterpriseService.pageList(queryVO);
+        return CommonRes.success(pageVO);
+     }
+
+    @PostMapping("/flow/page-list")
+    @SystemLog(value = "企业信息-分页(调用流程)")
+    @Operation(summary = "企业信息-分页(调用流程)")
+    public CommonRes<PageListVO<EnterpriseApproveRSVO>> flowPageList(@RequestBody @Valid FlowQueryDTO dto) {
+        PageListVO<EnterpriseApproveRSVO> pageVO = enterpriseService.flowPageList(dto);
+        return CommonRes.success(pageVO);
+    }
+     
+    @GetMapping("/detail")
+    @SystemLog(value = "企业信息-详情")
+    @Operation(summary = "企业信息-详情",
+            parameters = {@Parameter(name = "guid", description = "企业信息唯一标识", required = true)} )
+    public CommonRes<EnterpriseRSVO> getEnterpriseDetail(@RequestParam String guid) {
+        EnterpriseRSVO vo = enterpriseChangeApproveService.getEnterpriseChangeDetail(guid);
+        return CommonRes.success(vo);
+    }
+
+    @GetMapping("/detail-by-logonUser")
+    @SystemLog(value = "企业信息-根据登陆账号查询详情")
+    @Operation(summary = "企业信息-根据登陆账号查询详情",
+            parameters = {@Parameter(name = "logonUser", description = "登陆账号", required = true)} )
+    public CommonRes<EnterpriseRSVO> getEnterpriseDetailByLogonUser(@RequestParam String logonUser) {
+        EnterpriseRSVO vo = enterpriseService.getEnterpriseDetailByLogonUser(logonUser);
+        return CommonRes.success(vo);
+    }
+
+    @GetMapping("/detail-by-name")
+    @SystemLog(value = "按名称查企业信息详情")
+    @Operation(summary = "按名称查企业信息详情",
+            parameters = {@Parameter(name = "tenantName", description = "企业名称", required = true)} )
+    public CommonRes<EnterpriseRSVO> getEnterpriseDetailByName(@RequestParam String tenantName) {
+        EnterpriseRSVO vo = enterpriseService.getEnterpriseDetailByName(tenantName);
+        return CommonRes.success(vo);
+    }
+
+    @PostMapping("/flow-call-back")
+    @SystemLog(value = "企业信息-流程结束后进行业务回调")
+    @Operation(summary = "企业信息-流程结束后进行业务回调", hidden = true)
+    public CommonRes<Boolean> flowCallBack(@RequestBody @Valid BizCallbackDTO dto) {
+        enterpriseService.flowCallBack(dto);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/cross-flow-call-back")
+    @SystemLog(value = "企业信息-流程结束后进行业务回调(跨服务审批)")
+    @Operation(summary = "企业信息-流程结束后进行业务回调(跨服务审批)", hidden = true)
+    public CommonRes<Boolean> crossFlowCallBack(@RequestBody @Valid BizCallbackDTO dto) {
+        enterpriseService.crossFlowCallBack(dto);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/move-old-data")
+    @SystemLog(value = "将此账号提交的数据需求迁移到新的企业")
+    @Operation(summary = "将此账号提交的数据需求迁移到新的企业", hidden = true)
+    public CommonRes<Boolean> moveOldData(@RequestBody @Valid TenantRQVO vo) {
+        enterpriseService.moveOldData(vo);
+        return CommonRes.success(true);
+    }
+    
+    //endregion
+
+    //region 变更申请
+
+    /**
+     * 前置校验
+     */
+    @PostMapping("/check")
+    @SystemLog(value = "前置校验")
+    @Operation(summary = "前置校验")
+    public CommonRes<Boolean> check(@RequestBody EnterpriseRQVO vo) {
+        Boolean result = enterpriseService.check(vo);
+        return CommonRes.success(result);
+    }
+
+    @PostMapping("/change/update")
+    @SystemLog(value = "变更审批-最终更新")
+    @Operation( summary = "变更审批-最终更新" )
+    public CommonRes<Boolean> changeUpdate(@RequestBody BizCallbackDTO dto) {
+        enterpriseChangeApproveService.changeUpdate(dto);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/change/cross-flow-call-back")
+    @SystemLog(value = "变更审批-最终更新(跨平台)")
+    @Operation( summary = "变更审批-最终更新(跨平台)" )
+    public CommonRes<Boolean> changeCrossFlowCallBack(@RequestBody BizCallbackDTO dto) {
+        enterpriseChangeApproveService.crossFlowCallBack(dto);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/change/save")
+    @SystemLog(value = "变更申请-保存数据")
+    @Operation(summary = "变更申请-保存数据")
+    public CommonRes<Boolean> changeSave(@Validated @RequestBody ChangeApproveVO vo) {
+        enterpriseChangeApproveService.changeSave(vo);
+        return CommonRes.success(true);
+    }
+
+
+    @GetMapping("/change/detail")
+    @SystemLog(value = "变更申请-查询详情")
+    @Operation(summary = "变更申请-详情",parameters = {  @Parameter(name = "guid", description = "申请唯一标识", required = true)})
+    public CommonRes<ChangeApproveVO> changeDetail(@RequestParam String guid) {
+        return CommonRes.success(enterpriseChangeApproveService.changeDetail(guid));
+    }
+
+    @DeleteMapping("/change/delete")
+    @SystemLog(value = "变更申请-批量删除")
+    @Operation(summary = "变更申请-批量删除")
+    public CommonRes<Boolean> changeRemoveByGuids(@RequestBody List<String> guids) {
+        enterpriseChangeApproveService.removeByGuids(guids);
+        return CommonRes.success(true);
+    }
+
+    @DeleteMapping("/change/cross-delete")
+    @SystemLog(value = "变更申请-批量删除(跨平台)")
+    @Operation(summary = "变更申请-批量删除(跨平台)", hidden = true)
+    public CommonRes<Boolean> crossRemoveByGuids(@RequestBody List<String> zqBizGuids) {
+        enterpriseChangeApproveService.crossRemoveByBizGuid(zqBizGuids);
+        return CommonRes.success(true);
+    }
+
+    //endregion
+    
+}

+package com.csbr.qingcloud.portal.controller;
+
+import com.csbr.cloud.common.response.CommonRes;
+import csbr.cloud.entity.annotation.SystemLog;
+import csbr.cloud.entity.domain.base.vo.PageListVO;
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.qingcloud.portal.domain.vo.ServicerMaintainQueryVO;
+import com.csbr.qingcloud.portal.domain.vo.ServicerMaintainRQVO;
+import com.csbr.qingcloud.portal.domain.vo.ServicerMaintainRSVO;
+import com.csbr.qingcloud.portal.service.ServicerMaintainService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.annotation.Resource;
+import jakarta.validation.Valid;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护-控制器
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+@RestController
+@RequestMapping("/servicer-maintain")
+@Tag(name = "服务商维护-控制器")
+public class ServicerMaintainController {
+    
+    @Resource
+    private ServicerMaintainService servicerMaintainService;
+    
+    //region 基本操作
+
+    @PostMapping("/save")
+    @SystemLog(value = "服务商维护-新增")
+    @Operation(summary = "服务商维护-新增")
+    public CommonRes<Boolean> saveServicerMaintain(@RequestBody @Valid ServicerMaintainRQVO vo) {
+        servicerMaintainService.saveServicerMaintain(vo);
+        return CommonRes.success(true);
+    }
+
+    @PutMapping("/update")
+    @SystemLog(value = "服务商维护-修改")
+    @Operation(summary = "服务商维护-修改")
+    public CommonRes<Boolean> updateServicerMaintain(@RequestBody @Valid ServicerMaintainRQVO vo) {
+        servicerMaintainService.updateServicerMaintain(vo);
+        return CommonRes.success(true);
+    }
+    
+    @DeleteMapping("/delete")
+    @SystemLog(value = "服务商维护-批量删除")
+    @Operation(summary = "服务商维护-批量删除")
+    public CommonRes<Boolean> removeByGuids(@RequestBody List<String> guids) {
+        servicerMaintainService.removeByGuids(guids);
+        return CommonRes.success(true);
+    }
+
+    @PostMapping("/page-list")
+    @SystemLog(value = "服务商维护-分页")
+    @Operation(summary = "服务商维护-分页")
+    public CommonRes<PageListVO<ServicerMaintainRSVO>> pageList(@RequestBody @Valid ServicerMaintainQueryVO queryVO) {
+        PageListVO<ServicerMaintainRSVO> pageVO = servicerMaintainService.pageList(queryVO);
+        return CommonRes.success(pageVO);
+     }
+     
+    @GetMapping("/detail")
+    @SystemLog(value = "服务商维护-详情")
+    @Operation(
+            summary = "服务商维护-详情",
+            parameters = {
+                    @Parameter(name = "guid", description = "服务商维护唯一标识", required = true)}
+    )
+    public CommonRes<ServicerMaintainRSVO> getServicerMaintainDetail(@RequestParam String guid) {
+        ServicerMaintainRSVO vo = servicerMaintainService.getServicerMaintainDetail(guid);
+        return CommonRes.success(vo);
+    }
+
+    @PostMapping("/flow-call-back")
+    @SystemLog(value = "服务商维护-流程结束后进行业务回调")
+    @Operation(summary = "服务商维护-流程结束后进行业务回调", hidden = true)
+    public CommonRes<Boolean> flowCallBack(@RequestBody @Valid BizCallbackDTO dto) {
+        servicerMaintainService.flowCallBack(dto);
+        return CommonRes.success(true);
+    }
+    
+    //endregion
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @program: ms-user-scm-service
+ * @description: 行政区
+ * @author: yio
+ * @create: 2021-01-14 15:39
+ **/
+@Data
+public class BoroughPOJO {
+    private String code;
+    private String name;
+    private String parentId;
+    private String isPCapital;
+    private String isDeleted;
+    /** 城市等级 (0 一线城市，1 新一线城市，2 二线城市，3 三线城市，4 四线城市，5 五线城市，6 六线城市)*/
+    private String areaLevel;
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @program: ms-hc-workflow-service
+ * @description: 通用变更审批对象
+ * @author: XiaoCQ
+ * @create: 2024-01-20
+ **/
+@Data
+@Schema(name = "通用变更审批对象")
+public class ChangeApproveVO {
+
+    /**
+     * 各变更业务唯一标识
+     */
+    @Schema(description = "各变更业务唯一标识")
+    private String guid;
+
+    /**
+     * 审批流唯一标识
+     */
+    @Schema(description = "审批流唯一标识")
+    private String approveGuid;
+
+    @Schema(description = "业务审批状态")
+    private String bizApproveState;
+
+    @Schema(description = "原审批流唯一标识")
+    private String sourceApproveGuid;
+
+    /**
+     * 源数据GUID
+     */
+    @Schema(description = "源数据GUID")
+    private String sourceGuid;
+
+    /**
+     * 业务数据
+     */
+    @Schema(description = "业务数据")
+    private String bizDataJson;
+
+    @Schema(description = "业务数据明细")
+    private String bizDataDetailJson;
+
+    /**
+     * 原业务数据
+     */
+    @Schema(description = "原业务数据")
+    private String oldBizDataJson;
+
+    @Schema(description = "原业务数据明细")
+    private String oldBizDataDetailJson;
+
+    private String zqName;
+    private String zqBizGuid;
+
+}
\ No newline at end of file

+package com.csbr.qingcloud.portal.domain.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * @description: 审批变更检查实体
+ * @author: XiaoCQ
+ * @create: 2025-02-20
+ */
+@Data
+@Schema(name = "审批变更检查实体")
+public class ChangeCheckDTO {
+
+    @Schema(description = "json")
+    private String json;
+
+    public ChangeCheckDTO(){
+    }
+
+    public ChangeCheckDTO(String json){
+        this.json = json;
+    }
+
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import csbr.cloud.entity.domain.base.vo.CsbrBaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+* 变更信息视图对象类
+*
+* @author xiaocq
+* @date 2024-12-30
+*/
+@Data
+public class ChangeInfoVO extends CsbrBaseVO {
+
+    @Schema(description = "英文名称")
+    private String nameEn;
+
+    @Schema(description = "名称")
+    private String name;
+
+    @Schema(description = "日期")
+    private String date;
+
+    @Schema(description = "变更前")
+    private String before;
+
+    @Schema(description = "变更后")
+    private String after;
+
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import lombok.Data;
+
+/** 对比对象 */
+@Data
+public class CompareResult {
+    /** 字段名 */
+    private String fieldName;
+    /** 旧值 */
+    private Object oldValue;
+    /** 新值 */
+    private Object newValue;
+    /** 字段中文名 */
+    private String fieldComment;
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+* 项目结项表 视图对象类
+*
+* @author xiaocq
+* @date 2024-03-04
+*/
+@Data
+@Accessors(chain = true)
+@Schema(name = "项目结项审批传参")
+public class DemandApproveVO extends FlowUpdateStateDTO {
+
+    @Schema(description = "业务唯一标识")
+    private String bizGuid;
+
+    @Schema(description = "合同附件")
+    private String contractAttachJson;
+
+    @Schema(description = "加工单位类型")
+    private String processCompanyType;
+
+    @Schema(description = "加工单位唯一标识")
+    private String processCompanyGuid;
+
+    @Schema(description = "加工单位名称")
+    private String processCompanyName;
+
+
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.mybatis.annotations.LikeQuery;
+import com.csbr.cloud.mybatis.enums.LikeQueryEnum;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowBizGuidQueryDTO;
+import csbr.cloud.entity.domain.base.dto.BasePageDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求查询参数
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(title = "数据需求查询参数")
+public class DemandPortalQueryVO extends BasePageDTO {
+
+    @Schema(description = "数据需求名称")
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    private String dataDemandName;
+
+    @Schema(description = "需求类型")
+    private String requirementType;
+
+    @Schema(description = "交付标的")
+    private String updateCycle;
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import csbr.cloud.entity.domain.base.vo.BaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求门户返回参数
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@Data
+@Schema(title = "数据需求门户返回参数")
+public class DemandPortalRSVO extends BaseVO {
+    @Schema(description = "系统唯一标识")
+    private String guid;
+
+    @Schema(description = "数据需求名称")
+    private String dataDemandName;
+
+    @Schema(description = "需求类型")
+    private String requirementType;
+
+    @Schema(description = "需求开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermSdate;
+
+    @Schema(description = "需求结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermEdate;
+
+    @Schema(description = "最低预算")
+    private BigDecimal minBudget;
+
+    @Schema(description = "最高预算")
+    private BigDecimal maxBudget;
+
+    @Schema(description = "数据价格")
+    private String costSource;
+
+    @Schema(description = "需求内容")
+    private String requirementContent;
+
+    @Schema(description = "交付标的")
+    private String updateCycle;
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.mybatis.annotations.LikeQuery;
+import com.csbr.cloud.mybatis.enums.LikeQueryEnum;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowBizGuidQueryDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求查询参数
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(title = "数据需求查询参数")
+public class DemandQueryVO extends FlowBizGuidQueryDTO {
+
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    @Schema(description = "数据需求名称")
+    private String dataDemandName;
+
+    @Schema(description = "需求类型")
+    private String requirementType;
+
+    @Schema(description = "需求分类【1新增 2调整】")
+    private String demandCategory;
+
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    @Schema(description = "发起人")
+    private String createUserName;
+    
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃】
+     */
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃】")
+    private String bizApproveState;
+
+    /******** 自定义扩展 *****/
+    
+    /**
+     * 数据唯一标识【List集合】
+     */
+    @Schema(description = "数据唯一标识", hidden = true)
+    private List<String> guidList;
+    
+    /**
+     * 是否调用查询的判断
+     */
+    @Schema(description = "是否调用查询的判断", hidden = true)
+    private Boolean isNeedQuery;
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jdk.jfr.Name;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求新增、修改参数
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@Data
+@Schema(title = "数据需求新增、修改参数")
+public class DemandRQVO extends FlowRQBaseVO {
+    
+    /**
+     * 数据需求名称
+     */
+    @Schema(description = "数据需求名称")
+    private String dataDemandName;
+    
+    /**
+     * 需求类型
+     */
+    @Schema(description = "需求类型")
+    private String requirementType;
+
+    @Schema(title = "专区名称")
+    private String zqName;
+    
+    /**
+     * 需求分类【1新增 2调整】
+     */
+    @Schema(description = "需求分类【1新增 2调整】")
+    private String demandCategory;
+    
+    /**
+     * 数据产品唯一标识
+     */
+    @Schema(description = "数据产品唯一标识")
+    private String dataProductGuid;
+    
+    /**
+     * 需求开始时间
+     */
+    @Schema(description = "需求开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermSdate;
+    
+    /**
+     * 需求结束时间
+     */
+    @Schema(description = "需求结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermEdate;
+    
+    /**
+     * 需求内容
+     */
+    @Schema(description = "需求内容")
+    private String requirementContent;
+    
+    /**
+     * 数据需求字段【数据格式：[{"name":"","path":""},{"name":"","path":""}]】
+     */
+    @Schema(description = "数据需求字段【数据格式：[{\"name\":\"\",\"path\":\"\"},{\"name\":\"\",\"path\":\"\"}]】")
+    private String dataDemandFieldAttachJson;
+    
+    /**
+     * 期望交付日期
+     */
+    @Schema(description = "期望交付日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date deliveryTime;
+    
+    /**
+     * 最低预算
+     */
+    @Schema(description = "最低预算")
+    private BigDecimal minBudget;
+    
+    /**
+     * 最高预算
+     */
+    @Schema(description = "最高预算")
+    private BigDecimal maxBudget;
+    
+    /**
+     * 费用来源
+     */
+    @Schema(description = "费用来源")
+    private String costSource;
+    
+    /**
+     * 更新周期【取数据字典：周期，1 年度，2 半年度，3 季度，4 月度】
+     */
+    @Schema(description = "更新周期【取数据字典：周期，1 年度，2 半年度，3 季度，4 月度】")
+    private String updateCycle;
+    
+    /**
+     * 获取路径方式
+     */
+    @Schema(description = "获取路径方式")
+    private String requestType;
+    
+    /**
+     * 场景名称
+     */
+    @Schema(description = "场景名称")
+    private String sceneName;
+    
+    /**
+     * 应用场景描述
+     */
+    @Schema(description = "应用场景描述")
+    private String sceneDescription;
+    
+    /**
+     * 数据质量要求
+     */
+    @Schema(description = "数据质量要求")
+    private String qualityDemand;
+    
+    /**
+     * 隐私合规要求
+     */
+    @Schema(description = "隐私合规要求")
+    private String privacyDemand;
+    
+    /**
+     * 其他补充内容
+     */
+    @Schema(description = "其他补充内容")
+    private String otherContent;
+    
+    /**
+     * 联系人
+     */
+    @Schema(description = "联系人")
+    private String contacts;
+    
+    /**
+     * 需求单位
+     */
+    @Schema(description = "需求单位")
+    private String requirementUnit;
+    
+    /**
+     * 联系方式
+     */
+    @Schema(description = "联系方式")
+    private String contactInformation;
+    
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+     */
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    private String bizApproveState;
+    
+    /**
+     * 加工单生成时间
+     */
+    @Schema(description = "加工单生成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date processingGenerateTime;
+    
+    /**
+     * 验收完成时间
+     */
+    @Schema(description = "验收完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date acceptFinishTime;
+    
+    /**
+     * 完成周期
+     */
+    @Schema(description = "完成周期")
+    private Integer finishCycle;
+    
+    /**
+     * 资源获取状态【N未开始 A进行中 Y已完成】
+     */
+    @Schema(description = "资源获取状态【N未开始 A进行中 Y已完成】")
+    private String resourceAcquisitionState;
+    
+    /**
+     * 产品加工状态【N未开始 A进行中 Y已完成】
+     */
+    @Schema(description = "产品加工状态【N未开始 A进行中 Y已完成】")
+    private String productProcessingState;
+    
+    /**
+     * 产品交付状态【N未开始 A进行中 Y已完成】
+     */
+    @Schema(description = "产品交付状态【N未开始 A进行中 Y已完成】")
+    private String productDeliveryState;
+    
+    /**
+     * 产品验收状态【N未开始 A进行中 Y已完成】
+     */
+    @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】")
+    private String productAcceptState;
+    
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+
+    @Schema(description = "合同附件")
+    private String contractAttachJson;
+
+    @Schema(description = "加工单位类型")
+    private String processCompanyType;
+
+    @Schema(description = "加工单位唯一标识")
+    private String processCompanyGuid;
+
+    @Schema(description = "加工单位名称")
+    private String processCompanyName;
+
+    @Schema(title = "上架状态(Y 上架 N 下架)")
+    private String listingStatus;
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.vo.appove.BizApproveVO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求返回参数
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@Data
+@Schema(title = "数据需求返回参数")
+public class DemandRSVO {
+    
+    /**
+     * 系统唯一标识
+     */
+    @Schema(description = "系统唯一标识")
+    private String guid;
+    
+    /**
+     * 数据需求名称
+     */
+    @Schema(description = "数据需求名称")
+    private String dataDemandName;
+    
+    /**
+     * 需求类型
+     */
+    @Schema(description = "需求类型")
+    private String requirementType;
+    
+    /**
+     * 需求分类【1新增 2调整】
+     */
+    @Schema(description = "需求分类【1新增 2调整】")
+    private String demandCategory;
+    
+    /**
+     * 数据产品唯一标识
+     */
+    @Schema(description = "数据产品唯一标识")
+    private String dataProductGuid;
+    
+    /**
+     * 需求开始时间
+     */
+    @Schema(description = "需求开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermSdate;
+    
+    /**
+     * 需求结束时间
+     */
+    @Schema(description = "需求结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermEdate;
+    
+    /**
+     * 需求内容
+     */
+    @Schema(description = "需求内容")
+    private String requirementContent;
+    
+    /**
+     * 数据需求字段【数据格式：[{"name":"","path":""},{"name":"","path":""}]】
+     */
+    @Schema(description = "数据需求字段【数据格式：[{\"name\":\"\",\"path\":\"\"},{\"name\":\"\",\"path\":\"\"}]】")
+    private String dataDemandFieldAttachJson;
+    
+    /**
+     * 期望交付时间
+     */
+    @Schema(description = "期望交付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date deliveryTime;
+    
+    /**
+     * 最低预算
+     */
+    @Schema(description = "最低预算")
+    private BigDecimal minBudget;
+    
+    /**
+     * 最高预算
+     */
+    @Schema(description = "最高预算")
+    private BigDecimal maxBudget;
+    
+    /**
+     * 费用来源
+     */
+    @Schema(description = "费用来源")
+    private String costSource;
+    
+    /**
+     * 更新周期【取数据字典：周期，1 年度，2 半年度，3 季度，4 月度】
+     */
+    @Schema(description = "更新周期【取数据字典：周期，1 年度，2 半年度，3 季度，4 月度】")
+    private String updateCycle;
+    
+    /**
+     * 获取路径方式
+     */
+    @Schema(description = "获取路径方式")
+    private String requestType;
+    
+    /**
+     * 场景名称
+     */
+    @Schema(description = "场景名称")
+    private String sceneName;
+    
+    /**
+     * 应用场景描述
+     */
+    @Schema(description = "应用场景描述")
+    private String sceneDescription;
+    
+    /**
+     * 数据质量要求
+     */
+    @Schema(description = "数据质量要求")
+    private String qualityDemand;
+    
+    /**
+     * 隐私合规要求
+     */
+    @Schema(description = "隐私合规要求")
+    private String privacyDemand;
+    
+    /**
+     * 其他补充内容
+     */
+    @Schema(description = "其他补充内容")
+    private String otherContent;
+    
+    /**
+     * 联系人
+     */
+    @Schema(description = "联系人")
+    private String contacts;
+    
+    /**
+     * 需求单位
+     */
+    @Schema(description = "需求单位")
+    private String requirementUnit;
+    
+    /**
+     * 联系方式
+     */
+    @Schema(description = "联系方式")
+    private String contactInformation;
+    
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+     */
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    private String bizApproveState;
+    
+    /**
+     * 加工单生成时间
+     */
+    @Schema(description = "加工单生成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date processingGenerateTime;
+    
+    /**
+     * 验收完成时间
+     */
+    @Schema(description = "验收完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date acceptFinishTime;
+    
+    /**
+     * 完成周期
+     */
+    @Schema(description = "完成周期")
+    private Integer finishCycle;
+    
+    /**
+     * 资源获取状态【N未开始 A进行中 Y已完成】
+     */
+    @Schema(description = "资源获取状态【N未开始 A进行中 Y已完成】")
+    private String resourceAcquisitionState;
+    
+    /**
+     * 产品加工状态【N未开始 A进行中 Y已完成】
+     */
+    @Schema(description = "产品加工状态【N未开始 A进行中 Y已完成】")
+    private String productProcessingState;
+    
+    /**
+     * 产品交付状态【N未开始 A进行中 Y已完成】
+     */
+    @Schema(description = "产品交付状态【N未开始 A进行中 Y已完成】")
+    private String productDeliveryState;
+    
+    /**
+     * 产品验收状态【N未开始 A进行中 Y已完成】
+     */
+    @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】")
+    private String productAcceptState;
+
+    @Schema(description = "合同附件")
+    private String contractAttachJson;
+
+    @Schema(description = "加工单位类型")
+    private String processCompanyType;
+
+    @Schema(description = "加工单位唯一标识")
+    private String processCompanyGuid;
+
+    @Schema(description = "加工单位名称")
+    private String processCompanyName;
+
+    @Schema(description = "发起人")
+    private String createUserName;
+
+    @Schema(description = "提交时间")
+    private Date createTime;
+
+    @Schema(description = "需求单编号")
+    private String requirementOrderNo;
+
+    @Schema(description = "加工单编号")
+    private String processOrderNo;
+
+    @Schema(title = "专区名称")
+    private String zqName;
+
+    @Schema(description ="业务名称")
+    private String bizName;
+
+    /**
+     * 跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)
+     */
+    @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+
+    @Schema(title = "上架状态(Y 上架 N 下架)")
+    private String listingStatus;
+
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+    
+    /**
+     * 审批信息
+     */
+    @Schema(description = "审批信息")
+    private BizApproveVO approveVO;
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求状态修改参数
+ * @author: xcq
+ * @create: 2025-02-10
+ **/
+@Data
+@Schema(title = "数据需求状态修改参数")
+public class DemandUpdateStateVO {
+
+    @Schema(description = "加工单位唯一标识列表")
+    private List<String> processCompanyGuidList;
+
+    @Schema(description = "加工单位唯一标识")
+    private String processOrderGuid;
+
+    @Schema(description = "资源获取状态【N未开始 A进行中 Y已完成】")
+    private String resourceAcquisitionState;
+
+    @Schema(description = "产品加工状态【N未开始 A进行中 Y已完成】")
+    private String productProcessingState;
+
+    @Schema(description = "产品交付状态【N未开始 A进行中 Y已完成】")
+    private String productDeliveryState;
+
+    @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】")
+    private String productAcceptState;
+
+    @Schema(description ="产品验收验收完成时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date acceptFinishTime;
+
+    @Schema(description ="业务名称")
+    private String bizName;
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.vo.appove.ApproveVO;
+import com.csbr.cloud.workflow.domain.vo.appove.BizApproveVO;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息返回参数
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+@Data
+@Schema(title = "企业信息返回参数")
+public class EnterpriseApproveRSVO extends ApproveVO {
+
+    @Schema(description = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+
+    @Schema(description = "专区名称")
+    private String zqName;
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.mybatis.annotations.LikeQuery;
+import com.csbr.cloud.mybatis.enums.LikeQueryEnum;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowBizGuidQueryDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息查询参数
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(title = "企业信息查询参数")
+public class EnterpriseQueryVO extends FlowBizGuidQueryDTO {
+
+    @Schema(description = "企业名称")
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    private String tenantName;
+
+    @Schema(description = "企业类型【选择平台字典【公司类型】的选项】")
+    private String tenantType;
+
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃】
+     */
+    @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;
+
+    @Schema(description = "创建人姓名")
+    private String createUserName;
+
+    @Schema(description = "登录账号")
+    private String logonUser;
+
+    /******** 自定义扩展 *****/
+    
+    /**
+     * 数据唯一标识【List集合】
+     */
+    @Schema(description = "数据唯一标识", hidden = true)
+    private List<String> guidList;
+    
+    /**
+     * 是否调用查询的判断
+     */
+    @Schema(description = "是否调用查询的判断", hidden = true)
+    private Boolean isNeedQuery;
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息新增、修改参数
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+@Data
+@Schema(title = "企业信息新增、修改参数")
+public class EnterpriseRQVO extends FlowRQBaseVO {
+
+    @Schema(description = "会员GUID")
+    private String tenantGuid;
+    /**
+     * 公司名称
+     */
+    @Schema(description = "公司名称")
+    private String tenantName;
+
+    @Schema(title = "专区名称")
+    private String zqName;
+    
+    /**
+     * 统一社会信用代码
+     */
+    @Schema(description = "统一社会信用代码")
+    private String socialCreditCode;
+    
+    /**
+     * 企业类型【选择平台字典【公司类型】的选项】
+     */
+    @Schema(description = "企业类型【选择平台字典【公司类型】的选项】")
+    private String tenantType;
+    
+    /**
+     * 注册日期
+     */
+    @Schema(description = "注册日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date registrationDate;
+    
+    /**
+     * 注册资本【(万元)】
+     */
+    @Schema(description = "注册资本【(万元)】")
+    private BigDecimal registeredCapital;
+    
+    /**
+     * 税号
+     */
+    @Schema(description = "税号")
+    private String bankTaxNo;
+    
+    /**
+     * 省
+     */
+    @Schema(description = "省")
+    private String province;
+    
+    /**
+     * 市
+     */
+    @Schema(description = "市")
+    private String city;
+    
+    /**
+     * 区
+     */
+    @Schema(description = "区")
+    private String district;
+    
+    /**
+     * 营业期限【1 长期有效；2 自定义】
+     */
+    @Schema(description = "营业期限【1 长期有效；2 自定义】")
+    private String businessLicenseTerm;
+    
+    /**
+     * 营业开始日期
+     */
+    @Schema(description = "营业开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date businessLicenseStartDate;
+    
+    /**
+     * 营业结束日期
+     */
+    @Schema(description = "营业结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date businessLicenseEndDate;
+    
+    /**
+     * 营业执照
+     */
+    @Schema(description = "营业执照")
+    private String businessLicenseJson;
+    
+    /**
+     * 营业执照经营范围
+     */
+    @Schema(description = "营业执照经营范围")
+    private String businessLicenseScope;
+    
+    /**
+     * 公司法人
+     */
+    @Schema(description = "公司法人")
+    private String juridicalPerson;
+    
+    /**
+     * 法人证件类型
+     */
+    @Schema(description = "法人证件类型")
+    private String juridicalPersonIdType;
+    
+    /**
+     * 法人证件号
+     */
+    @Schema(description = "法人证件号")
+    private String juridicalPersonId;
+    
+    /**
+     * 法人证件照
+     */
+    @Schema(description = "法人证件照")
+    private String juridicalPersonIdPhotoJson;
+    
+    /**
+     * 登录账号
+     */
+    @Schema(description = "登录账号")
+    private String logonUser;
+    
+    /**
+     * 联系人
+     */
+    @Schema(description = "联系人")
+    private String contacts;
+    
+    /**
+     * 联系人电话
+     */
+    @Schema(description = "联系人电话")
+    private String contactTel;
+    
+    /**
+     * 管理员证件号
+     */
+    @Schema(description = "管理员证件号")
+    private String managerPersonId;
+    
+    /**
+     * 管理员证件照
+     */
+    @Schema(description = "管理员证件照")
+    private String managerPersonIdPhotoJson;
+    
+    /**
+     * 授权委托书
+     */
+    @Schema(description = "授权委托书")
+    private String authorizationLetter;
+    
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+     */
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中； 默认 N】")
+    private String bizApproveState;
+    
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.csbr.cloud.workflow.domain.vo.appove.BizApproveVO;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息返回参数
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+@Data
+@Schema(title = "企业信息返回参数")
+public class EnterpriseRSVO {
+    
+    /**
+     * 系统唯一标识
+     */
+    @Schema(description = "系统唯一标识")
+    private String guid;
+
+    @Schema(description = "会员GUID")
+    private String tenantGuid;
+
+    /**
+     * 公司名称
+     */
+    @Schema(description = "公司名称")
+    private String tenantName;
+    
+    /**
+     * 统一社会信用代码
+     */
+    @Schema(description = "统一社会信用代码")
+    private String socialCreditCode;
+    
+    /**
+     * 企业类型【选择平台字典【公司类型】的选项】
+     */
+    @Schema(description = "企业类型【选择平台字典【公司类型】的选项】")
+    private String tenantType;
+    
+    /**
+     * 注册日期
+     */
+    @Schema(description = "注册日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date registrationDate;
+    
+    /**
+     * 注册资本【(万元)】
+     */
+    @Schema(description = "注册资本【(万元)】")
+    private BigDecimal registeredCapital;
+    
+    /**
+     * 税号
+     */
+    @Schema(description = "税号")
+    private String bankTaxNo;
+    
+    /**
+     * 省
+     */
+    @Schema(description = "省")
+    private String province;
+    
+    /**
+     * 市
+     */
+    @Schema(description = "市")
+    private String city;
+    
+    /**
+     * 区
+     */
+    @Schema(description = "区")
+    private String district;
+
+    @Schema(description = "注册地")
+    private String venue;
+    
+    /**
+     * 营业期限【1 长期有效；2 自定义】
+     */
+    @Schema(description = "营业期限【1 长期有效；2 自定义】")
+    private String businessLicenseTerm;
+    
+    /**
+     * 营业开始日期
+     */
+    @Schema(description = "营业开始日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date businessLicenseStartDate;
+    
+    /**
+     * 营业结束日期
+     */
+    @Schema(description = "营业结束日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date businessLicenseEndDate;
+
+    @Schema(description = "营业日期范围")
+    private String businessLicenseStartEnd;
+    
+    /**
+     * 营业执照
+     */
+    @Schema(description = "营业执照")
+    private String businessLicenseJson;
+    
+    /**
+     * 营业执照经营范围
+     */
+    @Schema(description = "营业执照经营范围")
+    private String businessLicenseScope;
+    
+    /**
+     * 公司法人
+     */
+    @Schema(description = "公司法人")
+    private String juridicalPerson;
+    
+    /**
+     * 法人证件类型
+     */
+    @Schema(description = "法人证件类型")
+    private String juridicalPersonIdType;
+    
+    /**
+     * 法人证件号
+     */
+    @Schema(description = "法人证件号")
+    private String juridicalPersonId;
+    
+    /**
+     * 法人证件照
+     */
+    @Schema(description = "法人证件照")
+    private String juridicalPersonIdPhotoJson;
+    
+    /**
+     * 登录账号
+     */
+    @Schema(description = "登录账号")
+    private String logonUser;
+    
+    /**
+     * 联系人
+     */
+    @Schema(description = "联系人")
+    private String contacts;
+    
+    /**
+     * 联系人电话
+     */
+    @Schema(description = "联系人电话")
+    private String contactTel;
+    
+    /**
+     * 管理员证件号
+     */
+    @Schema(description = "管理员证件号")
+    private String managerPersonId;
+    
+    /**
+     * 管理员证件照
+     */
+    @Schema(description = "管理员证件照")
+    private String managerPersonIdPhotoJson;
+    
+    /**
+     * 授权委托书
+     */
+    @Schema(description = "授权委托书")
+    private String authorizationLetter;
+    
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+     */
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中； 默认 N】")
+    private String bizApproveState;
+
+    @Schema(description = "提交时间")
+    private Date createTime;
+
+    @Schema(title = "专区名称")
+    private String zqName;
+
+    /**
+     * 跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)
+     */
+    @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+    
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+    
+    /**
+     * 审批信息
+     */
+    @Schema(description = "审批信息")
+    private BizApproveVO approveVO;
+
+    @Schema(description = "变更信息列表")
+    private List<ChangeInfoVO> changeList;
+
+    @Schema(description = "变更前信息列表")
+    private List<ChangeInfoVO> beforeChangeList;
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.util.MultiValueMap;
+
+/**
+ * @description: 审批变更检查实体
+ * @author: XiaoCQ
+ * @create: 2025-02-20
+ */
+@Data
+@Schema(name = "审批变更检查实体")
+public class KafkaApproveDTO {
+
+    @Schema(description = "审批流参数")
+    private FlowUpdateStateDTO updateStateDTO;
+
+    @Schema(description = "请求头")
+    private MultiValueMap<String, String> header;
+
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @program: 
+ * @description: 加工单加工明细返回参数
+ * @author: xup
+ * @create: 2025-02-10 17:57
+ **/
+@Data
+@Schema(title = "加工单加工明细返回参数")
+public class ProcessOrderProcessDtlRSVO {
+    
+    /**
+     * 系统唯一标识
+     */
+    @Schema(description = "系统唯一标识")
+    private String guid;
+    
+    /**
+     * 会员Guid
+     */
+    @Schema(description = "会员Guid")
+    private String tenantGuid;
+    
+    /**
+     * 加工单Guid
+     */
+    @Schema(description = "加工单Guid")
+    private String processOrderGuid;
+    
+    /**
+     * 加工单号
+     */
+    @Schema(description = "加工单号")
+    private String processOrderNo;
+    
+    /**
+     * 加工单名称
+     */
+    @Schema(description = "加工单名称")
+    private String processOrderName;
+    
+    /**
+     * 加工方式（1 数据服务；2 需求申请）
+     */
+    @Schema(description = "加工方式（1 数据服务；2 需求申请）")
+    private Integer processType;
+    
+    /**
+     * 业务Guid
+     */
+    @Schema(description = "业务Guid")
+    private String bizGuid;
+
+    /**
+     * 业务名称
+     */
+    @Schema(description = "业务名称")
+    private String bizName;
+    
+    /**
+     * 加工状态(N 未开始；A 进行中；Y 已完成)
+     */
+    @Schema(description = "加工状态(N 未开始；A 进行中；Y 已完成)")
+    private String processState;
+    
+    /**
+     * 加工时间
+     */
+    @Schema(description = "加工时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date processTime;
+    
+    /**
+     * 交付时间
+     */
+    @Schema(description = "交付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date deliverTime;
+    
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @program: 
+ * @description: 加工单管理新增、修改参数
+ * @author: makejava
+ * @create: 2024-12-06 15:41
+ **/
+@Data
+@Schema(title = "加工单管理新增、修改参数")
+public class ProcessOrderRQVO {
+    
+    /**
+     * 系统唯一标识
+     */
+    @Schema(description = "系统唯一标识")
+    private String guid;
+    
+    /**
+     * 企业唯一标识
+     */
+    @Schema(description = "企业唯一标识")
+    private String tenantGuid;
+
+    @Schema(description = "加工单位唯一标识")
+    private String processCompanyGuid;
+
+    @Schema(description = "加工人员唯一标识")
+    private String processStaffGuid;
+    
+    /**
+     * 公司名称
+     */
+    @Schema(description = "公司名称")
+    private String tenantName;
+    
+    /**
+     * 加工单编号
+     */
+    @Schema(description = "加工单编号")
+    private String processOrderNo;
+    
+    /**
+     * 受理单编号
+     */
+    @Schema(description = "受理单编号")
+    private String acceptanceOrderNo;
+    
+    /**
+     * 需求单编号
+     */
+    @Schema(description = "需求单编号")
+    private String requirementOrderNo;
+    
+    /**
+     * 需求单名称
+     */
+    @Schema(description = "需求单名称")
+    private String requirementOrderName;
+    
+    /**
+     * 需求单位
+     */
+    @Schema(description = "需求单位")
+    private String requirementUnit;
+    
+    /**
+     * 需求开始时间
+     */
+    @Schema(description = "需求开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermSdate;
+    
+    /**
+     * 需求结束时间
+     */
+    @Schema(description = "需求结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date requirementTermEdate;
+    
+    /**
+     * 更新周期【取数据字典：周期，1 年度，2 半年度，3 季度，4 月度】
+     */
+    @Schema(description = "更新周期【取数据字典：周期，1 年度，2 半年度，3 季度，4 月度】")
+    private String updateCycle;
+    
+    /**
+     * 获取路径【API路径】
+     */
+    @Schema(description = "获取路径【API路径】")
+    private String requestPath;
+    
+    /**
+     * 需求内容
+     */
+    @Schema(description = "需求内容")
+    private String requirementContent;
+    
+    /**
+     * 需求附件【数据格式：[{"name":"","path":""},{"name":"","path":""}]】
+     */
+    @Schema(description = "需求附件【数据格式：[{\"name\":\"\",\"path\":\"\"},{\"name\":\"\",\"path\":\"\"}]】")
+    private String fileUrl;
+    
+    /**
+     * 应用场景说明
+     */
+    @Schema(description = "应用场景说明")
+    private String applicationSceneDesc;
+    
+    /**
+     * 受理原因
+     */
+    @Schema(description = "受理原因")
+    private String acceptanceReason;
+
+    /**
+     * 加工状态（N 未分派；A 处理中；J 已交付；Y 已验收）
+     */
+    @Schema(description = "加工状态（N 未分派；A 处理中；J 已交付；Y 已验收）")
+    private String processState;
+    
+    /**
+     * 联系人
+     */
+    @Schema(description = "联系人")
+    private String contacts;
+    
+    /**
+     * 联系人电话
+     */
+    @Schema(description = "联系人电话")
+    private String contactTel;
+    
+    /**
+     * 受理日期
+     */
+    @Schema(description = "受理日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date acceptanceDate;
+    
+    /**
+     * 接收人
+     */
+    @Schema(description = "接收人")
+    private String acceptanceName;
+    
+    /**
+     * 接收人唯一标识
+     */
+    @Schema(description = "接收人唯一标识")
+    private String acceptanceNameGuid;
+    
+    /**
+     * 关联合同信息
+     */
+    @Schema(description = "关联合同信息")
+    private String linkContractInfoJson;
+
+    @Schema(description = "加工单位类型")
+    private String processCompanyType;
+    
+    /**
+     * 负责人姓名
+     */
+    @Schema(description = "负责人姓名")
+    private String chargeStaffName;
+    
+    /**
+     * 负责人GUID
+     */
+    @Schema(description = "负责人GUID")
+    private String chargeStaffGuid;
+
+    /**
+     * 加加工成员【数据格式：[{"guid":"","name":""}]】
+     */
+    @Schema(description = "加工成员【数据格式：[{‘guid’:‘’,‘name’:‘’}]")
+    private String processMemberJson;
+    
+    /**
+     * 最后操作人唯一标识
+     */
+    @Schema(description = "最后操作人唯一标识")
+    private String lastOperatorUserId;
+    
+    /**
+     * 最后操作人姓名
+     */
+    @Schema(description = "最后操作人姓名")
+    private String lastOperatorUserName;
+    
+    /**
+     * 指派时间
+     */
+    @Schema(description = "指派时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date assignDay;
+
+    /**
+     * 加工时间
+     */
+    @Schema(description = "加工时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date processTime;
+
+    /**
+     * 交付时间
+     */
+    @Schema(description = "交付时间")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date deliverTime;
+    
+    /**
+     * 分库标识
+     */
+    @Schema(description = "分库标识")
+    private String shardingFlag;
+    
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @program: common-admin-platform-auth-service
+ * @description: 订单编号DTO
+ * @author: Huanglh
+ * @create: 2020-08-14 09:41
+ **/
+@Data
+@Accessors(chain = true)
+public class RuleDTO {
+    /** 规则名称 */
+    private String ruleName;
+
+    /** 规则类型 */
+    private String ruleType;
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.mybatis.annotations.LikeQuery;
+import com.csbr.cloud.mybatis.enums.LikeQueryEnum;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowBizGuidQueryDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.EqualsAndHashCode;
+import lombok.Data;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护查询参数
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Schema(title = "服务商维护查询参数")
+public class ServicerMaintainQueryVO extends FlowBizGuidQueryDTO {
+
+    @Schema(description = "公司名称")
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    private String tenantName;
+
+    @Schema(description = "企业类型【选择平台字典【公司类型】的选项】")
+    private String tenantType;
+
+    @Schema(description = "能否继续合作【Y 能；N 不能；】")
+    private String canContinueCollaborate;
+
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃】
+     */
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃】")
+    private String bizApproveState;
+
+    /******** 自定义扩展 *****/
+    
+    /**
+     * 数据唯一标识【List集合】
+     */
+    @Schema(description = "数据唯一标识", hidden = true)
+    private List<String> guidList;
+    
+    /**
+     * 是否调用查询的判断
+     */
+    @Schema(description = "是否调用查询的判断", hidden = true)
+    private Boolean isNeedQuery;
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护新增、修改参数
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+@Data
+@Schema(title = "服务商维护新增、修改参数")
+public class ServicerMaintainRQVO extends FlowRQBaseVO {
+    
+    /**
+     * 企业唯一标识
+     */
+    @Schema(description = "企业唯一标识")
+    private String tenantGuid;
+    
+    /**
+     * 公司名称
+     */
+    @Schema(description = "公司名称")
+    private String tenantName;
+    
+    /**
+     * 企业类型【选择平台字典【公司类型】的选项】
+     */
+    @Schema(description = "企业类型【选择平台字典【公司类型】的选项】")
+    private String tenantType;
+    
+    /**
+     * 提交时间
+     */
+    @Schema(description = "提交时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date submitTime;
+    
+    /**
+     * 联系人
+     */
+    @Schema(description = "联系人")
+    private String contacts;
+    
+    /**
+     * 联系人电话
+     */
+    @Schema(description = "联系人电话")
+    private String contactTel;
+    
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+     */
+    @Schema(description = "业务审批状态(传Y表示不走审批流)【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    private String bizApproveState;
+    
+    /**
+     * 能否继续合作【Y 能；N 不能；】
+     */
+    @Schema(description = "能否继续合作【Y 能；N 不能；】")
+    private String canContinueCollaborate;
+    
+    /**
+     * 维护信息
+     */
+    @Schema(description = "维护信息")
+    private String maintainJson;
+    
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import com.csbr.cloud.workflow.domain.vo.appove.BizApproveVO;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护返回参数
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+@Data
+@Schema(title = "服务商维护返回参数")
+public class ServicerMaintainRSVO {
+    
+    /**
+     * 系统唯一标识
+     */
+    @Schema(description = "系统唯一标识")
+    private String guid;
+    
+    /**
+     * 企业唯一标识
+     */
+    @Schema(description = "企业唯一标识")
+    private String tenantGuid;
+    
+    /**
+     * 公司名称
+     */
+    @Schema(description = "公司名称")
+    private String tenantName;
+    
+    /**
+     * 企业类型【选择平台字典【公司类型】的选项】
+     */
+    @Schema(description = "企业类型【选择平台字典【公司类型】的选项】")
+    private String tenantType;
+    
+    /**
+     * 提交时间
+     */
+    @Schema(description = "提交时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date submitTime;
+    
+    /**
+     * 联系人
+     */
+    @Schema(description = "联系人")
+    private String contacts;
+    
+    /**
+     * 联系人电话
+     */
+    @Schema(description = "联系人电话")
+    private String contactTel;
+    
+    /**
+     * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+     */
+    @Schema(description = "业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    private String bizApproveState;
+    
+    /**
+     * 能否继续合作【Y 能；N 不能；】
+     */
+    @Schema(description = "能否继续合作【Y 能；N 不能；】")
+    private String canContinueCollaborate;
+    
+    /**
+     * 维护信息
+     */
+    @Schema(description = "维护信息")
+    private String maintainJson;
+
+    @Schema(description = "创建人")
+    private String createUserName;
+
+    @Schema(description = "创建时间")
+    private Date createTime;
+    
+    /******** 库表存储属性 需处理 *****/
+    
+    /******** 自定义扩展 *****/
+
+    @Schema(description = "企业类型名称")
+    private String tenantTypeName;
+    
+    /**
+     * 审批信息
+     */
+    @Schema(description = "审批信息")
+    private BizApproveVO approveVO;
+    
+    /******** 子对象 *****/
+    
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import csbr.cloud.entity.domain.base.vo.CsbrBaseVO;
+import csbr.cloud.entity.domain.common.CommonJson;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jdk.jfr.Name;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.List;
+
+/**
+* 人员表 视图对象类
+*
+* @author xiaocq
+* @date 2023-12-19
+*/
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "人员详情返回实体")
+public class StaffRSVO extends CsbrBaseVO {
+
+    /**
+    * 上级guid
+    */
+    @Schema(description = "上级guid")
+    private String leaderGuid;
+
+    /**
+    * 用户guid
+    */
+    @Schema(description = "用户guid")
+    private String userGuid;
+
+    /**
+    * 微信小程序openId
+    */
+    @Schema(description = "微信小程序openId")
+    private String wechatOpenId;
+
+    /**
+     * 微信公众号openId
+     */
+    @Name("微信公众号openId")
+    @Schema(description = "微信公众号openId")
+    private String openId;
+
+    /**
+     * 微信唯一码
+     */
+    @Name("微信唯一码")
+    @Schema(description = "微信唯一码")
+    private String unionId;
+
+    /**
+    * 工作地
+    */
+    @Schema(description = "工作地")
+    private String workAddress;
+
+    /**
+    * 是否部门负责人
+    */
+    @Schema(description = "是否部门负责人")
+    private String isLeader;
+
+    /**
+    * 公司邮箱
+    */
+    @Schema(description = "公司邮箱")
+    private String companyEmail;
+
+    /**
+    * 姓名
+    */
+    @Schema(description = "姓名")
+    private String staffName;
+
+
+    /**
+    * 工号
+    */
+    @Schema(description = "工号")
+    private String staffNo;
+
+    /**
+    * 手机号码
+    */
+    @Schema(description = "手机号码")
+    private String mobileNo;
+
+    /**
+    * 身份证号
+    */
+    @Schema(description = "身份证号")
+    private String idCode;
+
+    /**
+    * 企业guid
+    */
+    @Schema(description = "企业guid")
+    private String tenantGuid;
+
+
+    /**
+    * 部门guidJson
+    */
+    @Schema(description = "部门guidJson")
+    private String organisationGuidJson;
+
+    /**
+     * 组织架构guid列表
+     */
+    @Schema(description = "组织架构guid列表")
+    private String organisationRelGuidJson;
+
+    /**
+    * 岗位guidJson
+    */
+    @Schema(description = "岗位guidJson")
+    private String postGuidJson;
+
+    @Schema(description = "是否管理员")
+    private String isAdmin;
+
+    /********非库表存储属性*****/
+
+
+    /** 职级名称 */
+    @Schema(description = "上级名称")
+    private String leaderName;
+
+    /** 企业名称 */
+    @Schema(description = "企业名称")
+    private String tenantName;
+
+    @Schema(description = "状态Y 期用；S 停用")
+    private String bizState;
+
+    /** 部门guid列表 */
+    @Schema(description = "部门guid列表")
+    private List<String> organisationGuidList;
+
+    /** 部门列表名称 */
+    @Schema(description = "部门列表名称")
+    private List<String> organisationNameList;
+
+    /** 岗位guid列表 */
+    @Schema(description = "岗位guid列表")
+    private List<String> postGuidList;
+
+    /** 岗位列表名称 */
+    @Schema(description = "岗位列表名称")
+    private List<String> postNameList;
+
+    /********字典类*****/
+
+    /********实体类、用户单选、组织机构单选*****/
+
+    /********范围查询*****/
+
+    /********自定义扩展*****/
+
+    /********子对象*****/
+
+    @Schema(description = "菜单模板")
+    private List<CommonJson> funcPermissionTemplateJson;
+
+
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import csbr.cloud.entity.domain.base.vo.CsbrBaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+* 企业证照表 视图对象类
+*
+* @author xiaocq
+* @date 2023-12-19
+*/
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "企业证照表")
+public class TenantLicRQVO extends CsbrBaseVO {
+    /**
+    * 企业唯一标识
+    */
+    @Schema(description = "企业唯一标识")
+    private String tenantGuid;
+
+    /**
+    * 证照类型
+    */
+    @Schema(description = "证照类型")
+    private String licenseType;
+
+    /**
+    * 图片内容
+    */
+    @Schema(description = "图片内容")
+    private String pictContentJson;
+
+
+    /********非库表存储属性*****/
+
+
+
+    /********字典类*****/
+
+    /********实体类、用户单选、组织机构单选*****/
+
+    /********范围查询*****/
+
+    /********自定义扩展*****/
+
+    /********子对象*****/
+
+
+
+
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import csbr.cloud.entity.domain.base.vo.CsbrBaseVO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+* 企业表 视图对象类
+*
+* @author xiaocq
+* @date 2023-12-19
+*/
+@Data
+@Accessors(chain = true)
+@EqualsAndHashCode(callSuper = true)
+@Schema(name = "企业表")
+public class TenantRQVO extends CsbrBaseVO {
+
+    @Schema(description = "上级企业GUID")
+    private String parentGuid;
+
+    /**
+    * 公司编号
+    */
+    @Schema(description = "公司编号")
+    private String tenantCode;
+
+    /**
+    * 公司名称
+    */
+    @Schema(description = "公司名称")
+    private String tenantName;
+
+    /**
+    * 公司简称
+    */
+    @Schema(description = "公司简称")
+    private String abbreviation;
+
+    @Schema(description = "企业类型")
+    private String tenantType;
+
+    /**
+    * 公司法人
+    */
+    @Schema(description = "公司法人")
+    private String personIncharge;
+
+    /**
+    * 注册日期
+    */
+    @Schema(description = "注册日期")
+    private LocalDateTime registrationDate;
+
+    /**
+    * 注册资本
+    */
+    @Schema(description = "注册资本")
+    private BigDecimal registeredCapital;
+
+    /**
+    * 税号
+    */
+    @Schema(description = "税号")
+    private String bankTaxNo;
+
+    /**
+    * 单位地址
+    */
+    @Schema(description = "单位地址")
+    private String companyAddress;
+
+    /**
+    * 状态
+    */
+    @Schema(description = "状态 N草稿 Y正常 S停用")
+    private String bizState;
+
+    /**
+    * 营业执照经营范围
+    */
+    @Schema(description = "营业执照经营范围")
+    private String businessLicenseScope;
+
+    /**
+    * 联系人
+    */
+    @Schema(description = "联系人")
+    private String contacts;
+
+    /**
+    * 联系人电话
+    */
+    @Schema(description = "联系人电话")
+    private String contactTel;
+
+    /**
+    * 公司电话
+    */
+    @Schema(description = "公司电话")
+    private String enterprisePhone;
+
+    /**
+    * 省
+    */
+    @Schema(description = "省")
+    private String province;
+
+    /**
+    * 市
+    */
+    @Schema(description = "市")
+    private String city;
+
+    /**
+    * 区
+    */
+    @Schema(description = "区")
+    private String district;
+
+    /**
+    * 地址
+    */
+    @Schema(description = "地址")
+    private String venue;
+
+    /**
+    * 详细地址
+    */
+    @Schema(description = "详细地址")
+    private String address;
+
+    /**
+    * 登录账号
+    */
+    @Schema(description = "登录账号")
+    private String logonUser;
+
+    @Schema(description = "会员状态 来自字典")
+    private String memberStatus;
+
+    @Schema(description = "持股类型 来自字典")
+    private String holdType;
+
+
+    /********非库表存储属性*****/
+
+    @Schema(description = "token后台赋值")
+    private String token;
+
+    @Schema(description = "业务唯一标识")
+    private String bizGuid;
+
+    /********字典类*****/
+
+    /********实体类、用户单选、组织机构单选*****/
+
+    /********范围查询*****/
+
+    /********自定义扩展*****/
+
+    /********子对象*****/
+
+    @Schema(description = "企业证照列表")
+    private List<TenantLicRQVO> tenantLicList;
+
+    @Schema(hidden = true,description = "分库标识")
+    private String shardingFlag;
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.csbr.cloud.mybatis.annotations.LikeQuery;
+import com.csbr.cloud.mybatis.enums.LikeQueryEnum;
+import csbr.cloud.entity.domain.base.dto.BasePageDTO;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Pattern;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @program: common-admin-platform-auth-service
+ * @description: 用户查询参数
+ * @author: yio
+ * @create: 2020-07-28 13:47
+ **/
+@Data
+@Schema(name = "用户查询参数")
+public class UserQueryDTO extends BasePageDTO {
+    /** 系统唯一标识 */
+    @Schema(name = "guid",title = "系统唯一标识")
+    private String guid;
+
+    /** 锁定(Y 是；N 否) */
+    @Schema(name = "guid",title = "锁定(Y 是；N 否)")
+    @Pattern(regexp = "^Y|N$", message = "锁定应该为Y、N中的值。")
+    private String isLocked;
+
+    /** 登录账号 */
+    @Schema(name = "guid",title = "登录账号")
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    private String logonUser;
+
+    /** 登录账号(多个) */
+    @Schema(name = "guid",title = "登录账号(多个)")
+    private List<String> logonUserList;
+
+    /** 手机号 */
+    @Schema(name = "guid",title = "手机号")
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    private String mobileNo;
+
+    /** 手机号 */
+    @Schema(name = "guid",title = "手机号(多个)")
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    private List<String> mobileNoList;
+
+    /** 姓名 */
+    @Schema(name = "guid",title = "姓名")
+    @LikeQuery(type = LikeQueryEnum.ALL)
+    private String name;
+
+    /** 平台GUID */
+    @Schema(name = "guid",title = "平台GUID")
+    private String platformGuid;
+
+    /** 业务状态(Y 有效；S 停用) */
+    @Schema(name = "guid",title = "业务状态(Y 有效；S 停用)")
+    @Pattern(regexp = "^Y|S$", message = "业务状态应该为Y、S中的值。")
+    private String bizState;
+
+}

+package com.csbr.qingcloud.portal.domain.vo;
+
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ * @program: common-admin-platform-auth-service
+ * @description: 获取用户查询的返回值对象
+ * @author: yio
+ * @create: 2020-07-28 14:46
+ **/
+@Data
+@Schema(name = "获取用户查询的返回值对象")
+public class UserVO {
+
+    /** 业务状态(Y 有效；S 停用) */
+    @Schema(name = "guid",title = "业务状态(Y 有效；S 停用)")
+    private String bizState;
+
+    /** 创建时间 */
+    @Schema(name = "guid",title = "创建时间")
+    private Timestamp createTime;
+
+    /** 创建人 */
+    @Schema(name = "guid",title = "创建人")
+    private String createUserId;
+
+    /** 创建人姓名 */
+    @Schema(name = "guid",title = "创建人姓名")
+    private String createUserName;
+
+    /** 系统唯一标识 */
+    @Schema(name = "guid",title = "系统唯一标识")
+    private String guid;
+
+    /** 是否删除(null 是；N 否 默认 N) */
+    @Schema(name = "guid",title = "是否删除(Y 是；N 否 默认 N)")
+    @TableLogic
+    private String isDeleted;
+
+    /** 锁定(Y 是；N 否) */
+    @Schema(name = "guid",title = "锁定(Y 是；N 否)")
+    private String isLocked;
+
+    /** 最后登录时间 */
+    @Schema(name = "guid",title = "最后登录时间")
+    private Timestamp lastLoginTime;
+
+    /** 登录失败次数 */
+    @Schema(name = "guid",title = "登录失败次数")
+    private Integer loginErrorCount;
+
+    /** 登录账号 */
+    @Schema(name = "guid",title = "登录账号")
+    private String logonUser;
+
+    /** 手机号 */
+    @Schema(name = "guid",title = "手机号")
+    private String mobileNo;
+
+    /** 姓名 */
+    @Schema(name = "guid",title = "姓名")
+    private String name;
+
+    /** 平台GUID */
+    @Schema(name = "guid",title = "平台GUID")
+    private String platformGuid;
+
+    /** 密码 */
+    @Schema(name = "guid",title = "密码")
+    private String pwd;
+
+    /** 修改时间 */
+    @Schema(name = "guid",title = "修改时间")
+    private Timestamp updateTime;
+
+    /** 修改人 */
+    @Schema(name = "guid",title = "修改人")
+    private String updateUserId;
+
+    /** 修改姓名 */
+    @Schema(name = "guid",title = "修改姓名")
+    private String updateUserName;
+
+    @Schema(name = "guid",title = "微信授权认证的unionId")
+    private String unionId;
+}

+package com.csbr.qingcloud.portal.feign;
+
+import com.csbr.cloud.common.config.FastCallFeignConfiguration;
+import com.csbr.cloud.common.entity.DictModel;
+import com.csbr.cloud.common.entity.DictionaryVO;
+import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.BoroughPOJO;
+import com.csbr.qingcloud.portal.domain.vo.RuleDTO;
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
+import jakarta.validation.Valid;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * @author Xiaocq
+ */
+@FeignClient(value = "ms-daop-configure-service", configuration = FastCallFeignConfiguration.class)
+
+public interface ConfigureFeign {
+
+    /**
+     * 通过字典类型获取字典数据
+     */
+    @HystrixCommand(fallbackMethod = "CommonUtil.sleepFallback", commandProperties =
+            {
+                    @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "1500")
+            })
+    @RequestMapping(value = "/dict/data/get-by-dictType", method = RequestMethod.GET)
+    CommonRes<List<DictModel>> getDictListByType(@RequestParam String dictType);
+
+
+    /**
+     * 获取全部字典
+     */
+    @GetMapping(value = "/dict/data/get-all",produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<List<DictionaryVO>> getAll();
+
+    /**
+     * 编码生成
+     */
+    @PostMapping(value = "/rule/new-code",produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<String> newCode(@RequestBody RuleDTO dto);
+
+    @GetMapping(value = "/borough/get-borough",produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<List<BoroughPOJO>> getBoroughCodeName();
+
+
+}

+package com.csbr.qingcloud.portal.feign;
+
+import com.csbr.cloud.common.config.FastCallFeignConfiguration;
+import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.DemandUpdateStateVO;
+import com.csbr.qingcloud.portal.domain.vo.ProcessOrderProcessDtlRSVO;
+import com.csbr.qingcloud.portal.domain.vo.ProcessOrderRQVO;
+import jakarta.validation.Valid;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Xiaocq
+ */
+@FeignClient(value = "ms-data-process-basic-service",url = "${dataProcessUrl}", configuration = FastCallFeignConfiguration.class)
+public interface DataProcessBasicFeign {
+
+    @PostMapping(value = "/process-order/saveOrUpdate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Boolean> saveProcessOrder(@RequestBody @Valid ProcessOrderRQVO vo);
+
+    @PostMapping(value = "/process-order-process-dtl/get-order-state", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Map<String, DemandUpdateStateVO>> getOrderState(@RequestBody List<String> processOrderGuids);
+
+    @PostMapping(value = "/process-order-process-dtl/process-order-list", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<List<ProcessOrderProcessDtlRSVO>> processOrderList(@RequestBody List<String> processOrderGuids);
+
+    @PostMapping(value = "/process-order-process-dtl/get-order-state-and-name", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Map<String, DemandUpdateStateVO>> getOrderStateAndBizName(@RequestBody List<String> bizGuids);
+
+}

+package com.csbr.qingcloud.portal.feign;
+
+import com.csbr.cloud.common.config.FastCallFeignConfiguration;
+import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.StaffRSVO;
+import com.csbr.qingcloud.portal.domain.vo.TenantRQVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @author Xiaocq
+ */
+@FeignClient(value = "ms-daop-personel-service", configuration = FastCallFeignConfiguration.class)
+public interface PersonelFeign {
+
+    @PostMapping(value = "/tenant/auth", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<TenantRQVO> authTenant(@RequestBody TenantRQVO vo);
+
+    @PutMapping(value = "/tenant/update", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<String> updateTenant(@RequestBody TenantRQVO vo);
+
+    @PutMapping(value = "/tenant/change-update", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Boolean> changeUpdate(@RequestBody TenantRQVO vo);
+
+    @GetMapping(value = "/tenant/get-all-tenant-guid-name-map", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Map<String, String>> getAllTenantGuidNameMap();
+
+    @PostMapping(value = "/tenant/check", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Boolean> checkTenant(@Validated @RequestBody TenantRQVO vo);
+
+    @GetMapping(value = "/staff/getByUserGuid", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<StaffRSVO> getByUserGuid(@RequestParam String userGuid);
+
+}

+package com.csbr.qingcloud.portal.feign;
+
+import com.csbr.cloud.common.config.FastCallFeignConfiguration;
+import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.qingcloud.portal.domain.vo.UserQueryDTO;
+import com.csbr.qingcloud.portal.domain.vo.UserVO;
+import csbr.cloud.entity.domain.base.vo.PageListVO;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import java.util.List;
+
+/**
+ * @author Xiaocq
+ */
+@FeignClient(value = "ms-daop-user-service", configuration = FastCallFeignConfiguration.class)
+public interface UserFeign {
+
+    @PostMapping(value = "/user/data/get-some-info", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<PageListVO<UserVO>> getUserSomeInfo(@RequestBody UserQueryDTO dto);
+
+    /**
+     * 通过手机查用户
+     */
+    @PostMapping(value = "/user/data/get/mobile", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<List<UserVO>> getUserByMobileOrIdCode(@RequestBody UserQueryDTO dto);
+
+}

+package com.csbr.qingcloud.portal.feign;
+
+import com.csbr.cloud.common.config.FastCallFeignConfiguration;
+import com.csbr.cloud.common.response.CommonRes;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO;
+import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
+import com.csbr.cloud.workflow.domain.vo.appove.ApproveVO;
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
+import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
+import csbr.cloud.entity.domain.base.vo.PageListVO;
+import jakarta.validation.Valid;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.http.MediaType;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+/**
+ * @author Xiaocq
+ */
+@FeignClient(value = "ms-daop-workflow-service", configuration = FastCallFeignConfiguration.class)
+public interface WorkflowFeign {
+
+    /** 动态业务处理 */
+    @HystrixCommand(fallbackMethod = "CommonUtil.sleepFallback", commandProperties = {
+                    @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "4500")})
+    @RequestMapping(value = "/work-flow/data/allow-flow-core", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<Boolean> allowFlowCore(@RequestBody FlowUpdateStateDTO dto, @RequestHeader(required = false) MultiValueMap<String, String> headers);
+
+    @HystrixCommand(fallbackMethod = "CommonUtil.sleepFallback", commandProperties = {
+            @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "4500")})
+    @RequestMapping(value = "/work-flow/data/get-flow-list-tenant", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
+    CommonRes<PageListVO<ApproveVO>> getFlowListCrossTenant(@RequestBody @Valid FlowQueryDTO dto);
+
+}

+package com.csbr.qingcloud.portal.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import csbr.cloud.entity.domain.base.dao.BaseShardingDO;
+import jdk.jfr.Name;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求实体
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@Name("数据需求")
+public class MfDemand extends BaseShardingDO {
+    
+    /**
+    * 数据需求名称
+    */
+    @Name("数据需求名称")
+    private String dataDemandName;
+    
+    /**
+    * 需求类型
+    */
+    @Name("需求类型")
+    private String requirementType;
+    
+    /**
+    * 需求分类【1新增 2调整】
+    */
+    @Name("需求分类【1新增 2调整】")
+    private String demandCategory;
+    
+    /**
+    * 数据产品唯一标识
+    */
+    @Name("数据产品唯一标识")
+    private String dataProductGuid;
+    
+    /**
+    * 需求开始时间
+    */
+    @Name("需求开始时间")
+    private Date requirementTermSdate;
+    
+    /**
+    * 需求结束时间
+    */
+    @Name("需求结束时间")
+    private Date requirementTermEdate;
+    
+    /**
+    * 需求内容
+    */
+    @Name("需求内容")
+    private String requirementContent;
+    
+    /**
+    * 数据需求字段【数据格式：[{"name":"","path":""},{"name":"","path":""}]】
+    */
+    @Name("数据需求字段【数据格式：[{\"name\":\"\",\"path\":\"\"},{\"name\":\"\",\"path\":\"\"}]】")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String dataDemandFieldAttachJson;
+    
+    /**
+    * 期望交付时间
+    */
+    @Name("期望交付时间")
+    private Date deliveryTime;
+    
+    /**
+    * 最低预算
+    */
+    @Name("最低预算")
+    private BigDecimal minBudget;
+    
+    /**
+    * 最高预算
+    */
+    @Name("最高预算")
+    private BigDecimal maxBudget;
+    
+    /**
+    * 费用来源
+    */
+    @Name("费用来源")
+    private String costSource;
+    
+    /**
+    * 更新周期【取数据字典：周期，1 年度，2 半年度，3 季度，4 月度】
+    */
+    @Name("更新周期【取数据字典：周期，1 年度，2 半年度，3 季度，4 月度】")
+    private String updateCycle;
+    
+    /**
+    * 获取路径方式
+    */
+    @Name("获取路径方式")
+    private String requestType;
+    
+    /**
+    * 场景名称
+    */
+    @Name("场景名称")
+    private String sceneName;
+    
+    /**
+    * 应用场景描述
+    */
+    @Name("应用场景描述")
+    private String sceneDescription;
+    
+    /**
+    * 数据质量要求
+    */
+    @Name("数据质量要求")
+    private String qualityDemand;
+    
+    /**
+    * 隐私合规要求
+    */
+    @Name("隐私合规要求")
+    private String privacyDemand;
+    
+    /**
+    * 其他补充内容
+    */
+    @Name("其他补充内容")
+    private String otherContent;
+    
+    /**
+    * 联系人
+    */
+    @Name("联系人")
+    private String contacts;
+    
+    /**
+    * 需求单位
+    */
+    @Name("需求单位")
+    private String requirementUnit;
+    
+    /**
+    * 联系方式
+    */
+    @Name("联系方式")
+    private String contactInformation;
+    
+    /**
+    * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+    */
+    @Name("业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    private String bizApproveState;
+    
+    /**
+    * 加工单生成时间
+    */
+    @Name("加工单生成时间")
+    private Date processingGenerateTime;
+    
+    /**
+    * 验收完成时间
+    */
+    @Name("验收完成时间")
+    private Date acceptFinishTime;
+    
+    /**
+    * 完成周期
+    */
+    @Name("完成周期")
+    private Integer finishCycle;
+    
+    /**
+    * 资源获取状态【N未开始 A进行中 Y已完成】
+    */
+    @Name("资源获取状态【N未开始 A进行中 Y已完成】")
+    private String resourceAcquisitionState;
+    
+    /**
+    * 产品加工状态【N未开始 A进行中 Y已完成】
+    */
+    @Name("产品加工状态【N未开始 A进行中 Y已完成】")
+    private String productProcessingState;
+    
+    /**
+    * 产品交付状态【N未开始 A进行中 Y已完成】
+    */
+    @Name("产品交付状态【N未开始 A进行中 Y已完成】")
+    private String productDeliveryState;
+    
+    /**
+    * 产品验收状态【N未开始 A进行中 Y已完成】
+    */
+    @Name("产品验收状态【N未开始 A进行中 Y已完成】")
+    private String productAcceptState;
+
+    @Name("合同附件")
+    private String contractAttachJson;
+
+    @Name("加工单位类型")
+    private String processCompanyType;
+
+    @Name("加工单位唯一标识")
+    private String processCompanyGuid;
+
+    @Name("加工单位名称")
+    private String processCompanyName;
+
+    @Name("需求单编号")
+    private String requirementOrderNo;
+
+    @Name("加工单编号")
+    private String processOrderNo;
+
+    @Name("资产Guid")
+    private String zqBizGuid;
+
+    @Name("专区名称")
+    private String zqName;
+
+    @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+
+    @Name("上架状态(Y 上架 N 下架)")
+    private String listingStatus;
+
+}

+package com.csbr.qingcloud.portal.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import csbr.cloud.entity.domain.base.dao.BaseDO;
+import jdk.jfr.Name;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息实体
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@Name("企业信息")
+public class MfEnterprise extends BaseDO {
+
+    @Name("会员GUID")
+    private String tenantGuid;
+
+    /**
+    * 公司名称
+    */
+    @Name("公司名称")
+    private String tenantName;
+    
+    /**
+    * 统一社会信用代码
+    */
+    @Name("统一社会信用代码")
+    private String socialCreditCode;
+    
+    /**
+    * 企业类型【选择平台字典【公司类型】的选项】
+    */
+    @Name("企业类型")
+    private String tenantType;
+    
+    /**
+    * 注册日期
+    */
+    @Name("注册日期")
+    private Date registrationDate;
+    
+    /**
+    * 注册资本【(万元)】
+    */
+    @Name("注册资本")
+    private BigDecimal registeredCapital;
+    
+    /**
+    * 税号
+    */
+    @Name("税号")
+    private String bankTaxNo;
+    
+    /**
+    * 省
+    */
+    @Name("省")
+    private String province;
+    
+    /**
+    * 市
+    */
+    @Name("市")
+    private String city;
+    
+    /**
+    * 区
+    */
+    @Name("区")
+    private String district;
+    
+    /**
+    * 营业期限【1 长期有效；2 自定义】
+    */
+    @Name("营业期限")
+    private String businessLicenseTerm;
+    
+    /**
+    * 营业开始日期
+    */
+    @Name("营业开始日期")
+    private Date businessLicenseStartDate;
+    
+    /**
+    * 营业结束日期
+    */
+    @Name("营业结束日期")
+    private Date businessLicenseEndDate;
+    
+    /**
+    * 营业执照
+    */
+    @Name("营业执照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String businessLicenseJson;
+    
+    /**
+    * 经营范围
+    */
+    @Name("经营范围")
+    private String businessLicenseScope;
+    
+    /**
+    * 公司法人
+    */
+    @Name("公司法人")
+    private String juridicalPerson;
+    
+    /**
+    * 法人证件类型
+    */
+    @Name("法人证件类型")
+    private String juridicalPersonIdType;
+    
+    /**
+    * 法人证件号
+    */
+    @Name("法人证件号")
+    private String juridicalPersonId;
+    
+    /**
+    * 法人证件照
+    */
+    @Name("法人证件照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String juridicalPersonIdPhotoJson;
+    
+    /**
+    * 登录账号
+    */
+    @Name("登录账号")
+    private String logonUser;
+    
+    /**
+    * 联系人
+    */
+    @Name("联系人")
+    private String contacts;
+    
+    /**
+    * 联系人电话
+    */
+    @Name("联系人电话")
+    private String contactTel;
+    
+    /**
+    * 管理员证件号
+    */
+    @Name("管理员证件号")
+    private String managerPersonId;
+    
+    /**
+    * 管理员证件照
+    */
+    @Name("管理员证件照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String managerPersonIdPhotoJson;
+    
+    /**
+    * 授权委托书
+    */
+    @Name("授权委托书")
+    private String authorizationLetter;
+
+    @Name("资产Guid")
+    private String zqBizGuid;
+
+    @Name("专区名称")
+    private String zqName;
+
+    @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+    
+    /**
+    * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+    */
+    @Name("业务审批状态")
+    private String bizApproveState;
+
+}

+package com.csbr.qingcloud.portal.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import csbr.cloud.entity.domain.base.dao.BaseDO;
+import jdk.jfr.Name;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息变更审批实体
+ * @author: xcq
+ * @create: 2024-12-27 15:10
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@Name("企业信息变更审批")
+public class MfEnterpriseChangeApprove extends BaseDO {
+
+    @Name("会员GUID")
+    private String tenantGuid;
+
+    /**
+    * 公司名称
+    */
+    @Name("公司名称")
+    private String tenantName;
+    
+    /**
+    * 统一社会信用代码
+    */
+    @Name("统一社会信用代码")
+    private String socialCreditCode;
+    
+    /**
+    * 企业类型【选择平台字典【公司类型】的选项】
+    */
+    @Name("企业类型")
+    private String tenantType;
+    
+    /**
+    * 注册日期
+    */
+    @Name("注册日期")
+    private Date registrationDate;
+    
+    /**
+    * 注册资本【(万元)】
+    */
+    @Name("注册资本")
+    private BigDecimal registeredCapital;
+    
+    /**
+    * 税号
+    */
+    @Name("税号")
+    private String bankTaxNo;
+    
+    /**
+    * 省
+    */
+    @Name("省")
+    private String province;
+    
+    /**
+    * 市
+    */
+    @Name("市")
+    private String city;
+    
+    /**
+    * 区
+    */
+    @Name("区")
+    private String district;
+    
+    /**
+    * 营业期限【1 长期有效；2 自定义】
+    */
+    @Name("营业期限")
+    private String businessLicenseTerm;
+    
+    /**
+    * 营业开始日期
+    */
+    @Name("营业开始日期")
+    private Date businessLicenseStartDate;
+    
+    /**
+    * 营业结束日期
+    */
+    @Name("营业结束日期")
+    private Date businessLicenseEndDate;
+    
+    /**
+    * 营业执照
+    */
+    @Name("营业执照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String businessLicenseJson;
+    
+    /**
+    * 营业执照经营范围
+    */
+    @Name("营业执照经营范围")
+    private String businessLicenseScope;
+    
+    /**
+    * 公司法人
+    */
+    @Name("公司法人")
+    private String juridicalPerson;
+    
+    /**
+    * 法人证件类型
+    */
+    @Name("法人证件类型")
+    private String juridicalPersonIdType;
+    
+    /**
+    * 法人证件号
+    */
+    @Name("法人证件号")
+    private String juridicalPersonId;
+    
+    /**
+    * 法人证件照
+    */
+    @Name("法人证件照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String juridicalPersonIdPhotoJson;
+    
+    /**
+    * 登录账号
+    */
+    @Name("登录账号")
+    private String logonUser;
+    
+    /**
+    * 联系人
+    */
+    @Name("联系人")
+    private String contacts;
+    
+    /**
+    * 联系人电话
+    */
+    @Name("联系人电话")
+    private String contactTel;
+    
+    /**
+    * 管理员证件号
+    */
+    @Name("管理员证件号")
+    private String managerPersonId;
+    
+    /**
+    * 管理员证件照
+    */
+    @Name("管理员证件照")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String managerPersonIdPhotoJson;
+    
+    /**
+    * 授权委托书
+    */
+    @Name("授权委托书")
+    private String authorizationLetter;
+    
+    /**
+    * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+    */
+    @Name("业务审批状态")
+    private String bizApproveState;
+    
+    /**
+    * 审批流唯一标识
+    */
+    @Name("审批流唯一标识")
+    private String approveGuid;
+    
+    /**
+    * 原数据唯一标识
+    */
+    @Name("原数据唯一标识")
+    private String sourceGuid;
+
+    @Name("资产Guid")
+    private String zqBizGuid;
+
+    @Name("专区名称")
+    private String zqName;
+
+    @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
+    private String crossPlatformApproveState;
+    
+    /**
+    * 数据类型【数据类型 1原数据 2新数据 0认证表数据】
+    */
+    @Name("数据类型")
+    private String dataType;
+
+}

+package com.csbr.qingcloud.portal.mybatis.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import csbr.cloud.entity.domain.base.dao.BaseDO;
+import jdk.jfr.Name;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护实体
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@Name("服务商维护")
+public class MfServicerMaintain extends BaseDO {
+    
+    /**
+    * 企业唯一标识
+    */
+    @Name("企业唯一标识")
+    private String tenantGuid;
+    
+    /**
+    * 公司名称
+    */
+    @Name("公司名称")
+    private String tenantName;
+    
+    /**
+    * 企业类型【选择平台字典【公司类型】的选项】
+    */
+    @Name("企业类型【选择平台字典【公司类型】的选项】")
+    private String tenantType;
+    
+    /**
+    * 提交时间
+    */
+    @Name("提交时间")
+    private Date submitTime;
+    
+    /**
+    * 联系人
+    */
+    @Name("联系人")
+    private String contacts;
+    
+    /**
+    * 联系人电话
+    */
+    @Name("联系人电话")
+    private String contactTel;
+    
+    /**
+    * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
+    */
+    @Name("业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】")
+    private String bizApproveState;
+    
+    /**
+    * 能否继续合作【Y 能；N 不能；】
+    */
+    @Name("能否继续合作【Y 能；N 不能；】")
+    private String canContinueCollaborate;
+    
+    /**
+    * 维护信息
+    */
+    @Name("维护信息")
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
+    private String maintainJson;
+
+}

+package com.csbr.qingcloud.portal.mybatis.entity;
+
+import csbr.cloud.entity.domain.base.dao.BaseDO;
+import jdk.jfr.Name;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import java.util.Date;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护明细实体
+ * @author: xcq
+ * @create: 2024-12-31 18:52
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@Name("服务商维护明细")
+public class MfServicerMaintainDetail extends BaseDO {
+    
+    /**
+    * 企业唯一标识
+    */
+    @Name("企业唯一标识")
+    private String tenantGuid;
+    
+    /**
+    * 父唯一标识
+    */
+    @Name("父唯一标识")
+    private String parentGuid;
+    
+    /**
+    * 字典唯一标识
+    */
+    @Name("字典唯一标识")
+    private String dicGuid;
+    
+    /**
+    * 字典值
+    */
+    @Name("字典值")
+    private String dicValue;
+
+}

+package com.csbr.qingcloud.portal.mybatis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求 Mapper 接口
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@Mapper
+public interface MfDemandMapper extends BaseMapper<MfDemand> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息变更审批 Mapper 接口
+ * @author: xcq
+ * @create: 2024-12-27 15:10
+ **/
+@Mapper
+public interface MfEnterpriseChangeApproveMapper extends BaseMapper<MfEnterpriseChangeApprove> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息 Mapper 接口
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+@Mapper
+public interface MfEnterpriseMapper extends BaseMapper<MfEnterprise> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfServicerMaintainDetail;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护明细 Mapper 接口
+ * @author: xcq
+ * @create: 2024-12-31 18:52
+ **/
+@Mapper
+public interface MfServicerMaintainDetailMapper extends BaseMapper<MfServicerMaintainDetail> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfServicerMaintain;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护 Mapper 接口
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+@Mapper
+public interface MfServicerMaintainMapper extends BaseMapper<MfServicerMaintain> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service;
+
+import com.csbr.cloud.base.service.CsbrService;
+import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求逻辑层接口
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+public interface MfDemandService extends CsbrService<MfDemand> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service;
+
+import com.csbr.cloud.base.service.CsbrService;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息变更审批逻辑层接口
+ * @author: xcq
+ * @create: 2024-12-27 15:10
+ **/
+public interface MfEnterpriseChangeApproveService extends CsbrService<MfEnterpriseChangeApprove> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service;
+
+import com.csbr.cloud.base.service.CsbrService;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息逻辑层接口
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+public interface MfEnterpriseService extends CsbrService<MfEnterprise> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service;
+
+import com.csbr.cloud.base.service.CsbrService;
+import com.csbr.qingcloud.portal.mybatis.entity.MfServicerMaintainDetail;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护明细逻辑层接口
+ * @author: xcq
+ * @create: 2024-12-31 18:52
+ **/
+public interface MfServicerMaintainDetailService extends CsbrService<MfServicerMaintainDetail> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service;
+
+import com.csbr.cloud.base.service.CsbrService;
+import com.csbr.qingcloud.portal.mybatis.entity.MfServicerMaintain;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护逻辑层接口
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+public interface MfServicerMaintainService extends CsbrService<MfServicerMaintain> {
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service.impl;
+
+import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
+import com.csbr.qingcloud.portal.mybatis.mapper.MfDemandMapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfDemand;
+import com.csbr.qingcloud.portal.mybatis.service.MfDemandService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求逻辑层接口实现
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+@Service
+public class MfDemandServiceImpl extends CsbrServiceImpl<MfDemandMapper, MfDemand> implements MfDemandService {
+
+    @Resource
+    private MfDemandMapper mfDemandMapper;
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
+import com.csbr.qingcloud.portal.mybatis.mapper.MfEnterpriseChangeApproveMapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
+import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息变更审批逻辑层接口实现
+ * @author: xcq
+ * @create: 2024-12-27 15:10
+ **/
+@Service
+public class MfEnterpriseChangeApproveServiceImpl extends CsbrServiceImpl<MfEnterpriseChangeApproveMapper, MfEnterpriseChangeApprove> implements MfEnterpriseChangeApproveService {
+
+    @Resource
+    private MfEnterpriseChangeApproveMapper mfEnterpriseChangeApproveMapper;
+
+    @Override
+    public List<MfEnterpriseChangeApprove> listByIds(Collection<? extends Serializable> idList) {
+        LambdaQueryWrapper<MfEnterpriseChangeApprove> queryWrapper = Wrappers.lambdaQuery(MfEnterpriseChangeApprove.class);
+        queryWrapper.in(MfEnterpriseChangeApprove::getGuid, idList);
+        csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
+        return list(queryWrapper);
+    }
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
+import com.csbr.qingcloud.portal.mybatis.mapper.MfEnterpriseMapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
+import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息逻辑层接口实现
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+@Service
+public class MfEnterpriseServiceImpl extends CsbrServiceImpl<MfEnterpriseMapper, MfEnterprise> implements MfEnterpriseService {
+
+    @Resource
+    private MfEnterpriseMapper mfEnterpriseMapper;
+
+    @Override
+    public List<MfEnterprise> listByIds(Collection<? extends Serializable> idList) {
+        LambdaQueryWrapper<MfEnterprise> queryWrapper = Wrappers.lambdaQuery(MfEnterprise.class);
+        queryWrapper.in(MfEnterprise::getGuid, idList);
+        csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
+        return list(queryWrapper);
+    }
+}

+package com.csbr.qingcloud.portal.mybatis.service.impl;
+
+import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
+import com.csbr.qingcloud.portal.mybatis.mapper.MfServicerMaintainDetailMapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfServicerMaintainDetail;
+import com.csbr.qingcloud.portal.mybatis.service.MfServicerMaintainDetailService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护明细逻辑层接口实现
+ * @author: xcq
+ * @create: 2024-12-31 18:52
+ **/
+@Service
+public class MfServicerMaintainDetailServiceImpl extends CsbrServiceImpl<MfServicerMaintainDetailMapper, MfServicerMaintainDetail> implements MfServicerMaintainDetailService {
+
+    @Resource
+    private MfServicerMaintainDetailMapper mfServicerMaintainDetailMapper;
+    
+}

+package com.csbr.qingcloud.portal.mybatis.service.impl;
+
+import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
+import com.csbr.qingcloud.portal.mybatis.mapper.MfServicerMaintainMapper;
+import com.csbr.qingcloud.portal.mybatis.entity.MfServicerMaintain;
+import com.csbr.qingcloud.portal.mybatis.service.MfServicerMaintainService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护逻辑层接口实现
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+@Service
+public class MfServicerMaintainServiceImpl extends CsbrServiceImpl<MfServicerMaintainMapper, MfServicerMaintain> implements MfServicerMaintainService {
+
+    @Resource
+    private MfServicerMaintainMapper mfServicerMaintainMapper;
+    
+}

+package com.csbr.qingcloud.portal.service;
+
+import com.csbr.qingcloud.portal.domain.vo.*;
+import csbr.cloud.entity.domain.base.vo.PageListVO;
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
+
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 数据需求业务逻辑接口
+ * @author: xcq
+ * @create: 2024-12-31 18:46
+ **/
+public interface DemandService {
+
+    /**
+     * 数据需求分页查询
+     * @author xcq
+     * @date 2024-12-31 18:46
+     * @param queryVO
+     * @return com.csbr.cloud.mybatis.entity.PageListVO<com.csbr.qingcloud.portal.domain.vo.DemandRSVO>
+     */
+    PageListVO<DemandRSVO> pageList(DemandQueryVO queryVO);
+
+    /**
+     * 数据需求-门户分页
+     * @param queryVO
+     * @return
+     */
+    PageListVO<DemandPortalRSVO> portalPageList(DemandPortalQueryVO queryVO);
+
+    /**
+     * 数据需求获取详情数据
+     * @author xcq
+     * @date 2024-12-31 18:46
+     * @param guid
+     * @return com.csbr.qingcloud.portal.domain.vo.DemandRSVO
+     */
+    DemandRSVO getDemandDetail(String guid);
+
+    /**
+     * 数据需求数据新增
+     * @author xcq
+     * @date 2024-12-31 18:46
+     * @param flowBaseVO
+     * @return void
+     */
+    void saveDemand(FlowRQBaseVO flowBaseVO);
+
+    /**
+     * 数据需求数据修改
+     * @author xcq
+     * @date 2024-12-31 18:46
+     * @param flowBaseVO
+     * @return void
+     */
+    void updateDemand(FlowRQBaseVO flowBaseVO);
+
+    /**
+     * 数据需求数据删除、并有相关的处理操作
+     * @author xcq
+     * @date 2024-12-31 18:46
+     * @param guids
+     * @return void
+     */
+    void removeByGuids(List<String> guids);
+    
+    /**
+     * 流程结束后进行业务回调
+     * @author xcq
+     * @date 2024-12-31 18:46
+     * @param dto
+     * @return void
+     */
+    void flowCallBack(BizCallbackDTO dto);
+
+    /**
+     * 数据需求-流程结束后进行业务回调(跨服务审批)
+     * @param dto
+     */
+    void crossFlowCallBack(BizCallbackDTO dto);
+
+    Boolean lastApprove(DemandApproveVO dto);
+
+    DemandRSVO getDemandDetailByProcess(String processOrderNo);
+
+    /**
+     * 根据加工单编号查询资产列表
+     * @return
+     */
+    List<ProcessOrderProcessDtlRSVO> listByProcessOrderNo();
+
+    /**
+     * 数据需求-修改上架状态
+     * @param vo
+     * @return
+     */
+    Boolean updateGroundingPick(DemandRQVO vo);
+}

+package com.csbr.qingcloud.portal.service;
+
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO;
+import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
+import com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO;
+
+import java.util.List;
+
+/**
+ * @description: 供应商商品变更
+ * @author: XiaoCQ
+ * @create: 2024-12-27
+ **/
+public interface EnterpriseChangeApproveService {
+    void changeSave(ChangeApproveVO vo);
+
+    ChangeApproveVO changeDetail(String guid);
+
+    void changeUpdate(BizCallbackDTO dto);
+
+    void removeByGuids(List<String> guids);
+
+    void crossFlowCallBack(BizCallbackDTO dto);
+
+    void crossRemoveByBizGuid(List<String> zqBizGuids);
+
+    EnterpriseRSVO getEnterpriseChangeDetail(String guid);
+}

+package com.csbr.qingcloud.portal.service;
+
+import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO;
+import com.csbr.qingcloud.portal.domain.vo.*;
+import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
+import csbr.cloud.entity.domain.base.vo.PageListVO;
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 企业信息业务逻辑接口
+ * @author: xcq
+ * @create: 2024-12-26 16:18
+ **/
+public interface EnterpriseService {
+
+    /**
+     * 企业信息分页查询
+     * @author xcq
+     * @date 2024-12-26 16:18
+     * @param queryVO
+     * @return com.csbr.cloud.mybatis.entity.PageListVO<com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO>
+     */
+    PageListVO<EnterpriseRSVO> pageList(EnterpriseQueryVO queryVO);
+
+    /**
+     * 企业信息-分页(调用流程)
+     * @param dto
+     * @return
+     */
+    PageListVO<EnterpriseApproveRSVO> flowPageList(FlowQueryDTO dto);
+
+    /**
+     * 企业信息获取详情数据
+     * @author xcq
+     * @date 2024-12-26 16:18
+     * @param guid
+     * @return com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO
+     */
+    EnterpriseRSVO getEnterpriseDetail(String guid);
+
+    /**
+     * 企业信息数据新增
+     * @author xcq
+     * @date 2024-12-26 16:18
+     * @param flowBaseVO
+     * @return void
+     */
+    void saveEnterprise(FlowRQBaseVO flowBaseVO);
+
+    /**
+     * 企业信息数据修改
+     * @author xcq
+     * @date 2024-12-26 16:18
+     * @param flowBaseVO
+     * @return void
+     */
+    void updateEnterprise(FlowRQBaseVO flowBaseVO);
+
+    /**
+     * 企业信息数据删除、并有相关的处理操作
+     * @author xcq
+     * @date 2024-12-26 16:18
+     * @param guids
+     * @return void
+     */
+    void removeByGuids(List<String> guids);
+
+    /**
+     * 流程结束后进行业务回调
+     * @author xcq
+     * @date 2024-12-26 16:18
+     * @param dto
+     * @return void
+     */
+    void flowCallBack(BizCallbackDTO dto);
+
+    /**
+     * 流程结束后进行业务回调(跨服务审批)
+     * @param dto
+     */
+    void crossFlowCallBack(BizCallbackDTO dto);
+
+    Boolean check(EnterpriseRQVO vo);
+
+    List<ChangeInfoVO> getChange(String sourceGuid, Date createTime);
+
+    List<ChangeInfoVO> beforeChangeList(String approveGuid);
+
+    EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
+
+    /** 将此账号提交的数据需求迁移到新的企业 */
+    void moveOldData(TenantRQVO vo);
+
+    /** 更新会员信息 */
+    void updateTenant(MfEnterprise vo);
+
+    /**
+     * 企业信息-根据登陆账号查询详情
+     * @param logonUser
+     * @return
+     */
+    EnterpriseRSVO getEnterpriseDetailByLogonUser(String logonUser);
+}

+package com.csbr.qingcloud.portal.service;
+
+import csbr.cloud.entity.domain.base.vo.PageListVO;
+import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
+import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
+import com.csbr.qingcloud.portal.domain.vo.ServicerMaintainQueryVO;
+import com.csbr.qingcloud.portal.domain.vo.ServicerMaintainRSVO;
+
+import java.util.List;
+
+/**
+ * @program: D:/git/ms-data-circulation-portal-service
+ * @description: 服务商维护业务逻辑接口
+ * @author: xcq
+ * @create: 2024-12-31 18:49
+ **/
+public interface ServicerMaintainService {
+
+    /**
+     * 服务商维护分页查询
+     * @author xcq
+     * @date 2024-12-31 18:49
+     * @param queryVO
+     * @return com.csbr.cloud.mybatis.entity.PageListVO<com.csbr.qingcloud.portal.domain.vo.ServicerMaintainRSVO>
+     */
+    PageListVO<ServicerMaintainRSVO> pageList(ServicerMaintainQueryVO queryVO);
+
+    /**
+     * 服务商维护获取详情数据
+     * @author xcq
+     * @date 2024-12-31 18:49
+     * @param guid
+     * @return com.csbr.qingcloud.portal.domain.vo.ServicerMaintainRSVO
+     */
+    ServicerMaintainRSVO getServicerMaintainDetail(String guid);
+
+    /**
+     * 服务商维护数据新增
+     * @author xcq
+     * @date 2024-12-31 18:49
+     * @param flowBaseVO
+     * @return void
+     */
+    void saveServicerMaintain(FlowRQBaseVO flowBaseVO);
+
+    /**
+     * 服务商维护数据修改
+     * @author xcq
+     * @date 2024-12-31 18:49
+     * @param flowBaseVO
+     * @return void
+     */
+    void updateServicerMaintain(FlowRQBaseVO flowBaseVO);
+
+    /**
+     * 服务商维护数据删除、并有相关的处理操作
+     * @author xcq
+     * @date 2024-12-31 18:49
+     * @param guids
+     * @return void
+     */
+    void removeByGuids(List<String> guids);
+    
+    /**
+     * 流程结束后进行业务回调
+     * @author xcq
+     * @date 2024-12-31 18:49
+     * @param dto
+     * @return void
+     */
+    void flowCallBack(BizCallbackDTO dto);
+    
+}

+package com.csbr.qingcloud.portal.util;
+
+import com.csbr.cloud.common.util.CommonUtil;
+import com.csbr.cloud.common.util.CsbrBeanUtil;
+import com.csbr.qingcloud.portal.domain.vo.BoroughPOJO;
+import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
+import com.csbr.qingcloud.portal.domain.vo.CompareResult;
+import com.csbr.qingcloud.portal.feign.ConfigureFeign;
+import com.csbr.qingcloud.portal.service.impl.EnterpriseServiceImpl;
+import jakarta.annotation.Resource;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Component;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Component
+public class ChangeInfoUtil {
+
+    public static List<BoroughPOJO> areaList;
+
+    /** 计算变更信息 */
+    public static List<ChangeInfoVO> getChangeList(List<EnterpriseServiceImpl.ChangeApproveBean> beanList) throws IllegalAccessException {
+        List<ChangeInfoVO> list = new ArrayList<>();
+        //循环对比每组记录生来变更内容
+        for(EnterpriseServiceImpl.ChangeApproveBean item : beanList){
+            if(item.oldBean == null || item.newBean == null){
+                continue;
+            }
+            List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
+            getVenueResult(item,list);
+            getStartEndResult(item,list);
+            getRegistrationDateResult(item,list);
+            getRegisteredCapitalResult(item,list);
+            for(CompareResult diffItem : diffList){
+                if(diffItem.getFieldComment().contains("审批状态") || diffItem.getFieldComment().contains("营业执照")
+                        || diffItem.getFieldComment().contains("法人证件照") || diffItem.getFieldComment().contains("管理员证件照")
+                        || diffItem.getFieldComment().contains("授权委托书") || diffItem.getFieldComment().contains("省")
+                        || diffItem.getFieldComment().contains("市") || diffItem.getFieldComment().contains("区")
+                        || diffItem.getFieldComment().contains("营业开始日期") || diffItem.getFieldComment().contains("营业结束日期") || diffItem.getFieldComment().contains("营业期限")
+                        || diffItem.getFieldComment().contains("注册日期") || diffItem.getFieldComment().contains("注册资本")){
+                    continue;
+                }
+                list.add(getChangeInfoVO(item,diffItem));
+            }
+        }
+        list = list.stream().sorted(Comparator.comparing(ChangeInfoVO::getNameEn).thenComparing(ChangeInfoVO::getDate).reversed()).collect(Collectors.toList());
+        return list;
+    }
+
+    private static ChangeInfoVO getChangeInfoVO(EnterpriseServiceImpl.ChangeApproveBean item,CompareResult diffItem){
+        ChangeInfoVO vo = new ChangeInfoVO();
+        vo.setNameEn(diffItem.getFieldName());
+        vo.setName(diffItem.getFieldComment());
+        vo.setDate(DateUtil.getDateToString(item.oldBean.getCreateTime()));
+        vo.setBefore(diffItem.getOldValue() == null ? "" : diffItem.getOldValue().toString());
+        vo.setAfter(diffItem.getNewValue() == null ? "" : diffItem.getNewValue().toString());
+        vo.setGuid(CommonUtil.newGuid());
+        return vo;
+    }
+
+    private static void getRegisteredCapitalResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
+        String oldValue = getRegisteredCapital(item.oldBean.getRegisteredCapital());
+        String newValue = getRegisteredCapital(item.newBean.getRegisteredCapital());
+        if(!oldValue.equals(newValue)){
+            list.add(getChangeInfoVO(item,getCompareResult("注册资本(万元)","registeredCapital",oldValue,newValue)));
+        }
+    }
+
+    private static String getRegisteredCapital(BigDecimal v) {
+        if(v == null){
+            return "";
+        }
+        return v.setScale(2, RoundingMode.HALF_DOWN).toString();
+    }
+
+    public static void getVenueResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
+        String oldValue = getVenue(item.oldBean.getProvince(),item.oldBean.getCity(),item.oldBean.getDistrict());
+        String newValue = getVenue(item.newBean.getProvince(),item.newBean.getCity(),item.newBean.getDistrict());
+        if(!oldValue.equals(newValue)){
+            list.add(getChangeInfoVO(item,getCompareResult("注册地","venue",oldValue,newValue)));
+        }
+    }
+
+    public static void getRegistrationDateResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
+        String oldValue = getRegistrationDate(item.oldBean.getRegistrationDate());
+        String newValue = getRegistrationDate(item.newBean.getRegistrationDate());
+        if(!oldValue.equals(newValue)){
+            list.add(getChangeInfoVO(item,getCompareResult("注册日期","registrationDate",oldValue,newValue)));
+        }
+    }
+
+    private static String getRegistrationDate(Date date) {
+        return DateUtil.getShortDateToString(date);
+    }
+
+    private static CompareResult getCompareResult(String comment,String name,String oldVenue,String newVenue){
+        CompareResult result = new CompareResult();
+        result.setFieldComment(comment);
+        result.setFieldName(name);
+        result.setOldValue(oldVenue);
+        result.setNewValue(newVenue);
+        return result;
+    }
+
+    public static void getStartEndResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
+        String oldValue = getStartEnd(item.oldBean.getBusinessLicenseTerm(),item.oldBean.getBusinessLicenseStartDate(),item.oldBean.getBusinessLicenseEndDate());
+        String newValue = getStartEnd(item.newBean.getBusinessLicenseTerm(),item.newBean.getBusinessLicenseStartDate(),item.newBean.getBusinessLicenseEndDate());
+        if(!oldValue.equals(newValue)){
+            list.add(getChangeInfoVO(item,getCompareResult("营业期限","businessLicenseStartEnd",oldValue,newValue)));
+        }
+    }
+
+    public static String getVenue(String province, String city, String district) {
+        if(StringUtils.isBlank(district)){
+            return String.format("%s/%s",getName(province),getName(city));
+        }
+        else{
+            return String.format("%s/%s/%s",getName(province),getName(city),getName(district));
+        }
+    }
+
+    private static String getName(String code){
+        List<String> names = areaList.stream().filter(x->x.getCode().equals(code)).map(BoroughPOJO::getName).collect(Collectors.toList());
+        if(CollectionUtils.isEmpty(names)){
+            return "";
+        }
+        return names.get(0);
+    }
+
+
+    public static String getStartEnd(String businessLicenseTerm, Date businessLicenseStartDate, Date businessLicenseEndDate) {
+        if("1".equals(businessLicenseTerm)){
+            return "长期有效";
+        }
+        return String.format("%s至%s",DateUtil.getShortDateToString(businessLicenseStartDate),DateUtil.getShortDateToString(businessLicenseEndDate));
+    }
+
+}

+package com.csbr.qingcloud.portal.util;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.util.Date;
+
+public class DateUtil {
+
+    /** 时间相差多少天 无视小时 */
+    public static int getDiffDay(Date one, Date two) {
+        if(one == null || two == null){
+            return 0;
+        }
+        one = getDateByString(getShortDateToString(one));
+        two = getDateByString(getShortDateToString(two));
+        long difference =  (one.getTime() - two.getTime()) / 86400000;
+        return (int) Math.abs(difference);
+    }
+
+    /** 字符串时间转日期 */
+    public static Date getDateByString(String time){
+        try {
+            return new SimpleDateFormat("yyyy-MM-dd").parse(time);
+        } catch (Exception e) {
+            return new Date();
+        }
+    }
+
+    /** 时间转字符串 */
+    public static String getDateToString(Date time){
+        if(time == null) {
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(time);
+    }
+
+    /** 时间转字符串 */
+    public static String getShortDateToString(Date time){
+        if(time == null) {
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd").format(time);
+    }
+
+    /** 时间转本地时间 */
+    public static LocalDateTime getDateToLocal(Date time){
+        if(time == null) {
+            return null;
+        }
+        return time.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
+    }
+
+    /** 字符串时间转日期 */
+    public static Date getShortDate(Date time){
+        if(time == null) {
+            return null;
+        }
+        try {
+            return new SimpleDateFormat("yyyy-MM-dd").parse(getShortDateToString(time));
+        } catch (Exception e) {
+            return new Date();
+        }
+    }
+
+}

+package com.csbr.qingcloud.portal.util;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.csbr.cloud.common.enums.SystemError;
+import com.csbr.cloud.common.exception.CsbrSystemException;
+import com.csbr.cloud.common.response.CommonRes;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
+import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
+import org.apache.hc.core5.util.Timeout;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.client.ClientHttpRequestFactory;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestTemplate;
+
+/**
+ * @program: daop-projects
+ * @description:
+ * @author: xiaojie
+ * @create: 2025-03-13 14:52
+ **/
+@Component
+@Slf4j
+public class InvokeUtil {
+
+    @Autowired
+    private RestTemplate restTemplate;
+
+    /**
+     * open调用接口
+     * @param jsonObject
+     * @param appKey
+     * @param zqDelUrl
+     */
+    public void invokeMainDel(JSONObject jsonObject, String appKey, String zqDelUrl) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("appKey", appKey);
+        HttpEntity<JSONObject> requestEntity = new HttpEntity<>(jsonObject, headers);
+        restTemplate.setRequestFactory(getFactory());
+        CommonRes commonRes = restTemplate.postForObject(zqDelUrl, requestEntity, CommonRes.class);
+        if (!CommonRes.success().getCode().equals(commonRes.getCode())) {
+            throw new CsbrSystemException(SystemError.ERROR_CODE, commonRes.getMsg());
+        } else {
+            CommonRes commonResData = JSON.parseObject(String.valueOf(commonRes.getData()), CommonRes.class);
+            if (!CommonRes.success().getCode().equals(commonResData.getCode())) {
+                throw new CsbrSystemException(SystemError.ERROR_CODE, commonResData.getMsg());
+            }
+        }
+    }
+
+    private ClientHttpRequestFactory getFactory() {
+        RequestConfig config = RequestConfig.custom()
+                .setConnectTimeout(Timeout.ofSeconds(5000)) // 连接超时
+                .setConnectionRequestTimeout(Timeout.ofSeconds(5000)) // 从连接池获取连接的超时时间
+                .setResponseTimeout(Timeout.ofSeconds(10000)) // 数据读取超时
+                .build();
+
+        CloseableHttpClient httpClient = HttpClientBuilder.create()
+                .setDefaultRequestConfig(config)
+                .build();
+
+        return new HttpComponentsClientHttpRequestFactory(httpClient);
+    }
+}
\ No newline at end of file