达沃特大屏和学校工资排序修改

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/vo/CorpNumberVO.java

@@ -22,13 +22,18 @@ public class CorpNumberVO implements Serializable {
 	@ApiModelProperty(value = "所属公司中文名")
 	private String belongToCorpName;
 	/**
-	 * 发货日期
+	 * 今日发货
 	 */
 	@ApiModelProperty(value = "今日发货")
 	private BigDecimal shipmentsNumber;
 	/**
-	 * 发货量
+	 * 待发货
 	 */
 	@ApiModelProperty(value = "待发货")
 	private BigDecimal waitDeliver;
+	/**
+	 * 已发货
+	 */
+	@ApiModelProperty(value = "已发货")
+	private BigDecimal delivered;
 }

blade-service-api/blade-deliver-goods-api/src/main/java/org/springblade/deliver/goods/vo/DailyNumberVO.java

@@ -16,12 +16,17 @@ import java.math.BigDecimal;
 public class DailyNumberVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 	/**
-	 * 发货日期
+	 * 总发货(月)
+	 */
+	@ApiModelProperty(value = "总发货(月)")
+	private BigDecimal totalShipments;
+	/**
+	 * 今日发货
 	 */
 	@ApiModelProperty(value = "今日发货")
 	private BigDecimal shipmentsNumber;
 	/**
-	 * 发货量
+	 * 待发货
 	 */
 	@ApiModelProperty(value = "待发货")
 	private BigDecimal waitDeliver;

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.java

@@ -81,7 +81,7 @@ public interface DeliveryItemsMapper extends BaseMapper<DeliveryItems> {
 	 * @param billType 订单类型
 	 * @param tenantId 租户id
 	 * @param salesCompany 所属公司
-	 * @param businessDate 发货日期
+	 * @param businessDate 发货日期 null 没有时间限制 0 查询当天 1 查询当月
 	 * @param deliveryStatus 单据状态
 	 * @return
 	 */
@@ -89,7 +89,7 @@ public interface DeliveryItemsMapper extends BaseMapper<DeliveryItems> {
 						   @Param("billType")String billType,
 						   @Param("tenantId")String tenantId,
 						   @Param("salesCompany")Long salesCompany,
-						   @Param("businessDate") Date businessDate,
+						   @Param("businessDate") Integer businessDate,
 						   @Param("deliveryStatus") String deliveryStatus);
 	/**
 	 * 更新生成货款状态

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/mapper/DeliveryItemsMapper.xml

@@ -135,9 +135,12 @@
         <if test="salesCompany != null">
             AND bd.sales_company = #{salesCompany}
         </if>
-        <if test="businessDate != null">
+        <if test="businessDate != null and businessDate == 0">
             AND TO_DAYS(bd.business_date) = TO_DAYS(NOW())
         </if>
+        <if test="businessDate != null and businessDate == 1">
+            AND MONTH(bd.business_date) = MONTH(NOW())
+        </if>
     </select>
     <update id="submitPay" parameterType="long">
         UPDATE business_delivery_items SET is_check = '1' WHERE pid = #{id}

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -846,7 +846,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 	public DailyNumberVO dailyNumber(DeliveryVO delivery) {
 		DailyNumberVO dailyNumberVo = new DailyNumberVO();
 		//获取今日发货数量
-		dailyNumberVo.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,new Date(),DeliveryStatusEnum.REVOCATION.getType()));
+		dailyNumberVo.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,0,DeliveryStatusEnum.REVOCATION.getType()));
+		//获取总发货量(月)
+		dailyNumberVo.setTotalShipments(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,1,DeliveryStatusEnum.REVOCATION.getType()));
 		//获取待发货数量
 		dailyNumberVo.setWaitDeliver(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),null,null,DeliveryStatusEnum.REPEAL.getType()));
 		return dailyNumberVo;
@@ -862,7 +864,9 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 				CorpNumberVO corpNumberVO = new CorpNumberVO();
 				corpNumberVO.setBelongToCorpName(e.getGoodtypes());
 				//获取今日发货数量
-				corpNumberVO.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),new Date(),DeliveryStatusEnum.REVOCATION.getType()));
+				corpNumberVO.setShipmentsNumber(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),0,DeliveryStatusEnum.REVOCATION.getType()));
+				//获取发货量(月)
+				corpNumberVO.setDelivered(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),1,DeliveryStatusEnum.REVOCATION.getType()));
 				//获取待发货数量
 				corpNumberVO.setWaitDeliver(baseMapper.dailyNumber(delivery.getTradeType(),delivery.getBillType(),delivery.getTenantId(),e.getId(),null,DeliveryStatusEnum.REPEAL.getType()));
 				list.add(corpNumberVO);

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryController.java

@@ -81,7 +81,7 @@ public class SalaryController extends BladeController {
 		salary.setTenantId(SecureUtil.getTenantId());
 		LambdaQueryWrapper<Salary> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.setEntity(salary);
-		lambdaQueryWrapper.orderByDesc(Salary::getAnnual).orderByAsc(Salary::getMoon);
+		lambdaQueryWrapper.orderByDesc(Salary::getAnnual).orderByDesc(Salary::getMoon);
 		IPage<Salary> pages = salaryService.page(Condition.getPage(query), lambdaQueryWrapper);
 		if (CollectionUtils.isNotEmpty(pages.getRecords())){
 			pages.getRecords().stream().forEach(item ->{