业委会每日上报2/6

whepi-ui/templates/yeweihui/home.ftl

@@ -57,10 +57,12 @@ var statisticsOrderList =${rbList!'[]'};
         });
 
     });
+    var userId = $("#userId").val;
+        userId = 0;
     $('#btnRB').empty();
     for (var i = 0; i < statisticsOrderList.length; i++) {
-        var v = statisticsOrderList[i];//value="'+v.ridgepole+'&'+v.unit+'"
-        $('#btnRB').append('<button class="weui-btn weui-btn_primary" style="display: grid;" value="'+v.ridgepole+'&'+v.unit+'" onclick="ribao_init(this.value)" >'+v.ridgepole+'栋'+v.unit+'单元'+'</button>');
+        var v = statisticsOrderList[i];//value="'+v.ridgepole+'&'+v.unit+'"    &'+userId+'
+        $('#btnRB').append('<button class="weui-btn weui-btn_primary" style="display: grid;" value="'+v.ridgepole+'&'+v.unit+'&'+userId+'" onclick="ribao_init(this.value)" >'+v.ridgepole+'栋'+v.unit+'单元'+'</button>');
     }
     <#--console.log('ssssss');-->
     <#--var tasks = ${taskList!'[]'};-->

whepi-ui/templates/yeweihui/ribao.ftl

@@ -77,11 +77,11 @@
                     }
                     var td;
                     if(v.msStatus == 2){//异常
-                        td = '<td style="background-color: yellow">'+v.doorplate+'</td>';
+                        td = '<td style="background-color: yellow" align="center">'+v.doorplate+'</td>';
                     }else if(v.msStatus != 2 && v.reportId != 0 && v.msStatus != null && v.reportId !=null){//已报
-                        td = '<td style="background-color: #0bb20c">'+v.doorplate+'</td>';
+                        td = '<td style="background-color: #0bb20c" align="center">'+v.doorplate+'</td>';
                     }else if(v.reportId == null){//待报
-                        td = '<td style="background-color: #75859f">'+v.doorplate+'</td>';
+                        td = '<td style="background-color: #75859f" align="center">'+v.doorplate+'</td>';
                     }
                     tr.append(td);
                     $("#tableId").append(tr);
@@ -94,7 +94,7 @@
     })(jQuery);
 
     $('#return').on('click', function () {
-        window.location.href = "/yeweihui/home.html#tab2"
+        window.location.href = "/user/home.html#tab2"
         // alert("日报");
     });
 </script>

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

@@ -19,9 +19,11 @@ public interface RbMapper extends BaseMapper<sysUptownUnit> {
 
     @Select("select a.doorplate as doorplate,c.report_id as reportId,c.ms_status as msStatus,a.time_update as time from sys_uptown_house a " +
             "inner join sys_uptown_unit b on a.unit_id = b.unit_id " +
-            "left join ms_report c on c.house_id = a.house_id and c.time_update = #{date} " +
-            "where b.ridgepole = #{ridgepole} and b.unit = #{unit}")
-    List<SysUptownHouse> selectMp(@Param("ridgepole") String ridgepole,@Param("unit") String unit,@Param("date") Date date);
+            "inner join sys_owner d on d.uptown_id = b.uptown_id " +
+            "inner join sys_user_role e on e.property_id = d.owner_id and e.role_id = 2 " +
+            "left join ms_report c on c.house_id = a.house_id and DATE_FORMAT(c.time_update,'%Y-%m-%d') = #{dateStr} " +
+            "where b.ridgepole = #{ridgepole} and b.unit = #{unit} and e.user_id = #{userId}")
+    List<SysUptownHouse> selectMp(@Param("ridgepole") String ridgepole,@Param("unit") String unit,@Param("dateStr") String dateStr,@Param("userId") Long userId);
     // and c.time_update = #{date}
 
     @Select("select c.ridgepole as ridgepole,c.unit as unit from sys_user_role a " +

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

@@ -9,6 +9,7 @@ import com.bofeng.entity.sysUptownUnit;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
@@ -24,10 +25,13 @@ public class RbService {
         return sysUptownHouses;
     }
 
-    public List<SysUptownHouse> selectXq (String ridgepole,String unit) {
+    public List<SysUptownHouse> selectXq (String ridgepole,String unit,Long userId) {
+        userId = 1224706869998772226L;
 //        List<SysUptownHouse> sysUptownHouses = rbMapper.selectList(new EntityWrapper<SysUptownHouse>().eq("ridgepole",ridgepole).eq("unit",unit));
         Date date = new Date();
-        List<SysUptownHouse> sysUptownHouses = rbMapper.selectMp(ridgepole,unit,date);
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+        String dateStr = simpleDateFormat.format(date);
+        List<SysUptownHouse> sysUptownHouses = rbMapper.selectMp(ridgepole,unit,dateStr,userId);
         return sysUptownHouses;
     }
 }

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

@@ -48,10 +48,10 @@ public class UserOpenController {
     public ModelAndView home(ModelMap model, @RequestParam(value = "userId", required = false,defaultValue = "0") Long userId) {
         List<UserRole> list = new ArrayList<>();
         if (userId == 0) {
-            UserOpen userOpen = homeService.getUserOpen();
-            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
-//            list = userRoleMapper.getUserRoleByUserId(1224706869998772226L);
-//            UserOpen userOpen = userOpenMapper.selectByUserId(1224706869998772226L);
+//            UserOpen userOpen = homeService.getUserOpen();
+//            list = userRoleMapper.getUserRoleByUserId(userOpen.getUserId());
+            list = userRoleMapper.getUserRoleByUserId(1224706869998772226L);
+            UserOpen userOpen = userOpenMapper.selectByUserId(1224706869998772226L);
             userId = list.get(0).getUserId();
             model.put("user", userOpen);
             model.put("user_id", "\""+userOpen.getUserId()+"\"");

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

@@ -14,6 +14,7 @@ import com.yvan.ModelOps;
 import com.yvan.mvc.Pd;
 import com.yvan.platform.JsonWapper;
 import com.yvan.platform.YvanUtil;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,9 +45,9 @@ public class YeWeiHuiController {
         queryParam.put("statistics", "M");
 
         List<QzTask> taskList = qzTaskService.selectAll();
-//        List<sysUptownUnit> rbList = rbService.selectAll();
+        List<sysUptownUnit> rbList = rbService.selectAll(1224706869998772226L);
         model.put("taskList", YvanUtil.toJsonPretty(taskList));
-//        model.put("rbList", YvanUtil.toJsonPretty(rbList));
+        model.put("rbList", YvanUtil.toJsonPretty(rbList));
 
         return new ModelAndView("/yeweihui/home.ftl", model);
     }
@@ -134,7 +135,7 @@ public class YeWeiHuiController {
     @GetMapping("/yeweihui/ribaoDy")
     public Model<List<SysUptownHouse>> yeweihuiRibaoDy(String str) {
         String[] split = str.split("&");
-        List<SysUptownHouse> rbList = rbService.selectXq(split[0],split[1]);
+        List<SysUptownHouse> rbList = rbService.selectXq(split[0],split[1],Long.parseLong(split[2]));
 
         return Model.newSuccess(rbList);
     }