Compare commits
No commits in common. "7ad0321545429a23d45fa502ae290c0213e48051" and "ffc02c97fcec58eabfc951db6bf9ab971da56992" have entirely different histories.
7ad0321545
...
ffc02c97fc
@ -11,6 +11,4 @@ public class BaseConstants {
|
|||||||
public static final String CUS_SIGN_CUSTOMER = "customer";
|
public static final String CUS_SIGN_CUSTOMER = "customer";
|
||||||
/**车辆标识*/
|
/**车辆标识*/
|
||||||
public static final String CUS_SIGN_CAR = "car";
|
public static final String CUS_SIGN_CAR = "car";
|
||||||
/**客户信息表名称*/
|
|
||||||
public static final String TABLE_BASE_CUSTOMER_MAIN = "base_customer_main";
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -6,7 +6,6 @@ import cn.iocoder.yudao.module.custom.service.CustomerMainService;
|
|||||||
import cn.iocoder.yudao.module.custom.vo.CustomerMainPageReqVO;
|
import cn.iocoder.yudao.module.custom.vo.CustomerMainPageReqVO;
|
||||||
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
|
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
|
||||||
import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
|
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.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import io.swagger.v3.oas.annotations.Operation;
|
import io.swagger.v3.oas.annotations.Operation;
|
||||||
@ -21,7 +20,6 @@ import javax.validation.Valid;
|
|||||||
|
|
||||||
import java.util.List;
|
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;
|
import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -37,8 +35,6 @@ import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
|
|||||||
public class CustomerMainController {
|
public class CustomerMainController {
|
||||||
@Resource
|
@Resource
|
||||||
private CustomerMainService customerMainService;
|
private CustomerMainService customerMainService;
|
||||||
@Resource
|
|
||||||
private BusiLabelService busiLabelService;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 客户管理分页列表查询
|
* 客户管理分页列表查询
|
||||||
@ -157,19 +153,4 @@ public class CustomerMainController {
|
|||||||
return success(true);
|
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -19,8 +19,6 @@ import cn.iocoder.yudao.module.custom.vo.CarMainRespVO;
|
|||||||
import cn.iocoder.yudao.module.custom.vo.CustomerMainPageReqVO;
|
import cn.iocoder.yudao.module.custom.vo.CustomerMainPageReqVO;
|
||||||
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
|
import cn.iocoder.yudao.module.custom.vo.CustomerMainRespVO;
|
||||||
import cn.iocoder.yudao.module.custom.vo.CustomerMainSaveReqVO;
|
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.conditions.query.LambdaQueryWrapper;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
@ -54,10 +52,6 @@ public class CustomerMainServiceImpl extends ServiceImpl<CustomerMainMapper, Cus
|
|||||||
private CustomerCarService customerCarService;
|
private CustomerCarService customerCarService;
|
||||||
@Resource
|
@Resource
|
||||||
private CustomerCarMapper customerCarMapper;
|
private CustomerCarMapper customerCarMapper;
|
||||||
@Resource
|
|
||||||
private CarMainMapper carMainMapper;
|
|
||||||
@Resource
|
|
||||||
private BusiLabelService busiLabelService;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 客户管理分页列表查询
|
* 客户管理分页列表查询
|
||||||
@ -126,9 +120,6 @@ public class CustomerMainServiceImpl extends ServiceImpl<CustomerMainMapper, Cus
|
|||||||
CustomerMainRespVO result = JSONUtil.toBean(JSONUtil.parseObj(main).toJSONString(0), CustomerMainRespVO.class);
|
CustomerMainRespVO result = JSONUtil.toBean(JSONUtil.parseObj(main).toJSONString(0), CustomerMainRespVO.class);
|
||||||
result.setItemList(itemList);
|
result.setItemList(itemList);
|
||||||
result.setCarList(carList);
|
result.setCarList(carList);
|
||||||
/*4、标签信息*/
|
|
||||||
List<BusiLabel> labelList = busiLabelService.listByMainId(id);
|
|
||||||
result.setLabelList(labelList);
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.custom.vo;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.module.custom.entity.CustomerItem;
|
import cn.iocoder.yudao.module.custom.entity.CustomerItem;
|
||||||
import cn.iocoder.yudao.module.custom.entity.CustomerMain;
|
import cn.iocoder.yudao.module.custom.entity.CustomerMain;
|
||||||
import cn.iocoder.yudao.module.label.entity.BusiLabel;
|
|
||||||
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
|
||||||
import io.swagger.v3.oas.annotations.media.Schema;
|
import io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
@ -24,8 +23,6 @@ public class CustomerMainRespVO extends CustomerMain {
|
|||||||
List<CarMainRespVO> carList;
|
List<CarMainRespVO> carList;
|
||||||
/**经办人信息集合*/
|
/**经办人信息集合*/
|
||||||
List<CustomerMain> attnList;
|
List<CustomerMain> attnList;
|
||||||
/**标签信息*/
|
|
||||||
List<BusiLabel> labelList;
|
|
||||||
|
|
||||||
/**是否车主(0否1是)*/
|
/**是否车主(0否1是)*/
|
||||||
private String isOwner;
|
private String isOwner;
|
||||||
|
|||||||
@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.custom.vo;
|
|||||||
|
|
||||||
import cn.iocoder.yudao.module.custom.entity.CustomerItem;
|
import cn.iocoder.yudao.module.custom.entity.CustomerItem;
|
||||||
import cn.iocoder.yudao.module.custom.entity.CustomerMain;
|
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 io.swagger.v3.oas.annotations.media.Schema;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@ -18,7 +17,5 @@ public class CustomerMainSaveReqVO extends CustomerMain {
|
|||||||
private List<CarMainRespVO> carList;
|
private List<CarMainRespVO> carList;
|
||||||
/**客户绑定车辆信息*/
|
/**客户绑定车辆信息*/
|
||||||
private List<CustomerMainRespVO> cusList;
|
private List<CustomerMainRespVO> cusList;
|
||||||
/**标签信息*/
|
|
||||||
List<BusiLabel> labelList;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -49,7 +49,5 @@ public class BusiLabel extends TenantBaseDO {
|
|||||||
* 系统标识
|
* 系统标识
|
||||||
*/
|
*/
|
||||||
private String systemCode;
|
private String systemCode;
|
||||||
/**标签库类型*/
|
|
||||||
private String labelType;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user