feats

src/main/java/com/huiju/estateagents/excel/TpBuildingOwnerInfoExport.java

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class TpBuildingOwnerInfoExport {
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String ownerName;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String ownerTel;
+
+    @ColumnWidth(25)
+    @ExcelProperty(value = "身份证", index = 2)
+    private String idCard;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "性别", index = 3)
+    private String sex;
+
+    @ColumnWidth(60)
+    @ExcelProperty(value = "房间号", index = 4)
+    private String roomNoName;
+
+    @ColumnWidth(10)
+    @ExcelProperty(value = "身份", index = 5)
+    private String roleName;
+
+    @ColumnWidth(15)
+    @ExcelProperty(value = "审核状态", index = 6)
+    private String verifyStatus;
+
+    @ColumnWidth(25)
+    @ExcelProperty(value = "操作时间", index = 7)
+    private String createDate;
+}

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

@@ -2,12 +2,18 @@ package com.huiju.estateagents.property.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.ExcelUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.excel.TpBuildingOwnerInfoExport;
 import com.huiju.estateagents.property.common.UserElement;
 import com.huiju.estateagents.property.model.TaFace;
 import com.huiju.estateagents.property.model.TaUserVerify;
+import com.huiju.estateagents.property.model.TpBuildingOwnerInfo;
 import com.huiju.estateagents.property.service.IBuildingOwnerInfoService;
 import com.huiju.estateagents.property.service.ITaFaceService;
 import com.huiju.estateagents.property.service.ITaUserVerifyService;
@@ -24,7 +30,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
+import java.io.IOException;
 import java.io.OutputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -66,6 +74,59 @@ public class BuildingOwnerInfoController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 业主导出
+     * @param parameter
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/buildingInfo/list/export", method = RequestMethod.POST)
+    public ResponseBean getListExport(@RequestBody String parameter,
+                                      HttpServletRequest request,
+                                      HttpServletResponse response){
+        ResponseBean responseBean = new ResponseBean();
+        TaUser userElement = getTaUser(request);
+        responseBean = iBuildingOwnerInfoService.listQuery(parameter, userElement);
+
+        List<TpBuildingOwnerInfo> records = (List<TpBuildingOwnerInfo>) ((Map<String, Object>) responseBean.getData()).get("list");
+
+        if (null != records) {
+            List<TpBuildingOwnerInfoExport> list = new ArrayList<>();
+            for (TpBuildingOwnerInfo item: records) {
+                TpBuildingOwnerInfoExport ownerInfo = new TpBuildingOwnerInfoExport();
+                ownerInfo.setOwnerName(item.getOwnerName());
+                ownerInfo.setIdCard(item.getIdCard());
+                ownerInfo.setOwnerTel(item.getOwnerTel());
+                ownerInfo.setSex(getSexFromIdCard(item.getIdCard()));
+                ownerInfo.setRoomNoName(item.getPhaseName()+item.getBuildingName()+item.getUnitName()+item.getLevelName()+item.getRoomNoName());
+                ownerInfo.setRoleName(item.getRoleName());
+                ownerInfo.setVerifyStatus("0".equals(item.getVerifyStatus()) ? "未审核" : ("1".equals(item.getVerifyStatus()) ? "审核通过" : ("1".equals(item.getVerifyStatus()) ? "审核不通过": "") ));
+                ownerInfo.setCreateDate(DateUtils.format(item.getCreateDate(), "yyyy-MM-dd HH:mm"));
+                list.add(ownerInfo);
+            }
+
+            try {
+                ExcelUtils.flush(response, TpBuildingOwnerInfoExport.class, list, "业主记录.xlsx");
+                return null;
+            } catch (IOException e) {
+                return ResponseBean.error("导出 Excel 失败 "+ e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+            }
+        }
+
+        return responseBean;
+    }
+
+    private String getSexFromIdCard(String idCard) {
+        if (StringUtils.isEmpty(idCard) || idCard.length() != 18) {
+            return null;
+        }
+
+        String sign = idCard.split("")[16];
+
+        return Integer.parseInt(sign) % 2 == 1 ? "男" : "女";
+    }
+
+
     // @ApiOperation(value = "获取楼栋业主审核详情", notes = "获取楼栋业主审核详情")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "query", dataTypeClass = Integer.class, name = "userVerifyId",value = "审核Id")

src/main/resources/application-dev.yml

@@ -80,7 +80,7 @@ pay-refund: https://dev.fangdeal.cn/api/refund/
 
 # 支付回调
 pay-new-notify:
-  wx-bill-notify: https://a.t.njyunzhi.com/api/wxBillNotify
+  wx-bill-notify: https://xs.njyunzhi.com/api/wxBillNotify
   ali-bill-notify:
   wx-car-notify:
   ali-car-notify:

src/main/resources/application-prod.yml

@@ -86,7 +86,7 @@ pay-refund: https://wx.fangdeal.cn/api/refund/
 
 # 支付回调
 pay-new-notify:
-  wx-bill-notify: https://a.t.njyunzhi.com/api/wxBillNotify
+  wx-bill-notify: https://xs.njyunzhi.com/api/wxBillNotify
   ali-bill-notify:
   wx-car-notify:
   ali-car-notify:

src/main/resources/application.yml

@@ -15,5 +15,5 @@ wx:
   miniapp:
     index: /pages/ShouYe/index
   mp:
-    festivalH5: https://xs.ycjcjy.com/jierih5.html
-    birthdayH5: https://xs.ycjcjy.com/shengrih5.html
+    festivalH5: https://xs.njyunzhi.com/jierih5.html
+    birthdayH5: https://xs.njyunzhi.com/shengrih5.html

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

@@ -60,6 +60,7 @@
 
     <select id="selectListByParams" resultType="com.huiju.estateagents.property.model.TpBuildingOwnerInfo">
         SELECT
+            distinct
             u.id,
             u.phase_name,
             u.building_name,
@@ -76,6 +77,7 @@
             u.create_date AS createDate
         FROM
         tp_building_owner_info u
+        left join ta_user_verify t on t.id = u.ta_user_verify_id
         WHERE
 
         u.org_id=#{tpBuildingOwnerInfo.orgId,jdbcType=INTEGER}
@@ -103,6 +105,9 @@
         <if test="tpBuildingOwnerInfo.idCard != null and tpBuildingOwnerInfo.idCard != ''">
             and u.id_card like concat('%',#{tpBuildingOwnerInfo.idCard,jdbcType=VARCHAR},'%')
         </if>
+        <if test="tpBuildingOwnerInfo.roleName != null and tpBuildingOwnerInfo.roleName != ''">
+            and t.role_id = #{tpBuildingOwnerInfo.roleName}
+        </if>
         order by u.create_date desc
     </select>
 </mapper>