fix 修改了小程序查询参数

boman-web-core/src/main/java/com/boman/web/core/controller/CzrkController.java

@@ -172,14 +172,16 @@ public class CzrkController extends BaseController {
     }
 
 
-/*    *//**
-     * 功能描述: 变更接口,接收status 状态值，id_card 身份证号码
-     *//*
+    /**
+     * 变更接口,接收status 状态值，id_card 身份证号码
+     * @param czrk
+     * @return
+     */
     @Log(title = "变更接口", businessType = BusinessType.UPDATE)
-    @GetMapping("/changeCzrk")
+    //@GetMapping("/changeCzrk")
     public AjaxResult changeCzrk(Czrk czrk) {
         return czrkService.changeCzrk(czrk);
-    }*/
+    }
 
     /**
      * 外部访问czrk的字段

boman-web-core/src/main/java/com/boman/web/core/controller/RyrlController.java

@@ -76,8 +76,8 @@ public class RyrlController extends BaseController {
      * @return com.boman.domain.dto.AjaxResult
      */
     @GetMapping("/sts")
-    public AjaxResult stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType,String isConfirm) {
-        return AjaxResult.success("成功", czrkService.stsByApplet(provinceId, cityId, regionId, townId, villageId, userName, queryType, houseType,isConfirm));
+    public AjaxResult stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String idCard, String queryType, String houseType,String isConfirm) {
+        return AjaxResult.success("成功", czrkService.stsByApplet(provinceId, cityId, regionId, townId, villageId, idCard, queryType, houseType,isConfirm));
     }
 
     /**

boman-web-core/src/main/java/com/boman/web/core/interceptor/ControllerTimeInterceptor.java

@@ -51,8 +51,6 @@ public class ControllerTimeInterceptor implements HandlerInterceptor {
         //判断接口时间
         if (expireTime > 2000L){
             LOGGER.warn(sb.toString(),"接口时间大于2秒");
-        }else {
-            LOGGER.info(sb.toString());
         }
     }
 

boman-web-core/src/main/java/com/boman/web/core/mapper/CzrkMapper.java

@@ -89,8 +89,8 @@ public interface CzrkMapper {
 
     List<Czrk> listByCodeSynchronization(String code);
 
-    int stsByYrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName, @Param("houseType") String houseType,@Param("isConfirm")String isConfirm);
-    int stsByWrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName, @Param("houseType") String houseType,@Param("isConfirm")String isConfirm);
+    int stsByYrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("idCard") String idCard, @Param("houseType") String houseType,@Param("isConfirm")String isConfirm);
+    int stsByWrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("idCard") String idCard, @Param("houseType") String houseType,@Param("isConfirm")String isConfirm);
 
     List<Czrk> listIsRl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
 
@@ -103,7 +103,7 @@ public interface CzrkMapper {
      * @return
      */
    Czrk findHjInfo(Czrk czrk);
-    List<Czrk> stsByAppletCz(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName, @Param("houseType") String houseType,@Param("isConfirm") String isConfirm);
+    List<Czrk> stsByAppletCz(@Param("type") int type, @Param("areaId") Long areaId, @Param("idCard") String idCard, @Param("houseType") String houseType,@Param("isConfirm") String isConfirm);
 
     List<Czrk> listByCzXz(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") int type, @Param("areaId") Long areaId);
     List<Czrk> listByCzJs(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("type") int type, @Param("areaId") Long areaId);

boman-web-core/src/main/java/com/boman/web/core/service/czrk/CzrkServiceImpl.java

@@ -157,19 +157,6 @@ public class CzrkServiceImpl implements ICzrkService {
                     crk.setNowInSelect(provinceCz + cityCz + regionCz + villageTownsCz + villageCz);
                 }
             }
-/*            List<CzrkJzdz> czrkJzdzs = czrkJzdzService.selectCzrkJzdzList(czrkJzdz);
-            List<String> idCardList = new ArrayList<>();
-            if (czrkJzdzs != null && czrkJzdzs.size() > 0) {
-                for (CzrkJzdz jzdz : czrkJzdzs) {
-                    String idCard = jzdz.getIdCard();
-                    if (StringUtils.isNotBlank(idCard)) {
-                        idCardList.add(idCard);
-                    }
-                }
-                czrk.setIdCardList(idCardList);
-                czrks = czrkMapper.listByRlry(czrk);
-                handleList(czrks, Czrk.HJ, czrkJzdzs);
-            }*/
             return czrks;
         }
         if (null == provinceId && null == cityId && null == regionId && null == villageTownsId && null == villageId) {
@@ -764,7 +751,7 @@ public class CzrkServiceImpl implements ICzrkService {
     }
 
     @Override
-    public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType, String isConfirm) {
+    public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String idCard, String queryType, String houseType, String isConfirm) {
         Long areaId = null;
         int type = 0, yrl = 0, wrl = 0;
         if (ObjectUtils.isNotEmpty(provinceId)) {
@@ -786,11 +773,11 @@ public class CzrkServiceImpl implements ICzrkService {
 
         if (Czrk.HJ.equals(queryType)) {
             // 户籍
-            yrl = czrkMapper.stsByYrl(type, areaId, userName, houseType, isConfirm);
-            wrl = czrkMapper.stsByWrl(type, areaId, userName, houseType, isConfirm);
+            yrl = czrkMapper.stsByYrl(type, areaId, idCard, houseType, isConfirm);
+            wrl = czrkMapper.stsByWrl(type, areaId, idCard, houseType, isConfirm);
         } else {
             // 常住
-            List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, userName, houseType, isConfirm);
+            List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, idCard, houseType, isConfirm);
             for (Czrk czrk : rls) {
                 if ("是".equals(czrk.getIsRl())) {
                     yrl++;

boman-web-core/src/main/java/com/boman/web/core/service/czrk/ICzrkService.java

@@ -77,7 +77,7 @@ public interface ICzrkService {
     AjaxResult addRlry(Czrk czrk);
     AjaxResult editRlry(Czrk czrk);
 
-    JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType, String isConfirm);
+    JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String idCard, String queryType, String houseType, String isConfirm);
     JSONObject stsByCzrk();
     JSONObject stsByCzrkHomePage();
 

boman-web-core/src/main/resources/mapper/CzrkMapper.xml

@@ -609,8 +609,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where vi.is_del = 'N'
         <!-- 已认领 -->
         and vi.is_rl = '是'
-        <if test="userName != null  and userName != ''">
-            and (vi.user_name like concat(#{userName}, '%') or vi.id_card like concat(#{userName}, '%'))
+        <if test="idCard != null  and idCard != ''">
+            and  vi.id_card like concat(#{idCard}, '%')
         </if>
         <if test="houseType != null  and houseType != ''">
             and vi.house_type = #{houseType}
@@ -631,8 +631,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT id, is_rl
         from czrk
         where is_del = 'N'
-        <if test="userName != null  and userName != ''">
-            and user_name like concat(#{userName}, '%')
+        <if test="idCard != null  and idCard != ''">
+            and id_card like concat(#{idCard}, '%')
         </if>
         <choose>
             <when test="type == 1">and province_id = #{areaId}</when>
@@ -661,8 +661,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where vi.is_del = 'N'
         <!-- 未认领 -->
         and vi.is_rl = '否'
-        <if test="userName != null  and userName != ''">
-            and (vi.user_name like concat(#{userName}, '%') or vi.id_card like concat(#{userName}, '%'))
+        <if test="idCard != null  and idCard != ''">
+            and vi.id_card like concat(#{idCard}, '%')
         </if>
         <if test="houseType != null  and houseType != ''">
             and vi.house_type = #{houseType}
@@ -881,8 +881,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         left join czrk_jzdz jzdz on czrk.id = jzdz.czrk_id
         <where>
             czrk.is_del = 'N' and jzdz.status = 'Y'
-            <if test="userName != null  and userName != ''">
-                and (czrk.user_name like concat(#{userName}, '%') or czrk.id_card like concat(#{userName}, '%'))
+            <if test="idCard != null  and idCard != ''">
+                and czrk.id_card like concat(#{idCard}, '%')
             </if>
             <if test="houseType != null  and houseType != ''">
                 and czrk.house_type = #{houseType}
@@ -1063,7 +1063,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isRl != null and isRl != ''">and c.is_rl = #{isRl}</if>
 
             <if test="userName != null  and userName != ''">
-                and (c.user_name like concat(#{userName}, '%') or c.id_card like concat(#{userName}, '%'))
+                and c.user_name like concat(#{userName}, '%')
             </if>
             <if test="params.startAge != null  and params.startAge != ''">and c.age &gt;= #{params.startAge}</if>
             <if test="params.endAge != null  and params.endAge != ''">and c.age &lt;= #{params.endAge}</if>