Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

 package com.xxfc.platform.vehicle.pojo;
 
+import com.github.wxiaoqi.security.common.vo.PageParam;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
-public class VehicleBookRecordQueryVo {
+public class VehicleBookRecordQueryVo extends PageParam {
 
     /**
      * 车辆编号，0-没有
@@ -38,20 +41,16 @@ public class VehicleBookRecordQueryVo {
      */
     private Integer retCompany;
 
-    private Integer page;
-
-    private Integer limit;
-
     /**
      * 预定类型
      */
     private Integer bookType;
 
     private Integer zoneId;
+    private Integer companyId;
+    private List<String> zoneIds;
 
-    private String[] zoneIds;
-
-    private String[] companyIds;
+    private List<String> companyIds;
     private String upkeepIds;
     private Integer userCompany;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -37,6 +37,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -93,10 +95,13 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     public RestResponse<PageDataVO> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
         Integer pageNo = vehicleBookRecordQueryVo.getPage() == null ? 1 : vehicleBookRecordQueryVo.getPage();
         Integer pageSize = vehicleBookRecordQueryVo.getLimit() == null ? 10 : vehicleBookRecordQueryVo.getLimit();
+        vehicleBookRecordQueryVo.setPage(pageNo);
+        vehicleBookRecordQueryVo.setLimit(pageSize);
         UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
         if(userDTO == null) {
             return RestResponse.codeAndMessage(235, "token失效");
         }
+        vehicleBookRecordQueryVo.setUserCompany(userDTO.getCompanyId());
         if(vehicleBookRecordQueryVo.getZoneId() == null) { //默认查出所有权限内的数据
             if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
                 String zoneId = null;
@@ -109,7 +114,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 } else {
                     zoneId = userDTO.getZoneId() + ",";
                 }
-                vehicleBookRecordQueryVo.setZoneIds(zoneId.split(","));
+                vehicleBookRecordQueryVo.setZoneIds(Arrays.asList(zoneId.split(",")));
                 String companyId = null;
                 if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
                     if(userDTO.getDataCompany().contains(",")) {
@@ -120,22 +125,24 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 } else {
                     companyId = userDTO.getCompanyId() + ",";
                 }
-                vehicleBookRecordQueryVo.setCompanyIds(companyId.split(","));
+                vehicleBookRecordQueryVo.setCompanyIds(Arrays.asList(companyId.split(",")));
             }
         } else {
-            vehicleBookRecordQueryVo.setZoneIds((vehicleBookRecordQueryVo.getZoneId() + "").split(","));
-            vehicleBookRecordQueryVo.setCompanyIds((vehicleBookRecordQueryVo.getLiftCompany() + "").split(","));
+            vehicleBookRecordQueryVo.setZoneIds(Arrays.asList((vehicleBookRecordQueryVo.getZoneId() + ",").split(",")));
+            vehicleBookRecordQueryVo.setCompanyIds(Arrays.asList((vehicleBookRecordQueryVo.getLiftCompany() + ",").split(",")));
         }
-        List<VehicleBookRecordVo> list = mapper.getBookRecord(vehicleBookRecordQueryVo);
-        PageHelper.startPage(pageNo,pageSize);
-        PageInfo<VehicleBookRecordVo> vehiclePageInfo = new PageInfo<>(list);
-        return RestResponse.suc(PageDataVO.pageInfo(vehiclePageInfo));
+        vehicleBookRecordQueryVo.getCompanyIds().add(vehicleBookRecordQueryVo.getCompanyId() + "");
+        Query query = new Query(vehicleBookRecordQueryVo);
+        PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
+        return RestResponse.suc(pageDataVO);
     }
 
 
     public RestResponse<PageDataVO> getBookRecordInfo(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
         Integer pageNo = vehicleBookRecordQueryVo.getPage() == null ? 1 : vehicleBookRecordQueryVo.getPage();
         Integer pageSize = vehicleBookRecordQueryVo.getLimit() == null ? 10 : vehicleBookRecordQueryVo.getLimit();
+        vehicleBookRecordQueryVo.setPage(pageNo);
+        vehicleBookRecordQueryVo.setLimit(pageSize);
         UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
         if(userDTO == null) {
             return RestResponse.codeAndMessage(235, "token失效");
@@ -153,7 +160,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 } else {
                     zoneId = userDTO.getZoneId() + ",";
                 }
-                vehicleBookRecordQueryVo.setZoneIds(zoneId.split(","));
+                vehicleBookRecordQueryVo.setZoneIds(Arrays.asList(zoneId.split(",")));
                 String companyId = null;
                 if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
                     if(userDTO.getDataCompany().contains(",")) {
@@ -164,16 +171,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
                 } else {
                     companyId = userDTO.getCompanyId() + ",";
                 }
-                vehicleBookRecordQueryVo.setCompanyIds(companyId.split(","));
+                vehicleBookRecordQueryVo.setCompanyIds(Arrays.asList(companyId.split(",")));
             }
         } else {
-            vehicleBookRecordQueryVo.setZoneIds((vehicleBookRecordQueryVo.getZoneId() + ",").split(","));
-            vehicleBookRecordQueryVo.setCompanyIds((vehicleBookRecordQueryVo.getLiftCompany() + ",").split(","));
+            vehicleBookRecordQueryVo.setZoneIds(Arrays.asList((vehicleBookRecordQueryVo.getZoneId() + ",").split(",")));
+            vehicleBookRecordQueryVo.setCompanyIds(Arrays.asList((vehicleBookRecordQueryVo.getLiftCompany() + ",").split(",")));
         }
-        List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(vehicleBookRecordQueryVo);
-        PageHelper.startPage(pageNo,pageSize);
-        PageInfo<VehicleBookRecordVo> vehiclePageInfo = new PageInfo<>(list);
-        return RestResponse.suc(PageDataVO.pageInfo(vehiclePageInfo));
+        if(vehicleBookRecordQueryVo.getCompanyId() != null) {
+            if(vehicleBookRecordQueryVo.getCompanyIds() == null) {
+                vehicleBookRecordQueryVo.setCompanyIds(new ArrayList<>());
+            }
+            vehicleBookRecordQueryVo.getCompanyIds().add(vehicleBookRecordQueryVo.getCompanyId() + "");
+        }
+        Query query = new Query(vehicleBookRecordQueryVo);
+        PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
+        return RestResponse.suc(pageDataVO);
     }
 
     public RestResponse<Integer> lift(Integer operatorId, String userName, LiftVehicleVo liftVehicleVo) throws Exception{

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

@@ -34,5 +34,5 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
 
     public List<VehicleBookRecordVo> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo);
 
-    public List<VehicleBookRecordVo> getBookRecordInfo(VehicleBookRecordQueryVo vehicleBookRecordQueryVo);
+    public List<VehicleBookRecordVo> getBookRecordInfo(Map<String, Object> param);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -416,12 +416,9 @@
     </select>
 
 
-    <select id="getBookRecordInfo" resultMap="searchBookRecord" parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
-        select (CASE v1.lift_company WHEN #{userCompany} THEN 1 ELSE 0 end) liftStatus,(CASE v1.ret_company WHEN #{userCompany} THEN 1 ELSE 0 end) retStatus,bc3.name parkCompanyName,bc4.name subordinateBranchName, conv(v2.booked_date,10,2) book_date, conv(v4.booked_hour,10,2) startHour,conv(v5.booked_hour,10,2) endHour, bc1.`name` lift_company_name, bc2.`name` ret_company_name, v3.number_plate,v1.*
+    <select id="getBookRecordInfo" resultMap="searchBookRecord" parameterType="java.util.Map">
+        select (CASE v1.lift_company WHEN #{userCompany} THEN 1 ELSE 0 end) liftStatus,(CASE v1.ret_company WHEN #{userCompany} THEN 1 ELSE 0 end) retStatus,bc4.name subordinateBranchName, bc1.`name` lift_company_name, bc2.`name` ret_company_name, v3.number_plate,v1.*
         from vehicle_book_record v1
-        LEFT JOIN vehicle_book_info v2 on v1.vehicle_id = v2.vehicle and  v2.year_month = CONCAT(YEAR(v1.book_start_date),"-",IF(MONTH(v1.book_start_date) > 10,MONTH(v1.book_start_date),CONCAT("0",MONTH(v1.book_start_date))))
-        LEFT JOIN vehicle_book_hour_info v4 on v4.book_record_id = v1.id and YEAR(v4.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v4.year_month_day) = MONTH(v1.book_start_date) AND DAY(v4.year_month_day) =DAY(v1.book_start_date)
-        LEFT JOIN vehicle_book_hour_info v5 on v5.book_record_id = v1.id and YEAR(v5.year_month_day) = YEAR(v1.book_end_date) AND MONTH(v5.year_month_day) = MONTH(v1.book_end_date) AND DAY(v5.year_month_day) =DAY(v1.book_end_date)
         LEFT JOIN branch_company bc1 ON v1.lift_company = bc1.id
         LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
         LEFT JOIN vehicle v3 on v3.id = v1.vehicle_id
@@ -429,7 +426,7 @@
         LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
         <where>
             <if test="selectedMonth != null">
-                and v2.year_month = #{selectedMonth}
+                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_start_date like CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
@@ -438,10 +435,14 @@
                 and v1.book_type = #{bookType}
             </if>
             <if test="companyIds != null">
-                and v1.lift_company in
+                and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
+                or v1.ret_company in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>)
             </if>
             <if test="zoneIds != null">
                 and bc1.zone_id in
@@ -453,6 +454,7 @@
                 and v1.status = #{status}
             </if>
         </where>
+        group by v1.id
         order by create_time DESC
     </select>
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -457,7 +457,7 @@
     </select>
 
     <select id="getVehicle" resultMap="vehicleModel" parameterType="java.util.Map">
-        select v1.* from vehicle v1
+        select v1.*,bc3.name parkCompanyName  from vehicle v1
         LEFT JOIN branch_company bc3 ON v1.park_branch_company_id = bc3.id
        <where>
            <if test="numberPlate != null">
@@ -468,7 +468,6 @@
                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
-
            </if>
            <if test="zoneIds != null">
                and bc3.zone_id in