fix: 获取用户列表

guzijian
1 parent 79de0fd0
Showing 6 changed files with 48 additions and 11 deletions
ruoyi-admin/src/main/java/com/ruoyi/driver/controller/DriverController.java
ruoyi-admin/src/main/java/com/ruoyi/driver/domain/Driver.java
ruoyi-admin/src/main/java/com/ruoyi/driver/mapper/DriverMapper.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/IDriverService.java
ruoyi-admin/src/main/java/com/ruoyi/driver/service/impl/DriverServiceImpl.java
ruoyi-admin/src/main/resources/mapper/driver/DriverMapper.xml
@@ -65,6 +65,18 @@ public class DriverController extends BaseController {
     }
  
     /**
+     * 获取驾驶员信息列表
+     * @param driver
+     * @return
+     */
+    @GetMapping("/getDrivers")
+    @ApiOperation(value = "查询驾驶员信息列表", notes = "查询驾驶员信息列表")
+    public AjaxResult getDrivers(Driver driver) {
+        return AjaxResult.success(driverService.getDrivers(driver));
+    }
+
+
+    /**
      * 导出驾驶员信息列表
      */
 //    @PreAuthorize("@ss.hasPermi('driver:driver:export')")
@@ -120,16 +132,6 @@ public class DriverController extends BaseController {
         return toAjax(driverService.deleteDriverByIds(ids));
     }
  
-    /**
-     * 获取用户信息列表
-     * @param driver
-     * @return
-     */
-    @GetMapping("/getDrivers")
-    @ApiOperation(value = "查询驾驶员信息列表", notes = "查询驾驶员信息列表")
-    public AjaxResult getDrivers(Driver driver) {
-        return AjaxResult.success(driverService.selectDriverList(driver));
-    }
  
     /**
      * 校验工号
@@ -130,7 +130,7 @@ public class Driver extends BaseEntity {
      * 是否人脸注册
      */
     @Excel(name = "是否人脸注册")
-    @ApiModelProperty("是否人脸注册 0 注册 1 未注册 2 注册过期")
+    @ApiModelProperty("是否人脸注册 0 注册 1 未注册 2 注册过期更新")
     private Integer faceSignIn;
     /**
      * 大头像
@@ -94,4 +94,6 @@ public interface DriverMapper
     Integer jobCodeIsEmpty(@Param("jobCode") String jobCode);
  
     String getDriverInfoByJobCode(@Param("jobCode") String jobCode);
+
+    List<Driver> getDrivers(Driver driver);
 }
@@ -85,4 +85,5 @@ public interface IDriverService
  
     void downloadHeadImage(String jobCode, HttpServletResponse response);
  
+    List<Driver> getDrivers(Driver driver);
 }
@@ -228,6 +228,13 @@ public class DriverServiceImpl implements IDriverService {
         }
     }
  
+    @Override
+    public List<Driver> getDrivers(Driver driver) {
+        // TODO 人事比对
+        List<Driver> drivers = driverMapper.getDrivers(driver);
+        return drivers;
+    }
+
     private File getLocationFile(String jobCode) {
         String image = driverMapper.getDriverInfoByJobCode(jobCode);
  
@@ -113,6 +113,31 @@
         select image from driver
         where job_code = #{jobCode}
     </select>
+    <select id="getDrivers" resultType="com.ruoyi.driver.domain.Driver">
+        <include refid="selectDriverVo"/>
+        <where>
+            <if test="jobCode != null  and jobCode != ''">and job_code = #{jobCode}</if>
+            <if test="companyCode != null  and companyCode != ''">and company_code = #{companyCode}</if>
+            <if test="brancheCompanyCode != null  and brancheCompanyCode != ''">and branche_company_code =
+                #{brancheCompanyCode}
+            </if>
+            <if test="personnelName != null  and personnelName != ''">and personnel_name like concat('%',
+                #{personnelName}, '%')
+            </if>
+            <if test="papersCode != null  and papersCode != ''">and papers_code = #{papersCode}</if>
+            <if test="icCardCode != null  and icCardCode != ''">and ic_card_code = #{icCardCode}</if>
+            <if test="personnelType != null  and personnelType != ''">and personnel_type = #{personnelType}</if>
+            <if test="posts != null  and posts != ''">and posts = #{posts}</if>
+            <if test="card != null  and card != ''">and card = #{card}</if>
+            <if test="telphone != null  and telphone != ''">and telphone = #{telphone}</if>
+            <if test="icRfid != null  and icRfid != ''">and ic_rfid = #{icRfid}</if>
+            <if test="idRfid != null  and idRfid != ''">and id_rfid = #{idRfid}</if>
+            <if test="tagRfid != null  and tagRfid != ''">and tag_rfid = #{tagRfid}</if>
+            <if test="lineName != null  and lineName != ''">and line_name like concat('%', #{lineName}, '%')</if>
+            <if test="lineCode != null  and lineCode != ''">and line_code = #{lineCode}</if>
+            <if test="faceSignIn != null  and faceSignIn != ''">and face_sign_in = #{faceSignIn}</if>
+        </where>
+    </select>
  
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver