2019-09-26 0920

src/main/java/com/jeeplus/modules/sg/overheadline/util/SettementUtil.java

@@ -145,7 +145,6 @@ public class SettementUtil {
                 }else {
                     key=BashInfo.JS_SJ;
                 }
-
             }
             if(key.contains(SE)){
                 if (key.contains(SE1)){
@@ -529,7 +528,9 @@ public class SettementUtil {
                 name=BashInfo.JS_JGJS;
             }
             if (name.contains(RESON_KYJ)||name.contains(RESON_XF)||name.contains(RESON_KYJ1)){
-                name = RESON_KYJ;
+                if (!name.equals(RESON_XFHZJ)){
+                    name = RESON_KYJ;
+                }
             }
 //            if (){
 //                name = RESON_KYJ1;
@@ -627,7 +628,9 @@ public class SettementUtil {
                 name=BashInfo.JS_JGJS;
             }
             if (name.contains(RESON_KYJ)||name.contains(RESON_XF)||name.contains(RESON_KYJ1)){
-                name = RESON_KYJ;
+                if (!name.equals(RESON_XFHZJ)){
+                    name = RESON_KYJ;
+                }
             }
 //            if (name.contains(RESON_KYJ1)){
 //                name = RESON_KYJ1;
@@ -1117,8 +1120,11 @@ public class SettementUtil {
         String reason="";
         reason+=tops.replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
         String amout=settlement.getTheAmount();
+        String name = "";
         for (int i = 0; i < settlements.size(); i++) {
-            if (settlements.get(i).getEntryName().equals(BashInfo.JS_JGJS)){
+            name = settlements.get(i).getEntryName();
+            if (name.equals(BashInfo.JS_JGJS)||
+                    name.equals(BDZ_TBNAME)){
                 reason+=RESON_JGJS8.replace("xxx",amout);
                 if (settlement.getStatus().equals("0")){
                     reason+=SettementUtil.RESON_TRUE;
@@ -1146,17 +1152,16 @@ public class SettementUtil {
      */
     public static String getJshzJoint(String tops,Settlement settlement,List<Settlement> settlements){
         String reason="";
+        String name="";
         reason = tops.replace("xxx",String.valueOf(nf.format(settlement.getMoney())));
         String amout=settlement.getTheAmount();
         for (int i = 0; i < settlements.size(); i++) {
-            if (settlements.get(i).getEntryName().equals(BashInfo.JS_JGJS)){
+            name = settlements.get(i).getEntryName();
+            if (name.equals(BashInfo.JS_JGJS)|| name.equals(BDZ_TBNAME)){
                 continue;
             }
-            if (settlements.get(i).getEntryName().equals(BashInfo.JS_GCJS)||
-                    settlements.get(i).getEntryName().equals(RESON_ZZJS)||
-                    settlements.get(i).getEntryName().equals(RESON_ZZFC)||
-                    settlements.get(i).getEntryName().equals(RESON_ZGTB)||
-                    settlements.get(i).getEntryName().equals(RESON_XFHZJ)){
+            if (name.equals(BashInfo.JS_GCJS)|| name.equals(RESON_ZZJS)|| name.equals(RESON_ZZFC)|| name.equals(RESON_ZGTB)||
+                    name.equals(RESON_XFHZJ)){
                 reason+=RESON_JGJS8.replace("xxx",amout);
                 if (settlement.getStatus().equals("0")){
                     reason+=SettementUtil.RESON_TRUE;