结算单价表查询

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcPriceController.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.alibaba.fastjson2.JSONObject;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -130,21 +131,17 @@ public class CmcPriceController extends BaseController
      * 根据比例等级查询出单位、一般地类、复杂地类
      */
     @GetMapping( "/price")
-    public List<String> getPriceInfo(@Param("workItem")String workItem, @Param("subItem")String subItem, @Param("scaleGrade")String scaleGrade, @Param("priceType")String priceType)
+    public AjaxResult getPriceInfo(@Param("workItem")String workItem, @Param("subItem")String subItem, @Param("scaleGrade")String scaleGrade, @Param("priceType")String priceType)
     {
         List<CmcPrice> cmcPriceList = cmcPriceService.selectCmcPriceByScaleGrade(workItem, subItem, scaleGrade);
-        List<String> priceList = new ArrayList<>();
-        for (CmcPrice cmcPrice : cmcPriceList) {
-            priceList.add(cmcPrice.getId().toString());
-            priceList.add(cmcPrice.getUnit());
-            BigDecimal commonPrice = BigDecimal.valueOf(Double.parseDouble(cmcPrice.getPricePercentage())).multiply(cmcPrice.getCommonPrice());
-            BigDecimal complexPrice = BigDecimal.valueOf(Double.parseDouble(cmcPrice.getPricePercentage())).multiply(cmcPrice.getComplexPrice());
-            if (priceType.equals("一般地类"))
-                priceList.add(commonPrice.toString());
-            else
-                priceList.add(complexPrice.toString());
-        }
-        return priceList;
+        JSONObject price = new JSONObject();
+        price.put("id", cmcPriceList.get(0).getId());
+        price.put("unit", cmcPriceList.get(0).getUnit());
+        if (priceType.equals("一般地类"))
+            price.put("price", cmcPriceList.get(0).getCommonPrice());
+        else
+            price.put("price", cmcPriceList.get(0).getComplexPrice());
+        return success(price);
     }
 
     /**