feats

src/main/java/com/huiju/estateagents/common/StringUtils.java

@@ -160,4 +160,14 @@ public class StringUtils {
 
         return source.replaceAll(regx, repl);
     }
+
+
+    public static String getGenderFromIdCard(String idCard) {
+        if (null == idCard || idCard.length() != 18) {
+            return null;
+        }
+
+        String sign = idCard.substring(16, 17);
+        return Integer.parseInt(sign) % 2 == 0 ? "2" : "1";
+    }
 }

src/main/java/com/huiju/estateagents/mapper/TaMpTemplateMapper.java

@@ -19,4 +19,6 @@ import java.util.List;
 public interface TaMpTemplateMapper extends BaseMapper<TaMpTemplate> {
 
     List<TaMpTemplate> getAvailableList(@Param("orgId") Integer orgId,@Param("typeCode") String typeCode);
+
+    TaMpTemplate getByCode(Integer orgId, String typeCode);
 }

src/main/java/com/huiju/estateagents/property/controller/UserVerifyController.java

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.property.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
@@ -16,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
 import java.util.Map;
 
 @RestController
@@ -122,6 +125,40 @@ public class UserVerifyController extends BaseController {
         return responseBean;
     }
 
+    @GetMapping("/admin/prop-user/points")
+    public ResponseBean getListWithPoints(@RequestParam(value = "communityId") Integer communityId,
+                                          @RequestParam(value = "phaseId", required = false) Integer phaseId,
+                                          @RequestParam(value = "buildingId", required = false)Integer buildingId,
+                                          @RequestParam(value = "unitId", required = false)Integer unitId,
+                                          @RequestParam(value = "levelId", required = false)Integer levelId,
+                                          @RequestParam(value = "roomNoId", required = false)Integer roomNoId,
+                                          @RequestParam(value = "phone", required = false) String phone,
+                                          @RequestParam(value = "ownerName", required = false) String ownerName,
+                                          @RequestParam(value = "idCard", required = false) String idCard,
+                                          @RequestParam(value = "minPoints", required = false) Integer minPoints,
+                                          @RequestParam(value = "maxPoints", required = false) Integer maxPoints,
+                                          @RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                          HttpServletRequest request) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("orgId", getOrgId(request));
+        params.put("communityId", communityId);
+        params.put("phaseId", phaseId);
+        params.put("buildingId", buildingId);
+        params.put("unitId", unitId);
+        params.put("levelId", levelId);
+        params.put("roomNoId", roomNoId);
+        params.put("phone", phone);
+        params.put("ownerName", ownerName);
+        params.put("idCard", idCard);
+        params.put("minPoints", minPoints);
+        params.put("maxPoints", maxPoints);
+        //
+        IPage<TaUserVerify> page = new Page<TaUserVerify>(pageNum, pageSize);
+        IPage<TaUserVerify> result = iTaUserVerifyService.getListWithPoints(page, params);
+        return ResponseBean.success(result);
+    }
+
     /**
      * 校验该 房产是否有房主
      * @param phaseId

src/main/java/com/huiju/estateagents/property/dao/TaUserVerifyMapper.java

@@ -172,4 +172,6 @@ public interface TaUserVerifyMapper extends BaseMapper<TaUserVerify> {
     List<Map<String, Object>> getVerifyMapList(@Param("orgId") Integer orgId,@Param("communityId") Integer communityId, @Param("startDate") String startDate, @Param("endDate") String endDate);
 
     int getNoVerifyNum(Integer orgId, Integer communityId);
+
+    IPage<TaUserVerify> getListWithPoints(IPage<TaUserVerify> page,@Param("params") Map<String, Object> params);
 }

src/main/java/com/huiju/estateagents/property/service/ITaUserVerifyService.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.property.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
@@ -103,4 +104,6 @@ public interface ITaUserVerifyService extends IService<TaUserVerify> {
     List<Map<String, Object>> getVerifyMapList(Integer orgId, Integer communityId, String startDate, String endDate);
 
     int getNoVerifyNum(Integer orgId, Integer communityId);
+
+    IPage<TaUserVerify> getListWithPoints(IPage<TaUserVerify> page, Map<String, Object> params);
 }

src/main/java/com/huiju/estateagents/property/service/impl/BuildingOwnerInfoServiceImpl.java

@@ -397,7 +397,8 @@ public class BuildingOwnerInfoServiceImpl extends ServiceImpl<TpBuildingOwnerInf
         tpBuildingOwnerInfo.setOwnerName(ownerName);
         tpBuildingOwnerInfo.setOwnerTel(ownerTel);
         tpBuildingOwnerInfo.setIdCard(idCard);
-        tpBuildingOwnerInfo.setGender(gender);
+//        tpBuildingOwnerInfo.setGender(gender);
+        tpBuildingOwnerInfo.setGender(com.huiju.estateagents.common.StringUtils.getGenderFromIdCard(idCard));
         tpBuildingOwnerInfo.setUpdateUser(userId);
         tpBuildingOwnerInfo.setUpdateDate(LocalDateTime.now());
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());

src/main/java/com/huiju/estateagents/property/service/impl/TaUserVerifyServiceImpl.java

@@ -233,7 +233,8 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
         tpBuildingOwnerInfo.setRoomNoName(tpRoomNo.getName());
         tpBuildingOwnerInfo.setOwnerName(userVerify.getOwnerName());
         tpBuildingOwnerInfo.setOwnerTel(userVerify.getPhone());
-        tpBuildingOwnerInfo.setGender(userVerify.getGender());
+//        tpBuildingOwnerInfo.setGender(userVerify.getGender());
+        tpBuildingOwnerInfo.setGender(com.huiju.estateagents.common.StringUtils.getGenderFromIdCard(userVerify.getIdCard()));
         tpBuildingOwnerInfo.setPairStatus("1");
         tpBuildingOwnerInfo.setVerifyStatus("1");
         tpBuildingOwnerInfo.setCreateDate(LocalDateTime.now());
@@ -526,4 +527,9 @@ public class TaUserVerifyServiceImpl extends ServiceImpl<TaUserVerifyMapper, TaU
     public int getNoVerifyNum(Integer orgId, Integer communityId) {
         return taUserVerifyMapper.getNoVerifyNum(orgId, communityId);
     }
+
+    @Override
+    public IPage<TaUserVerify> getListWithPoints(IPage<TaUserVerify> page, Map<String, Object> params) {
+        return taUserVerifyMapper.getListWithPoints(page, params);
+    }
 }

src/main/java/com/huiju/estateagents/property/service/impl/TpTicketServiceImpl.java

@@ -410,11 +410,14 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
             e.printStackTrace();
 
             // 如果客服消息发送失败, 则发送普通模板消息
-            List<TaMpTemplate> mpTemplateList = iTaMpTemplateService.getAvailableList(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
-            if (null == mpTemplateList || mpTemplateList.size() < 1) {
+//            List<TaMpTemplate> mpTemplateList = iTaMpTemplateService.getAvailableList(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
+//            if (null == mpTemplateList || mpTemplateList.size() < 1) {
+//                return;
+//            }
+            TaMpTemplate mpTemplate = iTaMpTemplateService.getByCode(ticket.getOrgId(), CommConstant.TP_MESSAGE_TICKET);
+            if (null == mpTemplate) {
                 return;
             }
-            TaMpTemplate mpTemplate = mpTemplateList.get(0);
 
             try {
                 TaPerson propOwner = iTaPersonService.getById(ticket.getPersonId());

src/main/java/com/huiju/estateagents/service/ITaMpTemplateService.java

@@ -16,4 +16,6 @@ import java.util.List;
 public interface ITaMpTemplateService extends IService<TaMpTemplate> {
 
     List<TaMpTemplate> getAvailableList(Integer orgId, String typeCode);
+
+    TaMpTemplate getByCode(Integer orgId, String typeCode);
 }

src/main/java/com/huiju/estateagents/service/impl/TaMpTemplateServiceImpl.java

@@ -29,4 +29,9 @@ public class TaMpTemplateServiceImpl extends ServiceImpl<TaMpTemplateMapper, TaM
     public List<TaMpTemplate> getAvailableList(Integer orgId, String typeCode) {
         return taMpTemplateMapper.getAvailableList(orgId, typeCode);
     }
+
+    @Override
+    public TaMpTemplate getByCode(Integer orgId, String typeCode) {
+        return taMpTemplateMapper.getByCode(orgId, typeCode);
+    }
 }

src/main/resources/mapper/TaMpTemplateMapper.xml

@@ -19,4 +19,14 @@
             AND t.`status` = 1
             AND s.`status` = 1
     </select>
+    <select id="getByCode" resultType="com.huiju.estateagents.entity.TaMpTemplate">
+        SELECT
+            t.*
+        FROM
+            ta_mp_template t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.type_code = #{typeCode}
+            AND t.`status` = 1
+    </select>
 </mapper>

src/main/resources/mapper/property/TaUserVerifyMapper.xml

@@ -154,4 +154,63 @@
         AND t.community_id = #{communityId}
         AND t.verify_status = '0'
     </select>
+    <select id="getListWithPoints" resultType="com.huiju.estateagents.property.model.TaUserVerify">
+        SELECT
+            t.id,
+            t.id_card,
+            t.owner_name,
+            t.phone,
+            t.person_id,
+            m.total_points,
+            GROUP_CONCAT( CONCAT( t.phase_name, t.building_name, t.unit_name, t.room_no_name ) ) AS room_no_name
+        FROM
+            ta_user_verify t
+            INNER JOIN  (
+                SELECT
+                    s.person_id,
+                    sum( s.points_amount ) AS total_points
+                FROM
+                    ta_points_records s
+                WHERE
+                    s.org_id = #{params.orgId}
+                GROUP BY
+                    s.person_id
+            ) m ON m.person_id = t.person_id
+        WHERE
+            t.org_id = #{params.orgId}
+            AND t.community_id = #{params.communityId}
+        <if test="null != params.phaseId">
+            AND t.phase_id = #{params.phaseId}
+        </if>
+        <if test="null != params.buildingId">
+            AND t.building_id = #{params.buildingId}
+        </if>
+        <if test="null != params.unitId">
+            AND t.unit_id = #{params.unitId}
+        </if>
+        <if test="null != params.levelId">
+            AND t.level_id = #{params.levelId}
+        </if>
+        <if test="null != params.roomNoId">
+            AND t.room_no_id = #{params.roomNoId}
+        </if>
+        <if test="null != params.ownerName and '' != params.ownerName">
+            AND t.owner_name LIKE CONCAT('%', #{params.ownerName}, '%')
+        </if>
+        <if test="null != params.phone and '' != params.phone">
+            AND t.phone LIKE CONCAT('%', #{params.phone}, '%')
+        </if>
+        <if test="null != params.idCard and '' != params.idCard">
+            AND t.id_card LIKE CONCAT('%', #{params.idCard}, '%')
+        </if>
+        <if test="null != params.minPoints">
+            AND m.total_points &gt;= #{params.minPoints}
+        </if>
+        <if test="null != params.maxPoints">
+            AND m.total_points &lt;= #{params.maxPoints}
+        </if>
+            AND t.verify_status = 1
+        GROUP BY t.person_id
+        ORDER BY t.create_date DESC
+    </select>
 </mapper>