he2802 2 years ago
parent
commit
7d7b33b470

+ 14 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderQueryBo.java

@@ -128,5 +128,19 @@ public class TopOldOrderQueryBo extends BaseEntity {
 	@ApiModelProperty("学员姓名")
 	private String userName;
 
+	@ApiModelProperty("月份时间(时间戳)")
+	private List<Long> monthTime;
+	/** 业务员名称 */
+	@ApiModelProperty("业务员名称")
+	private String createUsername;
+	/** 业务员名称ID */
+	@ApiModelProperty("业务员名称ID")
+	private Long createSysUserId;
+	/** 业务号 */
+	@ApiModelProperty("业务号")
+	private String createNo;
+	@ApiModelProperty("账单类型 (1月份 2季度 3半年 4年度)")
+	private Integer billType;
+
 
 }

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3806,7 +3806,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
         if (bo.getTotalType() == 2) {
             //机构分成
-            TopDivideLogQueryBo queryBo1 = new TopDivideLogQueryBo();
+            TopDivideLogQueryBo queryBo1 = BeanUtil.toBean(bo,TopDivideLogQueryBo.class);
             queryBo1.setDivideType(1);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
             map.put("unDeductMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getUnDeductMoneyTotal());
@@ -3816,7 +3816,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
         if (bo.getTotalType() == 3) {
             //3业务员提成
-            TopDivideLogQueryBo queryBo1 = new TopDivideLogQueryBo();
+            TopDivideLogQueryBo queryBo1 = BeanUtil.toBean(bo,TopDivideLogQueryBo.class);
             queryBo1.setDivideType(2);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
             map.put("unDeductMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getUnDeductMoneyTotal());
@@ -3826,7 +3826,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         }
         if (bo.getTotalType() == 4) {
             //4佣金结算
-            TopDivideLogQueryBo queryBo1 = new TopDivideLogQueryBo();
+            TopDivideLogQueryBo queryBo1 = BeanUtil.toBean(bo,TopDivideLogQueryBo.class);
             queryBo1.setDivideType(3);
             TopDivideLogVo vo1 = iTopDivideLogService.getSumMoney(queryBo1);
             map.put("unPayMoneyTotal", Validator.isEmpty(vo1) ? 0 : vo1.getUnPayMoneyTotal());