查询用户检疫证号

admin/src/main/java/com/huimv/farm/damsubsidy/controller/BaseAnimalController.java

@@ -30,4 +30,9 @@ public class BaseAnimalController {
         return baseAnimalService.noSubsidyAnimal(httpServletRequest,paramsMap);
     }
 
+    @PostMapping("/listNumByUser")
+    public Result listNumByUser(HttpServletRequest httpServletRequest, @RequestBody Map<String, String> paramsMap){
+        return baseAnimalService.listNumByUser(httpServletRequest,paramsMap);
+    }
+
 }

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BaseAnimalMapper.java

@@ -2,6 +2,9 @@ package com.huimv.farm.damsubsidy.mapper;
 
 import com.huimv.farm.damsubsidy.entity.BaseAnimal;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface BaseAnimalMapper extends BaseMapper<BaseAnimal> {
 
+    List<String> listNumByUser(@Param("userId") Long userId);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/mapper/BillLandingInspectionMapper.java

@@ -3,6 +3,8 @@ package com.huimv.farm.damsubsidy.mapper;
 import com.huimv.farm.damsubsidy.entity.vo.BillLandingInspection;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 落地检 Mapper 接口

admin/src/main/java/com/huimv/farm/damsubsidy/service/IBaseAnimalService.java

@@ -18,4 +18,6 @@ import java.util.Map;
 public interface IBaseAnimalService extends IService<BaseAnimal> {
 
     Result noSubsidyAnimal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
+
+    Result listNumByUser(HttpServletRequest httpServletRequest, Map<String, String> paramsMap);
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/BaseAnimalServiceImpl.java

@@ -11,6 +11,7 @@ import com.huimv.farm.damsubsidy.service.IBaseAnimalService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
@@ -26,6 +27,9 @@ import java.util.Map;
 @Service
 public class BaseAnimalServiceImpl extends ServiceImpl<BaseAnimalMapper, BaseAnimal> implements IBaseAnimalService {
 
+    @Resource
+    private BaseAnimalMapper baseAnimalMapper;
+
     @Override
     public Result noSubsidyAnimal(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
         String inspectionNum = paramsMap.get("inspectionNum");
@@ -39,4 +43,11 @@ public class BaseAnimalServiceImpl extends ServiceImpl<BaseAnimalMapper, BaseAni
             return new Result(ResultCode.SUCCESS,baseAnimals);
         }
     }
+
+    @Override
+    public Result listNumByUser(HttpServletRequest httpServletRequest, Map<String, String> paramsMap) {
+        Long userId = TokenSign.getMemberIdByJwtToken(httpServletRequest);
+        List<String> landingInspectionNums = baseAnimalMapper.listNumByUser(userId);
+        return new Result(ResultCode.SUCCESS,landingInspectionNums);
+    }
 }

admin/src/main/java/com/huimv/farm/damsubsidy/service/impl/SysUserServiceImpl.java

@@ -527,17 +527,15 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         String pageNum = paramsMap.get("pageNum");
         String pageSize = paramsMap.get("pageSize");
         String code = paramsMap.get("code");
-        String accoutType = paramsMap.get("accoutType");
         String farmType = paramsMap.get("farmType");
         SysUser sysUser = this.getById(TokenSign.getMemberIdByJwtToken(httpServletRequest));
         Integer userType = sysUser.getUserType();
 
         QueryWrapper<SysUser> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq(!StringUtils.isBlank(accoutType),"accout_type",accoutType)
-                    .eq(!StringUtils.isBlank(farmType),"farm_type",farmType);
+        queryWrapper.eq(!StringUtils.isBlank(farmType),"farm_type",farmType);
         if (userType == 0){
             queryWrapper.eq("user_type",3)
-                        .like("detailed_adress_code",code);
+                        .like(!StringUtils.isBlank(code),"detailed_adress_code",code);
         }else {
             queryWrapper.eq("user_type",3)
                         .like("detailed_adress_code",sysUser.getBriefAddressCode());

admin/src/main/resources/com/huimv/farm/damsubsidy/mapper/BaseAnimalMapper.xml

@@ -20,4 +20,7 @@
         <result column="is_delete" property="isDelete" />
     </resultMap>
 
+    <select id="listNumByUser" resultType="string">
+    SELECT DISTINCT inspection_num FROM `base_animal` WHERE belong_to_user = #{userId}
+    </select>
 </mapper>