整理审核状态

ruoyi-system/src/main/java/com/ruoyi/system/controller/DevelopmentInfoController.java

 package com.ruoyi.system.controller;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import com.ruoyi.common.utils.StringUtils;
@@ -63,6 +64,10 @@ public class DevelopmentInfoController extends BaseController {
             developmentInfo.setStatus(DevelopmentStatusEnum.DRAFT.getCode());
             list = developmentInfoService.selectExcludeByStatus(developmentInfo);
         } else {
+            if(DevelopmentStatusEnum.REJECT.getCode().equals(developmentInfo.getStatus())){
+                developmentInfo.setStatus(null);
+                developmentInfo.setStatusList(Arrays.asList(DevelopmentStatusEnum.USELESS.getCode(),DevelopmentStatusEnum.REJECT.getCode()));
+            }
             list = developmentInfoService.selectDevelopmentInfoList(developmentInfo);
         }
         return getDataTable(list);

ruoyi-system/src/main/java/com/ruoyi/system/controller/ParkInfoController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.system.VO.ParkInfoAllVO;
 import com.ruoyi.system.domain.ParkInfo;
+import com.ruoyi.system.enums.DevelopmentStatusEnum;
 import com.ruoyi.system.enums.ParkInfoStatusEnum;
 import com.ruoyi.system.service.IParkInfoService;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
@@ -18,6 +19,7 @@ import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -61,6 +63,10 @@ public class ParkInfoController extends BaseController {
             parkInfo.setStatus(ParkInfoStatusEnum.DRAFT.getCode());
             list = parkInfoService.selectExcludeByStatus(parkInfo);
         } else {
+            if(ParkInfoStatusEnum.REJECT.getCode().equals(parkInfo.getStatus())){
+                parkInfo.setStatus(null);
+                parkInfo.setStatusList(Arrays.asList(ParkInfoStatusEnum.USELESS.getCode(),ParkInfoStatusEnum.REJECT.getCode()));
+            }
             list = parkInfoService.selectParkInfoList(parkInfo);
         }
         return getDataTable(list);

ruoyi-system/src/main/java/com/ruoyi/system/domain/DevelopmentInfo.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -445,6 +447,16 @@ public class DevelopmentInfo extends BaseEntity
     @Excel(name = "排序")
     private Integer sort;
 
+    private List<Integer> statusList;
+
+    public List<Integer> getStatusList() {
+        return statusList;
+    }
+
+    public void setStatusList(List<Integer> statusList) {
+        this.statusList = statusList;
+    }
+
     public void setId(Long id)
     {
         this.id = id;
@@ -1520,6 +1532,7 @@ public class DevelopmentInfo extends BaseEntity
                 .append("longitude", getLongitude())
                 .append("latitude", getLatitude())
                 .append("sort", getSort())
+                .append("statusList", getStatusList())
                 .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/ParkInfo.java

@@ -2,6 +2,8 @@ package com.ruoyi.system.domain;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
@@ -384,6 +386,16 @@ public class ParkInfo extends BaseEntity
     @Excel(name = "排序字段（全局排序）")
     private Integer sort;
 
+    private List<Integer> statusList;
+
+    public List<Integer> getStatusList() {
+        return statusList;
+    }
+
+    public void setStatusList(List<Integer> statusList) {
+        this.statusList = statusList;
+    }
+
     /** 纬度（坐标系gcj02） */
     @Excel(name = "排序字段(开发区内产业园排序)")
     private Integer sortDevelopment;
@@ -1312,6 +1324,7 @@ public class ParkInfo extends BaseEntity
                 .append("latitude", getLatitude())
                 .append("sort", getSort())
                 .append("sortDevelopment", getSortDevelopment())
+                .append("statusList", getStatusList())
                 .toString();
     }
 }

ruoyi-system/src/main/resources/mapper/developmentInfo/DevelopmentInfoMapper.xml

@@ -261,6 +261,12 @@
         <include refid="selectDevelopmentInfoVo"/>
         <include refid="where"></include>
         <if test="status != null ">and status = #{status}</if>
+        <if test="statusList != null and statusList.size() > 0 ">
+            AND `status` IN
+            <foreach item="status" collection="statusList" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
         order by submit_time desc
     </select>
 

ruoyi-system/src/main/resources/mapper/parkinfo/ParkInfoMapper.xml

@@ -227,6 +227,12 @@
         <include refid="selectParkInfoVo"/>
         <include refid="where"></include>
         <if test="status != null ">and status = #{status}</if>
+        <if test="statusList != null and statusList.size() > 0 ">
+            AND `status` IN
+            <foreach item="status" collection="statusList" open="(" separator="," close=")">
+                #{status}
+            </foreach>
+        </if>
 --         and status != 1
         order by submit_time desc
     </select>

ruoyi-system/src/main/resources/templates/correcterror/info/info.html

@@ -204,7 +204,6 @@
         function onClickCell(field, value, row, $element){
             if( (field == "typeName" || field == "typeId") && row.typeId ){
                 $.modal.openTab('详情信息','/parkInfo/info/detail/' + row.typeId );
-                // alert("单击格name：" + field + " value：" + value+","+JSON.stringify(row) );
             }
         }
     </script>

ruoyi-system/src/main/resources/templates/developmentInfo/info/info.html

@@ -17,7 +17,7 @@
 
                         <li>
                             <label>审核状态：</label>
-                            <select name="status" th:with="type=${@dict.getType('lyy_developmentinfo_status')}">
+                            <select name="status" th:with="type=${@dict.getType('lyy_examine_status')}">
                                 <option value="">所有</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                         th:value="${dict.dictValue}"></option>
@@ -252,7 +252,7 @@
 <script th:inline="javascript">
     var editFlag = [[${@permission.hasPermi('developmentInfo:info:edit')}]];
     var removeFlag = [[${@permission.hasPermi('developmentInfo:info:remove')}]];
-    var datasExamineStatus = [[${@dict.getType('lyy_developmentinfo_status')}]];
+    var datasExamineStatus = [[${@dict.getType('lyy_parkinfo_status')}]];
     var prefix = ctx + "developmentInfo/info";
 
     $(function () {

ruoyi-system/src/main/resources/templates/parkInfo/info/info.html

@@ -24,7 +24,7 @@
                         </li>
                         <li>
                             <label>审核状态：</label>
-                            <select name="status" th:with="type=${@dict.getType('lyy_parkinfo_status')}">
+                            <select name="status" th:with="type=${@dict.getType('lyy_examine_status')}">
                                 <option value="">所有</option>
                                 <option th:each="dict : ${type}" th:text="${dict.dictLabel}"
                                         th:value="${dict.dictValue}"></option>