修补代码

src/main/java/com/ejweb/modules/report/service/ReportService.java

@@ -295,7 +295,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
             if (flag.equals("meanWhile")) {
                 reportNotice.setTitle("“" + reportEntity.getSupplementTitle() + "”已由" + user.getName() + "于" + dateStr + "处理完成");
                 //没点完成，title为请处理
-                if (reportEntity.getDealResult().equals("3") && StringUtils.isBlank(ifDone)) {
+                if (StringUtils.isBlank(ifDone)) {
                     reportNotice.setTitle("请处理-“" + reportEntity.getSupplementTitle() + "”");
                 }
             }
@@ -320,7 +320,7 @@ public class ReportService extends CrudService<ReportDao, ReportEntity> {
                 reportNotice.setSendToId(reportEntity.getExchangeAfterUser());
                 reportNotice.setTitle("“" + reportEntity.getSupplementTitle() + "”已由" + user.getName() + "于" + dateStr + "处理完成");
                 //没点完成，title为请处理
-                if (reportEntity.getDealResult().equals("3") && StringUtils.isBlank(ifDone)) {
+                if (StringUtils.isBlank(ifDone)) {
                     reportNotice.setTitle("请处理-“" + reportEntity.getSupplementTitle() + "”");
                 }
             } else {

src/main/java/com/ejweb/modules/report/web/ReportController.java

@@ -302,12 +302,12 @@ public class ReportController extends BaseController {
         }
         //更新举报状态
         reportEntity.setReportStatus("1");
-        if (reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2")){
-            reportEntity.setReportStatus("2");
-        }
-        if (reportEntity.getDealResult().equals("3")){
-            reportEntity.setReportStatus("1");
-        }
+//        if (reportEntity.getDealResult().equals("1") || reportEntity.getDealResult().equals("2")){
+//            reportEntity.setReportStatus("2");
+//        }
+//        if (reportEntity.getDealResult().equals("3")){
+//            reportEntity.setReportStatus("1");
+//        }
         if ("ifDone".equals(ifDone)) {
             reportEntity.setReportStatus("2");
         }

src/main/webapp/WEB-INF/views/modules/report/reportTrack.jsp

@@ -78,20 +78,9 @@
             }
             //判断是否显示是否完成选择框
             var dealResult = $("#dealResult").val();
-            if (dealResult =="1"){
+            if (dealResult != null && dealResult != ' '){
                 $("#selectDone").show();
             }
-            if(dealResult =="2") {
-                $("#selectDone").show();
-            }
-            if(dealResult =="3") {
-                $("#selectDone").show();
-            }
-            if(dealResult =="4") {
-                $("#selectDone").show();
-            } else if(dealResult ==""){
-                $("#selectDone").hide();
-            }
         });
 
         /**
@@ -399,19 +388,9 @@
         //显示是否完成选择框
         function showDone(){
             var dealResult = $("#dealResult").val();
-            if (dealResult =="1"){
+            if (dealResult != null && dealResult != ' '){
                 $("#selectDone").show();
-            }
-            if(dealResult =="2") {
-                $("#selectDone").show();
-            }
-            if(dealResult =="3") {
-                $("#selectDone").show();
-            }
-            if(dealResult =="4") {
-                $("#selectDone").show();
-            }
-            else if(dealResult ==""){
+            }else {
                 $("#selectDone").hide();
             }
         }