Pārlūkot izejas kodu

复核标准问题

[user3] 3 gadi atpakaļ
vecāks
revīzija
2ca90a89c1

+ 1 - 1
src/main/java/com/jeeplus/modules/ruralprojectrecords/service/RuralProjectMessageNewTwoService.java

@@ -239,7 +239,7 @@ public class RuralProjectMessageNewTwoService extends CrudService<RuralProjectMe
                     if ("2".equals(records.getSubmitMoney())){
                         reviewId="1";
                     }else{
-                        if ("0".equals(records.getEmergencyProject())){
+                        if (com.jeeplus.common.utils.StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                             reviewId="2";
                         }
                     }

+ 3 - 3
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralCostProjectMessageNewController.java

@@ -159,7 +159,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if("0".equals(records.getEmergencyProject())){
+            if(StringUtils.isBlank(records.getEmergencyProject()) ||"0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else{
                 reviewId="3";
@@ -357,7 +357,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject()) ){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";
@@ -1779,7 +1779,7 @@ public class RuralCostProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";

+ 4 - 4
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewController.java

@@ -169,7 +169,7 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) ||"0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";
@@ -373,7 +373,7 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(ruralProjectRecords.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(ruralProjectRecords.getEmergencyProject())){
+            if (StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) || "0".equals(ruralProjectRecords.getEmergencyProject())){
                 reviewId="2";
             }else{
                 reviewId="3";
@@ -755,7 +755,7 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }
         }
@@ -1631,7 +1631,7 @@ public class RuralProjectMessageNewController extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";

+ 2 - 2
src/main/java/com/jeeplus/modules/ruralprojectrecords/web/RuralProjectMessageNewTwoController.java

@@ -154,7 +154,7 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }
         }
@@ -468,7 +468,7 @@ public class RuralProjectMessageNewTwoController  extends BaseController {
         if ("2".equals(records.getSubmitMoney())){
             reviewId="1";
         }else{
-            if ("0".equals(records.getEmergencyProject())){
+            if (StringUtils.isBlank(records.getEmergencyProject()) || "0".equals(records.getEmergencyProject())){
                 reviewId="2";
             }else if ("1".equals(records.getEmergencyProject())){
                 reviewId="3";

+ 1 - 1
src/main/java/com/jeeplus/modules/workprojectnotify/web/WorkProjectNotifyController.java

@@ -2764,7 +2764,7 @@ public class WorkProjectNotifyController extends BaseController {
 					if ("2".equals(ruralProjectRecords.getSubmitMoney())){
 						reviewId="1";
 					}else{
-						if("0".equals(ruralProjectRecords.getEmergencyProject())){
+						if(StringUtils.isBlank(ruralProjectRecords.getEmergencyProject()) || "0".equals(ruralProjectRecords.getEmergencyProject()) ){
 							reviewId="2";
 						}else{
 							reviewId="3";

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1291 - 0
src/main/webapp/webpage/modules/ruralprojectrecords/record/projectReportRecordUrgentModifyApply.jsp