Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
89666749 by 郭燕华
Options

Merge remote-tracking branch 'origin/develop' into develop

2 parents 40d7db6c 137854e9
Expand all
Inline Side-by-side
Showing 35 changed files with 774 additions and 50 deletions
src/main/java/com/csbr/qingcloud/portal/controller/DemandController.java
...@@ -89,6 +89,14 @@ public class DemandController { ...@@ -89,6 +89,14 @@ public class DemandController {
89 return CommonRes.success(true); 89 return CommonRes.success(true);
90 } 90 }
91 91
92 @PostMapping("/cross-flow-call-back")
93 @SystemLog(value = "数据需求-流程结束后进行业务回调(跨服务审批)")
94 @Operation(summary = "数据需求-流程结束后进行业务回调(跨服务审批)", hidden = true)
95 public CommonRes<Boolean> crossFlowCallBack(@RequestBody @Valid BizCallbackDTO dto) {
96 demandService.crossFlowCallBack(dto);
97 return CommonRes.success(true);
98 }
99
92 @PostMapping("/last-approve") 100 @PostMapping("/last-approve")
93 @SystemLog(value = "数据需求审批") 101 @SystemLog(value = "数据需求审批")
94 @Operation(summary = "数据需求审批-最后一个节点时调用") 102 @Operation(summary = "数据需求审批-最后一个节点时调用")
...@@ -96,6 +104,13 @@ public class DemandController { ...@@ -96,6 +104,13 @@ public class DemandController {
96 Boolean vo = demandService.lastApprove(dto); 104 Boolean vo = demandService.lastApprove(dto);
97 return CommonRes.success(vo); 105 return CommonRes.success(vo);
98 } 106 }
107
108 @PostMapping("/process-order-list")
109 @Operation(summary = "查询加工单列表")
110 public CommonRes<List<ProcessOrderProcessDtlRSVO>> listByProcessOrderNo() {
111 List<ProcessOrderProcessDtlRSVO> pageVO = demandService.listByProcessOrderNo();
112 return CommonRes.success(pageVO);
113 }
99 114
100 //endregion 115 //endregion
101 116
......
src/main/java/com/csbr/qingcloud/portal/controller/EnterpriseController.java
...@@ -3,6 +3,7 @@ package com.csbr.qingcloud.portal.controller; ...@@ -3,6 +3,7 @@ package com.csbr.qingcloud.portal.controller;
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject; 4 import com.alibaba.fastjson.JSONObject;
5 import com.csbr.cloud.common.response.CommonRes; 5 import com.csbr.cloud.common.response.CommonRes;
6 import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO;
6 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO; 7 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
7 import com.csbr.qingcloud.portal.domain.vo.*; 8 import com.csbr.qingcloud.portal.domain.vo.*;
8 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService; 9 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
...@@ -69,6 +70,14 @@ public class EnterpriseController { ...@@ -69,6 +70,14 @@ public class EnterpriseController {
69 PageListVO<EnterpriseRSVO> pageVO = enterpriseService.pageList(queryVO); 70 PageListVO<EnterpriseRSVO> pageVO = enterpriseService.pageList(queryVO);
70 return CommonRes.success(pageVO); 71 return CommonRes.success(pageVO);
71 } 72 }
73
74 @PostMapping("/flow/page-list")
75 @SystemLog(value = "企业信息-分页(调用流程)")
76 @Operation(summary = "企业信息-分页(调用流程)")
77 public CommonRes<PageListVO<EnterpriseApproveRSVO>> flowPageList(@RequestBody @Valid FlowQueryDTO dto) {
78 PageListVO<EnterpriseApproveRSVO> pageVO = enterpriseService.flowPageList(dto);
79 return CommonRes.success(pageVO);
80 }
72 81
73 @GetMapping("/detail") 82 @GetMapping("/detail")
74 @SystemLog(value = "企业信息-详情") 83 @SystemLog(value = "企业信息-详情")
...@@ -79,6 +88,15 @@ public class EnterpriseController { ...@@ -79,6 +88,15 @@ public class EnterpriseController {
79 return CommonRes.success(vo); 88 return CommonRes.success(vo);
80 } 89 }
81 90
91 @GetMapping("/detail-by-logonUser")
92 @SystemLog(value = "企业信息-根据登陆账号查询详情")
93 @Operation(summary = "企业信息-根据登陆账号查询详情",
94 parameters = {@Parameter(name = "logonUser", description = "登陆账号", required = true)} )
95 public CommonRes<EnterpriseRSVO> getEnterpriseDetailByLogonUser(@RequestParam String logonUser) {
96 EnterpriseRSVO vo = enterpriseService.getEnterpriseDetailByLogonUser(logonUser);
97 return CommonRes.success(vo);
98 }
99
82 @GetMapping("/detail-by-name") 100 @GetMapping("/detail-by-name")
83 @SystemLog(value = "按名称查企业信息详情") 101 @SystemLog(value = "按名称查企业信息详情")
84 @Operation(summary = "按名称查企业信息详情", 102 @Operation(summary = "按名称查企业信息详情",
...@@ -96,12 +114,12 @@ public class EnterpriseController { ...@@ -96,12 +114,12 @@ public class EnterpriseController {
96 return CommonRes.success(true); 114 return CommonRes.success(true);
97 } 115 }
98 116
99 @PostMapping("/last-approve") 117 @PostMapping("/cross-flow-call-back")
100 @SystemLog(value = "企业认证审批") 118 @SystemLog(value = "企业信息-流程结束后进行业务回调(跨服务审批)")
101 @Operation(summary = "企业认证审批-最后一个节点时调用") 119 @Operation(summary = "企业信息-流程结束后进行业务回调(跨服务审批)", hidden = true)
102 public CommonRes<Boolean> lastApprove(@RequestBody FlowUpdateStateDTO dto) { 120 public CommonRes<Boolean> crossFlowCallBack(@RequestBody @Valid BizCallbackDTO dto) {
103 Boolean vo = enterpriseService.lastApprove(dto); 121 enterpriseService.crossFlowCallBack(dto);
104 return CommonRes.success(vo); 122 return CommonRes.success(true);
105 } 123 }
106 124
107 @PostMapping("/move-old-data") 125 @PostMapping("/move-old-data")
...@@ -135,6 +153,14 @@ public class EnterpriseController { ...@@ -135,6 +153,14 @@ public class EnterpriseController {
135 return CommonRes.success(true); 153 return CommonRes.success(true);
136 } 154 }
137 155
156 @PostMapping("/change/cross-flow-call-back")
157 @SystemLog(value = "变更审批-最终更新(跨平台)")
158 @Operation( summary = "变更审批-最终更新(跨平台)" )
159 public CommonRes<Boolean> changeCrossFlowCallBack(@RequestBody BizCallbackDTO dto) {
160 enterpriseChangeApproveService.crossFlowCallBack(dto);
161 return CommonRes.success(true);
162 }
163
138 @PostMapping("/change/save") 164 @PostMapping("/change/save")
139 @SystemLog(value = "变更申请-保存数据") 165 @SystemLog(value = "变更申请-保存数据")
140 @Operation(summary = "变更申请-保存数据") 166 @Operation(summary = "变更申请-保存数据")
...@@ -151,6 +177,22 @@ public class EnterpriseController { ...@@ -151,6 +177,22 @@ public class EnterpriseController {
151 return CommonRes.success(enterpriseChangeApproveService.changeDetail(guid)); 177 return CommonRes.success(enterpriseChangeApproveService.changeDetail(guid));
152 } 178 }
153 179
180 @DeleteMapping("/change/delete")
181 @SystemLog(value = "变更申请-批量删除")
182 @Operation(summary = "变更申请-批量删除")
183 public CommonRes<Boolean> changeRemoveByGuids(@RequestBody List<String> guids) {
184 enterpriseChangeApproveService.removeByGuids(guids);
185 return CommonRes.success(true);
186 }
187
188 @DeleteMapping("/change/cross-delete")
189 @SystemLog(value = "变更申请-批量删除(跨平台)")
190 @Operation(summary = "变更申请-批量删除(跨平台)", hidden = true)
191 public CommonRes<Boolean> crossRemoveByGuids(@RequestBody List<String> zqBizGuids) {
192 enterpriseChangeApproveService.crossRemoveByBizGuid(zqBizGuids);
193 return CommonRes.success(true);
194 }
195
154 //endregion 196 //endregion
155 197
156 } 198 }
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/BoroughPOJO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo;
2
3 import lombok.Data;
4
5 /**
6 * @program: ms-user-scm-service
7 * @description: 行政区
8 * @author: yio
9 * @create: 2021-01-14 15:39
10 **/
11 @Data
12 public class BoroughPOJO {
13 private String code;
14 private String name;
15 private String parentId;
16 private String isPCapital;
17 private String isDeleted;
18 /** 城市等级 (0 一线城市，1 新一线城市，2 二线城市，3 三线城市，4 四线城市，5 五线城市，6 六线城市)*/
19 private String areaLevel;
20 }
src/main/java/com/csbr/qingcloud/portal/domain/vo/ChangeApproveVO.java
...@@ -55,4 +55,7 @@ public class ChangeApproveVO { ...@@ -55,4 +55,7 @@ public class ChangeApproveVO {
55 @Schema(description = "原业务数据明细") 55 @Schema(description = "原业务数据明细")
56 private String oldBizDataDetailJson; 56 private String oldBizDataDetailJson;
57 57
58 private String zqName;
59 private String zqBizGuid;
60
58 } 61 }
...\ No newline at end of file ...\ No newline at end of file
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/DemandRQVO.java
...@@ -3,6 +3,7 @@ package com.csbr.qingcloud.portal.domain.vo; ...@@ -3,6 +3,7 @@ package com.csbr.qingcloud.portal.domain.vo;
3 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; 3 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
4 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
5 import com.fasterxml.jackson.annotation.JsonFormat; 5 import com.fasterxml.jackson.annotation.JsonFormat;
6 import jdk.jfr.Name;
6 import lombok.Data; 7 import lombok.Data;
7 import java.math.BigDecimal; 8 import java.math.BigDecimal;
8 import java.util.Date; 9 import java.util.Date;
...@@ -28,6 +29,9 @@ public class DemandRQVO extends FlowRQBaseVO { ...@@ -28,6 +29,9 @@ public class DemandRQVO extends FlowRQBaseVO {
28 */ 29 */
29 @Schema(description = "需求类型") 30 @Schema(description = "需求类型")
30 private String requirementType; 31 private String requirementType;
32
33 @Schema(title = "专区名称")
34 private String zqName;
31 35
32 /** 36 /**
33 * 需求分类【1新增 2调整】 37 * 需求分类【1新增 2调整】
...@@ -205,6 +209,18 @@ public class DemandRQVO extends FlowRQBaseVO { ...@@ -205,6 +209,18 @@ public class DemandRQVO extends FlowRQBaseVO {
205 /******** 库表存储属性 需处理 *****/ 209 /******** 库表存储属性 需处理 *****/
206 210
207 /******** 自定义扩展 *****/ 211 /******** 自定义扩展 *****/
212
213 @Schema(description = "合同附件")
214 private String contractAttachJson;
215
216 @Schema(description = "加工单位类型")
217 private String processCompanyType;
218
219 @Schema(description = "加工单位唯一标识")
220 private String processCompanyGuid;
221
222 @Schema(description = "加工单位名称")
223 private String processCompanyName;
208 224
209 /******** 子对象 *****/ 225 /******** 子对象 *****/
210 226
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/DemandRSVO.java
...@@ -168,7 +168,7 @@ public class DemandRSVO { ...@@ -168,7 +168,7 @@ public class DemandRSVO {
168 * 加工单生成时间 168 * 加工单生成时间
169 */ 169 */
170 @Schema(description = "加工单生成时间") 170 @Schema(description = "加工单生成时间")
171 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") 171 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
172 private Date processingGenerateTime; 172 private Date processingGenerateTime;
173 173
174 /** 174 /**
...@@ -218,7 +218,7 @@ public class DemandRSVO { ...@@ -218,7 +218,7 @@ public class DemandRSVO {
218 private String processCompanyGuid; 218 private String processCompanyGuid;
219 219
220 @Schema(description = "加工单位名称") 220 @Schema(description = "加工单位名称")
221 private String productAcceptName; 221 private String processCompanyName;
222 222
223 @Schema(description = "发起人") 223 @Schema(description = "发起人")
224 private String createUserName; 224 private String createUserName;
...@@ -231,6 +231,18 @@ public class DemandRSVO { ...@@ -231,6 +231,18 @@ public class DemandRSVO {
231 231
232 @Schema(description = "加工单编号") 232 @Schema(description = "加工单编号")
233 private String processOrderNo; 233 private String processOrderNo;
234
235 @Schema(title = "专区名称")
236 private String zqName;
237
238 @Schema(description ="业务名称")
239 private String bizName;
240
241 /**
242 * 跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)
243 */
244 @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
245 private String crossPlatformApproveState;
234 246
235 /******** 库表存储属性 需处理 *****/ 247 /******** 库表存储属性 需处理 *****/
236 248
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/DemandUpdateStateVO.java
1 package com.csbr.qingcloud.portal.domain.vo; 1 package com.csbr.qingcloud.portal.domain.vo;
2 2
3 import com.fasterxml.jackson.annotation.JsonFormat;
3 import io.swagger.v3.oas.annotations.media.Schema; 4 import io.swagger.v3.oas.annotations.media.Schema;
4 import lombok.Data; 5 import lombok.Data;
6
7 import java.util.Date;
5 import java.util.List; 8 import java.util.List;
6 9
7 /** 10 /**
...@@ -32,5 +35,11 @@ public class DemandUpdateStateVO { ...@@ -32,5 +35,11 @@ public class DemandUpdateStateVO {
32 @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】") 35 @Schema(description = "产品验收状态【N未开始 A进行中 Y已完成】")
33 private String productAcceptState; 36 private String productAcceptState;
34 37
38 @Schema(description ="产品验收验收完成时间")
39 @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
40 private Date acceptFinishTime;
41
42 @Schema(description ="业务名称")
43 private String bizName;
35 44
36 } 45 }
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseApproveRSVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo;
2
3 import com.csbr.cloud.workflow.domain.vo.appove.ApproveVO;
4 import com.csbr.cloud.workflow.domain.vo.appove.BizApproveVO;
5 import com.fasterxml.jackson.annotation.JsonFormat;
6 import io.swagger.v3.oas.annotations.media.Schema;
7 import lombok.Data;
8
9 import java.math.BigDecimal;
10 import java.util.Date;
11 import java.util.List;
12
13 /**
14 * @program: D:/git/ms-data-circulation-portal-service
15 * @description: 企业信息返回参数
16 * @author: xcq
17 * @create: 2024-12-26 16:18
18 **/
19 @Data
20 @Schema(title = "企业信息返回参数")
21 public class EnterpriseApproveRSVO extends ApproveVO {
22
23 @Schema(description = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
24 private String crossPlatformApproveState;
25
26 @Schema(description = "专区名称")
27 private String zqName;
28
29 /******** 子对象 *****/
30
31 }
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseRQVO.java
...@@ -16,12 +16,17 @@ import java.util.Date; ...@@ -16,12 +16,17 @@ import java.util.Date;
16 @Data 16 @Data
17 @Schema(title = "企业信息新增、修改参数") 17 @Schema(title = "企业信息新增、修改参数")
18 public class EnterpriseRQVO extends FlowRQBaseVO { 18 public class EnterpriseRQVO extends FlowRQBaseVO {
19 19
20 @Schema(description = "会员GUID")
21 private String tenantGuid;
20 /** 22 /**
21 * 公司名称 23 * 公司名称
22 */ 24 */
23 @Schema(description = "公司名称") 25 @Schema(description = "公司名称")
24 private String tenantName; 26 private String tenantName;
27
28 @Schema(title = "专区名称")
29 private String zqName;
25 30
26 /** 31 /**
27 * 统一社会信用代码 32 * 统一社会信用代码
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/EnterpriseRSVO.java
...@@ -23,7 +23,10 @@ public class EnterpriseRSVO { ...@@ -23,7 +23,10 @@ public class EnterpriseRSVO {
23 */ 23 */
24 @Schema(description = "系统唯一标识") 24 @Schema(description = "系统唯一标识")
25 private String guid; 25 private String guid;
26 26
27 @Schema(description = "会员GUID")
28 private String tenantGuid;
29
27 /** 30 /**
28 * 公司名称 31 * 公司名称
29 */ 32 */
...@@ -185,6 +188,15 @@ public class EnterpriseRSVO { ...@@ -185,6 +188,15 @@ public class EnterpriseRSVO {
185 188
186 @Schema(description = "提交时间") 189 @Schema(description = "提交时间")
187 private Date createTime; 190 private Date createTime;
191
192 @Schema(title = "专区名称")
193 private String zqName;
194
195 /**
196 * 跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)
197 */
198 @Schema(title = "跨平台审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
199 private String crossPlatformApproveState;
188 200
189 /******** 库表存储属性 需处理 *****/ 201 /******** 库表存储属性 需处理 *****/
190 202
......
src/main/java/com/csbr/qingcloud/portal/domain/vo/ProcessOrderProcessDtlRSVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo;
2
3 import com.fasterxml.jackson.annotation.JsonFormat;
4 import io.swagger.v3.oas.annotations.media.Schema;
5 import lombok.Data;
6
7 import java.util.Date;
8
9 /**
10 * @program:
11 * @description: 加工单加工明细返回参数
12 * @author: xup
13 * @create: 2025-02-10 17:57
14 **/
15 @Data
16 @Schema(title = "加工单加工明细返回参数")
17 public class ProcessOrderProcessDtlRSVO {
18
19 /**
20 * 系统唯一标识
21 */
22 @Schema(description = "系统唯一标识")
23 private String guid;
24
25 /**
26 * 会员Guid
27 */
28 @Schema(description = "会员Guid")
29 private String tenantGuid;
30
31 /**
32 * 加工单Guid
33 */
34 @Schema(description = "加工单Guid")
35 private String processOrderGuid;
36
37 /**
38 * 加工单号
39 */
40 @Schema(description = "加工单号")
41 private String processOrderNo;
42
43 /**
44 * 加工单名称
45 */
46 @Schema(description = "加工单名称")
47 private String processOrderName;
48
49 /**
50 * 加工方式（1 数据服务；2 需求申请）
51 */
52 @Schema(description = "加工方式（1 数据服务；2 需求申请）")
53 private Integer processType;
54
55 /**
56 * 业务Guid
57 */
58 @Schema(description = "业务Guid")
59 private String bizGuid;
60
61 /**
62 * 业务名称
63 */
64 @Schema(description = "业务名称")
65 private String bizName;
66
67 /**
68 * 加工状态(N 未开始；A 进行中；Y 已完成)
69 */
70 @Schema(description = "加工状态(N 未开始；A 进行中；Y 已完成)")
71 private String processState;
72
73 /**
74 * 加工时间
75 */
76 @Schema(description = "加工时间")
77 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
78 private Date processTime;
79
80 /**
81 * 交付时间
82 */
83 @Schema(description = "交付时间")
84 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
85 private Date deliverTime;
86
87 /******** 库表存储属性 需处理 *****/
88
89 /******** 自定义扩展 *****/
90
91 /******** 子对象 *****/
92
93 }
src/main/java/com/csbr/qingcloud/portal/domain/vo/TenantLicRQVO.java 0 → 100644
1 package com.csbr.qingcloud.portal.domain.vo;
2
3 import csbr.cloud.entity.domain.base.vo.CsbrBaseVO;
4 import io.swagger.v3.oas.annotations.media.Schema;
5 import lombok.Data;
6 import lombok.EqualsAndHashCode;
7 import lombok.experimental.Accessors;
8
9 /**
10 * 企业证照表 视图对象类
11 *
12 * @author xiaocq
13 * @date 2023-12-19
14 */
15 @Data
16 @Accessors(chain = true)
17 @EqualsAndHashCode(callSuper = true)
18 @Schema(name = "企业证照表")
19 public class TenantLicRQVO extends CsbrBaseVO {
20 /**
21 * 企业唯一标识
22 */
23 @Schema(description = "企业唯一标识")
24 private String tenantGuid;
25
26 /**
27 * 证照类型
28 */
29 @Schema(description = "证照类型")
30 private String licenseType;
31
32 /**
33 * 图片内容
34 */
35 @Schema(description = "图片内容")
36 private String pictContentJson;
37
38
39 /********非库表存储属性*****/
40
41
42
43 /********字典类*****/
44
45 /********实体类、用户单选、组织机构单选*****/
46
47 /********范围查询*****/
48
49 /********自定义扩展*****/
50
51 /********子对象*****/
52
53
54
55
56 }
src/main/java/com/csbr/qingcloud/portal/domain/vo/TenantRQVO.java
...@@ -154,6 +154,9 @@ public class TenantRQVO extends CsbrBaseVO { ...@@ -154,6 +154,9 @@ public class TenantRQVO extends CsbrBaseVO {
154 @Schema(description = "token后台赋值") 154 @Schema(description = "token后台赋值")
155 private String token; 155 private String token;
156 156
157 @Schema(description = "业务唯一标识")
158 private String bizGuid;
159
157 /********字典类*****/ 160 /********字典类*****/
158 161
159 /********实体类、用户单选、组织机构单选*****/ 162 /********实体类、用户单选、组织机构单选*****/
...@@ -164,6 +167,9 @@ public class TenantRQVO extends CsbrBaseVO { ...@@ -164,6 +167,9 @@ public class TenantRQVO extends CsbrBaseVO {
164 167
165 /********子对象*****/ 168 /********子对象*****/
166 169
170 @Schema(description = "企业证照列表")
171 private List<TenantLicRQVO> tenantLicList;
172
167 @Schema(hidden = true,description = "分库标识") 173 @Schema(hidden = true,description = "分库标识")
168 private String shardingFlag; 174 private String shardingFlag;
169 } 175 }
......
src/main/java/com/csbr/qingcloud/portal/feign/ConfigureFeign.java
...@@ -4,6 +4,7 @@ import com.csbr.cloud.common.config.FastCallFeignConfiguration; ...@@ -4,6 +4,7 @@ import com.csbr.cloud.common.config.FastCallFeignConfiguration;
4 import com.csbr.cloud.common.entity.DictModel; 4 import com.csbr.cloud.common.entity.DictModel;
5 import com.csbr.cloud.common.entity.DictionaryVO; 5 import com.csbr.cloud.common.entity.DictionaryVO;
6 import com.csbr.cloud.common.response.CommonRes; 6 import com.csbr.cloud.common.response.CommonRes;
7 import com.csbr.qingcloud.portal.domain.vo.BoroughPOJO;
7 import com.csbr.qingcloud.portal.domain.vo.RuleDTO; 8 import com.csbr.qingcloud.portal.domain.vo.RuleDTO;
8 import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; 9 import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
9 import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty; 10 import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
...@@ -43,5 +44,8 @@ public interface ConfigureFeign { ...@@ -43,5 +44,8 @@ public interface ConfigureFeign {
43 @PostMapping(value = "/rule/new-code",produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) 44 @PostMapping(value = "/rule/new-code",produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
44 CommonRes<String> newCode(@RequestBody RuleDTO dto); 45 CommonRes<String> newCode(@RequestBody RuleDTO dto);
45 46
47 @GetMapping(value = "/borough/get-borough",produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
48 CommonRes<List<BoroughPOJO>> getBoroughCodeName();
49
46 50
47 } 51 }
......
src/main/java/com/csbr/qingcloud/portal/feign/DataProcessBasicFeign.java
...@@ -3,6 +3,7 @@ package com.csbr.qingcloud.portal.feign; ...@@ -3,6 +3,7 @@ package com.csbr.qingcloud.portal.feign;
3 import com.csbr.cloud.common.config.FastCallFeignConfiguration; 3 import com.csbr.cloud.common.config.FastCallFeignConfiguration;
4 import com.csbr.cloud.common.response.CommonRes; 4 import com.csbr.cloud.common.response.CommonRes;
5 import com.csbr.qingcloud.portal.domain.vo.DemandUpdateStateVO; 5 import com.csbr.qingcloud.portal.domain.vo.DemandUpdateStateVO;
6 import com.csbr.qingcloud.portal.domain.vo.ProcessOrderProcessDtlRSVO;
6 import com.csbr.qingcloud.portal.domain.vo.ProcessOrderRQVO; 7 import com.csbr.qingcloud.portal.domain.vo.ProcessOrderRQVO;
7 import jakarta.validation.Valid; 8 import jakarta.validation.Valid;
8 import org.springframework.cloud.openfeign.FeignClient; 9 import org.springframework.cloud.openfeign.FeignClient;
...@@ -18,10 +19,13 @@ import java.util.Map; ...@@ -18,10 +19,13 @@ import java.util.Map;
18 @FeignClient(value = "ms-data-process-basic-service",url = "${dataProcessUrl}", configuration = FastCallFeignConfiguration.class) 19 @FeignClient(value = "ms-data-process-basic-service",url = "${dataProcessUrl}", configuration = FastCallFeignConfiguration.class)
19 public interface DataProcessBasicFeign { 20 public interface DataProcessBasicFeign {
20 21
21 @PostMapping(value = "/process-order/save", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) 22 @PostMapping(value = "/process-order/saveOrUpdate", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
22 CommonRes<Boolean> saveProcessOrder(@RequestBody @Valid ProcessOrderRQVO vo); 23 CommonRes<Boolean> saveProcessOrder(@RequestBody @Valid ProcessOrderRQVO vo);
23 24
24 @PostMapping(value = "/process-order-process-dtl/get-order-state", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) 25 @PostMapping(value = "/process-order-process-dtl/get-order-state", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
25 CommonRes<Map<String, DemandUpdateStateVO>> getOrderState(@RequestBody List<String> processOrderGuids); 26 CommonRes<Map<String, DemandUpdateStateVO>> getOrderState(@RequestBody List<String> processOrderGuids);
26 27
28 @PostMapping(value = "/process-order-process-dtl/process-order-list", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
29 CommonRes<List<ProcessOrderProcessDtlRSVO>> processOrderList(@RequestBody List<String> processOrderGuids);
30
27 } 31 }
......
src/main/java/com/csbr/qingcloud/portal/feign/PersonelFeign.java
...@@ -21,7 +21,10 @@ public interface PersonelFeign { ...@@ -21,7 +21,10 @@ public interface PersonelFeign {
21 CommonRes<TenantRQVO> authTenant(@RequestBody TenantRQVO vo); 21 CommonRes<TenantRQVO> authTenant(@RequestBody TenantRQVO vo);
22 22
23 @PutMapping(value = "/tenant/update", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) 23 @PutMapping(value = "/tenant/update", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
24 CommonRes<Boolean> updateTenant(@RequestBody TenantRQVO vo); 24 CommonRes<String> updateTenant(@RequestBody TenantRQVO vo);
25
26 @PutMapping(value = "/tenant/change-update", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
27 CommonRes<Boolean> changeUpdate(@RequestBody TenantRQVO vo);
25 28
26 @GetMapping(value = "/tenant/get-all-tenant-guid-name-map", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) 29 @GetMapping(value = "/tenant/get-all-tenant-guid-name-map", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
27 CommonRes<Map<String, String>> getAllTenantGuidNameMap(); 30 CommonRes<Map<String, String>> getAllTenantGuidNameMap();
......
src/main/java/com/csbr/qingcloud/portal/feign/WorkflowFeign.java
...@@ -2,10 +2,9 @@ package com.csbr.qingcloud.portal.feign; ...@@ -2,10 +2,9 @@ package com.csbr.qingcloud.portal.feign;
2 2
3 import com.csbr.cloud.common.config.FastCallFeignConfiguration; 3 import com.csbr.cloud.common.config.FastCallFeignConfiguration;
4 import com.csbr.cloud.common.response.CommonRes; 4 import com.csbr.cloud.common.response.CommonRes;
5 import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO;
5 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO; 6 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO;
6 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 7 import com.csbr.cloud.workflow.domain.vo.appove.ApproveVO;
7 import com.csbr.qingcloud.portal.domain.vo.UserQueryDTO;
8 import com.csbr.qingcloud.portal.domain.vo.UserVO;
9 import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand; 8 import com.netflix.hystrix.contrib.javanica.annotation.HystrixCommand;
10 import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty; 9 import com.netflix.hystrix.contrib.javanica.annotation.HystrixProperty;
11 import csbr.cloud.entity.domain.base.vo.PageListVO; 10 import csbr.cloud.entity.domain.base.vo.PageListVO;
...@@ -13,10 +12,10 @@ import jakarta.validation.Valid; ...@@ -13,10 +12,10 @@ import jakarta.validation.Valid;
13 import org.springframework.cloud.openfeign.FeignClient; 12 import org.springframework.cloud.openfeign.FeignClient;
14 import org.springframework.http.MediaType; 13 import org.springframework.http.MediaType;
15 import org.springframework.util.MultiValueMap; 14 import org.springframework.util.MultiValueMap;
16 import org.springframework.web.bind.annotation.*; 15 import org.springframework.web.bind.annotation.RequestBody;
17 16 import org.springframework.web.bind.annotation.RequestHeader;
18 import java.net.URI; 17 import org.springframework.web.bind.annotation.RequestMapping;
19 import java.util.List; 18 import org.springframework.web.bind.annotation.RequestMethod;
20 19
21 /** 20 /**
22 * @author Xiaocq 21 * @author Xiaocq
...@@ -30,5 +29,9 @@ public interface WorkflowFeign { ...@@ -30,5 +29,9 @@ public interface WorkflowFeign {
30 @RequestMapping(value = "/work-flow/data/allow-flow-core", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE) 29 @RequestMapping(value = "/work-flow/data/allow-flow-core", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
31 CommonRes<Boolean> allowFlowCore(@RequestBody FlowUpdateStateDTO dto, @RequestHeader(required = false) MultiValueMap<String, String> headers); 30 CommonRes<Boolean> allowFlowCore(@RequestBody FlowUpdateStateDTO dto, @RequestHeader(required = false) MultiValueMap<String, String> headers);
32 31
32 @HystrixCommand(fallbackMethod = "CommonUtil.sleepFallback", commandProperties = {
33 @HystrixProperty(name = "execution.isolation.thread.timeoutInMilliseconds", value = "4500")})
34 @RequestMapping(value = "/work-flow/data/get-flow-list-tenant", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
35 CommonRes<PageListVO<ApproveVO>> getFlowListCrossTenant(@RequestBody @Valid FlowQueryDTO dto);
33 36
34 } 37 }
......
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfDemand.java
...@@ -221,4 +221,13 @@ public class MfDemand extends BaseShardingDO { ...@@ -221,4 +221,13 @@ public class MfDemand extends BaseShardingDO {
221 @Name("加工单编号") 221 @Name("加工单编号")
222 private String processOrderNo; 222 private String processOrderNo;
223 223
224 @Name("资产Guid")
225 private String zqBizGuid;
226
227 @Name("专区名称")
228 private String zqName;
229
230 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
231 private String crossPlatformApproveState;
232
224 } 233 }
......
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfEnterprise.java
...@@ -21,7 +21,10 @@ import java.util.Date; ...@@ -21,7 +21,10 @@ import java.util.Date;
21 @Accessors(chain = true) 21 @Accessors(chain = true)
22 @Name("企业信息") 22 @Name("企业信息")
23 public class MfEnterprise extends BaseDO { 23 public class MfEnterprise extends BaseDO {
24 24
25 @Name("会员GUID")
26 private String tenantGuid;
27
25 /** 28 /**
26 * 公司名称 29 * 公司名称
27 */ 30 */
...@@ -37,7 +40,7 @@ public class MfEnterprise extends BaseDO { ...@@ -37,7 +40,7 @@ public class MfEnterprise extends BaseDO {
37 /** 40 /**
38 * 企业类型【选择平台字典【公司类型】的选项】 41 * 企业类型【选择平台字典【公司类型】的选项】
39 */ 42 */
40 @Name("企业类型【选择平台字典【公司类型】的选项】") 43 @Name("企业类型")
41 private String tenantType; 44 private String tenantType;
42 45
43 /** 46 /**
...@@ -49,7 +52,7 @@ public class MfEnterprise extends BaseDO { ...@@ -49,7 +52,7 @@ public class MfEnterprise extends BaseDO {
49 /** 52 /**
50 * 注册资本【(万元)】 53 * 注册资本【(万元)】
51 */ 54 */
52 @Name("注册资本【(万元)】") 55 @Name("注册资本")
53 private BigDecimal registeredCapital; 56 private BigDecimal registeredCapital;
54 57
55 /** 58 /**
...@@ -79,7 +82,7 @@ public class MfEnterprise extends BaseDO { ...@@ -79,7 +82,7 @@ public class MfEnterprise extends BaseDO {
79 /** 82 /**
80 * 营业期限【1 长期有效；2 自定义】 83 * 营业期限【1 长期有效；2 自定义】
81 */ 84 */
82 @Name("营业期限【1 长期有效；2 自定义】") 85 @Name("营业期限")
83 private String businessLicenseTerm; 86 private String businessLicenseTerm;
84 87
85 /** 88 /**
...@@ -102,9 +105,9 @@ public class MfEnterprise extends BaseDO { ...@@ -102,9 +105,9 @@ public class MfEnterprise extends BaseDO {
102 private String businessLicenseJson; 105 private String businessLicenseJson;
103 106
104 /** 107 /**
105 * 营业执照经营范围 108 * 经营范围
106 */ 109 */
107 @Name("营业执照经营范围") 110 @Name("经营范围")
108 private String businessLicenseScope; 111 private String businessLicenseScope;
109 112
110 /** 113 /**
...@@ -168,11 +171,20 @@ public class MfEnterprise extends BaseDO { ...@@ -168,11 +171,20 @@ public class MfEnterprise extends BaseDO {
168 */ 171 */
169 @Name("授权委托书") 172 @Name("授权委托书")
170 private String authorizationLetter; 173 private String authorizationLetter;
174
175 @Name("资产Guid")
176 private String zqBizGuid;
177
178 @Name("专区名称")
179 private String zqName;
180
181 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
182 private String crossPlatformApproveState;
171 183
172 /** 184 /**
173 * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】 185 * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
174 */ 186 */
175 @Name("业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃；B 变更中 默认 N】") 187 @Name("业务审批状态")
176 private String bizApproveState; 188 private String bizApproveState;
177 189
178 } 190 }
......
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfEnterpriseChangeApprove.java
...@@ -21,7 +21,10 @@ import java.util.Date; ...@@ -21,7 +21,10 @@ import java.util.Date;
21 @Accessors(chain = true) 21 @Accessors(chain = true)
22 @Name("企业信息变更审批") 22 @Name("企业信息变更审批")
23 public class MfEnterpriseChangeApprove extends BaseDO { 23 public class MfEnterpriseChangeApprove extends BaseDO {
24 24
25 @Name("会员GUID")
26 private String tenantGuid;
27
25 /** 28 /**
26 * 公司名称 29 * 公司名称
27 */ 30 */
...@@ -37,7 +40,7 @@ public class MfEnterpriseChangeApprove extends BaseDO { ...@@ -37,7 +40,7 @@ public class MfEnterpriseChangeApprove extends BaseDO {
37 /** 40 /**
38 * 企业类型【选择平台字典【公司类型】的选项】 41 * 企业类型【选择平台字典【公司类型】的选项】
39 */ 42 */
40 @Name("企业类型【选择平台字典【公司类型】的选项】") 43 @Name("企业类型")
41 private String tenantType; 44 private String tenantType;
42 45
43 /** 46 /**
...@@ -49,7 +52,7 @@ public class MfEnterpriseChangeApprove extends BaseDO { ...@@ -49,7 +52,7 @@ public class MfEnterpriseChangeApprove extends BaseDO {
49 /** 52 /**
50 * 注册资本【(万元)】 53 * 注册资本【(万元)】
51 */ 54 */
52 @Name("注册资本【(万元)】") 55 @Name("注册资本")
53 private BigDecimal registeredCapital; 56 private BigDecimal registeredCapital;
54 57
55 /** 58 /**
...@@ -79,7 +82,7 @@ public class MfEnterpriseChangeApprove extends BaseDO { ...@@ -79,7 +82,7 @@ public class MfEnterpriseChangeApprove extends BaseDO {
79 /** 82 /**
80 * 营业期限【1 长期有效；2 自定义】 83 * 营业期限【1 长期有效；2 自定义】
81 */ 84 */
82 @Name("营业期限【1 长期有效；2 自定义】") 85 @Name("营业期限")
83 private String businessLicenseTerm; 86 private String businessLicenseTerm;
84 87
85 /** 88 /**
...@@ -172,7 +175,7 @@ public class MfEnterpriseChangeApprove extends BaseDO { ...@@ -172,7 +175,7 @@ public class MfEnterpriseChangeApprove extends BaseDO {
172 /** 175 /**
173 * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】 176 * 业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】
174 */ 177 */
175 @Name("业务审批状态【N 草稿中，A 审批中，Y 已通过，R 驳回，C 已撤销，D 已废弃； 默认 N】") 178 @Name("业务审批状态")
176 private String bizApproveState; 179 private String bizApproveState;
177 180
178 /** 181 /**
...@@ -186,11 +189,20 @@ public class MfEnterpriseChangeApprove extends BaseDO { ...@@ -186,11 +189,20 @@ public class MfEnterpriseChangeApprove extends BaseDO {
186 */ 189 */
187 @Name("原数据唯一标识") 190 @Name("原数据唯一标识")
188 private String sourceGuid; 191 private String sourceGuid;
192
193 @Name("资产Guid")
194 private String zqBizGuid;
195
196 @Name("专区名称")
197 private String zqName;
198
199 @Name("审批状态(N 初始 A 审批中 Y 已通过 R 驳回 C 已撤销)")
200 private String crossPlatformApproveState;
189 201
190 /** 202 /**
191 * 数据类型【数据类型 1原数据 2新数据】 203 * 数据类型【数据类型 1原数据 2新数据】
192 */ 204 */
193 @Name("数据类型【数据类型 1原数据 2新数据】") 205 @Name("数据类型")
194 private String dataType; 206 private String dataType;
195 207
196 } 208 }
......
src/main/java/com/csbr/qingcloud/portal/mybatis/service/impl/MfEnterpriseServiceImpl.java
1 package com.csbr.qingcloud.portal.mybatis.service.impl; 1 package com.csbr.qingcloud.portal.mybatis.service.impl;
2 2
3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl; 5 import com.csbr.cloud.mybatis.service.impl.CsbrServiceImpl;
4 import com.csbr.qingcloud.portal.mybatis.mapper.MfEnterpriseMapper; 6 import com.csbr.qingcloud.portal.mybatis.mapper.MfEnterpriseMapper;
5 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise; 7 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
...@@ -7,6 +9,10 @@ import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService; ...@@ -7,6 +9,10 @@ import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
7 import jakarta.annotation.Resource; 9 import jakarta.annotation.Resource;
8 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
9 11
12 import java.io.Serializable;
13 import java.util.Collection;
14 import java.util.List;
15
10 /** 16 /**
11 * @program: D:/git/ms-data-circulation-portal-service 17 * @program: D:/git/ms-data-circulation-portal-service
12 * @description: 企业信息逻辑层接口实现 18 * @description: 企业信息逻辑层接口实现
...@@ -18,5 +24,12 @@ public class MfEnterpriseServiceImpl extends CsbrServiceImpl<MfEnterpriseMapper, ...@@ -18,5 +24,12 @@ public class MfEnterpriseServiceImpl extends CsbrServiceImpl<MfEnterpriseMapper,
18 24
19 @Resource 25 @Resource
20 private MfEnterpriseMapper mfEnterpriseMapper; 26 private MfEnterpriseMapper mfEnterpriseMapper;
21 27
28 @Override
29 public List<MfEnterprise> listByIds(Collection<? extends Serializable> idList) {
30 LambdaQueryWrapper<MfEnterprise> queryWrapper = Wrappers.lambdaQuery(MfEnterprise.class);
31 queryWrapper.in(MfEnterprise::getGuid, idList);
32 csbrExcludeShardingLambdaQueryWrapper(queryWrapper);
33 return list(queryWrapper);
34 }
22 } 35 }
......
src/main/java/com/csbr/qingcloud/portal/service/DemandService.java
1 package com.csbr.qingcloud.portal.service; 1 package com.csbr.qingcloud.portal.service;
2 2
3 import com.csbr.qingcloud.portal.domain.vo.DemandApproveVO; 3 import com.csbr.qingcloud.portal.domain.vo.*;
4 import com.csbr.qingcloud.portal.domain.vo.DemandUpdateStateVO;
5 import csbr.cloud.entity.domain.base.vo.PageListVO; 4 import csbr.cloud.entity.domain.base.vo.PageListVO;
6 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 5 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
7 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; 6 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
8 import com.csbr.qingcloud.portal.domain.vo.DemandQueryVO;
9 import com.csbr.qingcloud.portal.domain.vo.DemandRSVO;
10 7
11 import java.util.List; 8 import java.util.List;
12 9
...@@ -72,8 +69,19 @@ public interface DemandService { ...@@ -72,8 +69,19 @@ public interface DemandService {
72 */ 69 */
73 void flowCallBack(BizCallbackDTO dto); 70 void flowCallBack(BizCallbackDTO dto);
74 71
72 /**
73 * 数据需求-流程结束后进行业务回调(跨服务审批)
74 * @param dto
75 */
76 void crossFlowCallBack(BizCallbackDTO dto);
77
75 Boolean lastApprove(DemandApproveVO dto); 78 Boolean lastApprove(DemandApproveVO dto);
76 79
77 DemandRSVO getDemandDetailByProcess(String processOrderNo); 80 DemandRSVO getDemandDetailByProcess(String processOrderNo);
78 81
82 /**
83 * 根据加工单编号查询资产列表
84 * @return
85 */
86 List<ProcessOrderProcessDtlRSVO> listByProcessOrderNo();
79 } 87 }
......
src/main/java/com/csbr/qingcloud/portal/service/EnterpriseChangeApproveService.java
...@@ -16,4 +16,10 @@ public interface EnterpriseChangeApproveService { ...@@ -16,4 +16,10 @@ public interface EnterpriseChangeApproveService {
16 ChangeApproveVO changeDetail(String guid); 16 ChangeApproveVO changeDetail(String guid);
17 17
18 void changeUpdate(BizCallbackDTO dto); 18 void changeUpdate(BizCallbackDTO dto);
19
20 void removeByGuids(List<String> guids);
21
22 void crossFlowCallBack(BizCallbackDTO dto);
23
24 void crossRemoveByBizGuid(List<String> zqBizGuids);
19 } 25 }
......
src/main/java/com/csbr/qingcloud/portal/service/EnterpriseService.java
1 package com.csbr.qingcloud.portal.service; 1 package com.csbr.qingcloud.portal.service;
2 2
3 import com.csbr.cloud.workflow.domain.dto.appove.FlowUpdateStateDTO; 3 import com.csbr.cloud.workflow.domain.dto.appove.FlowQueryDTO;
4 import com.csbr.qingcloud.portal.domain.vo.*; 4 import com.csbr.qingcloud.portal.domain.vo.*;
5 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
5 import csbr.cloud.entity.domain.base.vo.PageListVO; 6 import csbr.cloud.entity.domain.base.vo.PageListVO;
6 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 7 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
7 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO; 8 import com.csbr.cloud.workflow.domain.vo.appove.FlowRQBaseVO;
8 9
10 import java.util.Date;
9 import java.util.List; 11 import java.util.List;
10 12
11 /** 13 /**
...@@ -26,6 +28,13 @@ public interface EnterpriseService { ...@@ -26,6 +28,13 @@ public interface EnterpriseService {
26 PageListVO<EnterpriseRSVO> pageList(EnterpriseQueryVO queryVO); 28 PageListVO<EnterpriseRSVO> pageList(EnterpriseQueryVO queryVO);
27 29
28 /** 30 /**
31 * 企业信息-分页(调用流程)
32 * @param dto
33 * @return
34 */
35 PageListVO<EnterpriseApproveRSVO> flowPageList(FlowQueryDTO dto);
36
37 /**
29 * 企业信息获取详情数据 38 * 企业信息获取详情数据
30 * @author xcq 39 * @author xcq
31 * @date 2024-12-26 16:18 40 * @date 2024-12-26 16:18
...@@ -60,7 +69,7 @@ public interface EnterpriseService { ...@@ -60,7 +69,7 @@ public interface EnterpriseService {
60 * @return void 69 * @return void
61 */ 70 */
62 void removeByGuids(List<String> guids); 71 void removeByGuids(List<String> guids);
63 72
64 /** 73 /**
65 * 流程结束后进行业务回调 74 * 流程结束后进行业务回调
66 * @author xcq 75 * @author xcq
...@@ -70,14 +79,28 @@ public interface EnterpriseService { ...@@ -70,14 +79,28 @@ public interface EnterpriseService {
70 */ 79 */
71 void flowCallBack(BizCallbackDTO dto); 80 void flowCallBack(BizCallbackDTO dto);
72 81
82 /**
83 * 流程结束后进行业务回调(跨服务审批)
84 * @param dto
85 */
86 void crossFlowCallBack(BizCallbackDTO dto);
87
73 Boolean check(EnterpriseRQVO vo); 88 Boolean check(EnterpriseRQVO vo);
74 89
75 List<ChangeInfoVO> getChange(String tenantName); 90 List<ChangeInfoVO> getChange(String sourceGuid, Date createTime);
76 91
77 EnterpriseRSVO getEnterpriseDetailByName(String tenantName); 92 EnterpriseRSVO getEnterpriseDetailByName(String tenantName);
78 93
79 /** 将此账号提交的数据需求迁移到新的企业 */ 94 /** 将此账号提交的数据需求迁移到新的企业 */
80 void moveOldData(TenantRQVO vo); 95 void moveOldData(TenantRQVO vo);
81 96
82 Boolean lastApprove(FlowUpdateStateDTO dto); 97 /** 更新会员信息 */
98 void updateTenant(MfEnterprise vo);
99
100 /**
101 * 企业信息-根据登陆账号查询详情
102 * @param logonUser
103 * @return
104 */
105 EnterpriseRSVO getEnterpriseDetailByLogonUser(String logonUser);
83 } 106 }
......
src/main/java/com/csbr/qingcloud/portal/service/impl/ServicerMaintainServiceImpl.java
...@@ -202,9 +202,9 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser ...@@ -202,9 +202,9 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
202 * @return void 202 * @return void
203 */ 203 */
204 private void againSubmitFlow(MfServicerMaintain entity, ServicerMaintainRQVO rqVO, AddApprovalDTO approvalDTO) { 204 private void againSubmitFlow(MfServicerMaintain entity, ServicerMaintainRQVO rqVO, AddApprovalDTO approvalDTO) {
205 // 重新提交的数据重置相关字段
206 entity.setGuid(CommonUtil.newGuid()); 205 entity.setGuid(CommonUtil.newGuid());
207 mfServicerMaintainService.csbrBaseEntity(entity); 206 mfServicerMaintainService.csbrBaseEntity(entity);
207 entity.setBizApproveState("A");
208 // 保存新数据 208 // 保存新数据
209 boolean flag = mfServicerMaintainService.save(entity); 209 boolean flag = mfServicerMaintainService.save(entity);
210 if (!flag) { 210 if (!flag) {
...@@ -284,7 +284,7 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser ...@@ -284,7 +284,7 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
284 // todo 284 // todo
285 approvalDTO.setFuncCode("FWSWH"); 285 approvalDTO.setFuncCode("FWSWH");
286 // 流程消息中的变量替换参数 286 // 流程消息中的变量替换参数
287 approvalDTO.setFlowMessageBody(null); 287 approvalDTO.setFlowMessageBody(String.format("%s,%s",entity.getCreateUserName(),entity.getTenantName()));
288 // 流程列表数据核心param参数处理 288 // 流程列表数据核心param参数处理
289 approvalDTO.setParam1(null); 289 approvalDTO.setParam1(null);
290 approvalDTO.setParam2(null); 290 approvalDTO.setParam2(null);
...@@ -388,7 +388,6 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser ...@@ -388,7 +388,6 @@ public class ServicerMaintainServiceImpl extends FlowAbstractImpl implements Ser
388 //region 3.数据转换处理 388 //region 3.数据转换处理
389 389
390 //region 3.1.数据过程转换 390 //region 3.1.数据过程转换
391 rqVO.setBizApproveState(entity.getBizApproveState());
392 //endregion 3.1.数据过程转换 391 //endregion 3.1.数据过程转换
393 392
394 //endregion 3.数据转换处理 393 //endregion 3.数据转换处理
......
src/main/java/com/csbr/qingcloud/portal/util/ChangeInfoUtil.java 0 → 100644
1 package com.csbr.qingcloud.portal.util;
2
3 import com.csbr.cloud.common.util.CommonUtil;
4 import com.csbr.cloud.common.util.CsbrBeanUtil;
5 import com.csbr.qingcloud.portal.domain.vo.BoroughPOJO;
6 import com.csbr.qingcloud.portal.domain.vo.ChangeInfoVO;
7 import com.csbr.qingcloud.portal.domain.vo.CompareResult;
8 import com.csbr.qingcloud.portal.feign.ConfigureFeign;
9 import com.csbr.qingcloud.portal.service.impl.EnterpriseServiceImpl;
10 import jakarta.annotation.Resource;
11 import org.apache.commons.collections.CollectionUtils;
12 import org.apache.commons.lang3.StringUtils;
13 import org.springframework.stereotype.Component;
14
15 import java.math.BigDecimal;
16 import java.math.RoundingMode;
17 import java.util.ArrayList;
18 import java.util.Comparator;
19 import java.util.Date;
20 import java.util.List;
21 import java.util.stream.Collectors;
22
23 @Component
24 public class ChangeInfoUtil {
25
26 public static List<BoroughPOJO> areaList;
27
28 /** 计算变更信息 */
29 public static List<ChangeInfoVO> getChangeList(List<EnterpriseServiceImpl.ChangeApproveBean> beanList) throws IllegalAccessException {
30 List<ChangeInfoVO> list = new ArrayList<>();
31 //循环对比每组记录生来变更内容
32 for(EnterpriseServiceImpl.ChangeApproveBean item : beanList){
33 if(item.oldBean == null || item.newBean == null){
34 continue;
35 }
36 List<CompareResult> diffList = ObjectUtil.getBeanDiff(item.oldBean,item.newBean);
37 getVenueResult(item,list);
38 getStartEndResult(item,list);
39 getRegistrationDateResult(item,list);
40 getRegisteredCapitalResult(item,list);
41 for(CompareResult diffItem : diffList){
42 if(diffItem.getFieldComment().contains("审批状态") || diffItem.getFieldComment().contains("营业执照")
43 || diffItem.getFieldComment().contains("法人证件照") || diffItem.getFieldComment().contains("管理员证件照")
44 || diffItem.getFieldComment().contains("授权委托书") || diffItem.getFieldComment().contains("省")
45 || diffItem.getFieldComment().contains("市") || diffItem.getFieldComment().contains("区")
46 || diffItem.getFieldComment().contains("营业开始日期") || diffItem.getFieldComment().contains("营业结束日期")
47 || diffItem.getFieldComment().contains("注册日期") || diffItem.getFieldComment().contains("注册资本")){
48 continue;
49 }
50 list.add(getChangeInfoVO(item,diffItem));
51 }
52 }
53 list = list.stream().sorted(Comparator.comparing(ChangeInfoVO::getNameEn).thenComparing(ChangeInfoVO::getDate).reversed()).collect(Collectors.toList());
54 return list;
55 }
56
57 private static ChangeInfoVO getChangeInfoVO(EnterpriseServiceImpl.ChangeApproveBean item,CompareResult diffItem){
58 ChangeInfoVO vo = new ChangeInfoVO();
59 vo.setNameEn(diffItem.getFieldName());
60 vo.setName(diffItem.getFieldComment());
61 vo.setDate(DateUtil.getDateToString(item.oldBean.getCreateTime()));
62 vo.setBefore(diffItem.getOldValue() == null ? "" : diffItem.getOldValue().toString());
63 vo.setAfter(diffItem.getNewValue() == null ? "" : diffItem.getNewValue().toString());
64 vo.setGuid(CommonUtil.newGuid());
65 return vo;
66 }
67
68 private static void getRegisteredCapitalResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
69 String oldValue = getRegisteredCapital(item.oldBean.getRegisteredCapital());
70 String newValue = getRegisteredCapital(item.newBean.getRegisteredCapital());
71 if(!oldValue.equals(newValue)){
72 list.add(getChangeInfoVO(item,getCompareResult("注册资本","registeredCapital",oldValue,newValue)));
73 }
74 }
75
76 private static String getRegisteredCapital(BigDecimal v) {
77 if(v == null){
78 return "";
79 }
80 return v.setScale(2, RoundingMode.HALF_DOWN).toString();
81 }
82
83 public static void getVenueResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
84 String oldValue = getVenue(item.oldBean.getProvince(),item.oldBean.getCity(),item.oldBean.getDistrict());
85 String newValue = getVenue(item.newBean.getProvince(),item.newBean.getCity(),item.newBean.getDistrict());
86 if(!oldValue.equals(newValue)){
87 list.add(getChangeInfoVO(item,getCompareResult("注册地","venue",oldValue,newValue)));
88 }
89 }
90
91 public static void getRegistrationDateResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
92 String oldValue = getRegistrationDate(item.oldBean.getRegistrationDate());
93 String newValue = getRegistrationDate(item.newBean.getRegistrationDate());
94 if(!oldValue.equals(newValue)){
95 list.add(getChangeInfoVO(item,getCompareResult("注册日期","registrationDate",oldValue,newValue)));
96 }
97 }
98
99 private static String getRegistrationDate(Date date) {
100 return DateUtil.getShortDateToString(date);
101 }
102
103 private static CompareResult getCompareResult(String comment,String name,String oldVenue,String newVenue){
104 CompareResult result = new CompareResult();
105 result.setFieldComment(comment);
106 result.setFieldName(name);
107 result.setOldValue(oldVenue);
108 result.setNewValue(newVenue);
109 return result;
110 }
111
112 public static void getStartEndResult(EnterpriseServiceImpl.ChangeApproveBean item, List<ChangeInfoVO> list) {
113 String oldValue = getStartEnd(item.oldBean.getBusinessLicenseTerm(),item.oldBean.getBusinessLicenseStartDate(),item.oldBean.getBusinessLicenseEndDate());
114 String newValue = getStartEnd(item.newBean.getBusinessLicenseTerm(),item.newBean.getBusinessLicenseStartDate(),item.newBean.getBusinessLicenseEndDate());
115 if(!oldValue.equals(newValue)){
116 list.add(getChangeInfoVO(item,getCompareResult("营业期限","businessLicenseStartEnd",oldValue,newValue)));
117 }
118 }
119
120 public static String getVenue(String province, String city, String district) {
121 if(StringUtils.isBlank(district)){
122 return String.format("%s/%s",getName(province),getName(city));
123 }
124 else{
125 return String.format("%s/%s/%s",getName(province),getName(city),getName(district));
126 }
127 }
128
129 private static String getName(String code){
130 List<String> names = areaList.stream().filter(x->x.getCode().equals(code)).map(BoroughPOJO::getName).collect(Collectors.toList());
131 if(CollectionUtils.isEmpty(names)){
132 return "";
133 }
134 return names.get(0);
135 }
136
137
138 public static String getStartEnd(String businessLicenseTerm, Date businessLicenseStartDate, Date businessLicenseEndDate) {
139 if("1".equals(businessLicenseTerm)){
140 return "长期有效";
141 }
142 return String.format("%s至%s",DateUtil.getShortDateToString(businessLicenseStartDate),DateUtil.getShortDateToString(businessLicenseEndDate));
143 }
144
145 }
src/main/java/com/csbr/qingcloud/portal/util/DateUtil.java 0 → 100644
1 package com.csbr.qingcloud.portal.util;
2
3 import java.text.SimpleDateFormat;
4 import java.time.LocalDateTime;
5 import java.time.ZoneId;
6 import java.util.Date;
7
8 public class DateUtil {
9
10 /** 时间相差多少天 无视小时 */
11 public static int getDiffDay(Date one, Date two) {
12 if(one == null || two == null){
13 return 0;
14 }
15 one = getDateByString(getShortDateToString(one));
16 two = getDateByString(getShortDateToString(two));
17 long difference = (one.getTime() - two.getTime()) / 86400000;
18 return (int) Math.abs(difference);
19 }
20
21 /** 字符串时间转日期 */
22 public static Date getDateByString(String time){
23 try {
24 return new SimpleDateFormat("yyyy-MM-dd").parse(time);
25 } catch (Exception e) {
26 return new Date();
27 }
28 }
29
30 /** 时间转字符串 */
31 public static String getDateToString(Date time){
32 if(time == null) {
33 return "";
34 }
35 return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(time);
36 }
37
38 /** 时间转字符串 */
39 public static String getShortDateToString(Date time){
40 if(time == null) {
41 return "";
42 }
43 return new SimpleDateFormat("yyyy-MM-dd").format(time);
44 }
45
46 /** 时间转本地时间 */
47 public static LocalDateTime getDateToLocal(Date time){
48 if(time == null) {
49 return null;
50 }
51 return time.toInstant().atZone(ZoneId.systemDefault()).toLocalDateTime();
52 }
53
54 /** 字符串时间转日期 */
55 public static Date getShortDate(Date time){
56 if(time == null) {
57 return null;
58 }
59 try {
60 return new SimpleDateFormat("yyyy-MM-dd").parse(getShortDateToString(time));
61 } catch (Exception e) {
62 return new Date();
63 }
64 }
65
66 }
src/main/java/com/csbr/qingcloud/portal/util/InvokeUtil.java 0 → 100644
1 package com.csbr.qingcloud.portal.util;
2
3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject;
5 import com.csbr.cloud.common.enums.SystemError;
6 import com.csbr.cloud.common.exception.CsbrSystemException;
7 import com.csbr.cloud.common.response.CommonRes;
8 import lombok.extern.slf4j.Slf4j;
9 import org.apache.hc.client5.http.config.RequestConfig;
10 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
11 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
12 import org.apache.hc.core5.util.Timeout;
13 import org.springframework.beans.factory.annotation.Autowired;
14 import org.springframework.http.HttpEntity;
15 import org.springframework.http.HttpHeaders;
16 import org.springframework.http.MediaType;
17 import org.springframework.http.client.ClientHttpRequestFactory;
18 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
19 import org.springframework.stereotype.Component;
20 import org.springframework.web.client.RestTemplate;
21
22 /**
23 * @program: daop-projects
24 * @description:
25 * @author: xiaojie
26 * @create: 2025-03-13 14:52
27 **/
28 @Component
29 @Slf4j
30 public class InvokeUtil {
31
32 @Autowired
33 private RestTemplate restTemplate;
34
35 /**
36 * open调用接口
37 * @param jsonObject
38 * @param appKey
39 * @param zqDelUrl
40 */
41 public void invokeMainDel(JSONObject jsonObject, String appKey, String zqDelUrl) {
42 HttpHeaders headers = new HttpHeaders();
43 headers.setContentType(MediaType.APPLICATION_JSON);
44 headers.set("appKey", appKey);
45 HttpEntity<JSONObject> requestEntity = new HttpEntity<>(jsonObject, headers);
46 restTemplate.setRequestFactory(getFactory());
47 CommonRes commonRes = restTemplate.postForObject(zqDelUrl, requestEntity, CommonRes.class);
48 if (!CommonRes.success().getCode().equals(commonRes.getCode())) {
49 throw new CsbrSystemException(SystemError.ERROR_CODE, commonRes.getMsg());
50 } else {
51 CommonRes commonResData = JSON.parseObject(String.valueOf(commonRes.getData()), CommonRes.class);
52 if (!CommonRes.success().getCode().equals(commonResData.getCode())) {
53 throw new CsbrSystemException(SystemError.ERROR_CODE, commonResData.getMsg());
54 }
55 }
56 }
57
58 private ClientHttpRequestFactory getFactory() {
59 RequestConfig config = RequestConfig.custom()
60 .setConnectTimeout(Timeout.ofSeconds(5000)) // 连接超时
61 .setConnectionRequestTimeout(Timeout.ofSeconds(5000)) // 从连接池获取连接的超时时间
62 .setResponseTimeout(Timeout.ofSeconds(10000)) // 数据读取超时
63 .build();
64
65 CloseableHttpClient httpClient = HttpClientBuilder.create()
66 .setDefaultRequestConfig(config)
67 .build();
68
69 return new HttpComponentsClientHttpRequestFactory(httpClient);
70 }
71 }
...\ No newline at end of file ...\ No newline at end of file
src/main/java/com/csbr/qingcloud/portal/util/ObjectUtil.java
...@@ -58,8 +58,8 @@ public class ObjectUtil { ...@@ -58,8 +58,8 @@ public class ObjectUtil {
58 r.setFieldComment(""); 58 r.setFieldComment("");
59 } 59 }
60 if (oldField.getType() == Date.class) { 60 if (oldField.getType() == Date.class) {
61 r.setOldValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) oldField.get(oldObj))); 61 r.setOldValue(DateUtil.getDateToString((Date)oldField.get(oldObj)));
62 r.setNewValue(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format((Date) newField.get(newObj))); 62 r.setNewValue(DateUtil.getDateToString((Date)oldField.get(newObj)));
63 } 63 }
64 return r; 64 return r;
65 } 65 }
......
src/main/java/com/csbr/qingcloud/portal/util/ZQConfig.java 0 → 100644
1 package com.csbr.qingcloud.portal.util;
2
3 import lombok.Data;
4 import org.springframework.boot.context.properties.ConfigurationProperties;
5 import org.springframework.stereotype.Component;
6
7 /**
8 * @program: daop-projects
9 * @description:
10 * @author: xiaojie
11 * @create: 2025-02-28 14:09
12 **/
13 @Data
14 @Component
15 @ConfigurationProperties(prefix = "csbr.zq")
16 public class ZQConfig {
17
18 private String appKey = "672c2c38e4b0cac8732a6106";
19
20 private String zqName = "";
21
22 private String zqDelUrl = "";
23
24 private Boolean isMain = false;
25
26 }
...\ No newline at end of file ...\ No newline at end of file
src/main/resources/release/bootstrap.yml
...@@ -5,7 +5,7 @@ spring: ...@@ -5,7 +5,7 @@ spring:
5 nacos: 5 nacos:
6 #配置中心 6 #配置中心
7 config: 7 config:
8 server-addr: nacos-cluster-service-develop.nacos-cluster:8848 8 server-addr: nacos-cluster-service.nacos-cluster:8848
9 file-extension: yaml 9 file-extension: yaml
10 group: release 10 group: release
11 namespace: daop-master 11 namespace: daop-master
...@@ -16,7 +16,7 @@ spring: ...@@ -16,7 +16,7 @@ spring:
16 #注册中心 16 #注册中心
17 discovery: 17 discovery:
18 enabled: true 18 enabled: true
19 server-addr: nacos-cluster-service-develop.nacos-cluster:8848 19 server-addr: nacos-cluster-service.nacos-cluster:8848
20 group: release 20 group: release
21 namespace: daop-master 21 namespace: daop-master
22 metadata: 22 metadata:
......
src/main/resources/release/lt/bootstrap.yml
...@@ -5,7 +5,7 @@ spring: ...@@ -5,7 +5,7 @@ spring:
5 nacos: 5 nacos:
6 #配置中心 6 #配置中心
7 config: 7 config:
8 server-addr: nacos-cluster-service-develop.nacos-cluster:8848 8 server-addr: nacos-cluster-service.nacos-cluster:8848
9 file-extension: yaml 9 file-extension: yaml
10 group: release 10 group: release
11 namespace: daop-lt 11 namespace: daop-lt
...@@ -16,7 +16,7 @@ spring: ...@@ -16,7 +16,7 @@ spring:
16 #注册中心 16 #注册中心
17 discovery: 17 discovery:
18 enabled: true 18 enabled: true
19 server-addr: nacos-cluster-service-develop.nacos-cluster:8848 19 server-addr: nacos-cluster-service.nacos-cluster:8848
20 group: release 20 group: release
21 namespace: daop-lt 21 namespace: daop-lt
22 metadata: 22 metadata:
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!