Merge branch 'master' of http://8.138.18.76:3000/qmrb/parking-server

src/main/java/com/qmrb/system/service/impl/ContractPlaceNumberRelServiceImpl.java

@@ -111,10 +111,15 @@ public class ContractPlaceNumberRelServiceImpl extends ServiceImpl<ContractPlace
             List<ContractPlaceNumberRelVO> records = pageResult.getRecords();
             // 创建一个新的可变列表，并将原列表元素复制进去
             List<ContractPlaceNumberRelVO> mutableRecords = new ArrayList<>(records);
-            if (CollectionUtil.isEmpty(records)) {
+            if (CollectionUtil.isEmpty(records) && list.size() == 0) {
                 ContractPlaceNumberRelVO contractPlaceNumberRelVO = new ContractPlaceNumberRelVO();
                 contractPlaceNumberRelVO.setContractId(sysUser.getContractId());
-                contractPlaceNumberRelVO.setAbledNum("1");
+                if(list.size() == 0) {
+                    contractPlaceNumberRelVO.setAbledNum("1");
+                }else{
+                    contractPlaceNumberRelVO.setAbledNum(String.valueOf(list.size()));
+                }
+
                 contractPlaceNumberRelVO.setStatus("1");
                 // 车位上限 大型车位 小型车位
                 contractPlaceNumberRelVO.setMaxParkingLotNum(contract.getMaxParkingLotNum());

src/main/resources/mapper/ContractPlaceNumberRelMapper.xml

@@ -11,17 +11,23 @@
         LEFT JOIN
         contract c ON cpnr.contract_id = c.id
         <where>
+            1=1
             <if test="role == 'ADMIN'">
                 <!-- 当role为ADMIN时，不添加额外条件，查询所有 -->
+
             </if>
             <if test="role != 'ADMIN'">
-                cpnr.contract_id = #{sysUser.contractId}
+                AND cpnr.contract_id = #{sysUser.contractId}
             </if>
             <if test="queryParams.contractName != null and queryParams.contractName != ''">
-                c.contract_name like concat('%', #{queryParams.contractName}, '%')
+                AND c.contract_name like concat('%', #{queryParams.contractName}, '%')
             </if>
             <if test="queryParams.startTimeBegin != null and queryParams.startTimeBegin != '' and queryParams.startTimeEnd != null and queryParams.startTimeEnd != ''">
-                cpnr.create_time between #{queryParams.startTimeBegin} and #{queryParams.startTimeEnd}
+                AND cpnr.start_time &lt;= #{queryParams.startTimeBegin}
+                AND cpnr.end_time &gt;= #{queryParams.startTimeEnd}
+            </if>
+            <if test="queryParams.endTimeBegin != null and queryParams.endTimeBegin != '' and queryParams.endTimeEnd != null and queryParams.endTimeEnd != ''">
+                AND cpnr.create_time between #{queryParams.endTimeBegin} and #{queryParams.endTimeEnd}
             </if>
         </where>
         order by cpnr.update_time desc