diff --git a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java index 0d0bfc8e..6f59db8d 100644 --- a/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java +++ b/src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java @@ -172,5 +172,10 @@ public class GoodsSku implements Serializable { @TableField(exist = false) private String seriesName; + /** + * spuCode + */ + @TableField(exist = false) + private String spuCode; } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java index 3d0441b2..a729087a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsBudgetController.java @@ -196,6 +196,18 @@ public class TbsBudgetController { return R.ok(); } + /** + * 批量更新跨年 + * @param param + * @return + */ + @PostMapping("/updateCrossYearBatch") + public R updateCrossYearBatch(@RequestBody TbsBudgetStateBo param){ + tbsBudgetService.updateCrossYearFlag(param.getCrossYearFlag()); + return R.ok(); + } + + /** * 更新跨年状态 * @param param diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java index 07f49ff0..33f86cf0 100644 --- a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java @@ -31,6 +31,7 @@ import com.qs.serve.modules.tbs.entity.*; import com.qs.serve.modules.tbs.entity.bo.*; import com.qs.serve.modules.tbs.entity.dto.*; import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; +import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableResultVo; import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo; import com.qs.serve.modules.tbs.entity.vo.TbsCostApplyVo; import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper; @@ -492,11 +493,13 @@ public class TbsCostApplyController { List budgetIds = costApplyBudgetLogs.stream().map(TbsBudgetLog::getBudgetId).distinct().collect(Collectors.toList()); List resultInfoList = new ArrayList<>(); for (Long budgetId : budgetIds) { + if(budgetId==0L){continue;} TbsBudget budget = tbsBudgetService.getById(budgetId); LambdaQueryWrapper scheduleLqw = new LambdaQueryWrapper<>(); scheduleLqw.eq(TbsScheduleItemBudget::getBudgetId,budgetId); List scheduleItemBudgetList = tbsScheduleItemBudgetService.list(scheduleLqw); List scheduleItemBudgetIds = scheduleItemBudgetList.stream().map(TbsScheduleItemBudget::getId).collect(Collectors.toList()); + scheduleItemBudgetIds.add(0L); List amountList = tbsScheduleItemBudgetService.listScheduleAmountByIds(scheduleItemBudgetIds); List relateInfoList = amountList.stream().map(obj->{ TbsCostBudgetRelateInfo info = CopierUtil.copy(obj,new TbsCostBudgetRelateInfo()); @@ -727,20 +730,8 @@ public class TbsCostApplyController { delBudgetLogLqw.notIn(TbsBudgetLog::getId,updateLogIdsList); tbsBudgetLogMapper.delete(delBudgetLogLqw); } - - } - /** - * 对比并建立异动信息 - * @return - */ - @PostMapping("compareToBuildChangeInfo") - public R compareToBuildChangeInfo(){ - - return R.ok(); - } - } diff --git a/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyTestController.java b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyTestController.java new file mode 100644 index 00000000..2e743c14 --- /dev/null +++ b/src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyTestController.java @@ -0,0 +1,218 @@ +package com.qs.serve.modules.tbs.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.qs.serve.common.model.annotation.LimitSubmit; +import com.qs.serve.common.model.annotation.SysLog; +import com.qs.serve.common.model.dto.PageVo; +import com.qs.serve.common.model.dto.R; +import com.qs.serve.common.model.enums.BizType; +import com.qs.serve.common.model.enums.BudgetLogOptFlag; +import com.qs.serve.common.model.enums.SystemModule; +import com.qs.serve.common.util.*; +import com.qs.serve.modules.bms.entity.BmsRegion2; +import com.qs.serve.modules.bms.entity.BmsSupplier; +import com.qs.serve.modules.bms.service.BmsRegion2Service; +import com.qs.serve.modules.bms.service.BmsSupplierService; +import com.qs.serve.modules.sys.entity.SysUser; +import com.qs.serve.modules.sys.service.SysDeleteLogService; +import com.qs.serve.modules.sys.service.SysPostUserService; +import com.qs.serve.modules.sys.service.SysUserService; +import com.qs.serve.modules.tbs.common.TbsCostApplyState; +import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil; +import com.qs.serve.modules.tbs.entity.*; +import com.qs.serve.modules.tbs.entity.bo.TbsActivityBo; +import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyActivityBo; +import com.qs.serve.modules.tbs.entity.bo.TbsCostApplyBo; +import com.qs.serve.modules.tbs.entity.dto.TbsActNotMatchAmtCenterGoods; +import com.qs.serve.modules.tbs.entity.dto.TbsBudgetScheduleWithAmount; +import com.qs.serve.modules.tbs.entity.dto.TbsCostBudgetRelateInfo; +import com.qs.serve.modules.tbs.entity.dto.TbsCostErrorBudgetDTO; +import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableResultVo; +import com.qs.serve.modules.tbs.entity.vo.TbsBudgetTableVo; +import com.qs.serve.modules.tbs.entity.vo.TbsCostApplyVo; +import com.qs.serve.modules.tbs.mapper.TbsBudgetLogMapper; +import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper; +import com.qs.serve.modules.tbs.service.*; +import com.qs.serve.modules.tbs.service.impl.TbsCostApplyOperationServiceImpl; +import lombok.AllArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +/** + * 预算 费用申请 + * @author YenHex + * @since 2022-11-08 + */ +@Slf4j +@AllArgsConstructor +@RestController +@RequestMapping("tbs/costTest") +public class TbsCostApplyTestController { + + private TbsCostApplyPart1Service costApplyPart1Service; + private TbsCostContractService costContractService; + private TbsCostApplyService tbsCostApplyService; + private TbsActivityService tbsActivityService; + private TbsActivityTemplateService tbsActivityTemplateService; + private TbsActivityCenterGoodsService tbsActivityCenterGoodsService; + private BmsSupplierService bmsSupplierService; + private final TbsBudgetLogMapper tbsBudgetLogMapper; + private BmsRegion2Service region2Service; + private SysUserService sysUserService; + private TbsBudgetApplicationService budgetApplicationService; + private TbsBudgetService tbsBudgetService; + private SysPostUserService postUserService; + private TbsCostApplyOperationServiceImpl tbsCostApplyOperationServiceImpl; + private TbsBudgetMatchApplication tbsBudgetMatchApplication; + private TbsBudgetCostItemService tbsBudgetCostItemService; + private TbsBudgetLogService tbsBudgetLogService; + private TbsScheduleItemBudgetService tbsScheduleItemBudgetService; + private SysDeleteLogService deleteLogService; + private TbsCostApplyMapper tbsCostApplyMapper; + private TbsCostChangeInfoService tbsCostChangeInfoService; + private TbsBudgetCostItemService budgetCostItemService; + private TbsBudgetLogService budgetLogService; + + + /** + * 重写适配预算 + * @param costApplyId + * @return + */ + public R rebuildCost(Long costApplyId){ + + TbsCostApply costApply = tbsCostApplyService.getById(costApplyId); + + TbsBudgetTableResultVo resultVo = tbsBudgetMatchApplication.getMatchResult(costApplyId ,false); + + List activityList = tbsActivityService.listByCostApplyId(costApplyId); + + SysUser sysUser = sysUserService.getById(costApply.getUserId()); + + // 未命中预算 + List costUnItems = new ArrayList<>(); + // 所有记录情况 + List allBudgetItem = new ArrayList<>(); + // 命中的预算 + List budgetLogList = new ArrayList<>(); + + Map matchItemBudgetsMap = resultVo.getMatchItemBudgetsMap(); + for (TbsActivityCenterGoods centerGoods : resultVo.getActivityCenterGoodsList()) { + TbsBudgetCostItem costItem = new TbsBudgetCostItem(); + costItem.setCenterGoodsCode(centerGoods.getCenterGoodsCode()); + costItem.setCostApplyId(centerGoods.getCostApplyId()); + costItem.setActivityId(centerGoods.getActivityId()); + costItem.setActivityCode(centerGoods.getActivityCode()); + costItem.setSupplierId(centerGoods.getSupplierId()); + costItem.setSupplierCode(centerGoods.getSupplierCode()); + costItem.setSupplierName(centerGoods.getSupplierName()); + costItem.setSubjectId(centerGoods.getSubjectId()); + costItem.setSubjectCode(centerGoods.getSubjectCode()); + costItem.setSubjectName(centerGoods.getSubjectName()); + costItem.setCenterType(centerGoods.getCenterType()); + costItem.setCenterId(centerGoods.getCenterId()); + costItem.setCenterCode(centerGoods.getCenterCode()); + costItem.setCenterName(centerGoods.getCenterName()); + costItem.setCenterAmount(centerGoods.getCenterAmount()); + costItem.setCenterRate(centerGoods.getCenterRate()); + costItem.setCenterGoodsAmount(centerGoods.getCenterGoodsAmount()); + costItem.setCenterGoodsRate(centerGoods.getCenterGoodsRate()); + costItem.setTargetType(centerGoods.getTargetType()); + costItem.setTargetId(centerGoods.getTargetId()); + costItem.setTargetCode(centerGoods.getTargetCode()); + costItem.setTargetName(centerGoods.getTargetName()); + costItem.setTargetLevelPathIds(centerGoods.getTargetLevelPathIds()); + costItem.setTargetLevelPathNames(centerGoods.getTargetLevelPathNames()); + costItem.setActStartDate(centerGoods.getActStartDate()); + costItem.setActEndDate(centerGoods.getActEndDate()); + costItem.setPreStartDate(centerGoods.getPreStartDate()); + costItem.setPreEndDate(centerGoods.getPreEndDate()); + costItem.setPreCheckDate(centerGoods.getPreCheckDate()); + costItem.setCenterGoodItemId(centerGoods.getId()); + + if(centerGoods.getScheduleItemBudgetId()==null){ + TbsCostUnItem costUnItem = new TbsCostUnItem(); + costUnItem.setCostApplyId(centerGoods.getCostApplyId()); + costUnItem.setActivityId(centerGoods.getActivityId()); + costUnItem.setActivityCode(centerGoods.getActivityCode()); + costUnItem.setSubjectId(centerGoods.getSubjectId()); + costUnItem.setSubjectCode(centerGoods.getSubjectCode()); + costUnItem.setSubjectName(centerGoods.getSubjectName()); + costUnItem.setCenterType(centerGoods.getCenterType()); + costUnItem.setCenterId(centerGoods.getCenterId()); + costUnItem.setCenterCode(centerGoods.getCenterCode()); + costUnItem.setCenterName(centerGoods.getCenterName()); + costUnItem.setAmount(centerGoods.getCenterGoodsAmount()); + costUnItem.setTargetType(centerGoods.getTargetType()); + costUnItem.setTargetId(centerGoods.getTargetId()); + costUnItem.setTargetCode(centerGoods.getTargetCode()); + costUnItem.setTargetName(centerGoods.getTargetName()); + costUnItem.setTargetLevelPathIds(centerGoods.getTargetLevelPathIds()); + costUnItem.setTargetLevelPathNames(centerGoods.getTargetLevelPathNames()); + costUnItem.setActStartDate(centerGoods.getActStartDate()); + costUnItem.setActEndDate(centerGoods.getActEndDate()); + costUnItem.setPreStartDate(centerGoods.getPreStartDate()); + costUnItem.setPreEndDate(centerGoods.getPreEndDate()); + costUnItem.setPreCheckDate(centerGoods.getPreCheckDate()); + costUnItem.setSupplierId(centerGoods.getSupplierId()); + costUnItem.setSupplierCode(centerGoods.getSupplierCode()); + costUnItem.setSupplierName(centerGoods.getSupplierName()); + costUnItems.add(costUnItem); + + costItem.setBudgetId(0L); + costItem.setScheduleId(0L); + costItem.setScheduleItemId(0L); + costItem.setScheduleItemAmount(BigDecimal.ZERO); + costItem.setScheduleItemAmountUsed(BigDecimal.ZERO); + costItem.setScheduleItemAmountApply(BigDecimal.ZERO); + costItem.setScheduleItemBudgetId(0L); + + }else { + TbsScheduleItemBudget itemBudget = matchItemBudgetsMap.get(centerGoods.getScheduleItemBudgetId()); + TbsActivity currActivity = null; + for (TbsActivity activity : activityList) { + if(centerGoods.getActivityId().equals(activity.getId())){ + currActivity = activity; + } + } + TbsBudgetLog budgetLog = TbsBudgetLogBuildUtil.buildTbsBudgetLog(BudgetLogOptFlag.State_1,sysUser, costApply, itemBudget, centerGoods,centerGoods.getCenterGoodsAmount(),currActivity); + budgetLogList.add(budgetLog); + + costItem.setBudgetId(itemBudget.getBudgetId()); + costItem.setScheduleId(itemBudget.getScheduleId()); + costItem.setScheduleItemId(itemBudget.getScheduleItemId()); + costItem.setScheduleItemName(itemBudget.getItemName()); + costItem.setScheduleItemAmount(itemBudget.getFinalBudgetAmount()); + costItem.setScheduleItemAmountUsed(itemBudget.getUsedBudgetAmount()); + costItem.setScheduleItemAmountApply(itemBudget.getUnUsedBudgetAmount()); + costItem.setScheduleItemBudgetId(itemBudget.getId()); + } + allBudgetItem.add(costItem); + + } + + //保存 + if(costUnItems.size() > 0){ + return R.error(); + } + budgetCostItemService.saveBatch(allBudgetItem); + + if(CollectionUtil.isNotEmpty(budgetLogList)){ + budgetLogService.saveBatch(budgetLogList); + } + return R.ok(); + } + +} + diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetStateBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetStateBo.java index 24507c0a..c6093002 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetStateBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsBudgetStateBo.java @@ -12,7 +12,6 @@ import javax.validation.constraints.NotNull; public class TbsBudgetStateBo { /** id */ - @NotNull private Long id; // diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java index e8555a26..5eeffa35 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/TbsBudgetVo.java @@ -46,6 +46,12 @@ public class TbsBudgetVo implements Serializable { /** 审批流程状态 */ private Integer budgetCheckState; + /** 停用状态 0/1 */ + private Integer stopFlag; + + /** 是否允许跨年，控制停用状态 */ + private Integer crossYearFlag; + /** 科目id */ @NotNull(message = "科目id不能为空") private Long subjectId; diff --git a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java index f04fca10..1b12d3ea 100644 --- a/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java +++ b/src/main/java/com/qs/serve/modules/tbs/mapper/TbsBudgetMapper.java @@ -33,6 +33,32 @@ public interface TbsBudgetMapper extends BaseMapper { int updateBudgetComboCenter(@Param("budgetId")Long budgetId); + @InterceptorIgnore(tenantLine = "true") + @Select("select tbs_budget.id from tbs_budget " + + "LEFT JOIN tbs_budget_condition " + + " on tbs_budget_condition.budget_id = tbs_budget.id " + + "where tbs_budget.del_flag = 0 " + + " and tbs_budget_condition.del_flag = 0 " + + " and tbs_budget.condition_flag = 1 " + + " and tbs_budget_condition.id is null " + + "GROUP BY tbs_budget.id") + List selectConditionBudgetIds(); + + + /** + * 查询未过期的预算ID + * @return + */ + @InterceptorIgnore(tenantLine = "true") + @Select("select tbs_budget.id " + + " from tbs_schedule_item " + + " left join tbs_budget on tbs_schedule_item.schedule_id = tbs_budget.schedule_id " + + " where YEAR(CURRENT_DATE) - YEAR(end_date) >=1 " + + " and tbs_schedule_item.del_flag = 0 " + + " and tbs_budget.del_flag = 0 " + + " GROUP BY tbs_budget.id") + List selectEnableBudgetId(); + /** * 查询未过期的预算ID * @return diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java index 0ae4fa76..4cc37db0 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetMatchApplication.java @@ -41,8 +41,6 @@ public class TbsBudgetMatchApplication { public TbsBudgetTableResultVo getMatchResult(Long costApplyId,boolean buildTable){ - TbsCostApply costApply = tbsCostApplyMapper.selectById(costApplyId); - List activityList = activityService.listByCostApplyId(costApplyId); //list转map，减少循环代码 @@ -82,6 +80,7 @@ public class TbsBudgetMatchApplication { this.batchInitScheduleAmount(activityCenterGoodsList, scheduleItemBudgetIds,costApplyId); + TbsCostApply costApply = tbsCostApplyMapper.selectById(costApplyId); //加载所有预算 diff --git a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java index 95e75c25..42f377a1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/TbsBudgetService.java @@ -54,6 +54,8 @@ public interface TbsBudgetService extends IService { void updateBudgetAfterStart(TbsBudgetUpdateAfterStartBo param); + void updateCrossYearFlag(Integer crossYearFlag); + void syncStopFlag(); } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java index c561c90d..c610402c 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsBudgetServiceImpl.java @@ -237,6 +237,14 @@ public class TbsBudgetServiceImpl extends ServiceImpl //冗余字段初始化 baseMapper.updateBudgetCondition(budget.getId()); baseMapper.updateBudgetComboCenter(budget.getId()); + //实时更新预算条件 + List conditionIds = baseMapper.selectConditionBudgetIds(); + if(CollectionUtil.isNotEmpty(conditionIds)){ + TbsBudget budget1 = new TbsBudget(); + budget1.setConditionFlag(1); + baseMapper.update(budget1,new LambdaQueryWrapper() + .in(TbsBudget::getId,conditionIds)); + } } /** @@ -1110,6 +1118,23 @@ public class TbsBudgetServiceImpl extends ServiceImpl } + @Override + public void updateCrossYearFlag(Integer crossYearFlag) { + + if(crossYearFlag==null||crossYearFlag!=1){ + crossYearFlag = 0; + } + + + TbsBudget crossBudget = new TbsBudget(); + crossBudget.setCrossYearFlag(crossYearFlag); + + this.update(crossBudget,new LambdaQueryWrapper()); + + this.syncStopFlag(); + + } + @Override public void syncStopFlag() { 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 9fc44a46..4c660fdb 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 @@ -908,7 +908,6 @@ public class PortalOfCostApplication { } verificationService.removeById(verification.getId()); verificationSubjectService.removeById(verificationSubject.getId()); - Assert.throwEx("连接支付接口异常"); } log.info("COST_TO_PAY_API 支付单信息：{},结果：{}", verification.getVerificationCode(), rs); } diff --git a/src/main/java/com/qs/serve/task/GoodsTask.java b/src/main/java/com/qs/serve/task/GoodsTask.java index 63054584..47cc0b70 100644 --- a/src/main/java/com/qs/serve/task/GoodsTask.java +++ b/src/main/java/com/qs/serve/task/GoodsTask.java @@ -29,7 +29,7 @@ public class GoodsTask { /** * 每两个小时同步一次 */ - @Scheduled(cron="0 0 0/2 * * ?") + @Scheduled(cron="0 0/2 0 * * ?") public void syncStandGoods(){ goodsApplicationService.syncStandGoods(false); } diff --git a/src/main/resources/mapper/baz/BazVisitInstanceMapper.xml b/src/main/resources/mapper/baz/BazVisitInstanceMapper.xml index 8bd131db..885444b5 100644 --- a/src/main/resources/mapper/baz/BazVisitInstanceMapper.xml +++ b/src/main/resources/mapper/baz/BazVisitInstanceMapper.xml @@ -78,6 +78,7 @@ select baz_visit_instance_flow.submit_time,baz_visit_instance_flow.visit_instance_id from baz_visit_instance_flow where flow_biz_type = '2' ) ins_flow3 on ins_flow3.visit_instance_id = baz_visit_instance.id + and baz_visit_instance.del_flag = 0 and `baz_visit_instance`.`id` = #{query.id} and `baz_visit_instance`.`title` = #{query.title} and `baz_visit_instance`.`visit_id` = #{query.visitId} diff --git a/src/main/resources/mapper/goods/GoodsSkuMapper.xml b/src/main/resources/mapper/goods/GoodsSkuMapper.xml index 4f16ed35..a8a333e3 100644 --- a/src/main/resources/mapper/goods/GoodsSkuMapper.xml +++ b/src/main/resources/mapper/goods/GoodsSkuMapper.xml @@ -121,6 +121,7 @@ and `goods_spu`.`del_flag` = 0 and `goods_sku`.`id` = #{query.id} and `goods_sku`.`sku_code` like concat('%',#{query.skuCode},'%') + and `goods_spu`.`spu_code` like concat('%',#{query.spuCode},'%') and `goods_sku`.`sku_name` like concat('%',#{query.skuName},'%') and `goods_sku`.`spu_id` = #{query.spuId} and `goods_sku`.`sales_price` = #{query.salesPrice} diff --git a/src/main/resources/mapper/tbs/TbsBudgetMapper.xml b/src/main/resources/mapper/tbs/TbsBudgetMapper.xml index cde26ca5..aa5f9f35 100644 --- a/src/main/resources/mapper/tbs/TbsBudgetMapper.xml +++ b/src/main/resources/mapper/tbs/TbsBudgetMapper.xml @@ -81,6 +81,7 @@ and `tbs_budget`.`budget_number` like concat('%',#{query.budgetNumber},'%') and `tbs_budget`.`budget_state` = #{query.budgetState} + and `tbs_budget`.`cross_year_flag` = #{query.crossYearFlag} and `tbs_budget`.`budget_check_state` = #{query.budgetCheckState} and `tbs_budget`.`budget_code` like concat('%',#{query.budgetCode},'%') diff --git a/src/main/resources/mapper/tzc/TzcPolicyMapper.xml b/src/main/resources/mapper/tzc/TzcPolicyMapper.xml index c799a641..21c653d2 100644 --- a/src/main/resources/mapper/tzc/TzcPolicyMapper.xml +++ b/src/main/resources/mapper/tzc/TzcPolicyMapper.xml @@ -69,6 +69,7 @@ FROM `tzc_policy` `tzc_policy` left join bms_supplier on tzc_policy.supplier_id = bms_supplier.id + and tzc_policy.del_flag = 0 and `tzc_policy`.`id` = #{query.id} and `tzc_policy`.`title` like concat('%',#{query.title},'%') and `tzc_policy`.`policy_code` like concat('%',#{query.policyCode},'%')