feat: 综合查询模块增加无需填写联合成本中心才能进行查询;

opt:过滤SKU同步带产的地区

src/main/java/com/qs/serve/modules/bir/mapper/BirTbsVtbPayJoinMapper.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.bir.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.bir.entity.BirBaseActivity;
 import com.qs.serve.modules.bir.entity.dto.BirTbsVtbPayJoinDTO;
@@ -17,6 +18,14 @@ import java.util.List;
  */
 public interface BirTbsVtbPayJoinMapper extends BaseMapper<BirTbsVtbPayJoinDTO> {
 
+    /**
+     * 更新维护综合查询的成本中心
+     * @param maxCostId
+     * @return
+     */
+    @InterceptorIgnore(tenantLine = "1")
+    int updateActivityAllCenters(@Param("maxCostId") Long maxCostId);
+
     List<BirTbsVtbPayJoinDTO> selectBirTbsVtbPayJoinDTO(@Param("query") BirTbsVtbPayJoinSo so);
 
     List<BirTbsVtbPayJoinDTO> selectSumVtbAmount(@Param("actIds") List<Long> actIds);

src/main/java/com/qs/serve/modules/goods/controller/GoodsSkuController.java

@@ -243,7 +243,13 @@ public class GoodsSkuController {
         param.setId(null);
         param.setSpuId(null);
         GoodsSku sku = goodsSkuService.getByCode(param.getSkuCode());
+        if(sku==null){
+            return R.errorNotFound();
+        }
         param.setId(sku.getId());
+        if(param.getBelong().contains("产")){
+            param.setBelong(param.getBelong().replace("产",""));
+        }
         goodsSkuService.updateById(param);
         return R.ok();
     }

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java

@@ -241,6 +241,10 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
 
     @Override
     public void editSku2(GoodsSkuBo goodSkuVo) {
+        // 过滤产字
+        if(goodSkuVo.getBelong().contains("产")){
+            goodSkuVo.setBelong(goodSkuVo.getBelong().replace("产",""));
+        }
         GoodsSku dbGoodSku = null;
         if(goodSkuVo.getSkuId()!=null){
             dbGoodSku = this.getById(goodSkuVo.getSkuId());

src/main/java/com/qs/serve/task/BirTask.java

@@ -7,6 +7,7 @@ import com.qs.serve.common.model.AmountDTO;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.HttpUtil;
 import com.qs.serve.modules.bir.controller.BirActivityCenterGoodsController;
+import com.qs.serve.modules.bir.mapper.BirTbsVtbPayJoinMapper;
 import com.qs.serve.modules.pay.mapper.PayPaymentItemMapper;
 import com.qs.serve.modules.pay.mapper.PayPaymentMapper;
 import com.qs.serve.modules.tbs.entity.TbsCostApply;

src/main/java/com/qs/serve/task/TbsTask.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.CollectionUtil;
+import com.qs.serve.modules.bir.mapper.BirTbsVtbPayJoinMapper;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
@@ -32,6 +33,7 @@ import java.util.stream.Collectors;
 @ConditionalOnProperty(value = "project.task", havingValue = "true")
 public class TbsTask {
 
+    private final BirTbsVtbPayJoinMapper birTbsVtbPayJoinMapper;
     private final TbsActivityService activityService;
     private final TbsCostApplyService tbsCostApplyService;
     private final TbsActivityTemplateService activityTemplateService;
@@ -95,6 +97,9 @@ public class TbsTask {
     public void updateCheckState(){
         AuthContextUtils.setTenant("001");
         tbsCostApplyService.updateCheckState();
+        //间隔几个月换一次即可
+        Long maxCostId = 313000L;
+        birTbsVtbPayJoinMapper.updateActivityAllCenters(maxCostId);
     }
 
 

src/main/resources/mapper/bir/BirTbsVtbPayJoinMapper.xml

@@ -4,6 +4,18 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qs.serve.modules.bir.mapper.BirTbsVtbPayJoinMapper">
 
+    <update id="updateActivityAllCenters">
+        update tbs_activity
+            left join (
+            select activity_id,
+            GROUP_CONCAT(DISTINCT  center_name SEPARATOR ', ') AS center_name
+            from tbs_activity_center where del_flag = 0 and cost_apply_id &gt; #{maxCostId}
+            GROUP BY activity_id
+            ) tmp on tmp.activity_id = tbs_activity.id
+            set all_center_names = tmp.center_name
+        where cost_apply_id &gt; #{maxCostId}
+    </update>
+
     <select id="selectSumVtbAmount" resultType="com.qs.serve.modules.bir.entity.dto.BirTbsVtbPayJoinDTO">
         select
             activity_id,
@@ -62,17 +74,12 @@
 
                 act.activity_code as activity_code,
                 act.act_title as activity_title,
-
-                <if test="query.centerName != null and query.centerName != ''">
-                    ac.center_name,
-                </if>
-
+                act.all_center_names as center_name,
                 act.act_start_date as act_start_date,
                 act.act_end_date as act_end_date,
                 act.total_amount as activity_amount,
                 act.release_amount as release_amount
 
-
                 <if test="query.showType == 0 or query.showType == 2">
                     ,v.id as vtb_id,
                     v.verification_code as vtb_code,
@@ -96,15 +103,6 @@
             LEFT JOIN vtb_verification v ON v.activity_id = act.id
             LEFT JOIN pay_payment_item p ON p.verification_id = v.id
 
-            <if test="query.centerName != null and query.centerName != ''">
-                left join
-                (select   activity_id,  GROUP_CONCAT(DISTINCT  center_name SEPARATOR ', ') AS center_name
-                from tbs_activity_center where
-                center_name LIKE CONCAT('%', #{query.centerName}, '%') and tbs_activity_center.del_flag = 0
-                GROUP BY activity_id
-                ) as ac  on act.id = ac.activity_id
-            </if>
-
             WHERE
             1=1
             and a.del_flag = 0
@@ -113,8 +111,9 @@
             and (act.del_flag = 0 or act.id is null )
             and (v.del_flag = 0 or v.id is null )
             and (p.del_flag = 0 or p.id is null )
+
             <if test="query.centerName != null and query.centerName != ''">
-                AND ac.center_name is not null
+                AND act.all_center_names LIKE CONCAT('%', #{query.centerName}, '%')
             </if>
             <if test="query.contractFlag != null and query.contractFlag != ''">
                 AND a.contract_flag = #{query.contractFlag}