更改材料费详情对比返回结果数据结构

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/controller/WzOutboundOrderHController.java

@@ -99,36 +99,17 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
                 CLFCompareTaskResultVo clfCompareTaskResultVo = new CLFCompareTaskResultVo();
                 clfCompareTaskResultVo.setTaskno(CDo.getRwh());
                 taskNoList.remove(CDo.getRwh());
-                ArrayList<Map<String, Object>> filedList = new ArrayList<>();
-                HashMap<String, Object> flag = new HashMap<>();
-                HashMap<String, Object> totalAmount = new HashMap<>();
-                HashMap<String, Object> totalCount = new HashMap<>();
-                HashMap<String, Object> unitPrice = new HashMap<>();
-                flag.put("name", "flag");
-                flag.put("value", "yes");
-                totalAmount.put("name", "totalAmount");
-                totalAmount.put("value", CDo.getTotalAmount());
-                totalCount.put("name", "totalCount");
-                totalCount.put("value", CDo.getTotalCount());
-                unitPrice.put("name", "unitPrice");
-                unitPrice.put("value", CDo.getUnitPrice());
-                filedList.add(flag);
-                filedList.add(totalAmount);
-                filedList.add(totalCount);
-                filedList.add(unitPrice);
-                clfCompareTaskResultVo.setTaskFiled(filedList);
+                clfCompareTaskResultVo.setFlag("yes");
+                clfCompareTaskResultVo.setTotalAmount(CDo.getTotalAmount());
+                clfCompareTaskResultVo.setTotalCount(CDo.getTotalCount());
+                clfCompareTaskResultVo.setUnitPrice(CDo.getUnitPrice());
                 taskVoList.add(clfCompareTaskResultVo);
             }
             if (!taskNoList.isEmpty()){
                 for (String no : taskNoList) {
                     CLFCompareTaskResultVo clfCompareTaskResultVo = new CLFCompareTaskResultVo();
                     clfCompareTaskResultVo.setTaskno(no);
-                    HashMap<String, Object> flag = new HashMap<>();
-                    flag.put("name", "flag");
-                    flag.put("value", "no");
-                    ArrayList<Map<String, Object>> filedList = new ArrayList<>();
-                    filedList.add(flag);
-                    clfCompareTaskResultVo.setTaskFiled(filedList);
+                    clfCompareTaskResultVo.setFlag("no");
                     taskVoList.add(clfCompareTaskResultVo);
                 }
             }

module_kzks/src/main/java/org/jeecg/modules/wzOutboundOrder/vo/CLFCompareTaskResultVo.java

@@ -2,8 +2,7 @@ package org.jeecg.modules.wzOutboundOrder.vo;
 
 import lombok.Data;
 
-import java.util.List;
-import java.util.Map;
+import java.math.BigDecimal;
 
 @Data
 public class CLFCompareTaskResultVo {
@@ -11,6 +10,15 @@ public class CLFCompareTaskResultVo {
     /*任务号*/
     private String taskno;
 
-    /*任务属性*/
-    private List<Map<String,Object>> taskFiled;
+    /*标识*/
+    private String flag;
+
+    /*总金额*/
+    private BigDecimal totalAmount;
+
+    /*总数量*/
+    private BigDecimal totalCount;
+
+    /*单价*/
+    private BigDecimal unitPrice;
 }