业委会每日上报unitId

whepi-ui/templates/yeweihui/home.ftl

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

whepi-ui/templates/yeweihui/ribao.ftl

@@ -50,6 +50,7 @@
 <script>
     (function ($) {
         $(function(){
+            var userId = $("#userId").val;
             var date2 = new Date();
             date2.setTime(date2.getTime());
             var month = date2.getMonth()+1;

whepi-ui/templates/yeweihui/ribao.js

@@ -1,6 +1,7 @@
 function ribao_init(tt) {
   $('#btnRB').on('click', function () {
       console.log(tt);
+      // alert(tt.toString());
       window.location.href = "/yeweihui/ribao.html?"+tt
   });
 }

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

@@ -17,16 +17,16 @@ import java.util.List;
 @Repository
 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 " +
+    @Select("select a.doorplate as doorplate,c.report_id as reportId,c.ms_status as msStatus,b.unit_id as unitId from sys_uptown_house a " +
             "inner join sys_uptown_unit b on a.unit_id = b.unit_id " +
             "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);
+            "where b.unit_id = #{str}")
+    List<SysUptownHouse> selectMp(@Param("str") Long str,@Param("dateStr") String dateStr);
     // and c.time_update = #{date}
 
-    @Select("select c.ridgepole as ridgepole,c.unit as unit from sys_user_role a " +
+    @Select("select c.ridgepole as ridgepole,c.unit as unit,c.unit_id as unitId from sys_user_role a " +
             "inner join sys_owner b on b.owner_id = a.property_id and a.role_id = 2 " +
             "inner join sys_uptown_unit c on c.uptown_id = b.uptown_id " +
             "where a.user_id = #{userId}")

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

@@ -17,6 +17,9 @@ public class SysUptownHouse implements Serializable {
     private Long uptownId;
 
     @TableField(exist = false)
+    private Long unitId;
+
+    @TableField(exist = false)
     private String ridgepole;
 
     @TableField(exist = false)

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

@@ -25,13 +25,13 @@ public class RbService {
         return sysUptownHouses;
     }
 
-    public List<SysUptownHouse> selectXq (String ridgepole,String unit,Long userId) {
+    public List<SysUptownHouse> selectXq (Long str) {
 //        userId = 1224706869998772226L;
 //        List<SysUptownHouse> sysUptownHouses = rbMapper.selectList(new EntityWrapper<SysUptownHouse>().eq("ridgepole",ridgepole).eq("unit",unit));
         Date date = new Date();
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         String dateStr = simpleDateFormat.format(date);
-        List<SysUptownHouse> sysUptownHouses = rbMapper.selectMp(ridgepole,unit,dateStr,userId);
+        List<SysUptownHouse> sysUptownHouses = rbMapper.selectMp(str,dateStr);
         return sysUptownHouses;
     }
 }

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

@@ -141,9 +141,9 @@ 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],Long.parseLong(split[2]));
+    public Model<List<SysUptownHouse>> yeweihuiRibaoDy(Long str) {
+//        String[] split = str.split("&");
+        List<SysUptownHouse> rbList = rbService.selectXq(str);
 
         return Model.newSuccess(rbList);
     }