Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessRelateCompanyController.java

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
 /**
- * 项目关联单位Controller
+ * 项目相关企业Controller
  *
  * @author lxl
  * @date 2023-05-17
@@ -25,7 +25,7 @@ public class BusinessRelateCompanyController extends BaseController
     private IBusinessRelateCompanyService businessRelateCompanyService;
 
     /**
-     * 查询关联单位角色
+     * 查询相关企业角色
      */
     @PostMapping("/role/list")
     public AjaxResult companyRoleList(@RequestBody BusinessIdDto dto){
@@ -33,7 +33,7 @@ public class BusinessRelateCompanyController extends BaseController
     }
 
     /**
-     * 查询项目关联单位列表
+     * 查询项目相关企业列表
      */
 //    @PreAuthorize("@ss.hasPermi('system:company:list')")
     @GetMapping("/list")
@@ -66,6 +66,17 @@ public class BusinessRelateCompanyController extends BaseController
         return toAjax(businessRelateCompanyService.updateBusinessRelateCompany(businessRelateCompany));
     }
 
+    /**
+     * 删除项目关联单位
+     */
+//    @PreAuthorize("@ss.hasPermi('system:company:remove')")
+//    @Log(title = "项目关联单位", businessType = BusinessType.DELETE)
+    @DeleteMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(businessRelateCompanyService.deleteBusinessRelateCompanyByIds(ids));
+    }
+
 //    /**
 //     * 导出项目关联单位列表
 //     */
@@ -89,15 +100,4 @@ public class BusinessRelateCompanyController extends BaseController
 //        return success(businessRelateCompanyService.selectBusinessRelateCompanyById(id));
 //    }
 
-//
-//    /**
-//     * 删除项目关联单位
-//     */
-//    @PreAuthorize("@ss.hasPermi('system:company:remove')")
-//    @Log(title = "项目关联单位", businessType = BusinessType.DELETE)
-//	@DeleteMapping("/{ids}")
-//    public AjaxResult remove(@PathVariable Long[] ids)
-//    {
-//        return toAjax(businessRelateCompanyService.deleteBusinessRelateCompanyByIds(ids));
-//    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/MarketAnalysisController.java

 package com.dsk.web.controller.search.controller;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -9,6 +11,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
 
 
 /**
@@ -18,7 +23,7 @@ import javax.annotation.Resource;
  */
 @RequestMapping("/marketAnalysis")
 @RestController
-public class MarketAnalysisController {
+public class MarketAnalysisController extends BaseController {
 
 
     @Resource
@@ -46,9 +51,8 @@ public class MarketAnalysisController {
     /*
      * 资质等级按照大类、省份、等级类型分组
      */
-    @RequestMapping("/certGroupByCategoryProvinceLevel")
-    public AjaxResult certGroupByCategoryProvinceLevel() {
-
+    @RequestMapping("/certGroupByMajorProvinceLevel")
+    public AjaxResult certGroupByMajorProvinceLevel() {
         return marketAnalysisService.certGroupByMajorProvinceLevel();
     }
 
@@ -86,11 +90,23 @@ public class MarketAnalysisController {
         return marketAnalysisService.countGroupByProvince(object);
     }
 
+    @RequestMapping("/getYear")
+    public TableDataInfo getYear(){
+        List<Integer> list = new ArrayList<>();
+        Calendar calendar = Calendar.getInstance();
+        int nowYear = calendar.get(Calendar.YEAR);
+        list.add(nowYear);
+        for (int i = 1; i < 5; i++) {
+            list.add(nowYear-i);
+        }
+        return getDataTable(list);
+    }
+
     /*
      * 中标数量按月份分组
      */
     @RequestMapping("/countGroupByMonth")
-    public AjaxResult countGroupByMonth() {
-        return marketAnalysisService.countGroupByMonth();
+    public AjaxResult countGroupByMonth(@RequestBody JSONObject object) {
+        return marketAnalysisService.countGroupByMonth(object);
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/MarketAnalysisService.java

@@ -19,7 +19,7 @@ public interface MarketAnalysisService {
 
     AjaxResult countGroupByProvince(JSONObject object);
 
-    AjaxResult countGroupByMonth();
+    AjaxResult countGroupByMonth(JSONObject object);
 
     AjaxResult bidMoneyGroupByProjectType(JSONObject object);
 

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/MarketAnalysisServiceImpl.java

@@ -62,8 +62,8 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     }
 
     @Override
-    public AjaxResult countGroupByMonth() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", null);
+    public AjaxResult countGroupByMonth(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseCreditLawsuitsPageBody.java

@@ -32,5 +32,15 @@ public class EnterpriseCreditLawsuitsPageBody extends BasePage {
      */
     private String keys;
 
+    /**
+     * 开始时间（年月日）
+     */
+    private String dateFrom;
+    /**
+     * 截止时间（年月日）
+     */
+    private String dateTo;
+
+
 
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidNoticePageBody.java

@@ -27,7 +27,7 @@ public class EnterpriseProjectBidNoticePageBody extends BasePage {
     /**
      * 类型
      */
-    private String tenderStage;
+    private List<String> tenderStage;
 
     /*
      * 1金额倒序，2金额正序，3时间倒序，4时间正序

dsk-framework/src/main/java/com/dsk/framework/web/service/SysLoginService.java

@@ -64,7 +64,7 @@ public class SysLoginService
     public String login(String username, String password, String code, String uuid)
     {
         // 验证码校验
-//        validateCaptcha(username, code, uuid);
+        validateCaptcha(username, code, uuid);
         // 登录前置校验
         loginPreCheck(username, password);
         // 用户验证

dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseProjectService.java

@@ -120,15 +120,11 @@ public class EnterpriseProjectService {
             return BeanUtil.toBean(map, R.class);
         }
 
-//        HashMap<String, Object> contentParam = new HashMap<>();
-//        contentParam.put("data_type", "bid_plan");
-//        contentParam.put("filter_type", 2);
-//        contentParam.put("strategy_id", contentId);
-        HashMap<String, Object> param = new HashMap<>();
-        param.put("data_type", "kaibiao");
-        param.put("filter_type", 2);
-        param.put("strategy_id", "647477d52ba0e4cb1410c7f6");
-        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", BeanUtil.beanToMap(param, false, false));
+        HashMap<String, Object> contentParam = new HashMap<>();
+        contentParam.put("data_type", "bid_plan");
+        contentParam.put("filter_type", 2);
+        contentParam.put("strategy_id", contentId);
+        Map<String, Object> contentMap = dskOpenApiUtil.requestBody("/mongocontent/v1/cjb/mongo_content", BeanUtil.beanToMap(contentParam, false, false));
 
         Map contentData = MapUtils.getMap(contentMap, "data", null);