11/17

src/main/java/cn/cslg/pas/controller/ProductMarketDataController.java

@@ -1,9 +1,7 @@
 package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.dto.business.ProductCategoryDTO;
 import cn.cslg.pas.common.dto.business.ProductMarketDataDTO;
-import cn.cslg.pas.common.dto.business.UpdateProductCategoryDTO;
 import cn.cslg.pas.common.dto.business.UpdateProductMarketDataDTO;
 import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.model.request.StringRequest;
@@ -13,7 +11,6 @@ import cn.cslg.pas.exception.UnLoginException;
 import cn.cslg.pas.exception.XiaoShiException;
 import cn.cslg.pas.factorys.businessFactory.Business;
 import cn.cslg.pas.factorys.businessFactory.BusinessFactory;
-import com.alibaba.fastjson.JSONObject;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,7 +73,7 @@ public class ProductMarketDataController {
     }
 
     @Operation(summary = "删除产品营销数据")
-    @PostMapping("/deleteReportProject")
+    @PostMapping("/deleteProductMarketData")
     public String deleteProductMarketData(@RequestBody List<Integer> ids) throws Exception {
         if (ids != null && ids.size() != 0) {
             Business business = businessFactory.getClass("productMarketDataService");

src/main/java/cn/cslg/pas/service/business/ProductMarketDataService.java

@@ -9,7 +9,6 @@ import cn.cslg.pas.common.model.request.GroupRequest;
 import cn.cslg.pas.common.model.request.QueryRequest;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
-import cn.cslg.pas.common.vo.business.CustomFieldVO;
 import cn.cslg.pas.common.vo.business.ProductMarketDataVO;
 import cn.cslg.pas.domain.business.ProductMarketData;
 import cn.cslg.pas.exception.UnLoginException;

src/main/resources/jsons/productMarketData.json

@@ -5,7 +5,7 @@
     "field":"id",
     "sqlField": "id",
     "sqlClass": "getComSql",
-    "orderClass": "",
+    "orderClass": "getComOrder",
     "groupClass":"",
     "ifSearch":"false",
     "ifGroup": "false",
@@ -17,7 +17,7 @@
     "field":"product_id",
     "sqlField": "productId",
     "sqlClass": "getComSql",
-    "orderClass": "",
+    "orderClass": "getComOrder",
     "groupClass":"",
     "ifSearch":"false",
     "ifGroup": "false",

src/test/java/cn/cslg/pas/service/ProductMarketDataServiceTests.java

@@ -21,15 +21,15 @@ public class ProductMarketDataServiceTests {
     private ProductMarketDataController productMarketDataController;
 
     @Test
-    public void addProductMarketData() throws Exception {
-        ProductMarketDataDTO productMarketDataDTO = new ProductMarketDataDTO();
-        productMarketDataDTO.setProductId(10);
-        productMarketDataDTO.setSaleArea("昆山");
-        productMarketDataDTO.setSaleTime("2023-11-11");
-        productMarketDataDTO.setSaleCount(10.0);
-        productMarketDataDTO.setSaleMoney(13.4);
-        productMarketDataDTO.setCustomLicenseRate(0.1);
-        Response response = productMarketDataController.addProductMarketData(productMarketDataDTO);
-        Assert.assertEquals(200,Integer.parseInt(response.getCode().toString()));
-    }
+        void test() throws Exception {
+            ProductMarketDataDTO productMarketDataDTO = new ProductMarketDataDTO();
+            productMarketDataDTO.setProductId(10);
+            productMarketDataDTO.setSaleArea("昆山");
+            productMarketDataDTO.setSaleTime("2023年12月");
+            productMarketDataDTO.setSaleCount(10.0);
+            productMarketDataDTO.setSaleMoney(13.4);
+            productMarketDataDTO.setCustomLicenseRate(0.1);
+            productMarketDataController.addProductMarketData(productMarketDataDTO);
+
+        }
 }