bug 修改

workflow/src/main/java/com/tofly/workflow/baseconf/controller/TfBaseTypePController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -235,13 +236,19 @@ public class TfBaseTypePController extends BaseController {
         List<String> orgCodes = new ArrayList<>();
         //贵州贞丰 和绵竹 不适用公共材料类型
         final Long tenantId = SecurityUtils.getTenantId();
-        orgCodes.add(String.valueOf(tenantId));
-        if(1569602913205559298l ==tenantId || 1578996650805321730l==tenantId ){
+        final String[] split = datatypes.split(",");
+        if( Arrays.asList(split).contains(String.valueOf(1570692286170427394l))){
+            if(1569602913205559298l ==tenantId || 1578996650805321730l==tenantId ){
+
+            }else{
+
+                orgCodes.add("global00");
+            }
 
-        }else{
-            orgCodes.add("global00");
         }
 
+
+
         Object obj = tfBaseTypePService.getTypeTree(datatypes,id,type,orgCodes);
 
         if(obj instanceof String){

workflow/src/main/java/com/tofly/workflow/buss/entity/TfChargeW.java

@@ -71,7 +71,7 @@ public class TfChargeW implements Serializable {
     @TableField(exist = false)
     private String totalAmountStr;
 
-    public String getBigNumberStr() {
+    public String getTotalAmountStr() {
         if(totalAmount!=null){
          return    MoneyToChineseUtils.convert(totalAmount.doubleValue());
         }else{

workflow/src/main/java/com/tofly/workflow/buss/entity/TfContractW.java

@@ -277,12 +277,16 @@ public class TfContractW extends Model<TfContractW> {
 
 
     public String getTotalAmountStr() {
-
-      Double  total =   totalContract+deductExpenses-waterElectricity;
-        if(total!=null){
-            return    MoneyToChineseUtils.convert(total);
-        }else{
+        try {
+            Double  total =   totalContract+deductExpenses-waterElectricity;
+            if(total!=null){
+                return    MoneyToChineseUtils.convert(total);
+            }else{
+                return  "零元整";
+            }
+        }catch (Exception e){
             return  "零元整";
         }
+
     }
 }

workflow/src/main/java/com/tofly/workflow/buss/service/impl/TfProjectMaterialWServiceImpl.java

@@ -156,12 +156,12 @@ public class TfProjectMaterialWServiceImpl extends ServiceImpl<TfProjectMaterial
                             for (MaterialOutIn materialOutIn : list1) {
                                 final List<MaterialItemOutIn> item = materialOutIn.getItem();
                                 for (MaterialItemOutIn materialItemOutIn : item) {
-                                    if(materialItemOutIn.getProduct()==mp.getId()){
+                                    if(mp.getYyId().equals(materialItemOutIn.getProduct())){
                                         if(StringUtils.isNotBlank(materialOutIn.getCode())){
                                             projectMaterial.setCode(materialOutIn.getCode());
-                                        }else{
+                                        }else{// 1790578952795848719 1790578952795848719
                                             //调用接口查询 并更新
-                                            final Long yyId = materialItemOutIn.getYyId();
+                                            final Long yyId = materialOutIn.getYyId();
 
                                             final String yyCode = materialOutInService.getYyCode(String.valueOf(yyId));
                                             materialOutIn.setCode(yyCode);