修复费用状态异常

src/main/java/com/qs/serve/modules/bms/controller/my/BmsSupplierMyController.java

@@ -140,10 +140,8 @@ public class BmsSupplierMyController {
         List<String> userIds = sysUserService.list().stream().map(a->a.getId()).collect(Collectors.toList());
         param.setSelectUserIds(userIds);
         param.setSelectUserIdsFlag(true);
-//        List<HisUserSupplier> list = hisUserSupplierService.selectSupplier(param,true);
+        hisUserSupplierService.selectListSupplier(param);
-        PageVo<BmsSupplier> pageVo = hisUserSupplierService.selectPageSupplier(param);
+        return R.ok();
-        initSupplierList(pageVo.getList());
-        return R.ok(pageVo);
     }
 }
 

src/main/java/com/qs/serve/modules/bms/service/impl/BmsRegionServiceImpl.java

@@ -39,7 +39,7 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
     private SysUserService sysUserService;
     private BmsChannelPointMapper bmsChannelPointMapper;
     private BmsFactoryService bmsFactoryService;
-//    private BmsSupplierApplicationService bmsSupplierApplicationService;
+    private BmsSupplierApplicationService bmsSupplierApplicationService;
 
     @Override
     public boolean saveBmsRegion(BmsRegion param){
@@ -64,7 +64,9 @@ public class BmsRegionServiceImpl extends ServiceImpl<BmsRegionMapper,BmsRegion>
                 hisUserChannelPointService.removeRegion(2,ori.getPathIds());
                 hisUserChannelPointService.flushRegion(2,parentRegion.getPathIds());*/
                 //todo 更新客户
-                //bmsSupplierApplicationService.listByRegionIds()
+                if(!ori.getPid().equals("0")){
+                    bmsSupplierApplicationService.listByRegionIds(Arrays.asList(ori.getPid()),ori.getLevel());
+                }
             }
         }
         return b;

src/main/java/com/qs/serve/modules/bms/service/impl/BmsSupplierApplicationService.java

@@ -8,6 +8,7 @@ import com.qs.serve.common.util.CopierUtil;
 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.BmsRegionMapper;
 import com.qs.serve.modules.bms.mapper.BmsSupplierMapper;
 import com.qs.serve.modules.bms.service.BmsRegion2Service;
 import com.qs.serve.modules.bms.service.BmsRegionService;
@@ -41,7 +42,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class BmsSupplierApplicationService {
 
-    private BmsRegionService regionService;
+    private BmsRegionMapper regionMapper;
     private BmsRegion2Service region2Service;
     private TbsBudgetLogService budgetLogService;
     private TbsCostUnItemService costUnItemService;
@@ -74,7 +75,7 @@ public class BmsSupplierApplicationService {
         String newRegionCode;
         String newRegionName;
         if(regionType.equals(TbsCenterType.saleRegion.name())){
-            BmsRegion bmsRegion = regionService.getById(newRegionId);
+            BmsRegion bmsRegion = regionMapper.selectById(newRegionId);
             newRegionCode = bmsRegion.getCode();
             newRegionName = bmsRegion.getName();
         }else {

src/main/java/com/qs/serve/modules/tbs/entity/TbsBudgetLog.java

@@ -171,6 +171,7 @@ public class TbsBudgetLog implements Serializable {
 
     /** 活动编码 */
     @Length(max = 30,message = "活动编码长度不能超过30字")
+    @TableField(condition = SqlCondition.LIKE)
     private String activityCode;
 
     private String activityTheme;

src/main/java/com/qs/serve/modules/tbs/service/TbsCostApplyService.java

@@ -24,5 +24,19 @@ public interface TbsCostApplyService extends IService<TbsCostApply> {
      */
     void releaseCost(Long costApplyId,Integer invalidFlag);
 
+    /**
+     * 属性费用申请的审批的状态
+     * @param costApplyId
+     */
+    void flushCostApply(Long costApplyId);
+
+    /**
+     * 刷新费用申请状态
+     * 1.前提先刷新活动状态
+     * 2.在释放费用和审批完成后调用
+     * @param costApplyId
+     */
+    void flushCostStatus(Long costApplyId);
+
 }
 

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

@@ -14,6 +14,7 @@ import com.qs.serve.modules.seeyon.entity.BaseCreateProcessBo;
 import com.qs.serve.modules.seeyon.service.SeeYonService;
 import com.qs.serve.modules.sys.entity.SysUser;
 import com.qs.serve.modules.sys.service.SysUserService;
+import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.common.TbsCostApplyState;
 import com.qs.serve.modules.tbs.common.TbsSeeYonConst;
 import com.qs.serve.modules.tbs.entity.*;
@@ -73,7 +74,6 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
                 Assert.throwEx("当前模板已停用");
             }
         }
-        tbsCostApply.setSubmitTime(LocalDateTime.now());
         if(tbsCostApply.getContractFlag().equals(1)){
             LambdaQueryWrapper<TbsActivityPayCondition> lqw = new LambdaQueryWrapper<>();
             lqw.eq(TbsActivityPayCondition::getCostApplyId,id);
@@ -168,6 +168,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         costApply.setSyFlowId(flowId);
         costApply.setSyFormId(formId);
         costApply.setChargeState(TbsCostApplyState.State_1_apply.getCode());
+        costApply.setSubmitTime(LocalDateTime.now());
         this.updateById(costApply);
         costApply = this.getById(costApply.getId());
         //移除历史记录
@@ -269,5 +270,27 @@ public class TbsCostApplyServiceImpl extends ServiceImpl<TbsCostApplyMapper,TbsC
         costItem.setInvalidFlag(invalidFlag);
         budgetCostItemService.update(costItem,lqw);
     }
+
+    @Override
+    public void flushCostApply(Long costApplyId) {
+
+    }
+
+    @Override
+    public void flushCostStatus(Long costApplyId) {
+        LambdaQueryWrapper<TbsActivity> actLqw = new LambdaQueryWrapper<>();
+        actLqw.eq(TbsActivity::getCostApplyId,costApplyId);
+        List<TbsActivity> activityList = tbsActivityMapper.selectList(actLqw);
+        for (TbsActivity activity : activityList) {
+            if(!activity.getActivityState().equals(TbsActivityState.STATE_4_Release)
+                    &&!activity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
+                return;
+            }
+        }
+        TbsCostApply costApply = new TbsCostApply();
+        costApply.setChargeState(TbsCostApplyState.State_3_finished.getCode());
+        this.updateById(costApply);
+    }
+
 }
 

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

@@ -151,8 +151,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         if(CollectionUtil.isNotEmpty(budgetLogList)){
             budgetLogService.saveBatch(budgetLogList);
         }
-        //todo 如果为最后的活动，更变费用申请状态
+        //如果为最后的活动，更变费用申请状态
-
+        costApplyService.flushCostStatus(costApply.getId());
     }
 
     @Override
@@ -313,6 +313,19 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         updCost.setTotalActivityUsedAmount(totalCostApplyUsed);
         if(costApply.getTotalActivityAmount().compareTo(totalCostApplyUsed)<=0){
             updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode());
+        }else {
+            List<TbsActivity> activityList = activityService.listByCostApplyId(costApply.getId());
+            boolean updateChargeState = true;
+            for (TbsActivity tbsActivity : activityList) {
+                if(!tbsActivity.getActivityState().equals(TbsActivityState.STATE_4_Release)
+                        &&!tbsActivity.getActivityState().equals(TbsActivityState.STATE_1_Finished)){
+                    updateChargeState = false;
+                    break;
+                }
+            }
+            if(updateChargeState){
+                updCost.setChargeState(TbsCostApplyState.State_3_finished.getCode());
+            }
         }
         costApplyService.updateById(updCost);
     }