Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system

# Conflicts:
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java
#	dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainSaveReqVO.java

dl-module-base/src/main/java/cn/iocoder/yudao/common/BaseConstants.java

@@ -11,4 +11,6 @@ public class BaseConstants {
     public static final String CUS_SIGN_CUSTOMER = "customer";
     /**车辆标识*/
     public static final String CUS_SIGN_CAR = "car";
+    /**客户信息表名称*/
+    public static final String TABLE_BASE_CUSTOMER_MAIN = "base_customer_main";
 }

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/controller/admin/CustomerMainController.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.module.custom.service.CustomerMainService;
 import cn.iocoder.yudao.module.custom.vo.CustomerMainPageReqVO;
 import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
 import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
+import cn.iocoder.yudao.module.label.service.BusiLabelService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.v3.oas.annotations.Operation;
@@ -20,6 +21,7 @@ import javax.validation.Valid;
 
 import java.util.List;
 
+import static cn.iocoder.yudao.common.BaseConstants.TABLE_BASE_CUSTOMER_MAIN;
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 
 /**
@@ -35,6 +37,8 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 public class CustomerMainController {
     @Resource
     private CustomerMainService customerMainService;
+    @Resource
+    private BusiLabelService busiLabelService;
 
     /**
      * 客户管理分页列表查询
@@ -153,4 +157,19 @@ public class CustomerMainController {
         return success(true);
     }
 
+    /**
+     * 设置标签
+     *
+     * @param saveReqVO CustomerMainSaveReqVO
+     * @return cn.iocoder.yudao.framework.common.pojo.CommonResult<java.lang.Boolean>
+     * @author PQZ
+     * @date 16:35 2024/8/6
+     **/
+    @PostMapping("/setLabel")
+    @Operation(summary = "设置标签")
+    public CommonResult<Boolean> setLabel(@Valid @RequestBody CustomerMainSaveReqVO saveReqVO) {
+        busiLabelService.saveBusiLable(saveReqVO.getId(), TABLE_BASE_CUSTOMER_MAIN, saveReqVO.getLabelList());
+        return success(true);
+    }
+
 }

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/service/impl/CustomerMainServiceImpl.java

@@ -19,6 +19,8 @@ import cn.iocoder.yudao.module.custom.vo.CarMainRespVO;
 import cn.iocoder.yudao.module.custom.vo.CustomerMainPageReqVO;
 import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
 import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
+import cn.iocoder.yudao.module.label.entity.BusiLabel;
+import cn.iocoder.yudao.module.label.service.BusiLabelService;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -52,6 +54,10 @@ public class CustomerMainServiceImpl extends ServiceImpl<CustomerMainMapper, Cus
     private CustomerCarService customerCarService;
     @Resource
     private CustomerCarMapper customerCarMapper;
+    @Resource
+    private CarMainMapper carMainMapper;
+    @Resource
+    private BusiLabelService busiLabelService;
 
     /**
      * 客户管理分页列表查询
@@ -120,6 +126,9 @@ public class CustomerMainServiceImpl extends ServiceImpl<CustomerMainMapper, Cus
         CustomerMainRespVO result = JSONUtil.toBean(JSONUtil.parseObj(main).toJSONString(0), CustomerMainRespVO.class);
         result.setItemList(itemList);
         result.setCarList(carList);
+        /*4、标签信息*/
+        List<BusiLabel> labelList = busiLabelService.listByMainId(id);
+        result.setLabelList(labelList);
         return result;
     }
 

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainRespVO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.custom.vo;
 
 import cn.iocoder.yudao.module.custom.entity.CustomerItem;
 import cn.iocoder.yudao.module.custom.entity.CustomerMain;
+import cn.iocoder.yudao.module.label.entity.BusiLabel;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -23,6 +24,8 @@ public class CustomerMainRespVO extends CustomerMain {
     List<CarMainRespVO> carList;
     /**经办人信息集合*/
     List<CustomerMain> attnList;
+    /**标签信息*/
+    List<BusiLabel> labelList;
 
     /**是否车主（0否1是）*/
     private String isOwner;

dl-module-base/src/main/java/cn/iocoder/yudao/module/custom/vo/CustomerMainSaveReqVO.java

@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.custom.vo;
 
 import cn.iocoder.yudao.module.custom.entity.CustomerItem;
 import cn.iocoder.yudao.module.custom.entity.CustomerMain;
+import cn.iocoder.yudao.module.label.entity.BusiLabel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -17,5 +18,7 @@ public class CustomerMainSaveReqVO extends CustomerMain {
     private List<CarMainRespVO> carList;
     /**客户绑定车辆信息*/
     private List<CustomerMainRespVO> cusList;
+    /**标签信息*/
+    List<BusiLabel> labelList;
 
 }

dl-module-base/src/main/java/cn/iocoder/yudao/module/label/entity/BusiLabel.java

@@ -49,5 +49,7 @@ public class BusiLabel extends TenantBaseDO {
      * 系统标识
      */
     private String systemCode;
+    /**标签库类型*/
+    private String labelType;
 
 }