支付宝支付

ace-common/src/main/resources/properties/resultcod.properties

@@ -28,6 +28,7 @@ RSTOKEN_EXPIRED_CODE=1006
 RSTOKEN_NULL_CODE=1007
 1007=rstoken为空
 
+
 #数据库操作失败
 DB_OPERATION_FAIL_CODE=1008
 1008=数据库操作失败
@@ -102,9 +103,11 @@ USER_EXIST_CODE=5003
 ORG_INSERT_FAILED_CODE=6001
 6001=新增组织失败
 
+VEHICLE_NOT_=6001
+6001=新增组织失败
 
 ORG_UPDATE_FAILED_CODE=6002
-6001=更新组织信息失败
+6002=更新组织信息失败
 
 ROLE_INSERT_FAILED_CODE=7001
 7001=新增角色信息失败

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -183,4 +183,7 @@ public class VehicleBookRecord {
     private String vehicleUsername;
 
     private String vehicleUserPhone;
+
+    @Column(name = "vehicle_upkeep_item_ids")
+    private String upkeepIds;
 }
\ No newline at end of file

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

@@ -100,4 +100,6 @@ public class BookVehicleVO {
     //使用人电话
     private String vehicleUserPhone;
 
+    private String upkeepIds;
+
 }
\ No newline at end of file

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

@@ -200,5 +200,13 @@ public class QueryVehicleBookRecordVo {
      */
     private Integer haveViolation;
 
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    private String vehicleUsername;
+
+    private String vehicleUserPhone;
 
 }
\ No newline at end of file

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

@@ -163,5 +163,5 @@ public class VehicleBookRecordAndTbNameVo {
      */
     private Integer haveViolation;
 
-
+    private String upkeepIds;
 }
\ No newline at end of file

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

@@ -52,5 +52,5 @@ public class VehicleBookRecordQueryVo {
     private String[] zoneIds;
 
     private String[] companyIds;
-
+    private String upkeepIds;
 }
\ No newline at end of file

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

@@ -24,4 +24,8 @@ public class VehicleBookRecordVo extends VehicleBookRecord {
     private String parkCompanyName;
     //所属公司
     private String subordinateBranchName;
+
+    private VehicleDepartureLogVo vehicleDepartureLogVo;
+
+    private String  numberPlate;
 }

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

@@ -415,8 +415,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
             vehicleBookRecord.setBookUser(userId);
             vehicleBookRecord.setBookUserName(userName);
-            vehicleBookRecord.setBookStartDate(new DateTime(new DateTime(startDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
-            vehicleBookRecord.setBookEndDate(new DateTime(new DateTime(endDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
+            vehicleBookRecord.setBookStartDate(startDay.toDate());
+            vehicleBookRecord.setBookEndDate(endDay.toDate());
             vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
             vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
             vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
@@ -424,11 +424,12 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
             vehicleBookRecord.setVehicleUsername(bookVehicleVo.getVehicleUsername());
             vehicleBookRecord.setVehicleUserPhone(bookVehicleVo.getVehicleUserPhone());
+            vehicleBookRecord.setUpkeepIds(bookVehicleVo.getUpkeepIds());
             vehicleBookRecordBiz.save(vehicleBookRecord);
         } else {
             vehicleBookRecord = vehicleBookRecordBiz.selectById(bookVehicleVo.getVehicleBookRecordId());
-            vehicleBookRecord.setBookStartDate(new DateTime(new DateTime(startDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
-            vehicleBookRecord.setBookEndDate(new DateTime(new DateTime(endDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
+            vehicleBookRecord.setBookStartDate(startDay.toDate());
+            vehicleBookRecord.setBookEndDate(endDay.toDate());
             vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
         }
 

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

@@ -127,7 +127,46 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         PageHelper.startPage(pageNo,pageSize);
         PageInfo<VehicleBookRecordVo> vehiclePageInfo = new PageInfo<>(list);
         return RestResponse.suc(PageDataVO.pageInfo(vehiclePageInfo));
+    }
+
 
+    public RestResponse<PageDataVO> getBookRecordInfo(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
+        Integer pageNo = vehicleBookRecordQueryVo.getPage() == null ? 1 : vehicleBookRecordQueryVo.getPage();
+        Integer pageSize = vehicleBookRecordQueryVo.getLimit() == null ? 10 : vehicleBookRecordQueryVo.getLimit();
+        UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
+        if(userDTO == null) {
+            return RestResponse.codeAndMessage(235, "token失效");
+        }
+        if(vehicleBookRecordQueryVo.getZoneId() == null) { //默认查出所有权限内的数据
+            if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
+                String zoneId = null;
+                if(StringUtils.isNotBlank(userDTO.getDataZone())) {
+                    if(userDTO.getDataZone().contains(",")) {
+                        zoneId = userDTO.getDataZone();
+                    } else {
+                        zoneId = userDTO.getDataZone() + ",";
+                    }
+                } else {
+                    zoneId = userDTO.getZoneId() + ",";
+                }
+                vehicleBookRecordQueryVo.setZoneIds(zoneId.split(","));
+                String companyId = null;
+                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
+                    if(userDTO.getDataCompany().contains(",")) {
+                        companyId = userDTO.getDataCompany();
+                    } else {
+                        companyId = userDTO.getDataCompany() + ",";
+                    }
+                } else {
+                    companyId = userDTO.getCompanyId() + ",";
+                }
+                vehicleBookRecordQueryVo.setCompanyIds(companyId.split(","));
+            }
+        }
+        List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(vehicleBookRecordQueryVo);
+        PageHelper.startPage(pageNo,pageSize);
+        PageInfo<VehicleBookRecordVo> vehiclePageInfo = new PageInfo<>(list);
+        return RestResponse.suc(PageDataVO.pageInfo(vehiclePageInfo));
     }
 
     public RestResponse<Integer> lift(Integer operatorId, String userName, LiftVehicleVo liftVehicleVo) throws Exception{
@@ -179,19 +218,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
      */
     public PageDataVO<QueryVehicleBookRecordVo> page(VehicleBookRecordQueryVo vehicleBookRecordQueryVo, List<Integer> companyList) throws Exception{
         Map<String, Object> params = PropertyUtils.describe(vehicleBookRecordQueryVo);
-        String selectedMonth = (String)params.get("selectedMonth");
-        if(StringUtils.isBlank(selectedMonth)){
-            throw new CustomIllegalParamException(" no month selected ");
-        }
+        String bookRecordAccItemTbName =  TB_ACC_ITEM_NAME_REAL;
         params.put("tbName",TB_NAME_REAL);
-        DateTime selectedMonthDate = DateTime.parse(selectedMonth,YEARMONTH_DATE_TIME_FORMATTER);
-        String bookRecordAccItemTbName = TB_ACC_ITEM_NAME_REAL;
-        if(selectedMonthDate.compareTo(DateTime.now().plusMonths(-1).withDayOfMonth(1).withMillisOfDay(0)) < 0){
-            params.put("tbName",getTbName(String.valueOf(selectedMonthDate.getYear())));
-            bookRecordAccItemTbName = getAccItemTbName(String.valueOf(selectedMonthDate.getYear()));
+        if(params.get("selectedMonth") != null) {
+            String selectedMonth = (String)params.get("selectedMonth");
+            if(StringUtils.isBlank(selectedMonth)){
+                throw new CustomIllegalParamException(" no month selected ");
+            }
+            DateTime selectedMonthDate = DateTime.parse(selectedMonth,YEARMONTH_DATE_TIME_FORMATTER);
+            if(selectedMonthDate.compareTo(DateTime.now().plusMonths(-1).withDayOfMonth(1).withMillisOfDay(0)) < 0){
+                params.put("tbName",getTbName(String.valueOf(selectedMonthDate.getYear())));
+                bookRecordAccItemTbName = getAccItemTbName(String.valueOf(selectedMonthDate.getYear()));
+            }
+            params.put("bookedStartDate",selectedMonthDate.withDayOfMonth(1).toString());
+            params.put("bookedEndDate",selectedMonthDate.plusMonths(1).withDayOfMonth(1).toDate());
         }
-        params.put("bookedStartDate",selectedMonthDate.withDayOfMonth(1).toString());
-        params.put("bookedEndDate",selectedMonthDate.plusMonths(1).withDayOfMonth(1).toDate());
         Integer pageSize = (Integer) params.get("limit");
         params.remove("pageSize");
         Integer pageNo = (Integer) params.get("page");

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

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

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

@@ -21,4 +21,6 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
     Integer selectMileageByVehicleId(String vehicleId);
 
     String selectDayByVehicleId(String vehicleId);
+
+    VehicleDepartureLogVo selectByBookRecordId(Integer bookRecordId);
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -451,6 +451,12 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return vehicleBookRecordBiz.getBookRecord(vehicleBookRecordQueryVo);
     }
 
+    @GetMapping(value = "/app/unauth/getBookRecordInfo")
+    @ApiOperation(value = "获取排班记录信息")
+    public RestResponse<PageDataVO> getBookRecordInfo(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
+        return vehicleBookRecordBiz.getBookRecordInfo(vehicleBookRecordQueryVo);
+    }
+
 
     @RequestMapping(value = "/app/unauth/getVehicleWarningMsg", method = RequestMethod.GET)
     @ApiOperation(value = "获取排车车辆警告信息")

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

@@ -6,6 +6,11 @@
          <association property="vehicle" column="vehicle_id" select="com.xxfc.platform.vehicle.mapper.VehicleMapper.selectById" />
     </resultMap>
 
+    <resultMap id="searchBookRecord" type="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
+        <result column="id" property="id" jdbcType="BIGINT" javaType="java.lang.Long"/>
+        <association property="vehicleDepartureLogVo" column="id" select="com.xxfc.platform.vehicle.mapper.VehicleDepartureLogMapper.selectByBookRecordId" />
+    </resultMap>
+
     <resultMap id="getVehicleHourMap" type="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo">
         <association property="vehicleBookHourInfo" column="id" select="com.xxfc.platform.vehicle.mapper.VehicleBookHourInfoMapper.selectByBookRecordId" />
     </resultMap>
@@ -245,7 +250,9 @@
             v.number_plate as numberPlate,
             v.subordinate_branch,
             bc.name as subBranchName,
-            vbf.booked_date as bookedDate
+            vbf.booked_date as bookedDate,
+            vbr.vehicle_username,
+            vbr.vehicle_user_phone
         from
             ${tbName} vbr left join
             vehicle v on vbr.vehicle_id = v.id left join
@@ -368,8 +375,8 @@
         order By v1.create_time DESC
     </select>
 
-    <select id="getBookRecord" resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo" parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
-        select 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="getBookRecord" resultMap="searchBookRecord" parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
+        select v3.number_plate, 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.*
             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)
@@ -402,17 +409,52 @@
                     #{id}
                 </foreach>
             </if>
-            <choose>
-                <when test="status != null">
-                    and v1.status = #{status}
-                </when>
-                <otherwise>
-                    and v1.status between  1 and 2
-                </otherwise>
-            </choose>
+            and v1.status between  1 and 2
+        </where>
+
+        order by create_time DESC
+    </select>
+
+
+    <select id="getBookRecordInfo" resultMap="searchBookRecord" parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
+        select v3.number_plate, 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.*
+        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
+        LEFT JOIN branch_company bc3 on v3.park_branch_company_id = bc3.id
+        LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
+        <where>
+            <if test="selectedMonth != null">
+                and v2.year_month = #{selectedMonth}
+            </if>
+            <if test="numberPlate != null">
+                and v3.number_plate = #{numberPlate}
+            </if>
+            <if test="bookType != null">
+                and v1.book_type = #{bookType}
+            </if>
+            <if test="companyIds != null">
+                and v1.lift_company in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
 
+            </if>
+            <if test="zoneIds != null">
+                and bc1.zone_id in
+                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="status != null">
+                and v1.status = #{status}
+            </if>
         </where>
-        order by update_time DESC
+        order by create_time DESC
     </select>
 
 

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

@@ -16,6 +16,15 @@
         where vehicle_id = #{vehicleId}
         order by create_time desc
     </select>
+
+    <select id="selectByBookRecordId" parameterType="java.lang.Integer" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
+        select vehicle_departure_log.*,vehicle.number_plate
+        from vehicle_departure_log
+        left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
+        where book_record_id = #{id}
+        order by create_time desc
+    </select>
+
     <select id="selectVoAll" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*,vehicle.number_plate,
         /* IFNULL(DATEDIFF(vehicle_departure_log.arrival_time,vehicle_departure_log.departure_time),0)*/