Merge remote-tracking branch 'origin/master'

whepi-web/src/main/java/com/bofeng/dao/UptownHouseMapper.java

@@ -1,7 +1,6 @@
 package com.bofeng.dao;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
-import com.bofeng.entity.UptownHome;
 import com.bofeng.entity.UptownHouse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -18,5 +17,5 @@ public interface UptownHouseMapper extends BaseMapper<UptownHouse> {
     List<UptownHouse> getAllUptownHouse(@Param("uptownId") Long uptownId);
 
     @Select("select * from sys_uptown_house where status = 1 and unit_id = #{unitId} and doorplate = #{doorplate}")
-    List<UptownHome> getUptownHouseBy(@Param("unitId") Long unitId, @Param("doorplate") String doorplate);
+    List<UptownHouse> getUptownHouseBy(@Param("unitId") Long unitId, @Param("doorplate") String doorplate);
 }

whepi-web/src/main/java/com/bofeng/entity/MsReport.java

@@ -4,7 +4,7 @@ package com.bofeng.entity;
 import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
-import io.swagger.models.auth.In;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
@@ -26,6 +26,9 @@ public class MsReport {
     @TableField("house_id")
     private Long houseId;
 
+    @TableField(exist = false)
+    private String houseIdStr = "";
+
     @TableField("safety_num")
     private Integer safetyNum;
 
@@ -45,6 +48,7 @@ public class MsReport {
     private String remarks;
 
     @TableField("report_date")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date reportDate;
 
     @TableField("report_status")

whepi-web/src/main/java/com/bofeng/entity/UptownHouse.java

@@ -1,13 +1,12 @@
 package com.bofeng.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import lombok.Getter;
 import lombok.Setter;
 import org.joda.time.DateTime;
 
-import java.util.Date;
-
 /**
  * 门牌信息表
  */
@@ -16,7 +15,7 @@ import java.util.Date;
 @TableName("sys_uptown_house")
 public class UptownHouse {
 
-    @TableField("house_id")
+    @TableId("house_id")
     private Long houseId;
 
     @TableField("unit_id")

whepi-web/src/main/java/com/bofeng/entity/UptownUnit.java

@@ -1,6 +1,7 @@
 package com.bofeng.entity;
 
 import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import lombok.Getter;
 import lombok.Setter;
@@ -14,7 +15,7 @@ import org.joda.time.DateTime;
 @TableName("sys_uptown_unit")
 public class UptownUnit {
 
-    @TableField("unit_id")
+    @TableId("unit_id")
     private Long unitId;
 
     @TableField("uptown_id")
@@ -32,14 +33,14 @@ public class UptownUnit {
     @TableField("status")
     private Integer status;
 
-    @TableField("user_create")
-    private Long userCreate;
+//    @TableField("user_create")
+//    private Long userCreate;
 
     @TableField(exist = false)
     private DateTime timeCreate;
 
-    @TableField("user_update")
-    private Long userUpdate;
+//    @TableField("user_update")
+//    private Long userUpdate;
 
     @TableField(exist = false)
     private DateTime timeUpdate;

whepi-web/src/main/java/com/bofeng/service/RiBaoService.java

@@ -4,8 +4,12 @@ package com.bofeng.service;
 import com.baomidou.mybatisplus.toolkit.IdWorker;
 import com.bofeng.dao.MsReportMapper;
 import com.bofeng.dao.MsSuspectedMapper;
+import com.bofeng.dao.UptownHouseMapper;
+import com.bofeng.dao.UptownUnitMapper;
 import com.bofeng.entity.MsReport;
 import com.bofeng.entity.MsSuspected;
+import com.bofeng.entity.UptownHouse;
+import com.bofeng.entity.UptownUnit;
 import org.apache.commons.collections.CollectionUtils;
 import org.joda.time.DateTime;
 import org.springframework.beans.BeanUtils;
@@ -36,6 +40,12 @@ public class RiBaoService {
     @Autowired
     private RiBaoService msReportService;
 
+    @Autowired
+    private UptownHouseMapper uptownHouseMapper;
+
+    @Autowired
+    private UptownUnitMapper uptownUnitMapper;
+
     public List<MsSuspected> getByReportId(Long reportId) {
         return msSuspectedMapper.selectByReportId(reportId);
     }
@@ -70,6 +80,17 @@ public class RiBaoService {
         return msReport;
     }
 
+
+    //获取今天数据
+    public String getHouseStr(Long houseId) {
+        UptownHouse house = uptownHouseMapper.selectById(houseId);
+        UptownUnit unit = uptownUnitMapper.selectById(house.getUnitId());
+        StringBuffer sb = new StringBuffer();
+        sb.append(unit.getRidgepole()).append("栋").append(unit.getUnit()).append("单元").append(house.getDoorplate()).append("室");
+        String houseStr = sb.toString();
+        return houseStr;
+    }
+
     //上报
     @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRED)
     public Integer addReport(Long userCreate) {

whepi-web/src/main/java/com/bofeng/wx/controller/RiBaoController.java

@@ -59,7 +59,8 @@ public class RiBaoController {
     public MsReport queryRibao(@Pd(name = "userCreate") Long userCreate) {
         Long reportId = riBaoService.getNowByYesterday(userCreate);
         MsReport msReport = riBaoService.selectById(reportId);
-
+        String houseStr = riBaoService.getHouseStr(msReport.getHouseId());
+        msReport.setHouseIdStr(houseStr);
         return msReport;
     }
 

whepi-web/src/main/java/com/bofeng/wx/controller/UserOpenController.java

@@ -127,7 +127,7 @@ public class UserOpenController {
         ResultModel resultModel = new ResultModel();
         Long unitId = Long.parseLong(request.getParameter("unitId"));
         String doorplate = request.getParameter("doorplate");
-        List<UptownHome> list = uptownHouseMapper.getUptownHouseBy(unitId, doorplate);
+        List<UptownHouse> list = uptownHouseMapper.getUptownHouseBy(unitId, doorplate);
         if (list.size() > 0) {
             resultModel.put("success", false);
             resultModel.put("msg", "该门牌已有人入住！");

whepi-web/src/main/java/com/bofeng/wx/controller/YeWeiHuiController.java

@@ -188,8 +188,8 @@ public class YeWeiHuiController {
     }
 
     @GetMapping("/yeweihui/ribaohuiz")
-    public Model<List<MsSuspected>> yeweihuiRibaohuiz(/*Long userCreate,*/String reportDate) {
-        Long userCreate = 1225321682867105793L;
+    public Model<List<MsSuspected>> yeweihuiRibaohuiz(Long userCreate,String reportDate) {
+//        Long userCreate = 1225321682867105793L;
         List<MsSuspected> rbList = rbService.selecthuiz(userCreate,reportDate);
         return Model.newSuccess(rbList);
     }

whepi-web/src/main/resources/mapper/UptownHouseMapper.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.bofeng.dao.UptownHouseMapper">
+
+
+</mapper>