部门下拉及页面数据缺失修复

src/main/java/com/liang/dao/SysDeptInfoDao.java

@@ -104,5 +104,7 @@ public interface SysDeptInfoDao {
     int batchDelete(List<Integer> deptIdList);
 
     String getUserDept(Integer sqr);
+
+    List<SysDeptInfo> getDeptName();
 }
 

src/main/java/com/liang/service/SysDeptInfoService.java

@@ -79,4 +79,6 @@ public interface SysDeptInfoService {
     int batchDelete(List<Integer> deptIdList);
 
     String getUserDept(Integer sqr);
+
+    List<SysDeptInfo> getDeptName();
 }

src/main/java/com/liang/service/impl/SysDeptInfoServiceImpl.java

@@ -9,6 +9,7 @@ import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -98,4 +99,13 @@ public class SysDeptInfoServiceImpl implements SysDeptInfoService {
     public String getUserDept(Integer sqr) {
         return sysDeptInfoDao.getUserDept(sqr);
     }
+
+    @Override
+    public List<SysDeptInfo> getDeptName() {
+        List<SysDeptInfo> list = new ArrayList<>();
+        if (this.sysDeptInfoDao.getDeptName().size() == 0){
+            return list;
+        }
+        return this.sysDeptInfoDao.getDeptName();
+    }
 }

src/main/resources/mapper/SysDeptInfoDao.xml

@@ -231,5 +231,14 @@
         LEFT JOIN sys_dept_info b on a.dept_id =b.dept_id
         WHERE a.user_id = #{sqr}
     </select>
+
+    <!-- 获取有效部门列表 -->
+    <select id="getDeptName" resultMap="SysDeptInfoMap">
+        SELECT *
+        FROM
+            sys_dept_info
+        where
+            del_flag = 0
+    </select>
 </mapper>
 

src/main/resources/templates/annualbudget/mylist.html

@@ -58,20 +58,25 @@
                                 </select>
                             </div>
                         </div>
-
+                        <br/>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">所属部门</label>
-                            <div class="layui-input-inline" style="width: 145px">
-                                <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">
+                            <div class="layui-input-inline" style="width: 145px"><!--
+                                <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">-->
+                                <select name="ssbmmc" id="ssbmmc" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${dept}" th:text="${item.deptName}"
+                                            th:value="${item.deptName}"></option>
+                                </select>
                             </div>
                         </div>
 
-                        <div class="layui-inline">
+                       <!-- <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">任务书</label>
                             <div class="layui-input-inline" style="width: 145px">
                                 <input type="text" id="rwsmc" name="rwsmc" autocomplete="off" class="layui-input">
                             </div>
-                        </div>
+                        </div>-->
 
                         <div class="layui-inline" style="margin-left: 0px">
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i

src/main/resources/templates/reportinfo/list.html

@@ -25,7 +25,7 @@
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">名称</label>
+                            <label class="layui-form-label" style="width: 60px">报告名称</label>
                             <div class="layui-input-inline" style="width: 220px">
                                 <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
                             </div>
@@ -43,11 +43,16 @@
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px; margin-left: -10px">所属部门</label>
                             <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
-                                       autocomplete="off"/>
+                              <!--  <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
+                                       autocomplete="off"/>-->
                                 <!--                                <input type="text" id="parentName" name="parentName"/>-->
                                 <!--                                <input type="hidden" id="parentId" name="parentId"/>-->
                                 <!--                                <input type="hidden" id="ancestors" name="ancestors"/>-->
+                                <select name="SSBMNAME" id="SSBMNAME" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${dept}" th:text="${item.deptName}"
+                                            th:value="${item.deptName}"></option>
+                                </select>
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -182,8 +187,8 @@
             cols: [
                 [
                     {type: "checkbox", fixed: 'left'},
-                    {type: 'numbers', align: 'center'},
-                    {field: 'mc', width: '25%', title: '名称'},
+                    {type: 'numbers', align: 'center',title: '序号'},
+                    {field: 'mc', width: '25%', title: '报告名称'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
                     {field: 'qs', width: '7%', title: '起始', align: 'center'},
                     {field: 'wc', width: '7%', title: '完成', align: 'center'},
@@ -238,7 +243,7 @@
             form.val("search-form", {
                 "MC": '',
                 "SPZT": '',
-                'SSBM': '',
+                'SSBMNAME': '',
                 'SQRQStart': '',
                 'SQRQEnd': '',
                 'YSP': ''

src/main/resources/templates/reportinfo/list_deptproject.html

@@ -25,7 +25,7 @@
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">名称</label>
+                            <label class="layui-form-label" style="width: 60px">报告名称</label>
                             <div class="layui-input-inline" style="width: 220px">
                                 <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
                             </div>
@@ -43,11 +43,16 @@
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px; margin-left: -10px">所属部门</label>
                             <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
-                                       autocomplete="off"/>
+                               <!-- <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
+                                       autocomplete="off"/>-->
                                 <!--                                <input type="text" id="parentName" name="parentName"/>-->
                                 <!--                                <input type="hidden" id="parentId" name="parentId"/>-->
                                 <!--                                <input type="hidden" id="ancestors" name="ancestors"/>-->
+                                <select name="SSBMNAME" id="SSBMNAME" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${dept}" th:text="${item.deptName}"
+                                            th:value="${item.deptName}"></option>
+                                </select>
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -178,8 +183,8 @@
             cols: [
                 [
                     {type: "checkbox", fixed: 'left'},
-                    {type: 'numbers', align: 'center'},
-                    {field: 'mc', width: '25%', title: '中文名称'},
+                    {type: 'numbers', align: 'center',title: '序号'},
+                    {field: 'mc', width: '25%', title: '报告名称'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
                     {field: 'qs', width: '7%', title: '起始', align: 'center'},
                     {field: 'wc', width: '7%', title: '完成', align: 'center'},
@@ -234,7 +239,7 @@
             form.val("search-form", {
                 "MC": '',
                 "SPZT": '',
-                'SSBM': '',
+                'SSBMNAME': '',
                 'SQRQStart': '',
                 'SQRQEnd': '',
                 'YSP': ''

src/main/resources/templates/reportinfo/list_myproject.html

@@ -25,7 +25,7 @@
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">名称</label>
+                            <label class="layui-form-label" style="width: 60px">报告名称</label>
                             <div class="layui-input-inline" style="width: 220px">
                                 <input type="text" id="MC" name="MC" autocomplete="off" class="layui-input">
                             </div>
@@ -43,11 +43,16 @@
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px; margin-left: -10px">所属部门</label>
                             <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
-                                       autocomplete="off"/>
+                               <!-- <input type="text" id="SSBMNAME" name="SSBMNAME" class="layui-input"
+                                       autocomplete="off"/>-->
                                 <!--                                <input type="text" id="parentName" name="parentName"/>-->
                                 <!--                                <input type="hidden" id="parentId" name="parentId"/>-->
                                 <!--                                <input type="hidden" id="ancestors" name="ancestors"/>-->
+                                <select name="SSBMNAME" id="SSBMNAME" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${dept}" th:text="${item.deptName}"
+                                            th:value="${item.deptName}"></option>
+                                </select>
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -183,7 +188,7 @@
                 [
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', align: 'center',title: '序号'},
-                    {field: 'mc', width: '25%', title: '名称'},
+                    {field: 'mc', width: '25%', title: '报告名称'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
                     {field: 'qs', width: '7%', title: '起始', align: 'center'},
                     {field: 'wc', width: '7%', title: '完成', align: 'center'},
@@ -238,11 +243,10 @@
             form.val("search-form", {
                 "MC": '',
                 "SPZT": '',
-                'SSBM': '',
+                'SSBMNAME': '',
                 'SQRQStart': '',
                 'SQRQEnd': '',
-                'YSP': '',
-                'SSBMNAME':''
+                'YSP': ''
             });
             // 执行搜索重载
             currTable.reload({

src/main/resources/templates/stabudgetapproval/view_apply.html

@@ -1361,6 +1361,8 @@
             autoSort: false,
             limits: [10, 15, 20, 25, 50, 100],
             limit: 10,
+            toolbar: '#toolbarDemo',
+            defaultToolbar:['filter', 'exports'],
             page: true,
             skin: 'grid',
             initSort: {