已办结的案件 让参与的成员也能看见

common/src/main/java/com/jpsoft/excellent/modules/base/entity/Incident.java

@@ -104,4 +104,6 @@ public class Incident {
 
     @ApiModelProperty(value = "完成按钮")
     private Boolean btnClose;
+    @ApiModelProperty(value = "显示按钮")
+    private Boolean btnShow;
 }

web/src/main/java/com/jpsoft/excellent/modules/base/controller/IncidentController.java

@@ -547,7 +547,7 @@ public class IncidentController {
         User user = userService.get(subject);
 
         Map<String,Object> searchParams = new HashMap<>();
-        searchParams.put("isFinished", "1");
+//        searchParams.put("isFinished", "1");
         if(StringUtils.isNotEmpty(user.getSpecialClassId())) {
             searchParams.put("orSpecialClassId", "%"+user.getSpecialClassId()+"%");
         }
@@ -557,6 +557,7 @@ public class IncidentController {
 //        searchParams.put("createBy", subject);
 
         List<Sort> sortList = new ArrayList<>();
+        sortList.add(new Sort("is_finished","desc"));
         sortList.add(new Sort("batch_","asc"));
         sortList.add(new Sort("serial_no","asc"));
 
@@ -603,18 +604,25 @@ public class IncidentController {
             }
 
             //报警灯
-            Date currentTime = new Date();
-            Date warnTime = incident.getWarnDate1();
-            Date allotedTime = incident.getAllotedDate();
-
-            if(currentTime.before(warnTime)){
-                incident.setWarningLight("绿");
+            if(incident.getIsFinished().equals("0")) {
+                incident.setBtnShow(false);
             }
-            else if(currentTime.after(allotedTime)){
-                incident.setWarningLight("红");
-            }
-            else{
-                incident.setWarningLight("黄");
+            else {
+                incident.setBtnShow(true);
+
+                Date currentTime = new Date();
+                Date warnTime = incident.getWarnDate1();
+                Date allotedTime = incident.getAllotedDate();
+
+                if (currentTime.before(warnTime)) {
+                    incident.setWarningLight("绿");
+                }
+                else if (currentTime.after(allotedTime)) {
+                    incident.setWarningLight("红");
+                }
+                else {
+                    incident.setWarningLight("黄");
+                }
             }
         }