Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys...

Merge branch 'V20231129-中建一局二公司' of http://192.168.60.201/root/dsk-operate-sys into V20231129-中建一局二公司

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/AdvisoryBodyManageController.java

@@ -9,7 +9,6 @@ import com.dsk.cscec.domain.AdvisoryBodyCustomForm;
 import com.dsk.cscec.domain.bo.*;
 import com.dsk.cscec.domain.vo.*;
 import com.dsk.cscec.service.AdvisoryBodyCustomFormService;
-import com.dsk.cscec.service.AdvisoryBodyProjectService;
 import com.dsk.cscec.service.AdvisoryBodyService;
 import com.dsk.cscec.service.IDProjectService;
 import org.springframework.transaction.annotation.Transactional;
@@ -34,12 +33,10 @@ public class AdvisoryBodyManageController extends BaseController {
     @Resource
     private AdvisoryBodyService advisoryBodyService;
     @Resource
-    private AdvisoryBodyProjectService advisoryBodyProjectService;
-    @Resource
     private AdvisoryBodyCustomFormService advisoryBodyCustomFormService;
 
     /**
-     * 获取所有项目列表数据
+     * 获取项目列表
      */
     @GetMapping("/getProjectList")
     public TableDataInfo<ProjectSearchVo> getProjectList(ProjectSearchBo projectSearchBo, PageQuery pageQuery) {
@@ -93,7 +90,7 @@ public class AdvisoryBodyManageController extends BaseController {
      * 新增/更新咨询机构与项目关联信息(advisory_body_project表)
      */
     @PostMapping("/editAdvisoryBody")
-    public R<Void> editAdvisoryBody(@Validated EditAdvisoryBodyInfoBo editInfoBo) {
+    public R<Void> editAdvisoryBody(@Validated @RequestBody EditAdvisoryBodyInfoBo editInfoBo) {
         return toAjax(advisoryBodyService.editAdvisoryBody(editInfoBo));
     }
 
@@ -110,7 +107,7 @@ public class AdvisoryBodyManageController extends BaseController {
      */
     @PostMapping("/addAdvisoryBodyCustomForm")
     @Transactional(rollbackFor = Exception.class)
-    public R<Void> addAdvisoryBodyCustomForm(@Validated AdvisoryBodyCustomForm advisoryBodyCustomForm) {
+    public R<Void> addAdvisoryBodyCustomForm(@Validated @RequestBody AdvisoryBodyCustomForm advisoryBodyCustomForm) {
         return toAjax(advisoryBodyCustomFormService.save(advisoryBodyCustomForm));
     }
 
@@ -119,7 +116,7 @@ public class AdvisoryBodyManageController extends BaseController {
      */
     @PutMapping("/updateAdvisoryBodyCustomForm")
     @Transactional(rollbackFor = Exception.class)
-    public R<Void> updateAdvisoryBodyCustomForm(@Validated EditAdvisoryBodyCustomFormBo editBo) {
+    public R<Void> updateAdvisoryBodyCustomForm(@Validated @RequestBody EditAdvisoryBodyCustomFormBo editBo) {
         return toAjax(advisoryBodyCustomFormService.updateById(editBo));
     }
 }
\ No newline at end of file

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

 package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import com.dsk.acc.openapi.client.util.CommonUtils;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.jsk.domain.*;
 import com.dsk.system.utils.DskOpenApiUtil;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 /**
  * @ClassName CompanyRelationTableV1Controller
@@ -41,8 +47,49 @@ public class CompanyRelationTableV1Service {
         } else {
             map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false));
         }
+        Map data = MapUtils.getMap(map, "data", null);
+        List<Object> list = CommonUtils.assertAsArray(MapUtils.getObject(data, "list", ""));
+        if (CollectionUtils.isEmpty(list)) {
+            return new TableDataInfo(list, 0);
+        }
+        for (Object dataMap : list) {
+            Map<String, Object> companyMap = CommonUtils.assertAsMap(dataMap);
+            String agencyBusinessType = MapUtils.getString(companyMap, "agencyBusinessType", "");
+            companyMap.put("agencyBusinessType", agencyBusinessType(agencyBusinessType, dto.getBusinessTypes()));
+        }
         return dskOpenApiUtil.responsePage(map);
     }
+    
+    /***
+     *@Description: 取其一
+     *@Param: 
+     *@return: java.lang.String
+     *@Author: Dgm
+     *@date: 2024/1/10 15:48
+     */
+    private String agencyBusinessType (String name, List<String> businessTypes) {
+        List<String> businessType = new ArrayList<>();
+        if (ObjectUtil.isNotEmpty(name)) {
+            name = name.replaceAll("\\['","");
+            name = name.replaceAll("']", "");
+            name = name.replaceAll("'", "");
+            name = name.replaceAll(" ", "");
+            if (name.contains(",")) {
+                String[] split = name.split(",");
+                for (String s : split) {
+                    businessType.add(s);
+                }
+            } else {
+                businessType.add(name);
+            }
+        }
+        String bTypes = null;
+        if (ObjectUtil.isNotEmpty(businessType)) {
+            bTypes = businessType.get(0);
+        }
+        return ObjectUtil.isNotEmpty(businessTypes) ?businessTypes.get(0): bTypes;
+    }
+
 
     /***
      *@Description: -分页列表-下拉