fix 成本模型导入

module_kzks/src/main/java/org/jeecg/modules/costModelClPrice/mapper/xml/CostModelClPriceMapper.xml

@@ -7,12 +7,24 @@
                min(CONVERT(danjia, DECIMAL)) as minDanjia,
                avg(CONVERT(danjia, DECIMAL)) as aveDanjia,
                ifnull((select danjia from kzks_cost_model_cl_price
-               ORDER BY ABS(NOW() - ifnull(caigou_time,now())) ASC limit 1),0) as recentDanjia,
+            <where>
+                <if test="wlbm != null  and wlbm != ''">and wlbm = #{wlbm}</if>
+                <if test="ggxh != null  and ggxh != ''">and ggxh = #{ggxh}</if>
+                <if test="zlLevel != null  and zlLevel != ''">and zl_level = #{zlLevel}</if>
+                <if test="pici != null  and pici != ''">and pici = #{pici}</if>
+            </where>
+               ORDER BY caigou_time DESC limit 1),0) as recentDanjia,
                max(CONVERT(danjia, DECIMAL)) * #{number} as maxPrice,
                min(CONVERT(danjia, DECIMAL)) * #{number} as minPrice,
                avg(CONVERT(danjia, DECIMAL)) * #{number} as avePrice,
                ifnull((select danjia from kzks_cost_model_cl_price
-               ORDER BY ABS(NOW() - ifnull(caigou_time,now())) ASC limit 1),0) * #{number} as recentPrice,
+            <where>
+                <if test="wlbm != null  and wlbm != ''">and wlbm = #{wlbm}</if>
+                <if test="ggxh != null  and ggxh != ''">and ggxh = #{ggxh}</if>
+                <if test="zlLevel != null  and zlLevel != ''">and zl_level = #{zlLevel}</if>
+                <if test="pici != null  and pici != ''">and pici = #{pici}</if>
+            </where>
+               ORDER BY caigou_time DESC limit 1),0) * #{number} as recentPrice,
                #{xiangmuId} as xiangmuId,
                #{xiangmuName} as xiangmuName,
                #{caigouTime} as caigouTime,

module_kzks/src/main/java/org/jeecg/modules/costModelXmxqWx/service/impl/CostModelXmxqWxServiceImpl.java

@@ -20,6 +20,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
 /**
  * @Description: 项目外协导入详情
@@ -66,9 +67,9 @@ public class CostModelXmxqWxServiceImpl extends ServiceImpl<CostModelXmxqWxMappe
                 CostModelXmxqWx wxxq = costModelwXPriceService.selectWxPriceValue(wx);
                 if(wxxq!=null){
                     list1.add(wxxq);
-                    wxfMax = wxfMax.add(new BigDecimal(wxxq.getMaxPrice()));
-                    wxfMin = wxfMin.add(new BigDecimal(wxxq.getMinPrice()));
-                    wxfAve = wxfAve.add(new BigDecimal(wxxq.getAvePrice()));
+                    wxfMax = wxfMax.add(new BigDecimal(Optional.ofNullable(wxxq.getMaxPrice()).orElse("0")));
+                    wxfMin = wxfMin.add(new BigDecimal(Optional.ofNullable(wxxq.getMinPrice()).orElse("0")));
+                    wxfAve = wxfAve.add(new BigDecimal(Optional.ofNullable(wxxq.getAvePrice()).orElse("0")));
                 }
             }
             costModel.setMaxWxf(wxfMax.toString());