From cea3d8d0fe01e4cfad394437f46c702fe920c290 Mon Sep 17 00:00:00 2001 From: Yen Date: Wed, 8 May 2024 09:33:19 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E4=B8=8B?= =?UTF-8?q?=E5=B1=9E=E7=9B=B8=E5=85=B3=E6=9F=A5=E8=AF=A2=20fix=EF=BC=9A?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A0=B8=E9=94=80=E7=BB=9F=E8=AE=A1=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GoodsSpuServiceImpl.java | 2 ++ .../service/SeeYonOperationService.java | 2 +- .../sys/controller/SysPostController.java | 10 ++++++- .../modules/sys/mapper/SysPostMapper.java | 11 +++++++ .../modules/sys/service/SysPostService.java | 5 ++++ .../sys/service/impl/SysPostServiceImpl.java | 30 +++++++++++++++++++ .../TbsCostApplyOperationServiceImpl.java | 22 -------------- .../vtb/mapper/VtbVerificationMapper.java | 3 ++ .../service/VtbVerificationApplication.java | 2 ++ .../VtbVerificationOperationServiceImpl.java | 25 +++++++++------- .../impl/VtbVerificationServiceImpl.java | 8 ++--- src/main/java/com/qs/serve/task/SysTask.java | 4 +++ src/main/resources/application.yml | 2 +- 13 files changed, 87 insertions(+), 39 deletions(-) diff --git a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java index 24fd15f7..5e0f793a 100644 --- a/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSpuServiceImpl.java @@ -429,6 +429,8 @@ public class GoodsSpuServiceImpl extends ServiceImpl im spu.setCategorySecond(""); spu.setCategoryThird(""); } + spu.setBookBelong(category.getBookBelong()); + spu.setBookName(category.getBookName()); } /** diff --git a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java index 62ff8ba3..63d68b43 100644 --- a/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java +++ b/src/main/java/com/qs/serve/modules/seeyon/service/SeeYonOperationService.java @@ -195,7 +195,7 @@ public interface SeeYonOperationService extends SeeYonBaseService{ String templateCode = getTemplateCode(); R> syResult = getRequestService().commonListAffairs(targetId,null,templateCode); List ctpAffairs = syResult.getData(); - if(ctpAffairs.size()>0){ + if(ctpAffairs!=null&&ctpAffairs.size()>0){ List result = getCtpAffairVos(ctpAffairs); return R.ok(result); } diff --git a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java b/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java index 18e673ab..cd6f3dec 100644 --- a/src/main/java/com/qs/serve/modules/sys/controller/SysPostController.java +++ b/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(); + } /** * 新增系统职务 diff --git a/src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java b/src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java index a9d6926f..4ab6a017 100644 --- a/src/main/java/com/qs/serve/modules/sys/mapper/SysPostMapper.java +++ b/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 { + /** + * 根据岗位更新员工的路径绑定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(); + } diff --git a/src/main/java/com/qs/serve/modules/sys/service/SysPostService.java b/src/main/java/com/qs/serve/modules/sys/service/SysPostService.java index 39c57f5c..0e373f74 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/SysPostService.java +++ b/src/main/java/com/qs/serve/modules/sys/service/SysPostService.java @@ -12,5 +12,10 @@ public interface SysPostService extends IService { void modify(SysPost param); + /** + * 刷新路径IDs + */ + void flushPathIds(); + } diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java index 9806f0ba..68e1841a 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostServiceImpl.java +++ b/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 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 list = list(new LambdaQueryWrapper().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()); + } + } + } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java index f02cb8ba..61eb17e3 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyOperationServiceImpl.java @@ -366,7 +366,6 @@ public class TbsCostApplyOperationServiceImpl implements SeeYonOperationService //移除非申请状态异常 LambdaQueryWrapper 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 budgetLogLqw = new LambdaQueryWrapper<>(); -// budgetLogLqw.eq(TbsBudgetLog::getCostApplyId,costApply.getId()); -// budgetLogLqw.eq(TbsBudgetLog::getOptType,1); -// List 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 diff --git a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java index 193d5a57..77894e0a 100644 --- a/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java +++ b/src/main/java/com/qs/serve/modules/vtb/mapper/VtbVerificationMapper.java @@ -18,6 +18,9 @@ import java.util.List; */ public interface VtbVerificationMapper extends BaseMapper { + @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%'" + diff --git a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java b/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java index e4644987..350e04b7 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/VtbVerificationApplication.java +++ b/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; diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java index 38a9c711..cbeeae64 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationOperationServiceImpl.java +++ b/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().eq(VtbFundFlow::getVerificationId,targetId)); vtbFundFlowService.flushActivityAmount(verification.getActivityId()); + //设置无效的,预算多次统计 + vtbVerificationSubjectCenterService.update(new LambdaUpdateWrapper() + .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); diff --git a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java index e5fc60c0..938a0db1 100644 --- a/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/vtb/service/impl/VtbVerificationServiceImpl.java @@ -179,7 +179,8 @@ public class VtbVerificationServiceImpl extends ServiceImpl