[CODE]: 审批驳回修改

ruoyi-warehouse/src/main/java/com/ruoyi/approvalFlow/service/impl/AuditPathsServiceImpl.java

@@ -383,8 +383,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             String code = ajaxResult.get("code").toString();
             if ("500".equals(code)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return ajaxResult;
             }
-            return ajaxResult;
         } else if (auditItems.getActId() >= 210 && auditItems.getActId() <= 230) {
             fettle = 3L;
             // 财务模块
@@ -392,8 +392,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             String code = ajaxResult.get("code").toString();
             if ("500".equals(code)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return ajaxResult;
             }
-            return ajaxResult;
         } else if (auditItems.getActId() >= 310 && auditItems.getActId() <= 320) {
             fettle = 3L;
             // 协议模块
@@ -401,8 +401,8 @@ public class AuditPathsServiceImpl implements IAuditPathsService {
             String code = ajaxResult.get("code").toString();
             if ("500".equals(code)) {
                 TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+                return ajaxResult;
             }
-            return ajaxResult;
         }
         AuditItems item = new AuditItems();
         item.setBillId(auditItems.getId());

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/service/impl/TWhgenlegServiceImpl.java

@@ -1,6 +1,8 @@
 package com.ruoyi.reportManagement.service.impl;
 
 
+import com.ruoyi.basicData.domain.TWarehouse;
+import com.ruoyi.basicData.mapper.TWarehouseMapper;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.reportManagement.domain.TWhgenleg;
 import com.ruoyi.reportManagement.mapper.TWhgenlegMapper;
@@ -28,6 +30,9 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
     @Autowired
     private TWarehouseBillsMapper tWarehouseBillsMapper;
 
+    @Autowired
+    private TWarehouseMapper  tWarehouseMapper;
+
     /**
      * 查询库存总账
      *
@@ -190,20 +195,34 @@ public class TWhgenlegServiceImpl implements ITWhgenlegService {
 
     @Override
     public List<Map<String, Object>> selectWareHouseList() {
-        List<Map<String, Object>> list = tWhgenlegMapper.selectWareHouseList();
-        for (Map<String, Object> m : list){
-            String  fTotalgross = null;
-            String fGrossweightblc = null;
-            for (String k : m.keySet()){
-                // 获取毛重库容
-                if(k.equals("fTotalgross")){
-                    fTotalgross= m.get(k).toString();
-                }
-                if(k.equals("fGrossweightD")){
-                    fGrossweightblc=  m.get(k).toString();
+        List<Map<String, Object>> list = new ArrayList<>();
+        list = tWhgenlegMapper.selectWareHouseList();
+        if(list!=null && list.size()>0){
+            for (Map<String, Object> m : list){
+                String  fTotalgross = null;
+                String fGrossweightblc = null;
+                for (String k : m.keySet()){
+                    // 获取毛重库容
+                    if(k.equals("fTotalgross")){
+                        fTotalgross= m.get(k).toString();
+                    }
+                    if(k.equals("fGrossweightD")){
+                        fGrossweightblc=  m.get(k).toString();
+                    }
                 }
+                m.put("percentage",calculation(fGrossweightblc,fTotalgross));
+            }
+        } else {
+            List<TWarehouse> tWarehouses= tWarehouseMapper.selectTWarehouseList(new TWarehouse());
+            for (TWarehouse tWarehouse : tWarehouses) {
+                Map<String, Object> maps = new HashMap<>();
+                maps.put("fName", tWarehouse.getfName());
+                maps.put("fWarehouseid", tWarehouse.getfId());
+                maps.put("fTotalgross", tWarehouse.getfTotalgross());
+                maps.put("fGrossweightD", "0");
+                maps.put("percentage", "");
+                list.add(maps);
             }
-            m.put("percentage",calculation(fGrossweightblc,fTotalgross));
         }
         return list;
     }