调整

src/main/java/com/qs/serve/modules/bir/service/impl/BirBaseActivityServiceImpl.java

@@ -7,7 +7,9 @@ import com.qs.serve.common.util.Assert;
 import com.qs.serve.common.util.DateSplitUtil;
 import com.qs.serve.modules.sys.mapper.SysUserMapper;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
+import com.qs.serve.modules.tbs.entity.TbsCostApply;
 import com.qs.serve.modules.tbs.mapper.TbsActivityMapper;
+import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -35,6 +37,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
 
 
     private final TbsActivityMapper activityMapper;
+    private final TbsCostApplyMapper costApplyMapper;
     private final SysUserMapper userMapper;
 
     @Override
@@ -105,6 +108,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
             }else {
                 Assert.throwEx("dateSplitList is empty");
             }
+            TbsCostApply costApply = costApplyMapper.selectById(activity.getCostApplyId());
             baseActivity.setKeyNum(yearMonth);
             baseActivity.setActivityId(activity.getId());
             baseActivity.setActivityAmt(currentAmount);
@@ -113,7 +117,7 @@ public class BirBaseActivityServiceImpl extends ServiceImpl<BirBaseActivityMappe
             baseActivity.setSupplierId(activity.getSupplierId());
             baseActivity.setSupplierCode(activity.getSupplierCode());
             baseActivity.setSupplierName(activity.getSupplierName());
-            baseActivity.setUserId(activity.getCreateBy());
+            baseActivity.setUserId(costApply.getUserId());
             baseActivity.setMonthDays(currItemDays);
             baseActivity.setTotalDays(currentActDays);
             birBaseActivities.add(baseActivity);

src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@@ -133,7 +133,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             if(dispatchSumVos!=null){
                 for (ErpDispatchSumVo dispatchSumVo : dispatchSumVos) {
                     if(dispatchSumVo.getYearMonth().equals(costItemVo.getYearMonth())){
-                        costItemVo.setDispatchAmt(dispatchSumVo.getSumDispatchCost());
+                        costItemVo.setDispatchAmt(dispatchSumVo.getDispatchSumCost());
                         break;
                     }
                 }

src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@@ -11,6 +11,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.qs.serve.common.framework.mybatis.handler.meta.SplitStringTypeHandler;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.his.entity.HisUserSupplier;
 import com.qs.serve.modules.his.entity.HisUserSupplierTemp;
 import com.qs.serve.modules.sys.entity.dto.SysUserVo;
@@ -329,5 +330,41 @@ public class BmsSupplier implements Serializable {
         return userSupplier;
     }
 
+    public String handleSaleRegionId(){
+        if(isValid(this.getRegionLast())){
+            return this.getRegionLast();
+        }else if(isValid(this.getRegionFourthly())){
+            return this.getRegionFourthly();
+        }else if(isValid(this.getRegionThird())){
+            return this.getRegionThird();
+        }else if(isValid(this.getRegionSecond())){
+            return this.getRegionSecond();
+        }else if(isValid(this.getRegionFirst())){
+            return this.getRegionFirst();
+        }else {
+            return null;
+        }
+    }
+
+    public String handleBizRegionId(){
+        if(isValid(this.getRegion2Last())){
+            return this.getRegion2Last();
+        }else if(isValid(this.getRegion2Fourthly())){
+            return this.getRegion2Fourthly();
+        }else if(isValid(this.getRegion2Third())){
+            return this.getRegion2Third();
+        }else if(isValid(this.getRegion2Second())){
+            return this.getRegion2Second();
+        }else if(isValid(this.getRegion2First())){
+            return this.getRegion2First();
+        }else {
+            return null;
+        }
+    }
+
+    private boolean isValid(String region){
+        return StringUtils.hasText(region)&&!"0".equals(region);
+    }
+
 }
 

src/main/java/com/qs/serve/modules/erp/entity/dto/ErpDispatchSumVo.java

@@ -13,6 +13,6 @@ public class ErpDispatchSumVo {
 
     Integer yearMonth;
 
-    BigDecimal sumDispatchCost;
+    BigDecimal dispatchSumCost;
 
 }

src/main/java/com/qs/serve/modules/tbs/controller/TbsCostApplyController.java

@@ -137,7 +137,7 @@ public class TbsCostApplyController {
     }
 
     /**
-     * 翻页(个人及下属的费用申请)
+     * 翻页(个人及所属的费用申请)
      * @param param
      * @return
      */

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java

@@ -8,7 +8,11 @@ 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.common.util.model.DateFormatString;
+import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
+import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.seeyon.entity.BaseCreateCallbackBo;
 import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo;
@@ -57,6 +61,8 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
     private TbsActivityGoodsService tbsActivityGoodsService;
     private TbsCostUnItemService tbsCostUnItemService;
     private BmsSupplierService bmsSupplierService;
+    private BmsRegionMapper regionMapper;
+    private BmsRegion2Mapper region2Mapper;
     private TbsActivityPayConditionMapper tbsActivityPayConditionMapper;
     private TbsActivityMapper tbsActivityMapper;
     private ProjectProperties projectProperties;
@@ -131,12 +137,24 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         data.put("targetId",tbsCostApply.getId()+"");
         data.put("targetCode",tbsCostApply.getCode());
         data.put("exsp1",TbsSeeYonConst.CostApplyConf.Code());
+
+        //拓展添加审批关联区域
+        String saleRegionId = supplier.handleSaleRegionId();
+        String bizRegionId = supplier.handleBizRegionId();
+        BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
+        BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId);
+        String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null";
+        String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null";
+        data.put("exsp2",saleRegionNames);
+        data.put("exsp3",bizRegionNames);
+
         //添加跳转地址业务
         String urlKey = "exsp5"+IdUtil.simpleUUID();
         String baseJumpUrl = JumpToUtil.getUrl(projectProperties.getHostUrl(),TbsSeeYonConst.CostApplyConf.Code(),urlKey);
         data.put("exsp5",urlKey);
         data.put("cmsLink",baseJumpUrl);
         data.put("activitySummary",actTitles);
+
         //添加科目和成本中心
         List<TbsActivityCenter> tbsActivityCenters = tbsActivityCenterService.listByCostApplyId(Long.parseLong(id));
         List<TbsActivitySubject> tbsActivitySubjects = tbsActivitySubjectService.listByCostApplyId(Long.parseLong(id));

src/main/java/com/qs/serve/modules/tzc/controller/TzcPolicyController.java

@@ -16,6 +16,7 @@ import com.qs.serve.modules.seeyon.entity.CtpAffairQo;
 import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam;
 import com.qs.serve.modules.seeyon.service.SeeYonRequestService;
 import com.qs.serve.modules.sys.entity.SysUser;
+import com.qs.serve.modules.sys.service.SysPostUserService;
 import com.qs.serve.modules.sys.service.SysUserService;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.common.util.TbsBudgetLogBuildUtil;
@@ -64,6 +65,7 @@ public class TzcPolicyController {
     private TbsBudgetLogService tbsBudgetLogService;
     private SysUserService sysUserService;
     private SeeYonRequestService seeYonService;
+    private SysPostUserService postUserService;
 
     @GetMapping("succ")
     public R<?> succ(Long id){
@@ -105,7 +107,7 @@ public class TzcPolicyController {
     }
 
     /**
-     * 翻页
+     * 翻页(我的)
      * @param param
      * @return
      */
@@ -120,6 +122,24 @@ public class TzcPolicyController {
         return R.byPageHelperList(list);
     }
 
+    /**
+     * 翻页
+     * @param param
+     * @return
+     */
+    @GetMapping("/pageMyAndChild")
+    public R<PageVo<TzcPolicy>> getPageMyAndChild(TzcPolicy param){
+        String userId = AuthContextUtils.getSysUserId();
+        List<String> userIds = postUserService.listByChildIds(userId);
+        userIds.add(userId);
+        LambdaQueryWrapper<TzcPolicy> lqw = new LambdaQueryWrapper<>(param);
+        PageUtil.startPage();
+        lqw.in(TzcPolicy::getUserId,userIds);
+        lqw.orderByDesc(TzcPolicy::getCreateTime);
+        List<TzcPolicy> list = tzcPolicyService.list(lqw);
+        return R.byPageHelperList(list);
+    }
+
     /**
      * 翻页
      * @param param

src/main/java/com/qs/serve/modules/tzc/service/impl/TzcPolicyApplicationServiceImpl.java

@@ -7,7 +7,11 @@ 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.common.util.model.DateFormatString;
+import com.qs.serve.modules.bms.entity.BmsRegion;
+import com.qs.serve.modules.bms.entity.BmsRegion2;
 import com.qs.serve.modules.bms.entity.BmsSupplier;
+import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
+import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
 import com.qs.serve.modules.bms.service.BmsSupplierService;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.service.GoodsSkuService;
@@ -82,6 +86,8 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
     private GoodsSkuService goodsSkuService;
     private XiaoLuTonService xiaoLuTonService;
     private ProjectProperties projectProperties;
+    private final BmsRegionMapper regionMapper;
+    private final BmsRegion2Mapper region2Mapper;
 
     @Override
     public void syncPolicyItem(Long policyItemId) {
@@ -166,6 +172,17 @@ public class TzcPolicyApplicationServiceImpl implements TzcPolicyApplicationServ
         data.put("targetId",tzcPolicy.getId());
         data.put("targetCode",tzcPolicy.getPolicyCode());
         data.put("exsp1", TbsSeeYonConst.PolicyConf.Code());
+
+        //拓展添加审批关联区域
+        String saleRegionId = supplier.handleSaleRegionId();
+        String bizRegionId = supplier.handleBizRegionId();
+        BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
+        BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId);
+        String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null";
+        String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null";
+        data.put("exsp2",saleRegionNames);
+        data.put("exsp3",bizRegionNames);
+
         //添加跳转地址业务
         String urlKey = "exsp5"+IdUtil.simpleUUID();
         String baseJumpUrl = JumpToUtil.getUrl(projectProperties.getHostUrl(),TbsSeeYonConst.CostApplyConf.Code(),urlKey);

src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java

@@ -7,10 +7,9 @@ import com.qs.serve.common.model.enums.BudgetLogOptFlag;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
 import com.qs.serve.common.util.model.DateFormatString;
-import com.qs.serve.modules.bms.entity.BmsChannel;
+import com.qs.serve.modules.bms.entity.*;
-import com.qs.serve.modules.bms.entity.BmsChannelPoint;
+import com.qs.serve.modules.bms.mapper.BmsRegion2Mapper;
-import com.qs.serve.modules.bms.entity.BmsSubject;
+import com.qs.serve.modules.bms.mapper.BmsRegionMapper;
-import com.qs.serve.modules.bms.entity.BmsSupplier;
 import com.qs.serve.modules.bms.service.BmsChannelPointService;
 import com.qs.serve.modules.bms.service.BmsChannelService;
 import com.qs.serve.modules.bms.service.BmsSubjectService;
@@ -90,6 +89,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
     private final PayWayMapper payWayMapper;
     private final ProjectProperties projectProperties;
 
+    private final BmsRegionMapper regionMapper;
+    private final BmsRegion2Mapper region2Mapper;
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void release(Long activityId) {
@@ -359,6 +361,19 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         data.put("targetCode",verification.getVerificationCode());
         data.put("exsp1",TbsSeeYonConst.CostCheckConf.Code());
         data.put("jinE",verification.getAmount().toString());
+
+        BmsSupplier supplier = bmsSupplierService.getById(verification.getSupplierId());
+
+        //拓展添加审批关联
+        String saleRegionId = supplier.handleSaleRegionId();
+        String bizRegionId = supplier.handleBizRegionId();
+        BmsRegion saleRegion = regionMapper.selectById(saleRegionId);
+        BmsRegion2 bizRegion = region2Mapper.selectById(bizRegionId);
+        String saleRegionNames = saleRegion!=null?saleRegion.getPathNames():"null";
+        String bizRegionNames = bizRegion!=null?bizRegion.getPathNames():"null";
+        data.put("exsp2",saleRegionNames);
+        data.put("exsp3",bizRegionNames);
+
         //添加跳转地址业务
         String urlKey = "exsp5"+IdUtil.simpleUUID();
         String baseJumpUrl = JumpToUtil.getUrl(projectProperties.getHostUrl(),TbsSeeYonConst.CostApplyConf.Code(),urlKey);

src/main/resources/mapper/erp/ErpDispatchDataMapper.xml

@@ -51,7 +51,7 @@
     <select id="querySumCost" resultType="com.qs.serve.modules.erp.entity.dto.ErpDispatchSumVo">
         SELECT
             DATE_FORMAT(date,'%Y%m') AS `yearMonth`,
-            SUM(dispatch_cost) as dispatchSumCost
+            SUM(sum_money) as dispatchSumCost
         FROM
             `erp_dispatch_data`
         where