结算

src/main/java/com/ssj/sys/controller/FinanceReportController.java

@@ -394,7 +394,7 @@ public class FinanceReportController extends BaseController {
         List<Map<String,Object>> list=page.getContent();
         for (Map<String, Object> map : list) {
         	if(map.containsKey("type")) {
-        		if(map.get("type")==null || Integer.parseInt(map.get("type").toString())!=1){
+        		if(map.get("type")==null || (Integer.parseInt(map.get("type").toString())!=1 && Integer.parseInt(map.get("type").toString())!=5)){
         			map.put("external_unit_name", map.get("unit_name"));
         			map.put("unit_name", "");
         			map.put("external_cons_count", map.get("cons_count"));
@@ -506,7 +506,7 @@ public class FinanceReportController extends BaseController {
             List<Map<String,Object>> list=page.getContent();
             for (Map<String, Object> map : list) {
             	if(map.containsKey("type")) {
-            		if(map.get("type")==null || Integer.parseInt(map.get("type").toString())!=1){
+            		if(map.get("type")==null || (Integer.parseInt(map.get("type").toString())!=1 && Integer.parseInt(map.get("type").toString())!=5)){
             			map.put("external_unit_name", map.get("unit_name"));
             			map.put("unit_name", "");
             			map.put("external_cons_count", map.get("cons_count"));