Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/java/com/ruoyi/web/controller/gas/GUserController.java

@@ -126,8 +126,8 @@ public class GUserController extends BaseController {
      * @return
      */
     @GetMapping("/getWorker")
-    public AjaxResult getWorker(String type,String name) {
-        return AjaxResult.success(iGUserService.getWorker(type,name));
+    public AjaxResult getWorker(String type,String name,String ranks) {
+        return AjaxResult.success(iGUserService.getWorker(type,name,ranks));
     }
 
     /**

ruoyi-admin/src/main/java/com/ruoyi/web/controller/mobile/MUserController.java

@@ -75,6 +75,6 @@ public class MUserController extends BaseController {
      */
     @GetMapping("/getWorker")
     public AjaxResult getWorker(String type,String name) {
-        return AjaxResult.success(igUserService.getWorker(type,name));
+        return AjaxResult.success(igUserService.getWorker(type,name,null));
     }
 }

ruoyi-gas/src/main/java/com/ruoyi/gas/mapper/GUserMapper.java

@@ -20,7 +20,7 @@ import java.util.List;
 public interface GUserMapper extends BaseMapperPlus<GUser> {
 
     Page<GUserVo> getList(@Param("p")GUserBo bo, Page<?> page);
-    List<GUserForemanVo>  getWorker(@Param("type") String type,@Param("name") String name);
+    List<GUserForemanVo>  getWorker(@Param("type") String type,@Param("name") String name, @Param("ranks") String ranks);
     Page<GUserVo> getBlacklist(@Param("p")GUserBo bo, Page<?> page);
     List<GCensusVo> getExamineForeman(Long foremanId);
     List<GCensusVo> getExamineWorker(Long workerId);

ruoyi-gas/src/main/java/com/ruoyi/gas/service/IGUserService.java

@@ -64,7 +64,7 @@ public interface IGUserService extends IServicePlus<GUser, GUserVo> {
 	 * 工人下拉
 	 * @return
 	 */
-	List<GUserForemanVo>  getWorker(String type,String name);
+	List<GUserForemanVo>  getWorker(String type,String name,String ranks);
 
 	/**
 	 * 黑名单列表

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GPatrolTeamServiceImpl.java

@@ -72,7 +72,8 @@ public class GPatrolTeamServiceImpl extends ServicePlusImpl<GPatrolTeamMapper, G
         lqw.eq(StringUtils.isNotBlank(bo.getUploadLocation()), GPatrolTeam::getUploadLocation, bo.getUploadLocation());
         lqw.eq(StringUtils.isNotBlank(bo.getIsNormalInspection()), GPatrolTeam::getIsNormalInspection, bo.getIsNormalInspection());
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GPatrolTeam::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
-
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GPatrolTeam::getCreateBy, bo.getCreateBy());
+        lqw.orderByDesc(GPatrolTeam::getCreateTime);
         return lqw;
     }
 

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRegulatingBoxMaintenanceServiceImpl.java

@@ -83,9 +83,11 @@ public class GRegulatingBoxMaintenanceServiceImpl extends ServicePlusImpl<GRegul
         lqw.like(StringUtils.isNotBlank(bo.getName()), GRegulatingBoxMaintenance::getName, bo.getName());
         lqw.eq(StringUtils.isNotBlank(bo.getNumber()), GRegulatingBoxMaintenance::getNumber, bo.getNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getAdministrativeOffice()), GRegulatingBoxMaintenance::getAdministrativeOffice, bo.getAdministrativeOffice());
-        lqw.eq(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
+        lqw.like(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
         lqw.eq(StringUtils.isNotBlank(bo.getRemarks()), GRegulatingBoxMaintenance::getRemarks, bo.getRemarks());
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GRegulatingBoxMaintenance::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
+//        lqw.like(StringUtils.isNotBlank(bo.getMaintenanceItem()), GRegulatingBoxMaintenance::getMaintenanceItem, bo.getMaintenanceItem());
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GRegulatingBoxMaintenance::getCreateBy, bo.getCreateBy());
         lqw.orderByDesc(GRegulatingBoxMaintenance::getCreateTime);
         return lqw;
     }

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GRoadSectionInspectionServiceImpl.java

@@ -74,6 +74,8 @@ public class GRoadSectionInspectionServiceImpl extends ServicePlusImpl<GRoadSect
         lqw.eq(StringUtils.isNotBlank(bo.getFindProblem()), GRoadSectionInspection::getFindProblem, bo.getFindProblem());
         lqw.eq(bo.getFindTime() != null, GRoadSectionInspection::getFindTime, bo.getFindTime());
         lqw.in(StringUtils.isNotEmpty(bo.getRanks()), GRoadSectionInspection::getCreateBy, !ObjectUtils.isEmpty(bo.getUids()) && bo.getUids().size() > 0 ? bo.getUids() : Arrays.asList(0L));
+        lqw.eq(StringUtils.isNotBlank(bo.getCreateBy()), GRoadSectionInspection::getCreateBy, bo.getCreateBy());
+        lqw.orderByDesc(GRoadSectionInspection::getCreateTime);
         return lqw;
     }
 

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GUserServiceImpl.java

@@ -122,8 +122,8 @@ public class GUserServiceImpl extends ServicePlusImpl<GUserMapper, GUser, GUserV
 
 
     @Override
-    public List<GUserForemanVo> getWorker(String type,String name) {
-        return gUserMapper.getWorker(type,name);
+    public List<GUserForemanVo> getWorker(String type,String name,String ranks) {
+        return gUserMapper.getWorker(type,name,ranks);
     }
 
     @Override

ruoyi-gas/src/main/java/com/ruoyi/gas/service/impl/GValveWellPositionServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.gas.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.core.mybatisplus.core.ServicePlusImpl;
 import com.ruoyi.common.core.page.PagePlus;
@@ -46,6 +47,17 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
             if (StringUtils.isBlank(districtValue)) {
                 throw new ServiceException("第" + (n + 1) + "行行政区填写错误,导入失败!");
             }
+            GValveWellPosition gValveWellPosition = new GValveWellPosition();
+            gValveWellPosition.setDistrict(districtValue);
+            gValveWellPosition.setPosition(vo.getPosition());
+            gValveWellPosition.setValveWellName(vo.getValveWellName());
+            QueryWrapper<GValveWellPosition> query = Wrappers.query(gValveWellPosition);
+            query.lambda().last(" LIMIT 1");
+            GValveWellPosition gValveWellPosition1 = baseMapper.selectOne(query);
+            if (!ObjectUtils.isEmpty(gValveWellPosition1)){
+                n++;
+                continue;
+            }
             vo.setDistrict(districtValue);
             try {
                 n++;
@@ -97,6 +109,7 @@ public class GValveWellPositionServiceImpl extends ServicePlusImpl<GValveWellPos
         lqw.like(StringUtils.isNotBlank(bo.getPosition()), GValveWellPosition::getPosition, bo.getPosition());
         lqw.eq(StringUtils.isNotBlank(bo.getLongitude()), GValveWellPosition::getLongitude, bo.getLongitude());
         lqw.eq(StringUtils.isNotBlank(bo.getLatitude()), GValveWellPosition::getLatitude, bo.getLatitude());
+        lqw.orderByDesc(GValveWellPosition::getCreateTime);
         return lqw;
     }
 

ruoyi-gas/src/main/resources/mapper/GUserMapper.xml

@@ -39,7 +39,7 @@
                 and a.ranks = #{p.ranks}
             </if>
         </where>
-        order by a.create_time desc
+        order by a.ranks + 0  ASC, a.job_num ASC
     </select>
 
     <select id="getWorker" resultType="com.ruoyi.gas.domain.vo.GUserForemanVo">
@@ -50,6 +50,9 @@
         <if test="name != null  and name != ''">
             and name LIKE CONCAT('%',#{name},'%')
         </if>
+        <if test="ranks != null  and ranks != ''">
+            and ranks = #{ranks}
+        </if>
         <if test="type != null  and type != ''">
             and ( power like '%6%'
             <foreach item="item" index="index" collection="type.split(',')">
@@ -57,6 +60,7 @@
             </foreach>
             )
         </if>
+        order by ranks + 0  ASC, job_num ASC
     </select>
     <select id="getBlacklist" resultType="com.ruoyi.gas.domain.vo.GUserVo">
         SELECT q.*

ruoyi-gas/src/main/resources/mapper/GValveWellInspectionMapper.xml

@@ -45,6 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="p.discoverProblems != null and p.discoverProblems != ''">
             AND vwi.discover_problems = #{p.discoverProblems}
         </if>
+        <if test="p.createBy != null and p.createBy != ''">
+            AND vwi.create_by = #{p.createBy}
+        </if>
         ORDER BY
         vwi.create_time DESC
     </select>