Merge branch 'V20240805' of http://192.168.60.201/root/dsk-cr20g into V20240805

dsk-admin/src/main/resources/application.yml

@@ -29,9 +29,9 @@ captcha:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-#  port: 9098
+  port: 9098
 #  二十局线上端口9097
-  port: 9097
+#  port: 9097
   servlet:
     # 应用的访问路径
     context-path: /

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/IndexController.java

@@ -322,4 +322,21 @@ public class IndexController {
         return enterpriseService.zxzxmqytj(object);
     }
 
+
+    /**
+     *
+     *
+     * 集团中标业绩统计统计图--刘杰那边的接口
+     * /nationzj/landMarket/companyStatis
+     * @param object
+     * @return {@link AjaxResult }
+     * @throws Exception
+     */
+    @PostMapping(value = "/project/combine/recentlyStatis")
+    public AjaxResult projectCombineRecentlyStatis(@RequestBody JSONObject object)  {
+        return enterpriseService.projectCombineRecentlyStatis(object);
+    }
+
+
+
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/IndexService.java

@@ -7,6 +7,7 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.utils.DateUtils;
+import com.dsk.common.utils.StringUtils;
 import com.dsk.system.utils.DskOpenApiUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.slf4j.Logger;
@@ -33,6 +34,16 @@ public class IndexService {
     @Autowired
     private DskOpenApiUtil dskOpenApiUtil;
 
+    public AjaxResult projectCombineRecentlyStatis(JSONObject object) {
+        String combineId = object.getStr("combineId");
+        if(StringUtils.isEmpty(combineId)){
+            return AjaxResult.error("combineId不能为空");
+        }
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/project/combine/recentlyStatis", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
 
     public AjaxResult zxzxmqytj(JSONObject object) {
         JSONObject page = object.getJSONObject("page");