fixed: 0919 BUG修复

src/main/resources/mybatis/system/UserMapper.xml

@@ -149,7 +149,7 @@
             <if test="hobby != null">`hobby` = #{hobby},</if>
             <if test="province != null">`province` = #{province},</if>
             <if test="city != null">`city` = #{city},</if>
-            <if test="unit != null">`city` = #{unit},</if>
+<!--            <if test="unit != null">`city` = #{unit},</if>-->
             <if test="district != null">`district` = #{district},</if>
             <if test="post != null">`post` = #{post},</if>
             <if test="duty != null">`duty` = #{duty}</if>

src/main/resources/static/js/appjs/datas/data/data.js

@@ -12,6 +12,7 @@ $(function () {
     loadType();
     //初始化联合审批部门
     load_direct_select();
+    loadAuditStage();
     //省份
     loadProvince();
     //地市
@@ -19,6 +20,34 @@ $(function () {
 
 });
 
+//审核阶段
+function loadAuditStage() {
+    var html = "";
+    $.ajax({
+        url: '/common/dict/list/audit_stage',
+        success: function (data) {
+            //加载数据
+            for (var i = 0; i < data.length; i++) {
+                html += '<option value="' + data[i].value + '">' + data[i].name + '</option>'
+            }
+            $(".chosen-select-auditStage").append(html);
+            $(".chosen-select-auditStage").chosen({
+                maxHeight: 200
+            });
+            //点击事件
+            $('.chosen-select-auditStage').on('change', function (e, params) {
+                console.log(params.selected);
+                var opt = {
+                    query: {
+                        type: params.selected,
+                    }
+                }
+                // $('#exampleTable').bootstrapTable('refresh', opt);
+            });
+        }
+    });
+}
+
 $('.dropdown-toggle').dropdown();
 
 var myColumns = [];
@@ -152,6 +181,7 @@ function load() {
                         industryTypeOne: $('#industryTypeOne').val(),
                         // dataStatus: $('#status').val(),
                         dataLevel: $('#dataLevel').val(),
+                        auditStage: $('#auditStage').val(),
                         unitProvince: $('#unitProvince').val(), //省
                         unitCity: $('#unitCity').val(), //市区
                         dataStatus: '3',//已审批
@@ -237,6 +267,7 @@ function reset() {
     $("#unitProvince").val("").trigger("chosen:updated");
     $("#unitCity").val("").trigger("chosen:updated");
     $("#dataLevel").val("").trigger("chosen:updated");
+    $("#auditStage").val("").trigger("chosen:updated");
 }
 
 function batchRemove() {

src/main/resources/static/js/appjs/datas/dataEntry/data.js

@@ -150,11 +150,11 @@ function load() {
                         reporterUnit: $('#reporterUnit').val(),
                         dataIndustry: $('#dataIndustry').val(),
                         industryTypeOne: $('#industryTypeOne').val(),
-                        // dataStatus: $('#status').val(),
+                        dataStatus: $('#status').val(),
                         dataLevel: $('#dataLevel').val(),
                         unitProvince: $('#unitProvince').val(), //省
                         unitCity: $('#unitCity').val(), //市区
-                        dataStatus: '3',//已审批
+                        // dataStatus: '3',//已审批
                     };
                 },
                 onLoadSuccess: function () {

src/main/resources/templates/datas/data/data.html

@@ -10,23 +10,26 @@
                 <div class="form-inline m-t" role="form">
                     <div class="form-group">
 
-                        <select data-placeholder="--选择行业--" name="industryTypeOne" id="industryTypeOne"
-                                class="form-control chosen-select-industryType" tabindex="2" required
-                                style="font-size: 14px;color: #9b9ea3;">
-                            <option value="">--选择行业--</option>
-                        </select>
-                        <select data-placeholder="--数据级别--" name="dataLevel" id="dataLevel"
-                                style="width: 130px;"  class="form-control chosen-select-level" tabindex="2" required >
-                            <option value="">--数据级别--</option>
-                        </select>
+<!--                        <select data-placeholder="&#45;&#45;选择行业&#45;&#45;" name="industryTypeOne" id="industryTypeOne"-->
+<!--                                class="form-control chosen-select-industryType" tabindex="2" required-->
+<!--                                style="font-size: 14px;color: #9b9ea3;">-->
+<!--                            <option value="">&#45;&#45;选择行业&#45;&#45;</option>-->
+<!--                        </select>-->
+<!--                        <select data-placeholder="&#45;&#45;数据级别&#45;&#45;" name="dataLevel" id="dataLevel"-->
+<!--                                style="width: 130px;"  class="form-control chosen-select-level" tabindex="2" required >-->
+<!--                            <option value="">&#45;&#45;数据级别&#45;&#45;</option>-->
+<!--                        </select>-->
 
 
-                        <select shiro:hasPermission="datas:data:city" data-placeholder="--选择城市--" name="unitCity" id="unitCity"
-                                style="width: 130px;" class="form-control chosen-select-city" tabindex="2" required>
-                            <option value="">--选择城市--</option>
+<!--                        <select shiro:hasPermission="datas:data:city" data-placeholder="&#45;&#45;选择城市&#45;&#45;" name="unitCity" id="unitCity"-->
+<!--                                style="width: 130px;" class="form-control chosen-select-city" tabindex="2" required>-->
+<!--                            <option value="">&#45;&#45;选择城市&#45;&#45;</option>-->
+<!--                        </select>-->
+                        <select data-placeholder="--审核阶段--" name="auditStage" id="auditStage" style="width: 130px;"  class="form-control chosen-select-auditStage" tabindex="2" required >
+                            <option value="">--审核阶段--</option>
                         </select>
-                        <input id="reporterUnit" type="text" class="form-control"
-                               placeholder="数据处理者名称">
+<!--                        <input id="reporterUnit" type="text" class="form-control"-->
+<!--                               placeholder="数据处理者名称">-->
                         <input id="dataName" type="text" class="form-control"
                                placeholder="数据名称">
 

src/main/resources/templates/datas/dataEntry/data.html

@@ -10,23 +10,30 @@
                 <div class="form-inline m-t" role="form">
                     <div class="form-group">
 
-                        <select data-placeholder="--选择行业--" name="industryTypeOne" id="industryTypeOne"
-                                class="form-control chosen-select-industryType" tabindex="2" required
-                                style="font-size: 14px;color: #9b9ea3;">
-                            <option value="">--选择行业--</option>
-                        </select>
-                        <select data-placeholder="--数据级别--" name="dataLevel" id="dataLevel"
-                                style="width: 130px;"  class="form-control chosen-select-level" tabindex="2" required >
-                            <option value="">--数据级别--</option>
-                        </select>
+<!--                        <select data-placeholder="&#45;&#45;选择行业&#45;&#45;" name="industryTypeOne" id="industryTypeOne"-->
+<!--                                class="form-control chosen-select-industryType" tabindex="2" required-->
+<!--                                style="font-size: 14px;color: #9b9ea3;">-->
+<!--                            <option value="">&#45;&#45;选择行业&#45;&#45;</option>-->
+<!--                        </select>-->
+<!--                        <select data-placeholder="&#45;&#45;数据级别&#45;&#45;" name="dataLevel" id="dataLevel"-->
+<!--                                style="width: 130px;"  class="form-control chosen-select-level" tabindex="2" required >-->
+<!--                            <option value="">&#45;&#45;数据级别&#45;&#45;</option>-->
+<!--                        </select>-->
 
 
-                        <select shiro:hasPermission="datas:data:city" data-placeholder="--选择城市--" name="unitCity" id="unitCity"
-                                style="width: 130px;" class="form-control chosen-select-city" tabindex="2" required>
-                            <option value="">--选择城市--</option>
+<!--                        <select shiro:hasPermission="datas:data:city" data-placeholder="&#45;&#45;选择城市&#45;&#45;" name="unitCity" id="unitCity"-->
+<!--                                style="width: 130px;" class="form-control chosen-select-city" tabindex="2" required>-->
+<!--                            <option value="">&#45;&#45;选择城市&#45;&#45;</option>-->
+<!--                        </select>-->
+<!--                        <input id="reporterUnit" type="text" class="form-control"-->
+<!--                               placeholder="数据处理者名称">-->
+                        <select data-placeholder="--选择审核状态--" name="status" id="status" 
+                                class="form-control" tabindex="" required style="font-size: 14px;color: #9b9ea3;">
+                            <option value="">--选择审核状态--</option>
+                            <option value="2">审核中</option>
+                            <option value="3">审核通过</option>
+                            <option value="4">驳回</option>
                         </select>
-                        <input id="reporterUnit" type="text" class="form-control"
-                               placeholder="数据处理者名称">
                         <input id="dataName" type="text" class="form-control"
                                placeholder="数据名称">
 

src/main/resources/templates/system/user/personal.html

@@ -34,40 +34,40 @@
                                            th:value="${user.name}" placeholder="请输入姓名"/>
                                 </div>
                             </div>
-                            <div class="gg-formGroup">
-                                <div class="gg-formTitle">
-                                    <em class="gg-star">*</em>
-                                    <span>性别:</span>
-                                </div>
-                                <div class="gg-formDetail">
-                                    <div class="radio i-checks">
-                                        <label class="radio-inline" th:each="sex:${sexList}"> <input
-                                                th:field="*{user.sex}" type="radio" name="sex" th:value="${sex.id}"
-                                                th:text="${sex.name}"/>
-                                        </label>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="gg-formGroup">
-                                <div class="gg-formTitle">
-                                    <em class="gg-star">*</em>
-                                    <span>岗位:</span>
-                                </div>
-                                <div class="gg-formDetail">
-                                    <input type="text" class="form-control" id="post" name="post" th:value="${user.post}"
-                                           placeholder="请输入岗位"/>
-                                </div>
-                            </div>
-                            <div class="gg-formGroup">
-                                <div class="gg-formTitle">
-                                    <em class="gg-star">*</em>
-                                    <span>职责:</span>
-                                </div>
-                                <div class="gg-formDetail">
-                                    <input type="text" class="form-control" id="duty" name="duty" th:value="${user.duty}"
-                                           placeholder="请输入职责"/>
-                                </div>
-                            </div>
+<!--                            <div class="gg-formGroup">-->
+<!--                                <div class="gg-formTitle">-->
+<!--                                    <em class="gg-star">*</em>-->
+<!--                                    <span>性别:</span>-->
+<!--                                </div>-->
+<!--                                <div class="gg-formDetail">-->
+<!--                                    <div class="radio i-checks">-->
+<!--                                        <label class="radio-inline" th:each="sex:${sexList}"> <input-->
+<!--                                                th:field="*{user.sex}" type="radio" name="sex" th:value="${sex.id}"-->
+<!--                                                th:text="${sex.name}"/>-->
+<!--                                        </label>-->
+<!--                                    </div>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                            <div class="gg-formGroup">-->
+<!--                                <div class="gg-formTitle">-->
+<!--                                    <em class="gg-star">*</em>-->
+<!--                                    <span>岗位:</span>-->
+<!--                                </div>-->
+<!--                                <div class="gg-formDetail">-->
+<!--                                    <input type="text" class="form-control" id="post" name="post" th:value="${user.post}"-->
+<!--                                           placeholder="请输入岗位"/>-->
+<!--                                </div>-->
+<!--                            </div>-->
+<!--                            <div class="gg-formGroup">-->
+<!--                                <div class="gg-formTitle">-->
+<!--                                    <em class="gg-star">*</em>-->
+<!--                                    <span>职责:</span>-->
+<!--                                </div>-->
+<!--                                <div class="gg-formDetail">-->
+<!--                                    <input type="text" class="form-control" id="duty" name="duty" th:value="${user.duty}"-->
+<!--                                           placeholder="请输入职责"/>-->
+<!--                                </div>-->
+<!--                            </div>-->
                             <div class="gg-formGroup">
                                 <div class="gg-formTitle">
                                     <em class="gg-star">*</em>
@@ -120,9 +120,9 @@
 <!--                                </div>-->
 <!--                            </div>-->
                         </form>
-<!--                        <div class="gg-btnGroup">-->
-<!--                            <button type="button" class="btn btn-sm btn-primary" id="base_save">保存</button>-->
-<!--                        </div>-->
+                        <div class="gg-btnGroup">
+                            <button type="button" class="btn btn-sm btn-primary" id="base_save">保存</button>
+                        </div>
                     </div>
                     <!--photo_info-->
                     <div class="ibox-content tab-pane fade gg" id="photo_info">
@@ -198,6 +198,6 @@
     </div>
 </div>
 <div th:include="system/user/include :: footer"></div>
-<!--<script type="text/javascript" src="/js/appjs/sys/user/personal.js"></script>-->
+<script type="text/javascript" src="/js/appjs/sys/user/personal.js"></script>
 </body>
 </html>