fix：修复下属相关查询

fix：修复核销统计异常

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

@@ -429,6 +429,8 @@ public class GoodsSpuServiceImpl extends ServiceImpl<GoodsSpuMapper,GoodsSpu> im
             spu.setCategorySecond("");
             spu.setCategoryThird("");
         }
+        spu.setBookBelong(category.getBookBelong());
+        spu.setBookName(category.getBookName());
     }
 
     /**

src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java

@@ -195,7 +195,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{
         String templateCode = getTemplateCode();
         R<List<CtpAffair>> syResult = getRequestService().commonListAffairs(targetId,null,templateCode);
         List<CtpAffair> ctpAffairs = syResult.getData();
-        if(ctpAffairs.size()>0){
+        if(ctpAffairs!=null&&ctpAffairs.size()>0){
             List<CtpAffairVo> result = getCtpAffairVos(ctpAffairs);
             return R.ok(result);
         }

src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java

@@ -115,7 +115,15 @@ public class SysPostController {
         return R.ok();
     }
 
-
+    /**
+     * 刷新岗位ID路径
+     * @return
+     */
+    @GetMapping("/flushPathIds")
+    public R<?> flushPathIds(){
+        sysPostService.flushPathIds();
+        return R.ok();
+    }
 
     /**
     * 新增系统职务

src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.sys.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.serve.modules.sys.entity.SysPost;
+import org.apache.ibatis.annotations.Update;
 
 /**
  * 系统职务 Mapper
@@ -10,5 +11,15 @@ import com.qs.serve.modules.sys.entity.SysPost;
  */
 public interface SysPostMapper extends BaseMapper<SysPost> {
 
+    /**
+     * 根据岗位更新员工的路径绑定ID
+     * @return
+     */
+    @Update("update sys_post_user " +
+            "left join sys_post on sys_post_user.post_id = sys_post.id " +
+            "set sys_post_user.path_ids = sys_post.path_ids, " +
+            "sys_post_user.path_names = sys_post.path_names ")
+    int updatePostUserIdPaths();
+
 }
 

src/main/java/com/qs/serve/modules/sys/service/SysPostService.java

@@ -12,5 +12,10 @@ public interface SysPostService extends IService<SysPost> {
 
     void modify(SysPost param);
 
+    /**
+     * 刷新路径IDs
+     */
+    void flushPathIds();
+
 }
 

src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java

@@ -3,6 +3,7 @@ package com.qs.serve.modules.sys.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qs.serve.common.util.Assert;
+import com.qs.serve.common.util.AuthContextUtils;
 import com.qs.serve.common.util.IdUtil;
 import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.sys.entity.SysPost;
@@ -92,5 +93,34 @@ public class SysPostServiceImpl extends ServiceImpl<SysPostMapper, SysPost> impl
 
     }
 
+    @Override
+    public void flushPathIds() {
+        AuthContextUtils.setTenant("001");
+        String pid = "0";
+        toFlushPathIds(pid, null,null);
+        //更新绑定的用户路径
+        baseMapper.updatePostUserIdPaths();
+    }
+
+    /**
+     * 递归设置
+     * @param pid
+     * @param pPathId
+     * @param pPathName
+     */
+    private void toFlushPathIds(String pid, String pPathId,String pPathName) {
+        List<SysPost> list = list(new LambdaQueryWrapper<SysPost>().eq(SysPost::getPid, pid));
+        for (SysPost post : list) {
+            if("0".equals(pid)){
+                post.setPathIds(post.getId());
+                post.setPathNames(post.getPostName());
+            }else {
+                post.setPathIds(pPathId +"_"+post.getId());
+                post.setPathNames(pPathName+"_"+post.getPostName());
+            }
+            this.toFlushPathIds(post.getId(),post.getPathIds(),post.getPostName());
+        }
+    }
+
 }
 

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

@@ -366,7 +366,6 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
         //移除非申请状态异常
         LambdaQueryWrapper<TbsBudgetLog> budgetLogRmLqw = new LambdaQueryWrapper<>();
         budgetLogRmLqw.eq(TbsBudgetLog::getCostApplyId,param.getId());
-        //budgetLogRmLqw.eq(TbsBudgetLog::getOptType,1);
         tbsBudgetLogMapper.delete(budgetLogRmLqw);
         //重新合计申请状态异常
 
@@ -437,23 +436,6 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
         }
         tbsBudgetLogService.saveBatch(budgetLogList);
 
-//        LambdaQueryWrapper<TbsBudgetLog> budgetLogLqw = new LambdaQueryWrapper<>();
-//        budgetLogLqw.eq(TbsBudgetLog::getCostApplyId,costApply.getId());
-//        budgetLogLqw.eq(TbsBudgetLog::getOptType,1);
-//        List<TbsBudgetLog> budgetLogList = tbsBudgetLogMapper.selectList(budgetLogLqw);
-//        for (TbsBudgetLog budgetLog : budgetLogList) {
-//            for (TbsActivityCenterGoods centerGoods : activityCenterGoodsList) {
-//                if( budgetLog.getActivityId().equals(centerGoods.getActivityId())
-//                &&budgetLog.getSubjectId().equals(centerGoods.getSubjectId())
-//                        && budgetLog.getCenterType().equals(centerGoods.getCenterType())
-//                        && budgetLog.getCenterId().equals(centerGoods.getCenterId())
-//                        && budgetLog.getTargetId().equals(centerGoods.getTargetId())
-//                ){
-//                    budgetLog.setAmount(centerGoods.getCenterGoodsAmount().negate());
-//                    tbsBudgetLogMapper.updateById(budgetLog);
-//                }
-//            }
-//        }
     }
 
     /**
@@ -727,10 +709,6 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService
                 }
             }
         }
-
-
-
-
     }
 
     @NotNull

src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java

@@ -18,6 +18,9 @@ import java.util.List;
  */
 public interface VtbVerificationMapper extends BaseMapper<VtbVerification> {
 
+    @Select("select COALESCE(sum(amount),0) from vtb_verification where del_flag = 0 and activity_id = #{activityId} and verification_state = 1")
+    BigDecimal totalActivityVerification(@Param("activityId")String activityId);
+
     @InterceptorIgnore(tenantLine = "true")
     @Select("SELECT verification_code FROM `vtb_verification`" +
             " where verification_code like 'HX%'" +

src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java

@@ -29,6 +29,7 @@ import com.qs.serve.modules.tbs.service.TbsActivityService;
 import com.qs.serve.modules.tbs.service.TbsCostApplyService;
 import com.qs.serve.modules.vtb.common.VtbVerificationState;
 import com.qs.serve.modules.vtb.entity.*;
+import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
 import com.qs.serve.modules.vtb.service.impl.VtbVerificationOperationServiceImpl;
 import com.qs.serve.task.TbsTask;
 import lombok.AllArgsConstructor;
@@ -60,6 +61,7 @@ import java.util.stream.Collectors;
 public class VtbVerificationApplication {
 
     private VtbVerificationService vtbVerificationService;
+    private VtbVerificationMapper verificationMapper;
     private VtbVerificationSubjectService vtbVerificationSubjectService;
     private VtbVerificationSubjectCenterService vtbVerificationSubjectCenterService;
     private VtbVerificationYardService yardService;

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

@@ -1,6 +1,7 @@
 package com.qs.serve.modules.vtb.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.*;
 import com.qs.serve.modules.seeyon.service.SeeYonOperationService;
@@ -16,16 +17,10 @@ import com.qs.serve.modules.tbs.mapper.TbsCostApplyMapper;
 import com.qs.serve.modules.tbs.service.TbsActivityPayConditionService;
 import com.qs.serve.modules.tbs.service.TbsActivityService;
 import com.qs.serve.modules.vtb.common.VtbVerificationState;
-import com.qs.serve.modules.vtb.entity.VtbFundFlow;
-import com.qs.serve.modules.vtb.entity.VtbVerification;
-import com.qs.serve.modules.vtb.entity.VtbVerificationSubject;
-import com.qs.serve.modules.vtb.entity.VtbVerificationYard;
+import com.qs.serve.modules.vtb.entity.*;
 import com.qs.serve.modules.vtb.entity.dto.XltDelVerificationDto;
 import com.qs.serve.modules.vtb.mapper.VtbVerificationMapper;
-import com.qs.serve.modules.vtb.service.VtbFundFlowService;
-import com.qs.serve.modules.vtb.service.VtbVerificationService;
-import com.qs.serve.modules.vtb.service.VtbVerificationSubjectService;
-import com.qs.serve.modules.vtb.service.VtbVerificationYardService;
+import com.qs.serve.modules.vtb.service.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -44,6 +39,7 @@ import java.util.List;
 public class VtbVerificationOperationServiceImpl implements SeeYonOperationService {
 
     private VtbVerificationMapper vtbVerificationMapper;
+    private VtbVerificationSubjectCenterService vtbVerificationSubjectCenterService;
     private VtbFundFlowService vtbFundFlowService;
     private TbsActivityPayConditionService activityPayConditionService;
     private TbsActivityService tbsActivityService;
@@ -115,6 +111,14 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
             vtbFundFlowService.remove(new LambdaQueryWrapper<VtbFundFlow>().eq(VtbFundFlow::getVerificationId,targetId));
             vtbFundFlowService.flushActivityAmount(verification.getActivityId());
 
+            //设置无效的,预算多次统计
+            vtbVerificationSubjectCenterService.update(new LambdaUpdateWrapper<VtbVerificationSubjectCenter>()
+                    .eq(VtbVerificationSubjectCenter::getVerificationId,verification.getId())
+                    .eq(VtbVerificationSubjectCenter::getEffectiveFlag,1)
+                    .set(VtbVerificationSubjectCenter::getEffectiveFlag,0)
+                    .set(VtbVerificationSubjectCenter::getRemark,"需要确认是否有核销写入ERP")
+            );
+
             String host = "http://59.37.164.96:2506/action/cms/cost/deletion";
             //TODO 请求伟成接口，删除 XLT_BIFyDbf
             XltDelVerificationDto delVerificationDto = new XltDelVerificationDto(
@@ -124,7 +128,7 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
             );
             String requestBody = JsonUtil.objectToJson(delVerificationDto);
             String response = HttpUtil.doPost(host,requestBody,null);
-            log.info("请求伟成接口，删除 XLT_BIFyDbf:{}",response);
+            log.info("补偿核销触发，删除 XLT_BIFyDbf:{}",response);
 
         }
         return null;
@@ -179,7 +183,8 @@ public class VtbVerificationOperationServiceImpl implements SeeYonOperationServi
             }else {
                 //刷新活动金额
                 TbsActivity activity = tbsActivityService.getById(verification.getActivityId());
-                BigDecimal totalUsed = activity.getUsedAmount().add(verification.getAmount());
+                BigDecimal lastUsedAmt = vtbVerificationMapper.totalActivityVerification(verification.getActivityId()+"");
+                BigDecimal totalUsed = lastUsedAmt.add(verification.getAmount());
                 TbsActivity activity4Upd = new TbsActivity();
                 activity4Upd.setId(activity.getId());
                 activity4Upd.setUsedAmount(totalUsed);

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

@@ -179,7 +179,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         Date nowDate_ = new Date();
 
         //更新费用
-        BigDecimal finalAmt = activity.getUsedAmount().add(param.getTotalCheckAmount());
+        BigDecimal lastUsedAmt = baseMapper.totalActivityVerification(verification.getActivityId()+"");
+        BigDecimal finalAmt = lastUsedAmt.add(param.getTotalCheckAmount());
         activity.setUsedAmount(finalAmt);
         if(finalAmt.compareTo(activity.getTotalAmount())==0) {
             activity.setActivityState(TbsActivityState.STATE_1_Finished);
@@ -385,7 +386,7 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         String requestBody = JsonUtil.objectToJson(delVerificationDto);
         String response = HttpUtil.doPost(host,requestBody,null);
         String errorMsg = null;
-        if(!response.contains("删除成功")){
+        if(!response.contains("200")){
             errorMsg = response;
         }
         SysSyncLog syncLog = new SysSyncLog();
@@ -399,10 +400,9 @@ public class VtbVerificationServiceImpl extends ServiceImpl<VtbVerificationMappe
         syncLog.setTryTimes(0);
         sysSyncLogService.save(syncLog);
         if(errorMsg!=null){
-            return false;
+            Assert.throwEx(errorMsg);
         }
 
-
         verification.setVerificationState(VtbVerificationState.Cancel.getCode());
         vtbFundFlowService.removeByVerificationId(verification.getId());
         this.updateById(verification);

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

@@ -2,6 +2,7 @@ package com.qs.serve.task;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.util.AuthContextUtils;
+import com.qs.serve.modules.sys.service.SysPostService;
 import com.qs.serve.modules.tbs.common.TbsActivityState;
 import com.qs.serve.modules.tbs.entity.TbsActivity;
 import com.qs.serve.task.controller.TaskUserController;
@@ -24,6 +25,7 @@ import java.time.LocalDate;
 public class SysTask {
 
     TaskUserController taskUserController;
+    SysPostService sysPostService;
 
     /**
      * 同步用户
@@ -32,6 +34,8 @@ public class SysTask {
     public void task1(){
         AuthContextUtils.setTenant("001");
         taskUserController.test();
+        //更新下属数据
+        sysPostService.flushPathIds();
     }
 
 

src/main/resources/application.yml

@@ -58,7 +58,7 @@ logging:
     ROOT: info
     com.qs.serve: debug
     #com.qs.serve.modules.his: info
-    com.qs.serve.modules.sys: info
+    com.qs.serve.modules.sys: debug
     com.qs.serve.modules.tag: info
     org.xnio.nio: info
     org.springframework: info