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 6f6be776..62046261 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 @@ -106,12 +106,6 @@ public class BirActivityCenterGoodsController { return costIds.size()<100; } - @GetMapping("/toSyncBir") - public R syncBir(Long costId){ - centerGoodsService.rebuildBir(Arrays.asList(costId)); - return R.ok(); - } - /** * 翻页 * @param param diff --git a/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java b/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java index 7beeaf56..c50a0a28 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java @@ -28,7 +28,7 @@ public class BirBaseActivity implements Serializable { private static final long serialVersionUID = 1L; /** 编号 */ - @TableId(type = IdType.AUTO) + @TableId(type = IdType.INPUT) private Long id; /** 键值(日期数) */ diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java index 5f2873d0..13af4519 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirActivityCenterGoodsMapper.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.bir.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.common.model.consts.DSName; import com.qs.serve.modules.bir.entity.BirActivityCenterGoods; import com.qs.serve.modules.bir.entity.so.BirMonthCusCenterSo; import com.qs.serve.modules.bir.entity.vo.BirActivityCenterGoodsMonthVo; @@ -19,7 +20,7 @@ import java.util.List; * @author YenHex * @date 2023-07-06 */ -@DS("erp_stand_ds") +@DS(DSName.QiSheng) public interface BirActivityCenterGoodsMapper extends BaseMapper { //List selectErrorBir(); diff --git a/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java b/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java index 5fad4d28..d107cce7 100644 --- a/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java +++ b/src/main/java/com/qs/serve/modules/bir/mapper/BirBaseActivityMapper.java @@ -3,6 +3,7 @@ package com.qs.serve.modules.bir.mapper; import com.baomidou.dynamic.datasource.annotation.DS; import com.baomidou.mybatisplus.annotation.InterceptorIgnore; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qs.serve.common.model.consts.DSName; import com.qs.serve.modules.bir.entity.BirBaseActivity; import com.qs.serve.modules.bir.entity.dto.UnMatchBirRecord; import com.qs.serve.modules.tbs.entity.TbsActivity; @@ -17,7 +18,7 @@ import java.util.List; * @author YenHex * @date 2023-06-05 */ -@DS("erp_stand_ds") +@DS(DSName.QiSheng) public interface BirBaseActivityMapper extends BaseMapper { //List selectByBirActivity(@Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate); diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java index e4e0ae87..d6beb8f2 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirActivityCenterGoodsServiceImpl.java @@ -1,6 +1,7 @@ package com.qs.serve.modules.bir.service.impl; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -216,7 +217,10 @@ public class BirActivityCenterGoodsServiceImpl extends ServiceImpl0){ - this.saveBatch(bacgList); + for (BirActivityCenterGoods bir : bacgList) { + bir.setId(IdUtil.getSnowflakeNextId()); + super.getBaseMapper().insert(bir); + } } } } diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java index 8900f35d..b2131bcd 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java @@ -1,5 +1,6 @@ package com.qs.serve.modules.bir.service.impl; +import cn.hutool.core.util.IdUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.qs.serve.common.model.dto.DateSplitDTO; @@ -52,7 +53,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl birBaseActivityLqw = new LambdaQueryWrapper<>(); birBaseActivityLqw.in(BirBaseActivity::getActivityId,ids); - this.remove(birBaseActivityLqw); + super.baseMapper.delete(birBaseActivityLqw); LambdaQueryWrapper activityLqw = new LambdaQueryWrapper<>(); activityLqw.in(TbsActivity::getId,ids); @@ -173,7 +174,10 @@ public class BirBaseActivityServiceImpl extends ServiceImpl save(@RequestBody @Valid GoodsRuleBo param){ goodsRuleService.modify(param); diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java index 708fd8b1..68b1274b 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysDeleteLogServiceImpl.java @@ -3,9 +3,11 @@ import java.time.LocalDateTime; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.HttpUtil; import com.qs.serve.common.util.IdUtil; import com.qs.serve.common.util.JsonUtil; +import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.bms.entity.BmsSupplier; import com.qs.serve.modules.bms.mapper.BmsSupplierMapper; import com.qs.serve.modules.sys.entity.dto.CostDeletion; @@ -47,8 +49,10 @@ public class SysDeleteLogServiceImpl extends ServiceImpl deleteLogList = new ArrayList<>(); if(costApply!=null){ @@ -61,6 +65,19 @@ public class SysDeleteLogServiceImpl extends ServiceImpl removeCostById(@PathVariable("id") Long id){ tbsCostApplyService.removeCostById(id); + BirActivityCenterGoodsUtil.buildBir(id); return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index 15541fb4..8471cc86 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -8,6 +8,7 @@ import com.qs.serve.common.model.enums.BudgetLogOptFlag; import com.qs.serve.common.model.consts.BudgetLogRollbackFlag; import com.qs.serve.common.model.dto.R; import com.qs.serve.common.util.*; +import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.data.entity.DataAffairCommit; import com.qs.serve.modules.data.mapper.DataAffairCommitMapper; import com.qs.serve.modules.seeyon.entity.CtpAffair; @@ -823,6 +824,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService bo.setCostApplyId(costApply.getId()); this.doFinished(bo); } + BirActivityCenterGoodsUtil.buildBir(costApply.getId()); return null; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java index dd2a45db..82bee3cb 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyPart1ServiceImpl.java @@ -8,6 +8,7 @@ import com.qs.serve.common.util.Assert; import com.qs.serve.common.util.AuthContextUtils; import com.qs.serve.common.util.CodeGenUtil; import com.qs.serve.common.util.CopierUtil; +import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.bir.service.BirCenterRateService; import com.qs.serve.modules.bir.service.BirRoiRateService; import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper; @@ -176,6 +177,8 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { orgCost.setChangeExtendId(costApply.getId()); orgCost.setChangeActionTime(LocalDateTime.now()); tbsCostApplyService.updateById(orgCost); + BirActivityCenterGoodsUtil.buildBir(costId); + BirActivityCenterGoodsUtil.buildBir(newCostApplyId); return costApply; } @@ -222,6 +225,9 @@ public class TbsCostApplyPart1ServiceImpl implements TbsCostApplyPart1Service { tbsBudgetLogMapper.updateLogDelFlagCancelByCostApply(extCost.getChangeSourceId(),0); //删除当前的异动记录 tbsBudgetLogMapper.updateLogDelFlagByCostApply(extCost.getId(),1); + + BirActivityCenterGoodsUtil.buildBir(extCost.getChangeSourceId()); + BirActivityCenterGoodsUtil.buildBir(extCost.getId()); } /** diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java index 35e0aca1..37e1d998 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationController.java @@ -9,6 +9,7 @@ import com.qs.serve.common.model.dto.R; import com.qs.serve.common.model.enums.BizType; import com.qs.serve.common.model.enums.SystemModule; import com.qs.serve.common.util.*; +import com.qs.serve.modules.bir.consts.BirActivityCenterGoodsUtil; import com.qs.serve.modules.seeyon.entity.CtpAffair; import com.qs.serve.modules.seeyon.entity.CtpAffairQo; import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam; @@ -460,7 +461,8 @@ public class VtbVerificationController { @LimitSubmit @PostMapping("/compensate/{id}") public R compensate(@PathVariable("id") String id){ - return vtbVerificationOperationService.runCompensate(id); + vtbVerificationOperationService.runCompensate(id); + return R.ok(); } diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index bf1eaa0e..9f96ce17 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -603,6 +603,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl