第二次修改

src/main/java/com/bonus/nxdt/energy/newcheck/service/impl/New_SubCheckManageServiceImpl.java

@@ -208,7 +208,31 @@ public class New_SubCheckManageServiceImpl implements New_SubCheckManageService
 //            listFilter = list;
 //        }
 //        return listFilter;
-        return list;
+
+        List<SubCheckManageBean> newList = new ArrayList<>();
+        if(o!=null && "0".equals(o.getAuditStatus())){
+            list.forEach(i -> {
+                String isCheck = i.getIsCheck();
+                if("1".equals(isCheck)){
+                    newList.add(i);
+                }
+
+
+            });
+        }else if(o!=null && "3".equals(o.getAuditStatus())){
+            list.forEach(i -> {
+                String isCheck = i.getIsCheck();
+                if(!"1".equals(isCheck)){
+                    newList.add(i);
+                }
+
+
+            });
+        }else{
+            newList.addAll(list);
+        }
+
+        return newList;
     }
 
     private void isManager(String phone, SubCheckManageBean i) {

src/main/resources/mappers/newcheck/NewSubCheckManageMapper.xml

@@ -16,7 +16,14 @@
 				and bmp.start_time between #{startDate} and #{endDate}
 			</if>
 			<if test="auditStatus != null and auditStatus != ''">
-				and apc.audit_status = #{auditStatus}
+
+				<if test="auditStatus == 3 or  auditStatus == '3'">
+					and apc.audit_status ='0' and apc.audit_status !='5'
+				</if>
+				<if test="auditStatus != 3 and  auditStatus != '3'">
+					and apc.audit_status = #{auditStatus} and apc.audit_status !='5'
+				</if>
+
 			</if>
 <!--			order by cq.id,ap.create_time desc-->
 			ORDER BY apc.id desc

src/main/resources/static/js/newCheck/datumCheckList_new.js

@@ -67,7 +67,7 @@ layui.use(['table', 'form', 'laydate'], function () {
         }
         , parseData: function (res) { //将原始数据解析成 table 组件所规定的数据，res为从url中get到的数据
             let result;
-            console.log(JSON.stringify(res));
+            console.log("111="+JSON.stringify(res));
             if (res.count > 0) {
                 if (this.page.curr) {
                     result = res.data.slice(this.limit * (this.page.curr - 1), this.limit * this.page.curr);

src/main/resources/static/js/newCheck/datumPublic_new.js

@@ -707,29 +707,33 @@ function jump(obj,id){
 }
 
 function isDefaultProcess(processType) {
-    if(processType === "-1"){
+    // if(processType === "-1"){ //还未选择审核流
-       //自由审核流
+    //   //  getFixProcess("");
-       //  jump('dynamic','process2');
+    // }else if(processType === '0'){
-       //  document.getElementById("checkProcess1").onclick=null;
+    //     //自由审核流
-       //  document.getElementById("checkProcess2").onclick=null;
+    //     jump('dynamic','process2');
-       //  $("#checkTip").html("审核流已被确定")
+    //     document.getElementById("checkProcess1").onclick=null;
-    }else if(processType === null){
+    //     document.getElementById("checkProcess2").onclick=null;
-        //还未选择审核流
+    //     $("#checkTip").html("审核流已被确定")
-        //getFixProcess("");
+    //
-
+    // }else{
-
+    //    // 固定审核流
-
+    //     getFixProcess(processType);
-    }else{
+    //     document.getElementById("checkProcess1").onclick=null;
-       // 固定审核流
+    //     document.getElementById("checkProcess2").onclick=null;
-        getFixProcess(processType);
+    //     $("#checkTip").html("审核流已被确定")
+    //     $("#fixProcessId").attr("disabled","disabled");
+    //     $("#addFlowButton").css("display","none");
+    // }
+    if(processType == "-1"){
+        getFixProcess("");
+        //jump('dynamic','process2');
+    }else if(processType == '0'){
+        //自由审核流
+        jump('dynamic','process2');
         document.getElementById("checkProcess1").onclick=null;
         document.getElementById("checkProcess2").onclick=null;
         $("#checkTip").html("审核流已被确定")
-        $("#fixProcessId").attr("disabled","disabled");
-        $("#addFlowButton").css("display","none");
-    }
-    if(processType == "-1"){
-        getFixProcess("");
     }else{
         document.getElementById("checkProcess1").onclick=null;
         document.getElementById("checkProcess2").onclick=null;

src/main/resources/static/js/work/auditDatum/datumPublic.js

@@ -610,7 +610,8 @@ function setHistoryData() {
     $.ajax({
         type: "POST",
         async: false, // 默认异步true,false表示同步
-        url: ctxPath + "/subCheckManage/setHistoryData",
+       // url: ctxPath + "/subCheckManage/setHistoryData",
+        url: ctxPath + "/new_subCheckManage/setHistoryData",
         data: thisParam, //获取提交的表单字段
         dataType: "json",// 服务器返回数据类型
         success: function (data) {

src/main/resources/static/pages/newCheck/datumCheckForm3_new.html

@@ -291,7 +291,7 @@
             <div class="datum-left left" style="width: 20%;height: 100%;float: left">
                 <ul id="process" class="layui-nav-tree layui-nav-side" lay-filter="test">
                     <li class="process1 layui-nav-item layui-this"><a id="checkProcess1" href="#" onclick="jump('fixed','process1')">固定审核流</a></li>
-                    <li class="process2 layui-nav-item" style="display: none" ><a id="checkProcess2" href="#" onclick="jump('dynamic','process2')">自由审核流</a></li>
+                    <li class="process2 layui-nav-item" style="" ><a id="checkProcess2" href="#" onclick="jump('dynamic','process2')">自由审核流</a></li>
                     <span id="checkTip" style="color: red;display: inline-block;font-size: 14px;"></span>
                 </ul>
             </div>