交收仓选择返回空仓查询查询条件用于查询仓房列表

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/vo/DeliveryRespVO.java

@@ -72,4 +72,15 @@ public class DeliveryRespVO {
     @Schema(description = "联系电话")
     @ExcelIgnore
     private String lxdh;
+    @Schema(description = "仓房类型编码")
+    private String cflx;
+
+    @Schema(description = "仓房状态编码")
+    private String cfzt;
+
+    // 仓房仓容
+    @Schema(description = "仓房仓容start")
+    private Integer cfStart;
+    @Schema(description = "仓房仓容end")
+    private Integer cfEnd;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/delivery/vo/StorePageReqVO.java

@@ -27,4 +27,15 @@ public class StorePageReqVO extends PageParam {
 
     @Schema(description = "银行名称")
     private String yhmc;
+
+    @Schema(description = "仓房类型编码")
+    private String cflx;
+
+    @Schema(description = "仓房状态编码")
+    private String cfzt;
+
+    @Schema(description = "仓房仓容start")
+    private Integer cfStart;
+    @Schema(description = "仓房仓容end")
+    private Integer cfEnd;
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/dal/mysql/caxx/CaxxMapper.java

@@ -8,6 +8,7 @@ import com.unis.framework.mybatis.core.query.LambdaQueryWrapperX;
 import com.unis.module.coding.controller.admin.caxx.vo.CaxxPageReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.SparePageReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.SpareRespVO;
+import com.unis.module.coding.controller.admin.delivery.vo.StorePageReqVO;
 import com.unis.module.coding.controller.admin.delivery.vo.StoreRespVO;
 import com.unis.module.coding.dal.dataobject.caxx.CaxxDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -52,11 +53,15 @@ public interface CaxxMapper extends BaseMapperX<CaxxDO> {
 
     Page<SpareRespVO> selectWrapperPageForSheng(Page<Object> objectPage, @Param("pageReqVO")SparePageReqVO pageReqVO);
 
-    default List<CaxxDO> selectListByKqId(Long  kqId) {
+    default List<CaxxDO> selectList(StorePageReqVO pageReqVO) {
           List<CaxxDO> caxxList = selectList(
                 new LambdaQueryWrapperX<CaxxDO>()
-                        .eqIfPresent(CaxxDO::getKqid, kqId)
-
+                        .eqIfPresent(CaxxDO::getKqid, pageReqVO.getKqId())
+                        .eqIfPresent(CaxxDO::getCflx, pageReqVO.getCflx())
+                        .eqIfPresent(CaxxDO::getCazt, pageReqVO.getCfzt())
+                        .between(pageReqVO.getCfStart() != null && pageReqVO.getCfEnd() != null,CaxxDO::getSjcr, pageReqVO.getCfStart(), pageReqVO.getCfEnd())
+                        .le(pageReqVO.getCfStart() == null && pageReqVO.getCfEnd() != null,CaxxDO::getSjcr, pageReqVO.getCfEnd())
+                        .ge(pageReqVO.getCfStart() != null && (pageReqVO.getCfEnd() == null ),CaxxDO::getSjcr, pageReqVO.getCfStart())
         );
         return caxxList;
     }
@@ -77,4 +82,12 @@ public interface CaxxMapper extends BaseMapperX<CaxxDO> {
     Page<SpareRespVO> getSelectPageForBank(Page<Object> objectPage, @Param("pageReqVO")SparePageReqVO pageReqVO);
 
     Page<SpareRespVO> getSelectPageForSheng(Page<Object> objectPage, @Param("pageReqVO")SparePageReqVO pageReqVO);
+
+    default  List<CaxxDO> selectListByKqId(Long kqId){
+        List<CaxxDO> caxxList = selectList(
+                new LambdaQueryWrapperX<CaxxDO>()
+                        .eqIfPresent(CaxxDO::getKqid, kqId)
+        );
+        return caxxList;
+    }
 }

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/dwxx/DwxxServiceImpl.java

@@ -242,7 +242,17 @@ public class DwxxServiceImpl implements DwxxService {
                     page = dwxxMapper.selectWrapperPageForSheng(new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()), pageReqVO);
                 }
             }
-
+        }
+        if (!ObjectUtils.isEmpty(page)) {
+            List<DeliveryRespVO> records = page.getRecords();
+            if (!ObjectUtils.isEmpty(records)) {
+                records.stream().forEach(s -> {
+                     s.setCflx(pageReqVO.getCflx());
+                     s.setCfzt(pageReqVO.getCfzt());
+                     s.setCfEnd(pageReqVO.getCfEnd());
+                     s.setCfStart(pageReqVO.getCfStart());
+                });
+            }
         }
         return new PageResult<>(page.getRecords(), page.getTotal());
     }
@@ -324,7 +334,7 @@ public class DwxxServiceImpl implements DwxxService {
                     }
                 } else {// 省已选
                     if (YXZT.NOT_SELECTED.getCode().equals(pageReqVO.getYxcf())) {
-                        List<CaxxDO> caxxDOS = caxxMapper.selectListByKqId(pageReqVO.getKqId());
+                        List<CaxxDO> caxxDOS = caxxMapper.selectList(pageReqVO);
                         List<StoreRespVO> storeListSelect = provinceMapper.getStoreListForProvince(pageReqVO.getKqId(), 0);
                         List<StoreRespVO> storeListForProvice = new ArrayList<>();
                         if (!ObjectUtils.isEmpty(caxxDOS)) {

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/dwxx/DwxxMapper.xml

@@ -284,6 +284,21 @@
             cf.deleted=0
             and cf.lsxz='000'
             and cc.KQID=#{pageReqVO.kqId}
+            <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
+                        and cc.CFLX=#{pageReqVO.cflx}
+            </if>
+            <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
+                        and cc.CAZT=#{pageReqVO.cfzt}
+            </if>
+            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
+                        and cc.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
+            </if>
+            <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
+                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
+            </if>
+            <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
+                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
+            </if>
         </where>
         order by cc.KQID desc
     </select>

delivery-module-core/delivery-module-core-biz/src/main/resources/mapper/province/ProvinceMapper.xml

@@ -26,6 +26,21 @@
              <if test="type!=null  and type==1">
                 and pe.HY_STATE=1
             </if>
+            <if test="pageReqVO.cflx!=null and pageReqVO.cflx!=''">
+                        and cc.CFLX=#{pageReqVO.cflx}
+            </if>
+            <if test="pageReqVO.cfzt!=null and pageReqVO.cfzt!=''">
+                        and cc.CAZT=#{pageReqVO.cfzt}
+            </if>
+            <if test="pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and pageReqVO.cfEnd!=null and pageReqVO.cfEnd!=''">
+                        and cc.SJCR between #{pageReqVO.cfStart} and #{pageReqVO.cfEnd}
+            </if>
+            <if test="(pageReqVO.cfStart == null or pageReqVO.cfStart == '') and pageReqVO.cfEnd != null and pageReqVO.cfEnd != ''">
+                        and cc.SJCR <![CDATA[<=]]>  #{pageReqVO.cfEnd}
+            </if>
+            <if test=" pageReqVO.cfStart!=null and pageReqVO.cfStart!='' and (pageReqVO.cfEnd == null or pageReqVO.cfEnd == '') ">
+                        and cc.SJCR <![CDATA[>=]]>  #{pageReqVO.cfStart}
+            </if>
         </where>
         order by pe.KQ_ID desc
     </select>