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

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

@@ -24,6 +24,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -95,6 +96,10 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
             clfCompareResultVO.setGgxh(cLfCompareDO.getGgxh());
             ArrayList<CLFCompareTaskResultVo> taskVoList = new ArrayList<>();
             List<String> taskNoList = new ArrayList<>(Arrays.asList(tasknoArray));
+
+            BigDecimal unitPrice = null;
+            boolean equals = true;
+
             for (CLfCompareDO CDo : cLfCompareDOS) {
                 CLFCompareTaskResultVo clfCompareTaskResultVo = new CLFCompareTaskResultVo();
                 clfCompareTaskResultVo.setTaskno(CDo.getRwh());
@@ -103,6 +108,11 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
                 clfCompareTaskResultVo.setTotalAmount(CDo.getTotalAmount());
                 clfCompareTaskResultVo.setTotalCount(CDo.getTotalCount());
                 clfCompareTaskResultVo.setUnitPrice(CDo.getUnitPrice());
+                if (unitPrice == null) {
+                    unitPrice = CDo.getUnitPrice();
+                }else {
+                   if (CDo.getUnitPrice().compareTo(unitPrice) != 0) equals = false;
+                }
                 taskVoList.add(clfCompareTaskResultVo);
             }
             if (!taskNoList.isEmpty()){
@@ -112,7 +122,9 @@ public class WzOutboundOrderHController extends JeecgController<WzOutboundOrderH
                     clfCompareTaskResultVo.setFlag("no");
                     taskVoList.add(clfCompareTaskResultVo);
                 }
+                equals = false;
             }
+            clfCompareResultVO.setEqual(equals);
             clfCompareResultVO.setTaskVoList(taskVoList);
             clfCompareResultVOS.add(clfCompareResultVO);
         }

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

@@ -20,4 +20,7 @@ public class CLFCompareResultVO {
 
     /*任务集合*/
     private List<CLFCompareTaskResultVo> taskVoList;
+
+    /*是否相等，true相等，false不相等*/
+    private Boolean equal;
 }