fix 新增人员信息确认按钮和一键确认功能

因此修改小程序统计数据

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) {
-        return AjaxResult.success("成功", czrkService.stsByApplet(provinceId, cityId, regionId, townId, villageId, userName, queryType, houseType));
+    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));
     }
 
     /**

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

@@ -83,8 +83,8 @@ public interface CzrkMapper {
     List<Czrk> listByCode(String code);
 
 
-    int stsByYrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName, @Param("houseType") String houseType);
-    int stsByWrl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName, @Param("houseType") String houseType);
+    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);
 
     List<Czrk> listIsRl(@Param("type") int type, @Param("areaId") Long areaId, @Param("userName") String userName);
 
@@ -97,7 +97,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);
+    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> 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

@@ -552,7 +552,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) {
+    public JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType,String isConfirm) {
         Long areaId = null;
         int type = 0, yrl = 0, wrl = 0;
         if (ObjectUtils.isNotEmpty(provinceId)) {
@@ -574,11 +574,11 @@ public class CzrkServiceImpl implements ICzrkService {
 
         if (Czrk.HJ.equals(queryType)) {
             // 户籍
-            yrl = czrkMapper.stsByYrl(type, areaId, userName, houseType);
-            wrl = czrkMapper.stsByWrl(type, areaId, userName, houseType);
+            yrl = czrkMapper.stsByYrl(type, areaId, userName, houseType,isConfirm);
+            wrl = czrkMapper.stsByWrl(type, areaId, userName, houseType,isConfirm);
         } else {
             // 常住
-            List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, userName, houseType);
+            List<Czrk> rls = czrkMapper.stsByAppletCz(type, areaId, userName, 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);
+    JSONObject stsByApplet(Long provinceId, Long cityId, Long regionId, Long townId, Long villageId, String userName, String queryType, String houseType, String isConfirm);
     JSONObject stsByCzrk();
     JSONObject stsByCzrkHomePage();
 

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

@@ -522,6 +522,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="houseType != null  and houseType != ''">
             and vi.house_type = #{houseType}
         </if>
+        <if test="isConfirm != null  and isConfirm != ''">
+            and vi.is_confirm = #{isConfirm}
+        </if>
         <choose>
             <when test="type == 1">and vi.province_id = #{areaId}</when>
             <when test="type == 2">and vi.city_id = #{areaId}</when>
@@ -571,6 +574,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="houseType != null  and houseType != ''">
             and vi.house_type = #{houseType}
         </if>
+        <if test="isConfirm != null  and isConfirm != ''">
+            and vi.is_confirm = #{isConfirm}
+        </if>
         <choose>
             <when test="type == 1">and vi.province_id = #{areaId}</when>
             <when test="type == 2">and vi.city_id = #{areaId}</when>
@@ -768,6 +774,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="houseType != null  and houseType != ''">
                 and czrk.house_type = #{houseType}
             </if>
+            <if test="isConfirm != null  and isConfirm != ''">
+                and czrk.is_confirm = #{isConfirm}
+            </if>
             <choose>
                 <when test="type == 1">and jzdz.province_id = #{areaId}</when>
                 <when test="type == 2">and jzdz.city_id = #{areaId}</when>