运维人员扩展根据人员类型、场站地址过滤

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/MaintenanceMapper.java

@@ -33,7 +33,8 @@ public interface MaintenanceMapper extends BaseMapper<Maintenance> {
     //列表
     List<MaintenanceDto> Maintenancepage(@Param("name")String name, @Param("maintenanceTypeCode")String maintenanceTypeCode,
                                          @Param("lockStatus")String lockStatus, @Param("reviewStatus")String reviewStatus,
-                                         @Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId);
+                                         @Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId,@Param("maintenanceType")String maintenanceType,
+                                         @Param("maintenanceAreaAddress")String maintenanceAreaAddress);
 
 
     //详情

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/MaintenanceMapper.xml

@@ -66,6 +66,12 @@
             <if test="maintenanceTypeCode != null and maintenanceTypeCode != ''">
                 AND ph.maintenance_type_code = #{maintenanceTypeCode}
             </if>
+            <if test="maintenanceType != null and maintenanceType != ''">
+                AND ph.maintenance_type = #{maintenanceType}
+            </if>
+            <if test="maintenanceAreaAddress != null and maintenanceAreaAddress != ''">
+                AND ph.maintenance_area_address LIKE CONCAT('%', #{maintenanceAreaAddress}, '%')
+            </if>
             <if test="lockStatus != null and lockStatus != ''">
                 AND std_user_biz.lock_status = #{lockStatus}
             </if>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/MaintenanceController.java

@@ -117,12 +117,14 @@ public class MaintenanceController extends BaseController {
             (value = "size") int size,
                                                          @RequestParam(required = false) String name,
                                                          @RequestParam(required = false)String maintenanceTypeCode,
+                                                         @RequestParam(required = false)String maintenanceType,
                                                          @RequestParam(required = false) String lockStatus,
                                                          @RequestParam(required = false)String reviewStatus,
                                                          @RequestParam(required = false)Long regionalCompaniesSeq,
-                                                         @RequestParam(required = false)Long dealerId
+                                                         @RequestParam(required = false)Long dealerId,
+                                                         @RequestParam(required = false)String maintenanceAreaAddress
     ) {
-        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage( current, size, name, maintenanceTypeCode,lockStatus,reviewStatus,regionalCompaniesSeq,dealerId));
+        return ResponseHelper.buildResponse(maintenanceServiceImpl.queryForMaintenancePage( current, size, name, maintenanceTypeCode,lockStatus,reviewStatus,regionalCompaniesSeq,dealerId,maintenanceType,maintenanceAreaAddress));
     }
 
 

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/MaintenanceServiceImpl.java

@@ -84,10 +84,10 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
      * 分页查询
      */
     public Page<MaintenanceDto> queryForMaintenancePage( int current,int size,String name, String maintenanceTypeCode,  String lockStatus, String reviewStatus,Long regionalCompaniesSeq, Long dealerId
-    )   {
+    ,String maintenanceType,String maintenanceAreaAddress)   {
 
         PageHelper.startPage(current,  size);
-        List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name,  maintenanceTypeCode,   lockStatus,  reviewStatus, regionalCompaniesSeq,  dealerId);
+        List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name,  maintenanceTypeCode,   lockStatus,  reviewStatus, regionalCompaniesSeq,  dealerId,maintenanceType,maintenanceAreaAddress);
         PageInfo<MaintenanceDto> page = new PageInfo(resultPage);
         Page<MaintenanceDto> pagenew = new Page<MaintenanceDto>();
         pagenew.setCurrent(current);