diff --git a/src/main/java/com/qs/serve/common/util/BirHttpUtil.java b/src/main/java/com/qs/serve/common/util/BirHttpUtil.java index 285fbd42..0cca76c7 100644 --- a/src/main/java/com/qs/serve/common/util/BirHttpUtil.java +++ b/src/main/java/com/qs/serve/common/util/BirHttpUtil.java @@ -102,7 +102,8 @@ public class BirHttpUtil { map.put("centerName",centerName); map.put("supplierCode",supplierCode); R result = get("/bir/roiRate/getCostCenter",map); - return JsonUtil.jsonToPojo(result.getData().toString(),TbsCostSubItem.CostCenterTranStr.class); + String json = result.getData().toString(); + return JsonUtil.jsonToPojo(json,TbsCostSubItem.CostCenterTranStr.class); } } diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java index fe206c89..780caef0 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirActivityCenterGoodsController.java @@ -74,7 +74,14 @@ public class BirActivityCenterGoodsController { return R.ok(); } - + @GetMapping("/toSyncBirbyCode") + public R toSyncBirEcro(String costCode){ + List list = tbsCostApplyService.list(new LambdaQueryWrapper().eq(TbsCostApply::getCode,costCode)); + for (TbsCostApply costApply : list) { + centerGoodsService.rebuildBir(Arrays.asList(costApply.getId())); + } + return R.ok(); + } @GetMapping("/toSyncBirEcro") public R toSyncBirEcro(){ diff --git a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java index 03223a4e..6dc4ae65 100644 --- a/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java +++ b/src/main/java/com/qs/serve/modules/bir/controller/BirRoiRateController.java @@ -64,11 +64,11 @@ public class BirRoiRateController { * @param id * @return */ - //@GetMapping("/testCostCenter") + @GetMapping("/testCostCenter") public R buildCostCenter(String id){ TbsActivityCenter tbsActivityCenter = tbsActivityCenterMapper.selectById(id); TbsActivity activity = tbsActivityMapper.selectById(tbsActivityCenter.getActivityId()); - return R.ok(birCenterRateService.buildCostCenter(tbsActivityCenter.getCenterType(), + return R.ok(BirHttpUtil.buildCostCenter(tbsActivityCenter.getCenterType(), tbsActivityCenter.getCenterId(), tbsActivityCenter.getCenterName(), activity.getSupplierCode())); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index ef8ecb1e..3b80e143 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -46,6 +46,8 @@ public class TbsCostApply implements Serializable { @TableField(condition = SqlCondition.LIKE) private String chargeTheme; + private String recId; + /** 客户id */ @NotNull(message = "客户id不能为空") private Long supplierId; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java index dda4a339..f0ffc5c6 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsCostSubItem.java @@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.entity.dto; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.math.BigDecimal; @@ -99,6 +100,7 @@ public class TbsCostSubItem { } @Data + @NoArgsConstructor public static class CostCenterTranStr{ public CostCenterTranStr(String chengBenZhongXin, String chengBenZhongXinId) { this.chengBenZhongXin = chengBenZhongXin; diff --git a/src/main/java/com/qs/serve/modules/third/entity/ProcessCreatePolicyCostBo.java b/src/main/java/com/qs/serve/modules/third/entity/ProcessCreatePolicyCostBo.java index 0e95a13d..7022176a 100644 --- a/src/main/java/com/qs/serve/modules/third/entity/ProcessCreatePolicyCostBo.java +++ b/src/main/java/com/qs/serve/modules/third/entity/ProcessCreatePolicyCostBo.java @@ -49,4 +49,9 @@ public class ProcessCreatePolicyCostBo { /** 拓展:是否保存支付到中间库 xlt,0->不保存(默认);1->保存 */ private Integer toSavePaymentFlag; + /** + * 唯一标识 + */ + private String recId; + } diff --git a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java index ff28abe9..9cda2fbf 100644 --- a/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java +++ b/src/main/java/com/qs/serve/modules/third/service/PortalOfCostApplication.java @@ -346,8 +346,28 @@ public class PortalOfCostApplication { Assert.throwEx("政策预算不足,可用余额:"+surplusAmt); } + //移除历史记录 + List histCostApplyList = costApplyService.list(new LambdaQueryWrapper() + .eq(TbsCostApply::getRecId,createBo.getRecId())); + for (TbsCostApply costApply : histCostApplyList) { + costApplyService.removeById(costApply.getId()); + QueryWrapper costqw = new QueryWrapper(); + costqw.eq("cost_apply_id",costApply.getId()); + activityService.remove(costqw); + activitySubjectService.remove(costqw); + activityCenterService.remove(costqw); + activityGoodsService.remove(costqw); + activityCenterGoodsService.remove(costqw); + budgetLogService.remove(costqw); + costItemService.remove(costqw); + verificationService.remove(costqw); + verificationSubjectService.remove(costqw); + } + //构建费用申请 TbsCostApply costApply = new TbsCostApply(); + //标记唯一 + costApply.setRecId(createBo.getRecId()); costApply.setBillNumber(billNumber); costApply.setCode(costApplyCode); costApply.setChargeTheme(costTheme);