diff --git a/src/main/java/com/qs/serve/common/model/dto/R.java b/src/main/java/com/qs/serve/common/model/dto/R.java index 23ba1fff..565cff0f 100644 --- a/src/main/java/com/qs/serve/common/model/dto/R.java +++ b/src/main/java/com/qs/serve/common/model/dto/R.java @@ -162,6 +162,17 @@ public class R implements Serializable { return pageVo; } + public static PageVo buildPageHelperList(List sources,List details){ + PageVo pageVo = new PageVo<>(); + PageInfo pageInfo = new PageInfo<>(sources); + pageVo.setPageSize(pageInfo.getPageSize()); + pageVo.setPageNum(pageInfo.getPageNum()); + pageVo.setTotal(pageInfo.getTotal()); + pageVo.setList(details); + pageVo.setTotalPage(new Long(pageInfo.getPages())); + return pageVo; + } + public static R> byEmptyList(){ PageVo pageVo = new PageVo<>(); pageVo.setPageSize(PageUtil.getPageSize()); diff --git a/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java b/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java index 4a3e12ff..42793896 100644 --- a/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java +++ b/src/main/java/com/qs/serve/modules/bir/entity/BirBaseActivity.java @@ -56,7 +56,7 @@ public class BirBaseActivity implements Serializable { @NotNull(message = "核销金额不能为空") private BigDecimal verificationAmt; - private Long preActQuantity; + private BigDecimal preActQuantity; /** 费用通过标识，用于已申请费用活动列表 */ private Integer costPassFlag; diff --git a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java index d8a8becc..525fedcf 100644 --- a/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/his/service/impl/HisUserSupplierServiceImpl.java @@ -92,7 +92,7 @@ public class HisUserSupplierServiceImpl extends ServiceImpl supplierIds = hisUserSuppliers.stream().map(HisUserSupplier::getSupplierId).collect(Collectors.toList()); if(supplierIds.size()>0) { List supplierList = bmsSupplierService.listByIds(supplierIds); - return R.buildPageHelperList(supplierList); + return R.buildPageHelperList(hisUserSuppliers,supplierList); }else{ return R.buildPageHelperList(new ArrayList<>()); } 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 59e4427c..1adcc19b 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 @@ -10,7 +10,9 @@ import com.qs.serve.modules.seeyon.entity.CtpAffair; import com.qs.serve.modules.seeyon.entity.CtpAffairQo; import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeDTO; import com.qs.serve.modules.seeyon.entity.bo.CtpAddNodeParam; +import com.qs.serve.modules.sys.entity.SysPostUser; 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.entity.bo.TbsAffairCommitBo; @@ -19,6 +21,7 @@ import com.qs.serve.modules.tbs.entity.vo.CtpAffairVo; import java.util.ArrayList; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.stream.Collectors; /** @@ -140,6 +143,10 @@ public interface SeeYonOperationService extends SeeYonBaseService{ if(ctpAffairs.size()>0){ List oaUserIds = ctpAffairs.stream().map(CtpAffair::getMemberId).collect(Collectors.toList()); List userList = getSysUserService().listByOaMemberIds(oaUserIds); + SysPostUserService postUserService = SpringUtils.getBean(SysPostUserService.class); + List userIds = userList.stream().map(SysUser::getId).collect(Collectors.toList()); + List postUserList = postUserService.listByUserIds(userIds); + Map> postMap = postUserList.stream().collect(Collectors.groupingBy(SysPostUser::getUserId)); List result = new ArrayList<>(); for (CtpAffair ctpAffair : ctpAffairs) { CtpAffairVo ctpAffairVo = new CtpAffairVo(); @@ -147,6 +154,8 @@ public interface SeeYonOperationService extends SeeYonBaseService{ for (SysUser user : userList) { if(ctpAffair.getMemberId().equals(user.getSyUserId())){ ctpAffairVo.setUserInfo(user.toSysUserVo()); + List postUsers = postMap.get(user.getId()); + ctpAffairVo.setUserPostList(postUsers); } } result.add(ctpAffairVo); diff --git a/src/main/java/com/qs/serve/modules/sys/service/SysPostUserService.java b/src/main/java/com/qs/serve/modules/sys/service/SysPostUserService.java index 1b097751..3bd0b004 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/SysPostUserService.java +++ b/src/main/java/com/qs/serve/modules/sys/service/SysPostUserService.java @@ -15,6 +15,8 @@ public interface SysPostUserService extends IService { List listByUserId(String userId); + List listByUserIds(List userIds); + void updatePathIds(String orgPathIds,String newPathIds,String orgPathNames,String newPathNames); void bind(SysPostUserBo param); diff --git a/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java b/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java index eee486c4..a55c8679 100644 --- a/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/sys/service/impl/SysPostUserServiceImpl.java @@ -60,6 +60,13 @@ public class SysPostUserServiceImpl extends ServiceImpl listByUserIds(List userIds) { + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.in(SysPostUser::getUserId,userIds); + return this.list(lqw); + } + @Override public void updatePathIds(String orgPathIds,String newPathIds,String orgPathNames,String newPathNames){ LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java index c85a89ff..9a983cf3 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsActivity.java @@ -149,10 +149,10 @@ public class TbsActivity implements Serializable { private Integer preActFlag; /** 预计活动销量 */ - private Long preActQuantity; + private BigDecimal preActQuantity; /** 预计不做活动销量 */ - private Long preNotActQuantity; + private BigDecimal preNotActQuantity; /** 预估roi费率(人工输入) */ private BigDecimal preRoiRate; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java index 77932a2b..d744fef4 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/TbsCostApply.java @@ -134,6 +134,12 @@ public class TbsCostApply implements Serializable { /** 统计所有活动申请的金额 */ private BigDecimal totalActivityAmount; + /** 统计所有活动预估发货的金额 */ + private BigDecimal totalActivityPreAmount; + + /** 统计所有活动预估不发货的金额 */ + private BigDecimal totalActivityPreNotAmount; + /** 统计所有活动使用的金额 */ private BigDecimal totalActivityUsedAmount; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java index 65a5ec4b..7a29eae1 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/bo/TbsActivityBo.java @@ -68,10 +68,10 @@ public class TbsActivityBo implements Serializable { private Integer preActFlag; /** 预计活动销量 */ - private Long preActQuantity; + private BigDecimal preActQuantity; /** 预计不做活动销量 */ - private Long preNotActQuantity; + private BigDecimal preNotActQuantity; /** 预估roi费率(人工输入) */ private BigDecimal preRoiRate; diff --git a/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java b/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java index 299753a7..c04fc702 100644 --- a/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java +++ b/src/main/java/com/qs/serve/modules/tbs/entity/vo/CtpAffairVo.java @@ -28,6 +28,9 @@ public class CtpAffairVo { /** 审批人 */ private Object userInfo; + /** 岗位列表（有可能返回null） */ + private List userPostList; + /** 活动 */ private Object activityInfo; diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java index 62b28855..3600b360 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsActivityServiceImpl.java @@ -143,8 +143,8 @@ public class TbsActivityServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); - lqw.select(TbsActivity::getTotalAmount); + lqw.select(TbsActivity::getTotalAmount, + TbsActivity::getPreActQuantity, + TbsActivity::getPreNotActQuantity); lqw.eq(TbsActivity::getCostApplyId,costApplyId); List activityList = list(lqw); BigDecimal totalCostAmount = BigDecimal.ZERO; + BigDecimal totalCostAmount2 = BigDecimal.ZERO; + BigDecimal totalCostAmount3 = BigDecimal.ZERO; for (TbsActivity tbsActivity : activityList) { totalCostAmount = totalCostAmount.add(tbsActivity.getTotalAmount()); + totalCostAmount2 = totalCostAmount2.add(tbsActivity.getPreActQuantity()); + totalCostAmount3 = totalCostAmount3.add(tbsActivity.getPreNotActQuantity()); } TbsCostApply costApplyParam = new TbsCostApply(); costApplyParam.setId(costApplyId); costApplyParam.setTotalActivity(activityList.size()); costApplyParam.setTotalActivityAmount(totalCostAmount); + costApplyParam.setTotalActivityPreAmount(totalCostAmount2); + costApplyParam.setTotalActivityPreNotAmount(totalCostAmount3); costApplyService.updateById(costApplyParam); }