Merge remote-tracking branch 'origin/master'

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

@@ -139,6 +139,7 @@ public class RiBaoService {
                 msReport.setMsStatus(1);
             }
 
+            msReport.setReportStatus(0);
             msReportMapper.updateById(msReport);
         }
     }
@@ -152,6 +153,19 @@ public class RiBaoService {
         return msReport;
     }
 
+    public MsReport getRibaoWithDate(Long userCreate, String reportDate) {
+        List<MsReport> msReportList = msReportMapper.selectByReportDate(reportDate, userCreate);
+        if (CollectionUtils.isEmpty(msReportList)) {
+            return null;
+        }
+
+        MsReport msReport = msReportList.get(0);
+        String houseStr = this.getHouseStr(msReport.getHouseId());
+        msReport.setHouseIdStr(houseStr);
+
+        return msReport;
+    }
+
     //获取今天数据
     public String getHouseStr(Long houseId) {
         UptownHouse house = uptownHouseMapper.selectById(houseId);

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

@@ -49,6 +49,20 @@ public class RiBaoController {
 //    private String user_update;
 //    private String time_update;
 
+    //查询日历日报
+    @GetMapping("/riBao/getRibaoWithDate")
+    public Model<MsReport> getRibaoWithDate(@Pd(name = "userCreate") Long userCreate, @Pd(name = "reportDate") String reportDate) {
+        MsReport msReport = riBaoService.getRibaoWithDate(userCreate, reportDate);
+        return Model.newSuccess(msReport);
+    }
+
+    // 查询日历日报关联的家人列表
+    @GetMapping("/riBao/queryRibaoDetailListWithDate")
+    public Model<List<MsSuspected>> queryRibaoDetailListWithDate(@Pd(name = "reportId") Long reportId) {
+        List<MsSuspected> listSuspected = riBaoService.queryRibaoDetailList(reportId);
+        return Model.newSuccess(listSuspected);
+    }
+
 
     //查询日报
     @GetMapping("/riBao/getRibao")

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

@@ -65,10 +65,10 @@ public class UserOpenController {
                              @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-           /* UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());*/
-            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
-            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
+            UserOpen userOpen = homeService.getUserOpen();
+            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+//            list = userRoleMapper.getUserRoleByUserId(1225321682867105793L);
+//            UserOpen userOpen = userOpenMapper.selectByUserId(1225321682867105793L);
             userId = userOpen.getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\"" + userOpen.getUserId() + "\"");
@@ -116,7 +116,7 @@ public class UserOpenController {
     })
     @GetMapping("/tuangou/home.html")
     public ModelAndView tuangouHome(ModelMap model, @RequestParam(value = "userId", required = false, defaultValue = "0") Long userId,
-                             @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
+                                    @RequestParam(value = "userType", required = false, defaultValue = "0") Integer userType) throws JsonProcessingException {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
             UserOpen userOpen = homeService.getUserOpen();
@@ -244,10 +244,10 @@ public class UserOpenController {
 
     @GetMapping("/home/testOk.html")
     public ModelAndView testOk(ModelMap model, HttpServletResponse response) {
-        response.setHeader("Access-Control-Allow-Credentials","true");
-        response.setHeader("Access-Control-Allow-Origin","*");
-        response.setHeader("Access-Control-Allow-Methods","GET,POST,OPTIONS,DELETE");
-        response.setHeader("Access-Control-Max-Age","3600");
+        response.setHeader("Access-Control-Allow-Credentials", "true");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "GET,POST,OPTIONS,DELETE");
+        response.setHeader("Access-Control-Max-Age", "3600");
         response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
 
         return new ModelAndView("/ok.html", model);

whepi-web/src/main/resources/application.yml

@@ -43,7 +43,7 @@ endpoints:
 #  whitelabel.enabled: false
 
 spring:
-  profiles.active: lll
+  profiles.active: guojing
 
   application:
     name: bofeng-web

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

@@ -45,6 +45,9 @@
         ) z
         on a.jm_id=z.jm_id
         where a.jm_id=#{jmId} and a.buy_status=1
+        <if test="queryProperties!=null and queryProperties!=''">
+            and y.uptown_name like concat('%',#{queryProperties},'%')
+        </if>
     </select>
 
     <select id="querMemberListByJmIdexport" resultType="com.bofeng.entity.JmTuangouMember">