feat(all): 修改仓库租用管理

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/WarehouseLeasingController.java

@@ -16,8 +16,6 @@
  */
 package com.logpm.basicdata.controller;
 
-import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -28,6 +26,7 @@ import com.logpm.basicdata.entity.WarehouseLeasingEntity;
 import com.logpm.basicdata.excel.WarehouseLeasingExcel;
 import com.logpm.basicdata.feign.IBasicdataClientClient;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
+import com.logpm.basicdata.query.WarehouseLeasingQuery;
 import com.logpm.basicdata.service.IWarehouseLeasingService;
 import com.logpm.basicdata.vo.ResidualAreaVO;
 import com.logpm.basicdata.vo.WarehouseLeasingVO;
@@ -122,21 +121,8 @@ public class WarehouseLeasingController extends BladeController {
 	@GetMapping("/page")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "分页", notes = "传入warehouseLeasing")
-	public R<IPage<WarehouseLeasingVO>> page(WarehouseLeasingVO warehouseLeasing, Query query) {
-		IPage<WarehouseLeasingVO> pages = warehouseLeasingService.selectWarehouseLeasingPage(Condition.getPage(query), warehouseLeasing);
-		if (ObjectUtil.isNotEmpty(pages)) {
-			List<WarehouseLeasingVO> records = pages.getRecords();
-			if (CollUtil.isNotEmpty(records)) {
-				for (WarehouseLeasingVO record : records) {
-					if (NumberUtil.equals(record.getType(), 1)) {
-						record.setTypeName("面积");
-					}
-					if (NumberUtil.equals(record.getType(), 2)) {
-						record.setTypeName("库位");
-					}
-				}
-			}
-		}
+	public R<IPage<WarehouseLeasingVO>> page(WarehouseLeasingQuery query) {
+		IPage<WarehouseLeasingVO> pages = warehouseLeasingService.selectWarehouseLeasingPage(query);
 		return R.data(pages);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/WarehouseLeasingMapper.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.mapper;
 
 import com.logpm.basicdata.entity.WarehouseLeasingEntity;
+import com.logpm.basicdata.query.WarehouseLeasingQuery;
 import com.logpm.basicdata.vo.WarehouseLeasingVO;
 import com.logpm.basicdata.excel.WarehouseLeasingExcel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -40,7 +41,7 @@ public interface WarehouseLeasingMapper extends BaseMapper<WarehouseLeasingEntit
 	 * @param warehouseLeasing
 	 * @return
 	 */
-	List<WarehouseLeasingVO> selectWarehouseLeasingPage(IPage page, WarehouseLeasingVO warehouseLeasing);
+	List<WarehouseLeasingVO> selectWarehouseLeasingPage(@Param("page") IPage page, @Param("warehouseLeasing") WarehouseLeasingQuery warehouseLeasing);
 
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/WarehouseLeasingMapper.xml

@@ -8,15 +8,33 @@
 
     <select id="selectWarehouseLeasingPage" resultType="com.logpm.basicdata.vo.WarehouseLeasingVO">
         select t.*,
-               lww.name warehouseName,
-               case when t.lease_termination_date &lt; CURDATE() then '是'
-        when t.lease_termination_date >= CURDATE() then '否'
-        else '' end expired,
-        lbc.client_name clientName
+               lww.name        warehouseName,
+               case
+                   when t.lease_termination_date &lt; CURDATE() then '是'
+                   when t.lease_termination_date >= CURDATE() then '否'
+                   else '' end expired,
+               lbc.client_name clientName
         from logpm_warehouse_leasing t
-        left join logpm_warehouse_warehouse lww on lww.id = t.warehouse_id
-        left join logpm_basicdata_client lbc on lbc.id = t.client_id
+                 left join logpm_warehouse_warehouse lww on lww.id = t.warehouse_id
+                 left join logpm_basicdata_client lbc on lbc.id = t.client_id
         where t.is_deleted = 0
+        <if test="warehouseLeasing.clientName != null and warehouseLeasing.clientName != ''">
+            and lbc.client_name like concat('%', #{warehouseLeasing.clientName}, '%')
+        </if>
+        <if test="warehouseLeasing.expired != null and warehouseLeasing.expired != ''">
+            <if test="warehouseLeasing.expired == '是'">
+                and t.lease_termination_date &lt; CURDATE()
+            </if>
+            <if test="warehouseLeasing.expired == '否'">
+                and t.lease_termination_date >= CURDATE()
+            </if>
+        </if>
+        <if test="warehouseLeasing.warehouseIds != null and warehouseLeasing.warehouseIds != ''">
+            and t.warehouse_id in
+            <foreach collection="warehouseLeasing.warehouseIds" item="warehouseId" separator="," open="(" close=")">
+                #{warehouseId}
+            </foreach>
+        </if>
     </select>
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/query/WarehouseLeasingQuery.java

@@ -0,0 +1,55 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.query;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springblade.core.mp.support.Query;
+
+import java.util.List;
+
+/**
+ * 仓库租用管理 视图实体类
+ *
+ * @author zqb
+ * @since 2024-08-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class WarehouseLeasingQuery extends Query {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 仓库id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	private List<Long> warehouseIds;
+
+	/**
+	 * 是否过期
+	 */
+	@ApiModelProperty(value = "是否过期")
+	private String expired;
+
+	/**
+	 * 客户名称
+	 */
+	@ApiModelProperty(value = "客户名称")
+	private String clientName;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IWarehouseLeasingService.java

@@ -18,6 +18,7 @@ package com.logpm.basicdata.service;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.logpm.basicdata.entity.WarehouseLeasingEntity;
+import com.logpm.basicdata.query.WarehouseLeasingQuery;
 import com.logpm.basicdata.vo.ResidualAreaVO;
 import com.logpm.basicdata.vo.WarehouseLeasingVO;
 import com.logpm.basicdata.excel.WarehouseLeasingExcel;
@@ -36,10 +37,9 @@ public interface IWarehouseLeasingService extends BaseService<WarehouseLeasingEn
 	 * 自定义分页
 	 *
 	 * @param page
-	 * @param warehouseLeasing
 	 * @return
 	 */
-	IPage<WarehouseLeasingVO> selectWarehouseLeasingPage(IPage<WarehouseLeasingVO> page, WarehouseLeasingVO warehouseLeasing);
+	IPage<WarehouseLeasingVO> selectWarehouseLeasingPage(WarehouseLeasingQuery page);
 
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/WarehouseLeasingServiceImpl.java

@@ -18,6 +18,7 @@ package com.logpm.basicdata.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
@@ -28,10 +29,12 @@ import com.logpm.basicdata.entity.WarehouseLeasingEntity;
 import com.logpm.basicdata.excel.WarehouseLeasingExcel;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.mapper.WarehouseLeasingMapper;
+import com.logpm.basicdata.query.WarehouseLeasingQuery;
 import com.logpm.basicdata.service.IWarehouseLeasingService;
 import com.logpm.basicdata.vo.ResidualAreaVO;
 import com.logpm.basicdata.vo.WarehouseLeasingVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.User;
@@ -61,12 +64,19 @@ public class WarehouseLeasingServiceImpl extends BaseServiceImpl<WarehouseLeasin
 	private IBasicdataWarehouseClient warehouseClient;
 
 	@Override
-	public IPage<WarehouseLeasingVO> selectWarehouseLeasingPage(IPage<WarehouseLeasingVO> page, WarehouseLeasingVO warehouseLeasing) {
-		List<WarehouseLeasingVO> warehouseLeasingVOS = baseMapper.selectWarehouseLeasingPage(page, warehouseLeasing);
+	public IPage<WarehouseLeasingVO> selectWarehouseLeasingPage(WarehouseLeasingQuery query) {
+		IPage<WarehouseLeasingVO> page = Condition.getPage(query);
+		List<WarehouseLeasingVO> warehouseLeasingVOS = baseMapper.selectWarehouseLeasingPage(page, query);
 		if (CollUtil.isNotEmpty(warehouseLeasingVOS)) {
 			// 获取修改用户id
 			Set<Long> collect = new HashSet<>();
 			warehouseLeasingVOS.forEach(expenseDispatchPriceUnitVO -> {
+				if (NumberUtil.equals(expenseDispatchPriceUnitVO.getType(), 1)) {
+					expenseDispatchPriceUnitVO.setTypeName("面积");
+				}
+				if (NumberUtil.equals(expenseDispatchPriceUnitVO.getType(), 2)) {
+					expenseDispatchPriceUnitVO.setTypeName("库位");
+				}
 				collect.add(expenseDispatchPriceUnitVO.getCreateUser());
 				collect.add(expenseDispatchPriceUnitVO.getUpdateUser());
 			});
@@ -106,9 +116,9 @@ public class WarehouseLeasingServiceImpl extends BaseServiceImpl<WarehouseLeasin
 			BigDecimal acreage = warehouseEntity.getAcreage();
 			BigDecimal divide = BigDecimal.ZERO;
 			if (ObjectUtil.isNotEmpty(acreage)) {
-				if(ObjectUtil.isNotEmpty(warehouseEntity.getTemporaryTurnoverArea())){
+				if (ObjectUtil.isNotEmpty(warehouseEntity.getTemporaryTurnoverArea())) {
 					divide = acreage.subtract(warehouseEntity.getTemporaryTurnoverArea());
-				}else{
+				} else {
 					divide = acreage;
 				}
 				if (ObjectUtil.isNotEmpty(warehouseEntity.getSeating())) {
@@ -120,7 +130,7 @@ public class WarehouseLeasingServiceImpl extends BaseServiceImpl<WarehouseLeasin
 			if (CollUtil.isNotEmpty(list)) {
 				BigDecimal sum = list.stream().map(WarehouseLeasingEntity::getLeasedArea).reduce(BigDecimal.ZERO, BigDecimal::add);
 				residualAreaVO.setResidualArea(Convert.toStr(divide.subtract(sum)));
-			}else{
+			} else {
 				residualAreaVO.setResidualArea(Convert.toStr(divide));
 			}
 		}