生物防控人员

huimv-receive/src/main/java/com/huimv/receive/service/impl/SysUserServiceImpl.java

@@ -17,10 +17,7 @@ import com.huimv.receive.entity.pojo.UserPagePojo;
 import com.huimv.receive.entity.vo.UserAccountVo;
 import com.huimv.receive.entity.vo.UserAgeAndGender;
 import com.huimv.receive.entity.vo.UserJob;
-import com.huimv.receive.mapper.BaseLocationMapper;
-import com.huimv.receive.mapper.FarmMapper;
-import com.huimv.receive.mapper.SysAccountMultilevelMapper;
-import com.huimv.receive.mapper.SysUserMapper;
+import com.huimv.receive.mapper.*;
 import com.huimv.receive.service.IBaseLocationService;
 import com.huimv.receive.service.IFarmService;
 import com.huimv.receive.service.ISysUserService;
@@ -61,6 +58,9 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     @Autowired
     private UploadImage uploadImage;
 
+    @Autowired
+    private ExistMapper  existMapper;
+
     @Override
     public Result pageAll(UserPagePojo userPagePojo) {
         Integer pageNum = userPagePojo.getPageNum();
@@ -98,8 +98,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String farmId = (String)map.get("farmId");
         if (checkFarm(farmId))
             return new Result(10001,"牧场信息为空",false);
-        return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().eq("farm_id",farmId).groupBy("location_type").orderByAsc("location_type")));
-    }
+        Exist exist = existMapper.selectOne(new QueryWrapper<Exist>().eq("farm_id", farmId));
+        if (exist.getExist() == 0){
+            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().groupBy("location_type").orderByAsc("location_type")));
+        }else {
+            return new Result(ResultCode.SUCCESS,baseLocationMapper.selectList(new QueryWrapper<BaseLocation>().notIn("location_type",3,7,9).groupBy("location_type").orderByAsc("location_type")));
+        }
+      }
 
     @Override
     public Result pageAccount(UserPagePojo userPagePojo) {

huimv-receive/src/main/resources/mapper/SysUserMapper.xml

@@ -63,10 +63,10 @@ GROUP BY age_range
     <select id="userJob" resultType="com.huimv.receive.entity.vo.UserJob">
 
       SELECT
-        IFNULL (SUM(CASE WHEN LIKE "%5%"  THEN 1 ELSE 0 END) ,0)AS clean,
-        IFNULL (SUM(CASE WHEN LIKE "%4%"  THEN 1 ELSE 0 END) ,0) AS pcr,
-        IFNULL (SUM(CASE WHEN LIKE "%3%"  THEN 1 ELSE 0 END)  ,0)AS safe,
-       IFNULL ( SUM(CASE WHEN LIKE "%1%"  THEN 1 ELSE 0 END)  ,0)AS factory
+        IFNULL (SUM(CASE WHEN job LIKE "%5%"  THEN 1 ELSE 0 END) ,0)AS clean,
+        IFNULL (SUM(CASE WHEN job LIKE "%4%"  THEN 1 ELSE 0 END) ,0) AS pcr,
+        IFNULL (SUM(CASE WHEN job LIKE "%3%"  THEN 1 ELSE 0 END)  ,0)AS safe,
+       IFNULL ( SUM(CASE WHEN job LIKE "%1%"  THEN 1 ELSE 0 END)  ,0)AS factory
     FROM
        `sys_user`
        WHERE farm_id = #{farmId}