Skip to content

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

Go to a project
Toggle navigation
Toggle navigation pinning
ac4cd00c by xiaojie
Options

【数据资产】 

1、变更申请-批量删除
1 parent 5dcb3de0
Inline Side-by-side
Showing 5 changed files with 105 additions and 7 deletions
src/main/java/com/csbr/qingcloud/portal/controller/EnterpriseController.java
...@@ -169,6 +169,14 @@ public class EnterpriseController { ...@@ -169,6 +169,14 @@ public class EnterpriseController {
169 return CommonRes.success(enterpriseChangeApproveService.changeDetail(guid)); 169 return CommonRes.success(enterpriseChangeApproveService.changeDetail(guid));
170 } 170 }
171 171
172 @DeleteMapping("/change/delete")
173 @SystemLog(value = "变更申请-批量删除")
174 @Operation(summary = "变更申请-批量删除")
175 public CommonRes<Boolean> changeRemoveByGuids(@RequestBody List<String> guids) {
176 enterpriseChangeApproveService.removeByGuids(guids);
177 return CommonRes.success(true);
178 }
179
172 //endregion 180 //endregion
173 181
174 } 182 }
......
src/main/java/com/csbr/qingcloud/portal/mybatis/entity/MfEnterpriseChangeApprove.java
...@@ -190,6 +190,15 @@ public class MfEnterpriseChangeApprove extends BaseDO { ...@@ -190,6 +190,15 @@ public class MfEnterpriseChangeApprove extends BaseDO {
190 @Name("原数据唯一标识") 190 @Name("原数据唯一标识")
191 private String sourceGuid; 191 private String sourceGuid;
192 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;
201
193 /** 202 /**
194 * 数据类型【数据类型 1原数据 2新数据】 203 * 数据类型【数据类型 1原数据 2新数据】
195 */ 204 */
......
src/main/java/com/csbr/qingcloud/portal/service/EnterpriseChangeApproveService.java
...@@ -16,4 +16,6 @@ public interface EnterpriseChangeApproveService { ...@@ -16,4 +16,6 @@ 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);
19 } 21 }
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseChangeApproveServiceImpl.java
1 package com.csbr.qingcloud.portal.service.impl; 1 package com.csbr.qingcloud.portal.service.impl;
2 2
3 import com.alibaba.fastjson.JSON; 3 import com.alibaba.fastjson.JSON;
4 import com.alibaba.fastjson.JSONObject;
4 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 5 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
5 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 6 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
6 import com.csbr.cloud.common.enums.SystemError; 7 import com.csbr.cloud.common.enums.SystemError;
7 import com.csbr.cloud.common.exception.CsbrSystemException; 8 import com.csbr.cloud.common.exception.CsbrSystemException;
8 import com.csbr.cloud.common.util.CommonUtil; 9 import com.csbr.cloud.common.util.CommonUtil;
9 import com.csbr.cloud.common.util.CsbrBeanUtil; 10 import com.csbr.cloud.common.util.CsbrBeanUtil;
11 import com.csbr.cloud.common.util.MessageSourceUtil;
10 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO; 12 import com.csbr.cloud.workflow.domain.dto.callback.BizCallbackDTO;
13 import com.csbr.cloud.workflow.util.ApprovalFlowUtil;
11 import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO; 14 import com.csbr.qingcloud.portal.domain.vo.ChangeApproveVO;
12 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO; 15 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRQVO;
13 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO; 16 import com.csbr.qingcloud.portal.domain.vo.EnterpriseRSVO;
14 import com.csbr.qingcloud.portal.domain.vo.TenantRQVO;
15 import com.csbr.qingcloud.portal.feign.PersonelFeign; 17 import com.csbr.qingcloud.portal.feign.PersonelFeign;
16 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise; 18 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterprise;
17 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove; 19 import com.csbr.qingcloud.portal.mybatis.entity.MfEnterpriseChangeApprove;
...@@ -19,15 +21,18 @@ import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveServic ...@@ -19,15 +21,18 @@ import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseChangeApproveServic
19 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService; 21 import com.csbr.qingcloud.portal.mybatis.service.MfEnterpriseService;
20 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService; 22 import com.csbr.qingcloud.portal.service.EnterpriseChangeApproveService;
21 import com.csbr.qingcloud.portal.service.EnterpriseService; 23 import com.csbr.qingcloud.portal.service.EnterpriseService;
22 import com.csbr.qingcloud.portal.util.DateUtil; 24 import com.csbr.qingcloud.portal.util.InvokeUtil;
25 import com.csbr.qingcloud.portal.util.ZQConfig;
23 import csbr.cloud.entity.enums.ApprovalStateEnum; 26 import csbr.cloud.entity.enums.ApprovalStateEnum;
27 import io.seata.spring.annotation.GlobalTransactional;
24 import jakarta.annotation.Resource; 28 import jakarta.annotation.Resource;
25 import lombok.extern.slf4j.Slf4j; 29 import lombok.extern.slf4j.Slf4j;
26 import org.apache.commons.collections.CollectionUtils; 30 import org.apache.commons.collections.CollectionUtils;
27 import org.apache.commons.lang.StringUtils; 31 import org.apache.commons.lang.StringUtils;
32 import org.springframework.beans.factory.annotation.Autowired;
28 import org.springframework.stereotype.Component; 33 import org.springframework.stereotype.Component;
34
29 import java.util.List; 35 import java.util.List;
30 import java.util.Map;
31 36
32 /** 37 /**
33 * @program: ms-hc-customer-service 38 * @program: ms-hc-customer-service
...@@ -39,6 +44,19 @@ import java.util.Map; ...@@ -39,6 +44,19 @@ import java.util.Map;
39 @Slf4j 44 @Slf4j
40 public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeApproveService { 45 public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeApproveService {
41 46
47 /**
48 * 功能名称
49 */
50 private static final String FUNCTION_NAME = "企业变更信息";
51
52 private static final String SysFuncCode = "QYRZ";
53
54 @Autowired
55 private ZQConfig zqConfig;
56
57 @Autowired
58 private InvokeUtil invokeUtil;
59
42 @Resource 60 @Resource
43 private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService; 61 private MfEnterpriseChangeApproveService mfEnterpriseChangeApproveService;
44 62
...@@ -52,6 +70,12 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -52,6 +70,12 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
52 private EnterpriseService enterpriseService; 70 private EnterpriseService enterpriseService;
53 71
54 @Resource 72 @Resource
73 private MessageSourceUtil messageSourceUtil;
74
75 @Resource
76 private ApprovalFlowUtil approvalFlowUtil;
77
78 @Resource
55 private PersonelFeign personelFeign; 79 private PersonelFeign personelFeign;
56 80
57 /** 保存变更数据 */ 81 /** 保存变更数据 */
...@@ -151,7 +175,55 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro ...@@ -151,7 +175,55 @@ public class EnterpriseChangeApproveServiceImpl implements EnterpriseChangeAppro
151 enterpriseService.updateTenant(vo); 175 enterpriseService.updateTenant(vo);
152 } 176 }
153 177
178 @Override
179 @GlobalTransactional(rollbackFor = Exception.class)
180 public void removeByGuids(List<String> guids) {
181 if (CollectionUtils.isEmpty(guids)) {
182 // W00012 = {0}:参数[{1}]不能为空!
183 throw new CsbrSystemException(SystemError.DATA_INPUT_ERROR, messageSourceUtil.getMessage("W00012",
184 String.format("删除%s数据", FUNCTION_NAME), "数据唯一标识"));
185 }
186 String crossPlatformApproveState = "";
187 for (String guid : guids) {
188 MfEnterpriseChangeApprove entity = mfEnterpriseChangeApproveService.getById(guid);
189 beforeRemove(entity);
190 boolean flag = mfEnterpriseChangeApproveService.removeById(guid);
191 if (!flag) {
192 throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, messageSourceUtil.delMessage(FUNCTION_NAME));
193 }
194
195 crossPlatformApproveState = entity.getCrossPlatformApproveState();
196 }
197
198 // 删除主平台数据
199 if (!zqConfig.getIsMain() && StringUtils.isNotEmpty(crossPlatformApproveState)) {
200 JSONObject jsonObject = new JSONObject();
201 jsonObject.put("zqSystemCode", SysFuncCode + "BG");
202 jsonObject.put("zqBizGuids", JSON.toJSONString(guids));
203 jsonObject.put("isCollection", true);
204 invokeUtil.invokeMainDel(jsonObject, zqConfig.getAppKey(), zqConfig.getZqDelUrl());
205 }
154 206
207 // 删除流程数据
208 approvalFlowUtil.removeApproveByBizGuids(guids);
209 }
210
211 /**
212 * 企业信息删除前置处理
213 * @author xcq
214 * @date 2024-12-26 16:18
215 * @param entity
216 * @return void
217 */
218 private void beforeRemove(MfEnterpriseChangeApprove entity) {
219 if (entity == null) {
220 throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, messageSourceUtil.notExistsToDelMessage(FUNCTION_NAME));
221 }
222 if (ApprovalStateEnum.CHECKING.getValue().equals(entity.getBizApproveState()) ||
223 ApprovalStateEnum.PASSED.getValue().equals(entity.getBizApproveState())) {
224 throw new CsbrSystemException(SystemError.DATA_DEL_ERROR, "审批中和审批通过的数据不能删除!");
225 }
226 }
155 227
156 /** 转换数据 */ 228 /** 转换数据 */
157 private String convertToVO(MfEnterpriseChangeApprove entity){ 229 private String convertToVO(MfEnterpriseChangeApprove entity){
......
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
...@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject; ...@@ -6,7 +6,6 @@ import com.alibaba.fastjson.JSONObject;
6 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 6 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
7 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; 7 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
8 import com.baomidou.mybatisplus.core.toolkit.Wrappers; 8 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
9 import com.csbr.cloud.common.entity.RedisStaffPOJO;
10 import com.csbr.cloud.common.enums.SystemError; 9 import com.csbr.cloud.common.enums.SystemError;
11 import com.csbr.cloud.common.enums.WorkFlowBizEnum; 10 import com.csbr.cloud.common.enums.WorkFlowBizEnum;
12 import com.csbr.cloud.common.exception.CsbrSystemException; 11 import com.csbr.cloud.common.exception.CsbrSystemException;
...@@ -145,8 +144,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -145,8 +144,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
145 144
146 // 根据业务guid查询认证变更表数据 145 // 根据业务guid查询认证变更表数据
147 List<MfEnterpriseChangeApprove> mfEnterpriseChangeApproves = mfEnterpriseChangeApproveService.listByIds(guids); 146 List<MfEnterpriseChangeApprove> mfEnterpriseChangeApproves = mfEnterpriseChangeApproveService.listByIds(guids);
147 Map<String, MfEnterpriseChangeApprove> mfEnterpriseChangeApproveMap = new HashMap<>();
148 if (ObjectUtils.isNotEmpty(mfEnterpriseChangeApproves)) { 148 if (ObjectUtils.isNotEmpty(mfEnterpriseChangeApproves)) {
149 Map<String, MfEnterpriseChangeApprove> mfEnterpriseChangeApproveMap = mfEnterpriseChangeApproves.stream().collect(Collectors.toMap(MfEnterpriseChangeApprove::getGuid, Function.identity())); 149 mfEnterpriseChangeApproveMap = mfEnterpriseChangeApproves.stream().collect(Collectors.toMap(MfEnterpriseChangeApprove::getGuid, Function.identity()));
150 } 150 }
151 151
152 // 数据转换 152 // 数据转换
...@@ -160,6 +160,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -160,6 +160,12 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
160 enterpriseApproveRSVO.setZqName(mfEnterprise.getZqName()); 160 enterpriseApproveRSVO.setZqName(mfEnterprise.getZqName());
161 enterpriseApproveRSVO.setTenantName(mfEnterprise.getTenantName()); 161 enterpriseApproveRSVO.setTenantName(mfEnterprise.getTenantName());
162 } 162 }
163 if (ObjectUtils.isNotEmpty(mfEnterpriseChangeApproveMap) && mfEnterpriseChangeApproveMap.containsKey(enterpriseApproveRSVO.getBizGuid())) {
164 MfEnterpriseChangeApprove mfEnterpriseChangeApprove = mfEnterpriseChangeApproveMap.get(enterpriseApproveRSVO.getBizGuid());
165 enterpriseApproveRSVO.setCrossPlatformApproveState(mfEnterpriseChangeApprove.getCrossPlatformApproveState());
166 enterpriseApproveRSVO.setZqName(mfEnterpriseChangeApprove.getZqName());
167 enterpriseApproveRSVO.setTenantName(mfEnterpriseChangeApprove.getTenantName());
168 }
163 results.add(enterpriseApproveRSVO); 169 results.add(enterpriseApproveRSVO);
164 } 170 }
165 171
...@@ -359,8 +365,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -359,8 +365,6 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
359 afterRemove(entity); 365 afterRemove(entity);
360 crossPlatformApproveState = entity.getCrossPlatformApproveState(); 366 crossPlatformApproveState = entity.getCrossPlatformApproveState();
361 } 367 }
362 // 删除流程数据
363 approvalFlowUtil.removeApproveByBizGuids(guids);
364 368
365 // 删除主平台数据 369 // 删除主平台数据
366 if (!zqConfig.getIsMain() && StringUtils.isNotEmpty(crossPlatformApproveState)) { 370 if (!zqConfig.getIsMain() && StringUtils.isNotEmpty(crossPlatformApproveState)) {
...@@ -370,6 +374,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris ...@@ -370,6 +374,9 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
370 jsonObject.put("isCollection", true); 374 jsonObject.put("isCollection", true);
371 invokeUtil.invokeMainDel(jsonObject, zqConfig.getAppKey(), zqConfig.getZqDelUrl()); 375 invokeUtil.invokeMainDel(jsonObject, zqConfig.getAppKey(), zqConfig.getZqDelUrl());
372 } 376 }
377
378 // 删除流程数据
379 approvalFlowUtil.removeApproveByBizGuids(guids);
373 } 380 }
374 381
375 /** 382 /**
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!