yuliang 5 年之前
父节点
当前提交
d9a9abb923
共有 2 个文件被更改,包括 10 次插入6 次删除
  1. 4 4
      whepi-ui/templates/home/ribao.ftl
  2. 6 2
      whepi-web/src/main/java/com/bofeng/dao/UserOpenMapper.java

+ 4 - 4
whepi-ui/templates/home/ribao.ftl

@@ -259,7 +259,7 @@
                                        style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
                                        onchange="selectinput1(this)"/>
                                        
-                                <input id="js_input_qtdd" placeholder="其它地点" disabled="disabled" type="text"
+                                <input id="js_input_qtdd" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
                                        style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
@@ -268,7 +268,7 @@
                                        style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
                                        onchange="selectinput2(this)"/>
                                 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                <input id="js_input_jrszq" placeholder="其它地点" disabled="disabled" type="text"
+                                <input id="js_input_jrszq" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
                                        style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                             </div>
                             <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
@@ -295,7 +295,7 @@
                                            style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
                                            onchange="selectinput3(this)"/>
                                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <input id="js_input_cfdq" placeholder="其它地点" disabled="disabled" type="text"
+                                    <input id="js_input_cfdq" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
                                            style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                                 </div>
                                 <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">
@@ -304,7 +304,7 @@
                                            style="border: 1px solid rgba(0,0,0,.2);box-sizing:border-box; border-radius: 5px; height: 5vh;width: 50%"
                                            onchange="selectinput4(this)"/>
                                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                                    <input id="js_input_mddq" placeholder="其它地点" disabled="disabled" type="text"
+                                    <input id="js_input_mddq" placeholder="仅填市级如,上海市" disabled="disabled" type="text"
                                            style="width: 80%;text-align: center;border-top-width: 0px;border-right-width: 0px;border-bottom-width: 1px;border-left-width: 0px;border-color: #75859f;height: 5vh;font-size:inherit;color:inherit;"/>
                                 </div>
                                 <div style="display:flex; flex-direction: row; justify-content: space-between; margin-top: 1vh;">

+ 6 - 2
whepi-web/src/main/java/com/bofeng/dao/UserOpenMapper.java

@@ -25,8 +25,12 @@ public interface UserOpenMapper extends BaseMapper<UserOpen> {
 
     List<UserOpen> getAllUser();
 
-    @Select(
-            "select user_id as userId, open_id as openId, nick_name as nickName from sys_user_open limit #{start}, #{count}"
+//    @Select(
+//            "select user_id as userId, open_id as openId, nick_name as nickName from sys_user_open limit #{start}, #{count}"
+//    )
+    @Select("select user_id as userId, open_id as openId, nick_name as nickName from sys_user_open suo \n" +
+            "left join ms_report mr on mr.user_create=suo.user_id \n" +
+            "where (mr.report_status<1 or mr.report_status is null) and (mr.report_date = curdate() or mr.report_date is null) limit #{start}, #{count}"
     )
     List<UserOpen> getOpenUser(@Param("start") Long start, @Param("count") Long count);