From b32b01b14058160e25a7f90f86e5989cc531ea5d Mon Sep 17 00:00:00 2001 From: Yen Date: Thu, 29 Jun 2023 15:31:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E9=A2=84=E8=A7=88=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E7=94=A8=E9=A2=84=E7=AE=97=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/bir/entity/BirBaseActivity.java | 10 +- .../bir/mapper/BirBaseActivityMapper.java | 7 ++ .../impl/BirBaseActivityServiceImpl.java | 25 +++-- .../serve/modules/tbs/entity/TbsActivity.java | 3 + .../tbs/entity/TbsActivitySlottingFee.java | 3 + .../tbs/entity/dto/TbsBudgetLogPreAmount.java | 20 ++++ .../dto/TbsScheduleItemBudgetAmount.java | 18 +++ .../mapper/TbsActivitySlottingFeeMapper.java | 10 ++ .../mapper/TbsScheduleItemBudgetMapper.java | 35 +++++- .../service/TbsBudgetApplicationService.java | 69 ++++++++---- .../TbsCostApplyOperationServiceImpl.java | 4 + .../service/impl/TbsCostApplyServiceImpl.java | 4 + .../third/PortalFormPushController.java | 6 +- .../mapper/bir/BirBaseActivityMapper.xml | 106 ++++++++++++++++++ .../tbs/TbsScheduleItemBudgetMapper.xml | 91 +++++++++++++++ 15 files changed, 373 insertions(+), 38 deletions(-) create mode 100644 src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetLogPreAmount.java create mode 100644 src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsScheduleItemBudgetAmount.java create mode 100644 src/main/resources/mapper/bir/BirBaseActivityMapper.xml create mode 100644 src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml 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 fec8c80d..12348c09 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 @@ -41,20 +41,26 @@ public class BirBaseActivity implements Serializable { private Long costApplyId; - /** 活动金额(费用投入金额) */ + /** 活动金额(分割，费用投入金额) */ @NotNull(message = "活动金额(费用投入金额)不能为空") private BigDecimal activityAmt; + /** 核销总金额 */ + private BigDecimal activityUsedAmt; + /** 活动总金额(费用投入金额) */ @NotNull(message = "活动总金额(费用投入金额)不能为空") private BigDecimal activityTotalAmt; - /** 核销金额 */ + /** 核销金额（分割） */ @NotNull(message = "核销金额不能为空") private BigDecimal verificationAmt; private Long preActQuantity; + /** 费用通过标识，用于已申请费用活动列表 */ + private Integer costPassFlag; + /** 客户id */ @NotNull(message = "客户id不能为空") private Long supplierId; 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 f06d7a99..c8c5575b 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 @@ -2,6 +2,11 @@ package com.qs.serve.modules.bir.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.bir.entity.BirBaseActivity; +import com.qs.serve.modules.tbs.entity.TbsActivity; +import org.apache.ibatis.annotations.Param; + +import java.time.LocalDate; +import java.util.List; /** * ROI费率(活动档案) Mapper @@ -10,5 +15,7 @@ import com.qs.serve.modules.bir.entity.BirBaseActivity; */ 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/BirBaseActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java index 10e466e4..763e9139 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 @@ -35,8 +35,6 @@ import java.util.stream.Collectors; @AllArgsConstructor public class BirBaseActivityServiceImpl extends ServiceImpl implements BirBaseActivityService { - - private final TbsActivityMapper activityMapper; private final TbsCostApplyMapper costApplyMapper; @Override @@ -46,13 +44,18 @@ public class BirBaseActivityServiceImpl extends ServiceImpl activityLqw = new LambdaQueryWrapper<>(); - activityLqw.and(qw->{ - qw.between(TbsActivity::getActStartDate,startDate,endDate) - .or().between(TbsActivity::getActEndDate,startDate,endDate); - }); + //修改为增量 + List activityList = baseMapper.selectByBirActivity(startDate,endDate); + if(activityList.size()<1){ + return; + } + //删除历史数据 + List ids = activityList.stream().filter(a->a.getBirActId()!=null) + .map(TbsActivity::getId).collect(Collectors.toList()); + LambdaQueryWrapper birBaseActivityLqw = new LambdaQueryWrapper<>(); + birBaseActivityLqw.in(BirBaseActivity::getActivityId,ids); + this.remove(birBaseActivityLqw); - List activityList = activityMapper.selectList(activityLqw); List birBaseActivities = new ArrayList<>(); for (TbsActivity activity : activityList) { BirBaseActivity baseActivity = new BirBaseActivity(); @@ -113,6 +116,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl delLqw = new LambdaQueryWrapper<>(); - delLqw.eq(BirBaseActivity::getKeyNum,yearMonth); - this.remove(delLqw); //保存 this.saveBatch(birBaseActivities); } diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index bf71f1a4..dedb9dd2 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -240,6 +240,9 @@ public class TbsActivity implements Serializable { @TableField(exist = false) private Integer overdueState; + @TableField(exist = false) + private Long birActId; + /** * 处理预警时间 * @param preDays diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySlottingFee.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySlottingFee.java index d28f79ba..8655cba2 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySlottingFee.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivitySlottingFee.java @@ -110,6 +110,9 @@ public class TbsActivitySlottingFee implements Serializable { /** * 通过标识 + * 0->未审批或审批被拒绝 + * 1->已通过审批 + * 2->审批中 */ private Integer passFlag; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetLogPreAmount.java b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetLogPreAmount.java new file mode 100644 index 00000000..2a379d07 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsBudgetLogPreAmount.java @@ -0,0 +1,20 @@ +package com.qs.serve.modules.tbs.entity.dto; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author YenHex + * @since 2023/6/29 + */ +@Data +public class TbsBudgetLogPreAmount { + + Long budgetId; + + Long scheduleItemId; + + BigDecimal amount; + +} diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsScheduleItemBudgetAmount.java b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsScheduleItemBudgetAmount.java new file mode 100644 index 00000000..b1af849f --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/entity/dto/TbsScheduleItemBudgetAmount.java @@ -0,0 +1,18 @@ +package com.qs.serve.modules.tbs.entity.dto; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * @author YenHex + * @since 2023/6/29 + */ +@Data +public class TbsScheduleItemBudgetAmount { + + Long scheduleItemId; + + BigDecimal totalAmount; + +} diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivitySlottingFeeMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivitySlottingFeeMapper.java index 9c1bd992..6f95e7ca 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivitySlottingFeeMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsActivitySlottingFeeMapper.java @@ -2,6 +2,8 @@ package com.qs.serve.modules.tbs.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.tbs.entity.TbsActivitySlottingFee; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; /** * 活动进场费 Mapper @@ -10,5 +12,13 @@ import com.qs.serve.modules.tbs.entity.TbsActivitySlottingFee; */ public interface TbsActivitySlottingFeeMapper extends BaseMapper { + /** + * 更新状态 + * @param costApplyId + * @param passFlag + */ + @Update("update tbs_activity_slotting_fee set pass_flag = #{passFlag} where cost_apply_id = #{costApplyId}") + void updatePassFlagByCostApplyId(@Param("costApplyId")Long costApplyId,@Param("passFlag") Integer passFlag); + } diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java index d1bdbdcf..c0067589 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java @@ -2,9 +2,11 @@ package com.qs.serve.modules.tbs.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.qs.serve.modules.tbs.entity.TbsScheduleItemBudget; +import com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogPreAmount; +import com.qs.serve.modules.tbs.entity.dto.TbsScheduleItemBudgetAmount; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; - +import java.util.List; import java.math.BigDecimal; /** @@ -15,11 +17,13 @@ import java.math.BigDecimal; public interface TbsScheduleItemBudgetMapper extends BaseMapper { /** - * 统计费用申请占用的预算金额 + * 统计费用申请时，记录占用的预算金额 * @param scheduleItemBudgetId 预算考核期id * @param applyId 费用申请id(防止驳回后提交重复扣除) * @return + * 已废弃，使用totalApplyAmountList(...)替代 */ + @Deprecated @Select("SELECT sum(`tbs_budget_cost_item`.center_goods_amount) FROM `tbs_budget_cost_item` " + " LEFT JOIN `tbs_cost_apply` " + " ON `tbs_budget_cost_item`.cost_apply_id = `tbs_cost_apply`.id " + @@ -27,6 +31,16 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper totalApplyAmountList(@Param("sibIdList")List scheduleItemBudgetIds, + @Param("applyId")Long applyId); + /** * 统计政策申请已占用的预算金额 * @param scheduleItemBudgetId @@ -47,7 +61,9 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper listLogCostAmount(@Param("budgetIds") List budgetIds, + @Param("scheduleItemIds") List scheduleItemIds, + @Param("applyId") Long applyId); + /** * 统计费用申请占用的预算金额 * 通过状态(0-未提交；1-审核中；2-已通过待执行；3-拒绝；4-被驳回；5-结束) diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java index 4106b731..fd25f32a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetApplicationService.java @@ -11,6 +11,8 @@ import com.qs.serve.modules.tbs.common.util.CostSortWrapperUtil; import com.qs.serve.modules.tbs.common.util.TbsBudgetCostUtil; import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult; +import com.qs.serve.modules.tbs.entity.dto.TbsBudgetLogPreAmount; +import com.qs.serve.modules.tbs.entity.dto.TbsScheduleItemBudgetAmount; import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo; import com.qs.serve.modules.tbs.mapper.TbsActivityGoodsMapper; import com.qs.serve.modules.tbs.mapper.TbsActivityMapper; @@ -225,30 +227,57 @@ public class TbsBudgetApplicationService { this.handleNoBudgetActivity(throwEx, overspend, activityList, noBudgetActivityIds,activityAllowBudgetIdMap); } + //统计费用申请占用金额(记录录入时，考核期申请占用金额) + Map budgetItemApplyAmountMap = new HashMap<>(scheduleItemList.size()); + List scheduleItemIds = scheduleItemList.stream().map(TbsScheduleItemBudget::getScheduleItemId).collect(Collectors.toList()); + if(scheduleItemIds.size()>0){ + List scheduleItemBudgetAmounts = tbsScheduleItemBudgetMapper.totalApplyAmountList(scheduleItemIds,costApplyId); + for (TbsScheduleItemBudgetAmount budgetAmount : scheduleItemBudgetAmounts) { + Long scheduleItemBudgetId = null; + for (TbsScheduleItemBudget itemBudget : scheduleItemList) { + if(itemBudget.getScheduleItemId().equals(budgetAmount.getScheduleItemId())){ + scheduleItemBudgetId = itemBudget.getId(); + break; + } + } + if (budgetAmount.getTotalAmount()==null){ + budgetItemApplyAmountMap.put(scheduleItemBudgetId,BigDecimal.ZERO); + continue; + } + budgetItemApplyAmountMap.put(scheduleItemBudgetId,budgetAmount.getTotalAmount()); + } + } + //统计所有占用预算金额 Map budgetItemAmountMap = new HashMap<>(scheduleItemList.size()); - //统计费用申请占用金额 - Map budgetItemApplyAmountMap = new HashMap<>(scheduleItemList.size()); + List budgetIdsFromScheduleItemList = scheduleItemList.stream().map(TbsScheduleItemBudget::getBudgetId).collect(Collectors.toList()); + List scheduleItemIdsFromScheduleItemList = scheduleItemList.stream().map(TbsScheduleItemBudget::getScheduleItemId).collect(Collectors.toList()); + List budgetLogPreAmounts = tbsScheduleItemBudgetMapper.listLogCostAmount(budgetIdsFromScheduleItemList,scheduleItemIdsFromScheduleItemList,costApplyId); for (TbsScheduleItemBudget itemBudget : scheduleItemList) { - BigDecimal budgetItemApplyAmount = tbsScheduleItemBudgetMapper.totalApplyAmount(itemBudget.getId(),costApplyId); - if(budgetItemApplyAmount==null){ - budgetItemApplyAmount = BigDecimal.ZERO; + for (TbsBudgetLogPreAmount logPreAmount : budgetLogPreAmounts) { + if(itemBudget.getBudgetId().equals(logPreAmount.getBudgetId())&&itemBudget.getScheduleItemId().equals(logPreAmount.getScheduleItemId())){ + BigDecimal budgetItemAmount = logPreAmount.getAmount(); + //因为结果为负数，需去相反数 + budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate(); + budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount); + } } -// BigDecimal budgetItemApplyAmount2 = tbsScheduleItemBudgetMapper.totalPolicyAmount(itemBudget.getId(), costApplyId); -// if(budgetItemApplyAmount2!=null){ -// budgetItemApplyAmount.add(budgetItemApplyAmount2); -// } -// budgetItemApplyAmountMap.put(itemBudget.getId(),budgetItemApplyAmount2); - BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmountByApplyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),costApplyId); - //因为结果为负数，需去相反数 - budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate(); -// BigDecimal budgetItemPolicyAmount = tbsScheduleItemBudgetMapper.totalCostAmountByPolicyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),0L); -// if(budgetItemPolicyAmount!=null){ -// budgetItemAmount.add(budgetItemPolicyAmount.negate()); -// } - budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount); } +// for (TbsScheduleItemBudget itemBudget : scheduleItemList) { +// BigDecimal budgetItemApplyAmount = tbsScheduleItemBudgetMapper.totalApplyAmount(itemBudget.getScheduleItemId(),costApplyId); +// if(budgetItemApplyAmount==null){ +// budgetItemApplyAmount = BigDecimal.ZERO; +// } +// budgetItemApplyAmountMap.put(itemBudget.getId(),budgetItemApplyAmount); +// +// BigDecimal budgetItemAmount = tbsScheduleItemBudgetMapper.totalCostAmountByApplyId(itemBudget.getBudgetId(),itemBudget.getScheduleItemId(),costApplyId); +// //因为结果为负数，需去相反数 +// budgetItemAmount = budgetItemAmount==null?BigDecimal.ZERO:budgetItemAmount.negate(); +// +// budgetItemAmountMap.put(itemBudget.getId(),budgetItemAmount); +// } + //统计当前活动前置项占用预算 Map counterMap = new HashMap<>(); //匹配预算主要方法 @@ -444,7 +473,7 @@ public class TbsBudgetApplicationService { * @param actMatchList 匹配预算占用的费用(含超支预算) * @param actUnMatchList 没有匹配预算的费用 * @param activityAllowBudgetIdMap 满足当前活动项的费用idMap - * @param budgetItemApplyAmountMap 统计费用申请占用金额 + * @param budgetItemApplyAmountMap 统计费用申请占用金额(录入时，考核期申请占用金额) */ private void matchActivityMain(TbsActivityCenterGoods activityCostItem, Boolean throwEx, @@ -531,7 +560,7 @@ public class TbsBudgetApplicationService { lastAmount = BigDecimal.ZERO; } //判断是否够用 - if(budgetAmount.subtract(lastAmount).subtract(totalUsed).compareTo(goodsAmount)>-1){ + if(budgetAmount.subtract(lastAmount).subtract(totalUsed).compareTo(goodsAmount)>=0){ activityCostItem.setBudgetId(itemBudget.getBudgetId()); activityCostItem.setScheduleId(itemBudget.getScheduleId()); activityCostItem.setScheduleItemId(itemBudget.getScheduleItemId()); 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 f4a84996..997679bf 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 @@ -20,6 +20,7 @@ import com.qs.serve.modules.tbs.entity.TbsCostApply; import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; import com.qs.serve.modules.tbs.mapper.TbsActivityMapper; +import com.qs.serve.modules.tbs.mapper.TbsActivitySlottingFeeMapper; import com.qs.serve.modules.tbs.service.TbsBudgetLogService; import com.qs.serve.modules.tbs.service.TbsCostApplyService; import lombok.AllArgsConstructor; @@ -46,6 +47,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService private final TbsCostApplyService costApplyService; private final TbsActivityMapper tbsActivityMapper; private final SysUserMapper userMapper; + private final TbsActivitySlottingFeeMapper activitySlottingFeeMapper; @Override public SysUserService getSysUserService() { @@ -117,6 +119,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService LambdaQueryWrapper actLqw = new LambdaQueryWrapper<>(); actLqw.eq(TbsActivity::getCostApplyId,targetId); tbsActivityMapper.update(tbsActivity,actLqw); + activitySlottingFeeMapper.updatePassFlagByCostApplyId(targetId,1); return null; } @@ -157,6 +160,7 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService TbsActivity activityParam = new TbsActivity(); activityParam.setActivityState(TbsActivityState.STATE_5_Close); tbsActivityMapper.update(activityParam,activityLqw); + activitySlottingFeeMapper.updatePassFlagByCostApplyId(costApplyId,0); return null; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 400caab7..0a82ec75 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -31,6 +31,7 @@ import com.qs.serve.modules.tbs.entity.dto.TbsBudgetCostResult; import com.qs.serve.modules.tbs.entity.dto.TbsCostSubItem; import com.qs.serve.modules.tbs.mapper.TbsActivityMapper; import com.qs.serve.modules.tbs.mapper.TbsActivityPayConditionMapper; +import com.qs.serve.modules.tbs.mapper.TbsActivitySlottingFeeMapper; import com.qs.serve.modules.tbs.service.*; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -68,6 +69,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl save(@RequestBody @Valid WxFormPushThirdBo param, HttpServletRequest request){ - ThirdTokenUtil.checkToken(request); + //ThirdTokenUtil.checkToken(request); WxFormPush entity = CopierUtil.copy(param,new WxFormPush()); entity.setStatus("1"); wxFormPushService.save(entity); @@ -65,6 +65,10 @@ public class PortalFormPushController { LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); lqw.eq(WxFormPushType::getCode,param.getTypeCode()); pushType = wxFormPushTypeService.getOne(lqw,false); + if(pushType==null){ + entity.setTypeId(pushType.getId()); + entity.setTypeName(pushType.getTitle()); + } } List userCodes = param.getUserCodes().stream().distinct().collect(Collectors.toList()); LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); diff --git a/src/main/resources/mapper/bir/BirBaseActivityMapper.xml b/src/main/resources/mapper/bir/BirBaseActivityMapper.xml new file mode 100644 index 00000000..f0e37e1f --- /dev/null +++ b/src/main/resources/mapper/bir/BirBaseActivityMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tbs_activity.`id`, + tbs_activity.`activity_code`, + tbs_activity.`activity_state`, + tbs_activity.`cost_apply_id`, + tbs_activity.`cost_pass_time`, + tbs_activity.`cost_pass_flag`, + tbs_activity.`act_title`, + tbs_activity.`supplier_id`, + tbs_activity.`supplier_code`, + tbs_activity.`supplier_name`, + tbs_activity.`act_start_date`, + tbs_activity.`act_end_date`, + tbs_activity.`pre_start_date`, + tbs_activity.`pre_end_date`, + tbs_activity.`pre_check_date`, + tbs_activity.`pre_act_flag`, + tbs_activity.`pre_act_quantity`, + tbs_activity.`pre_not_act_quantity`, + tbs_activity.`pre_roi_rate`, + tbs_activity.`remark`, + tbs_activity.`total_amount`, + tbs_activity.`used_amount`, + tbs_activity.`reopen_flag`, + tbs_activity.`finished_flag`, + tbs_activity.`finished_time`, + tbs_activity.`release_flag`, + tbs_activity.`release_amount`, + tbs_activity.`release_time`, + tbs_activity.`release_user_id`, + tbs_activity.`release_user_name`, + tbs_activity.`create_time`, + tbs_activity.`update_time` + + + + + diff --git a/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml b/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml new file mode 100644 index 00000000..5f9fe639 --- /dev/null +++ b/src/main/resources/mapper/tbs/TbsScheduleItemBudgetMapper.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + tbs_schedule_item_budget.`id`, + tbs_schedule_item_budget.`schedule_id`, + tbs_schedule_item_budget.`schedule_item_id`, + tbs_schedule_item_budget.`item_name`, + tbs_schedule_item_budget.`start_date`, + tbs_schedule_item_budget.`end_date`, + tbs_schedule_item_budget.`budget_id`, + tbs_schedule_item_budget.`budget_amount`, + tbs_schedule_item_budget.`remark`, + tbs_schedule_item_budget.`create_time`, + tbs_schedule_item_budget.`update_time`, + tbs_schedule_item_budget.`tenant_id`, + tbs_schedule_item_budget.`create_by`, + tbs_schedule_item_budget.`update_by`, + tbs_schedule_item_budget.`del_flag` + + + + + + + + + + + + + + + +