fix: 车辆管理添加数据权限

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/controller/CarController.java

@@ -269,6 +269,32 @@ public class CarController extends BladeController {
         return R.data(page);
     }
 
+//    @ApiOperation(value = "新增车检记录模板")
+//    @ApiOperationSupport(order = 39)
+//    public R saveCarCheckRecordTemplate() {
+//
+//    }
+//
+//    @ApiOperationSupport(order = 40)
+//    public R updateCarCheckRecordTemplate() {
+//
+//    }
+//
+//    @ApiOperationSupport(order = 41)
+//    public R removeCarCheckRecordTemplate() {
+//
+//    }
+//
+//    @ApiOperationSupport(order = 42)
+//    public R carCheckRecordTemplateDetail() {
+//
+//    }
+//
+//    @ApiOperationSupport(order = 43)
+//    public R carCheckRecordTemplatePage() {
+//
+//    }
+
     @GetMapping("/exportCarMaintenanceData")
     @ApiOperation(value = "导出车辆维保记录单")
     @ApiOperationSupport(order = 24)

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarAnnualInspectionMapper.java

@@ -1,11 +1,13 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarAnnualInspectionEntity;
 import com.hnac.hzims.safeproduct.vo.CarAnnualInspectionPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.annotation.UserDataAuth;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,7 +17,7 @@ import java.util.Map;
  * @date 2024-01-22
  */
 @Mapper
-public interface CarAnnualInspectionMapper extends BaseMapper<CarAnnualInspectionEntity> {
+public interface CarAnnualInspectionMapper extends UserDataScopeBaseMapper<CarAnnualInspectionEntity> {
 
     /**
      * 年检记录分页
@@ -23,5 +25,13 @@ public interface CarAnnualInspectionMapper extends BaseMapper<CarAnnualInspectio
      * @param page 分页类
      * @return 年检记录数据
      */
+    @UserDataAuth
     IPage<CarAnnualInspectionPageVO> getCarAnnualInspectionPage(IPage<CarAnnualInspectionPageVO> page, Map<String, Object> param);
+
+    /**
+     * 查询当月年检记录
+     * @param month 当月
+     * @return 当月年检记录数据表
+     */
+    List<CarAnnualInspectionEntity> selectCarAnnualInspectionByMonth(String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarAnnualInspectionMapper.xml

@@ -5,7 +5,8 @@
     <select id="getCarAnnualInspectionPage"
             resultType="com.hnac.hzims.safeproduct.vo.CarAnnualInspectionPageVO">
         SELECT
-            t1.id, t1.code, t1.annual_inspection_time, t1.location, t2.unit, t2.car_brand, t2.plate_number
+            t1.id, t1.code, t1.annual_inspection_time, t1.location, t2.unit, t2.car_brand, t2.plate_number, t1.create_user,
+            t1.create_dept
         FROM
             hzims_car_annual_inspection t1
             LEFT JOIN hzims_car t2 ON t1.car_id = t2.id
@@ -29,4 +30,17 @@
         ORDER BY
             t1.create_time DESC
     </select>
+
+    <select id="selectCarAnnualInspectionByMonth"
+            resultType="com.hnac.hzims.safeproduct.entity.CarAnnualInspectionEntity">
+        SELECT
+            *
+        FROM
+            hzims_car_annual_inspection
+        WHERE
+            is_deleted = 0
+            AND create_time like concat(#{month}, '%')
+        ORDER BY
+            code DESC
+    </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarCheckRecordMapper.java

@@ -1,11 +1,13 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarCheckRecordEntity;
 import com.hnac.hzims.safeproduct.vo.CarCheckRecordPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.annotation.UserDataAuth;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,7 +17,7 @@ import java.util.Map;
  * @date 2024-01-05
  */
 @Mapper
-public interface CarCheckRecordMapper extends BaseMapper<CarCheckRecordEntity> {
+public interface CarCheckRecordMapper extends UserDataScopeBaseMapper<CarCheckRecordEntity> {
 
     /**
      * 车检记录分页
@@ -23,5 +25,13 @@ public interface CarCheckRecordMapper extends BaseMapper<CarCheckRecordEntity> {
      * @param page 分页类
      * @return 分页数据
      */
+    @UserDataAuth
     IPage<CarCheckRecordPageVO> getCarCheckRecordPage(IPage<CarCheckRecordPageVO> page, Map<String, Object> param);
+
+    /**
+     * 查询当月车检记录
+     * @param month 当月
+     * @return 当月车检记录数据表
+     */
+    List<CarCheckRecordEntity> selectCarCheckRecordByMonth(String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarCheckRecordMapper.xml

@@ -4,7 +4,8 @@
 
     <select id="getCarCheckRecordPage" resultType="com.hnac.hzims.safeproduct.vo.CarCheckRecordPageVO">
         SELECT
-            t1.id, t2.unit, t2.car_brand, t2.plate_number, t1.checker, t1.check_time, t1.conclusion
+            t1.id, t2.unit, t2.car_brand, t2.plate_number, t1.checker, t1.check_time, t1.conclusion, t1.create_user,
+            t1.create_dept
         FROM
             hzims_car_check_record t1
             LEFT JOIN hzims_car t2 ON t1.car_id = t2.id
@@ -28,4 +29,17 @@
         ORDER BY
             t1.create_time DESC
     </select>
+
+    <select id="selectCarCheckRecordByMonth"
+            resultType="com.hnac.hzims.safeproduct.entity.CarCheckRecordEntity">
+        SELECT
+            *
+        FROM
+            hzims_car_check_record
+        WHERE
+            is_deleted = 0
+            AND create_time like concat(#{month}, '%')
+        ORDER BY
+            code DESC
+    </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarInsuranceMapper.java

@@ -1,11 +1,13 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarInsuranceEntity;
 import com.hnac.hzims.safeproduct.vo.CarInsurancePageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.annotation.UserDataAuth;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -15,7 +17,7 @@ import java.util.Map;
  * @date 2024-01-22
  */
 @Mapper
-public interface CarInsuranceMapper extends BaseMapper<CarInsuranceEntity> {
+public interface CarInsuranceMapper extends UserDataScopeBaseMapper<CarInsuranceEntity> {
 
     /**
      * 车保记录页面
@@ -23,5 +25,13 @@ public interface CarInsuranceMapper extends BaseMapper<CarInsuranceEntity> {
      * @param page 分页类
      * @return 车保记录数据
      */
+    @UserDataAuth
     IPage<CarInsurancePageVO> getCarInsurancePage(IPage<CarInsurancePageVO> page, Map<String, Object> param);
+
+    /**
+     * 查询当月年保记录
+     * @param month 当月
+     * @return 当月年保记录数据表
+     */
+    List<CarInsuranceEntity> selectCarInsuranceByMonth(String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarInsuranceMapper.xml

@@ -4,7 +4,8 @@
 
     <select id="getCarInsurancePage" resultType="com.hnac.hzims.safeproduct.vo.CarInsurancePageVO">
         SELECT
-            t1.id, t1.code, t1.insurance_time, t1.location, t2.unit, t2.car_brand, t2.plate_number
+            t1.id, t1.code, t1.insurance_time, t1.location, t2.unit, t2.car_brand, t2.plate_number, t1.create_user,
+            t1.create_dept
         FROM
             hzims_car_insurance t1
             LEFT JOIN hzims_car t2 ON t1.car_id = t2.id
@@ -28,4 +29,16 @@
         ORDER BY
             t1.create_time DESC
     </select>
+
+    <select id="selectCarInsuranceByMonth" resultType="com.hnac.hzims.safeproduct.entity.CarInsuranceEntity">
+        SELECT
+            *
+        FROM
+            hzims_car_insurance
+        WHERE
+            is_deleted = 0
+            AND create_time like concat(#{month}, '%')
+        ORDER BY
+            code DESC
+    </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.java

@@ -1,12 +1,14 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarMaintenanceEntity;
 import com.hnac.hzims.safeproduct.vo.CarMaintenanceDetailVO;
 import com.hnac.hzims.safeproduct.vo.CarMaintenancePageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.annotation.UserDataAuth;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,7 +18,7 @@ import java.util.Map;
  * @date 2024-01-04
  */
 @Mapper
-public interface CarMaintenanceMapper extends BaseMapper<CarMaintenanceEntity> {
+public interface CarMaintenanceMapper extends UserDataScopeBaseMapper<CarMaintenanceEntity> {
 
     /**
      * 查询车辆维保记录详情
@@ -31,5 +33,13 @@ public interface CarMaintenanceMapper extends BaseMapper<CarMaintenanceEntity> {
      * @param page 分页类
      * @return 分页数据
      */
+    @UserDataAuth
     IPage<CarMaintenancePageVO> getCarMaintenancePage(IPage<CarMaintenancePageVO> page, Map<String, Object> param);
+
+    /**
+     * 查询当月车辆维保记录
+     * @param month 当月
+     * @return 当月车辆维保数据表
+     */
+    List<CarMaintenanceEntity> selectCarMaintenanceByMonth(String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMaintenanceMapper.xml

@@ -19,7 +19,7 @@
     <select id="getCarMaintenancePage" resultType="com.hnac.hzims.safeproduct.vo.CarMaintenancePageVO">
         SELECT
             t2.unit, t2.car_brand, t2.car_type, t2.plate_number, t1.id, t1.maintenance_type, t1.content, t1.location,
-            t1.cost, t1.maintainer, t1.confirmation_time, t1.maintenance_status
+            t1.cost, t1.maintainer, t1.confirmation_time, t1.maintenance_status, t1.create_user, t1.create_dept
         FROM
             hzims_car_maintenance t1
             LEFT JOIN hzims_car t2 ON t1.car_id = t2.id
@@ -43,4 +43,17 @@
         ORDER BY
             t1.create_time DESC
     </select>
+
+    <select id="selectCarMaintenanceByMonth"
+            resultType="com.hnac.hzims.safeproduct.entity.CarMaintenanceEntity">
+        SELECT
+            *
+        FROM
+            hzims_car_maintenance
+        WHERE
+            is_deleted = 0
+            AND create_time like concat(#{month}, '%')
+        ORDER BY
+            code DESC
+    </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMapper.java

@@ -1,11 +1,12 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.dto.CarMilesYearDTO;
 import com.hnac.hzims.safeproduct.entity.CarEntity;
 import com.hnac.hzims.safeproduct.vo.CarMilesYearVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.annotation.UserDataAuth;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
 import java.math.BigDecimal;
 import java.util.List;
@@ -17,7 +18,7 @@ import java.util.List;
  * @date 2024-01-03
  */
 @Mapper
-public interface CarMapper extends BaseMapper<CarEntity> {
+public interface CarMapper extends UserDataScopeBaseMapper<CarEntity> {
 
     /**
      * 查询当年的全部车辆
@@ -26,6 +27,7 @@ public interface CarMapper extends BaseMapper<CarEntity> {
      * @param unit 单位
      * @return 分页车辆数据
      */
+    @UserDataAuth
     IPage<CarMilesYearVO> selectCarByYear(IPage<CarMilesYearVO> page, String year, String unit);
 
     /**
@@ -34,6 +36,7 @@ public interface CarMapper extends BaseMapper<CarEntity> {
      * @param year 年份
      * @return 里程数列表
      */
+    @UserDataAuth
     List<CarMilesYearDTO> selectMilesByCar(List<String> carList, String year);
 
     /**

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarMapper.xml

@@ -4,7 +4,7 @@
 
     <select id="selectCarByYear" resultType="com.hnac.hzims.safeproduct.vo.CarMilesYearVO">
         SELECT
-            DISTINCT t1.unit, t1.car_brand, t1.plate_number
+            DISTINCT t1.unit, t1.car_brand, t1.plate_number, t1.create_user, t1.create_dept
         FROM
             hzims_car t1
             LEFT JOIN hzims_car_used_record t2 ON t1.id = t2.car_id
@@ -22,7 +22,8 @@
 
     <select id="selectMilesByCar" resultType="com.hnac.hzims.safeproduct.dto.CarMilesYearDTO">
         SELECT
-            t1.unit, t1.car_brand, t1.plate_number, DATE_FORMAT(t2.end_time, '%m') as dateTime, sum(t2.miles) as miles
+            t1.unit, t1.car_brand, t1.plate_number, DATE_FORMAT(t2.end_time, '%m') as dateTime, sum(t2.miles) as miles,
+            t1.create_user, t1.create_dept
         FROM
             hzims_car t1
             LEFT JOIN hzims_car_used_record t2 ON t1.id = t2.car_id

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarUsedRecordMapper.java

@@ -1,12 +1,14 @@
 package com.hnac.hzims.safeproduct.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.safeproduct.entity.CarUsedRecordEntity;
 import com.hnac.hzims.safeproduct.vo.CarUsedRecordDetailVO;
 import com.hnac.hzims.safeproduct.vo.CarUsedRecordPageVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.springblade.core.datascope.annotation.UserDataAuth;
+import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -16,7 +18,7 @@ import java.util.Map;
  * @date 2024-01-04
  */
 @Mapper
-public interface CarUsedRecordMapper extends BaseMapper<CarUsedRecordEntity> {
+public interface CarUsedRecordMapper extends UserDataScopeBaseMapper<CarUsedRecordEntity> {
 
     /**
      * 用车记录详情
@@ -31,5 +33,13 @@ public interface CarUsedRecordMapper extends BaseMapper<CarUsedRecordEntity> {
      * @param page 分页类
      * @return 分页数据
      */
+    @UserDataAuth
     IPage<CarUsedRecordPageVO> getCarUsedRecordPage(IPage<CarUsedRecordPageVO> page, Map<String, Object> param);
+
+    /**
+     * 查询当月用车记录
+     * @param month 当月
+     * @return 当月用车记录数据表
+     */
+    List<CarUsedRecordEntity> selectCarUsedRecordByMonth(String month);
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/mapper/CarUsedRecordMapper.xml

@@ -18,8 +18,8 @@
 
     <select id="getCarUsedRecordPage" resultType="com.hnac.hzims.safeproduct.vo.CarUsedRecordPageVO">
         SELECT
-            t1.id, t2.unit, t1.start_time, t1.user, t1.remark, t1.start_miles, t1.end_miles, t1.miles,
+            t1.id, t2.unit, t1.start_time, t1.user, t1.remark, t1.start_miles, t1.end_miles, t1.miles,t2.car_brand,
-            t2.car_brand, t2.plate_number, t1.used_location, t1.confirmation_time, t1.used_location
+            t2.plate_number, t1.used_location, t1.confirmation_time, t1.used_location, t1.create_user, t1.create_dept
         FROM
             hzims_car_used_record t1
             LEFT JOIN hzims_car t2 ON t1.car_id = t2.id
@@ -43,4 +43,16 @@
         ORDER BY
             t1.create_time DESC
     </select>
+
+    <select id="selectCarUsedRecordByMonth" resultType="com.hnac.hzims.safeproduct.entity.CarUsedRecordEntity">
+        SELECT
+            *
+        FROM
+            hzims_car_used_record
+        WHERE
+            is_deleted = 0
+            AND create_time like concat(#{month}, '%')
+        ORDER BY
+            code DESC
+    </select>
 </mapper>

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarAnnualInspectionServiceImpl.java

@@ -128,9 +128,6 @@ public class CarAnnualInspectionServiceImpl extends ServiceImpl<CarAnnualInspect
      * @return 当月年检记录数据表
      */
     private List<CarAnnualInspectionEntity> getCarAnnualInspectionByMonth(String month) {
-        QueryWrapper<CarAnnualInspectionEntity> queryWrapper = new QueryWrapper<>();
+        return baseMapper.selectCarAnnualInspectionByMonth(month);
-        queryWrapper.lambda().like(CarAnnualInspectionEntity::getCreateTime, month)
-                .orderByDesc(CarAnnualInspectionEntity::getCode);
-        return this.list(queryWrapper);
     }
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarCheckRecordServiceImpl.java

@@ -1,13 +1,11 @@
 package com.hnac.hzims.safeproduct.service.impl;
 
-import cn.afterturn.easypoi.entity.ImageEntity;
 import cn.hutool.core.date.DatePattern;
 import com.alibaba.excel.util.CollectionUtils;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hnac.hzims.common.logs.utils.StringUtils;
 import com.hnac.hzims.safeproduct.constants.SafeProductConstant;
 import com.hnac.hzims.safeproduct.dto.CarCheckRecordDTO;
 import com.hnac.hzims.safeproduct.entity.CarCheckItemEntity;
@@ -140,10 +138,7 @@ public class CarCheckRecordServiceImpl extends ServiceImpl<CarCheckRecordMapper,
      * @return 当月车检记录数据表
      */
     private List<CarCheckRecordEntity> getCarCheckRecordByMonth(String month) {
-        QueryWrapper<CarCheckRecordEntity> queryWrapper = new QueryWrapper<>();
+        return baseMapper.selectCarCheckRecordByMonth(month);
-        queryWrapper.lambda().like(CarCheckRecordEntity::getCreateTime, month)
-                .orderByDesc(CarCheckRecordEntity::getCode);
-        return this.list(queryWrapper);
     }
 
     /**

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarInsuranceServiceImpl.java

@@ -125,9 +125,6 @@ public class CarInsuranceServiceImpl extends ServiceImpl<CarInsuranceMapper, Car
      * @return 当月年保记录数据表
      */
     private List<CarInsuranceEntity> getCarInsuranceByMonth(String month) {
-        QueryWrapper<CarInsuranceEntity> queryWrapper = new QueryWrapper<>();
+        return baseMapper.selectCarInsuranceByMonth(month);
-        queryWrapper.lambda().like(CarInsuranceEntity::getCreateTime, month)
-                .orderByDesc(CarInsuranceEntity::getCode);
-        return this.list(queryWrapper);
     }
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarMaintenanceServiceImpl.java

@@ -198,9 +198,6 @@ public class CarMaintenanceServiceImpl extends ServiceImpl<CarMaintenanceMapper,
      * @return 当月车辆维保数据表
      */
     private List<CarMaintenanceEntity> getCarMaintenanceByMonth(String month) {
-        QueryWrapper<CarMaintenanceEntity> queryWrapper = new QueryWrapper<>();
+        return baseMapper.selectCarMaintenanceByMonth(month);
-        queryWrapper.lambda().like(CarMaintenanceEntity::getCreateTime, month)
-                .orderByDesc(CarMaintenanceEntity::getCode);
-        return this.list(queryWrapper);
     }
 }

hzims-service/safeproduct/src/main/java/com/hnac/hzims/safeproduct/service/impl/CarUsedRecordServiceImpl.java

@@ -177,9 +177,6 @@ public class CarUsedRecordServiceImpl extends ServiceImpl<CarUsedRecordMapper, C
      * @return 当月用车记录数据表
      */
     private List<CarUsedRecordEntity> getCarUsedRecordByMonth(String month) {
-        QueryWrapper<CarUsedRecordEntity> queryWrapper = new QueryWrapper<>();
+        return baseMapper.selectCarUsedRecordByMonth(month);
-        queryWrapper.lambda().like(CarUsedRecordEntity::getCreateTime, month)
-                .orderByDesc(CarUsedRecordEntity::getCode);
-        return this.list(queryWrapper);
     }
 }