楚江ERP:客户资信-新增接口

@@ -22,6 +22,12 @@ public class GetCorePersonnelBo extends BaseBo<CorePersonnel> {
     private String id;
     private String id;
 
 
     /**
     /**
+     * personId前端自用id
+     */
+    @ApiModelProperty("personId")
+    private String personId;
+
+    /**
      * 姓名
      * 姓名
      */
      */
     @ApiModelProperty("姓名")
     @ApiModelProperty("姓名")

@@ -7,6 +7,8 @@ import com.lframework.xingyun.sc.entity.CustomerCredit;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.common.constants.StringPool;
 import com.lframework.starter.web.core.bo.BaseBo;
 import com.lframework.starter.web.core.bo.BaseBo;
+
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.List;
 
 
@@ -47,7 +49,7 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> {
      */
      */
     @ApiModelProperty("登记日期")
     @ApiModelProperty("登记日期")
     @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
     @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
-    private LocalDateTime registerDate;
+    private LocalDate registerDate;
 
 
     /**
     /**
      * 客户简称
      * 客户简称
@@ -114,7 +116,7 @@ public class GetCustomerCreditBo extends BaseBo<CustomerCredit> {
      */
      */
     @ApiModelProperty("注册时间")
     @ApiModelProperty("注册时间")
     @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
     @JsonFormat(pattern = StringPool.DATE_TIME_PATTERN)
-    private LocalDateTime registrationTime;
+    private LocalDate registrationTime;
 
 
     /**
     /**
      * 经营年限（年）
      * 经营年限（年）

 package com.lframework.xingyun.sc.controller.customer;
 package com.lframework.xingyun.sc.controller.customer;
 
 
 import com.lframework.starter.web.core.annotations.security.HasPermission;
 import com.lframework.starter.web.core.annotations.security.HasPermission;
-import com.lframework.starter.web.core.components.security.AbstractUserDetails;
-import com.lframework.starter.web.core.components.security.SecurityUtil;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.starter.web.core.controller.DefaultBaseController;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
 import com.lframework.xingyun.sc.bo.customer.credit.GetCustomerCreditBo;
@@ -95,7 +93,7 @@ public class CustomerCreditController extends DefaultBaseController {
     @ApiOperation("新增")
     @ApiOperation("新增")
     @HasPermission({"customerCredit:customercredit:add"})
     @HasPermission({"customerCredit:customercredit:add"})
     @PostMapping("/add")
     @PostMapping("/add")
-    public InvokeResult<Void> create(@Valid CreateCustomerCreditVo vo) {
+    public InvokeResult<Void> create(@RequestBody @Valid CreateCustomerCreditVo vo) {
 
 
         customerCreditService.create(vo);
         customerCreditService.create(vo);
 
 
@@ -108,7 +106,7 @@ public class CustomerCreditController extends DefaultBaseController {
     @ApiOperation("修改")
     @ApiOperation("修改")
     @HasPermission({"customerCredit:customercredit:modify"})
     @HasPermission({"customerCredit:customercredit:modify"})
     @PutMapping("/update")
     @PutMapping("/update")
-    public InvokeResult<Void> update(@Valid UpdateCustomerCreditVo vo) {
+    public InvokeResult<Void> update(@RequestBody @Valid UpdateCustomerCreditVo vo) {
 
 
         customerCreditService.update(vo);
         customerCreditService.update(vo);
 
 

@@ -28,6 +28,11 @@ public class CorePersonnel extends BaseEntity implements BaseDto {
     private String id;
     private String id;
 
 
     /**
     /**
+     * 前端自用id
+     */
+    private String personId;
+
+    /**
      * 客户资信
      * 客户资信
      */
      */
     private String creditId;
     private String creditId;

@@ -3,6 +3,8 @@ package com.lframework.xingyun.sc.entity;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.TableName;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import com.lframework.starter.web.core.dto.BaseDto;
 import com.lframework.starter.web.core.dto.BaseDto;
+
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.lframework.starter.web.core.entity.BaseEntity;
 import com.lframework.starter.web.core.entity.BaseEntity;
@@ -41,7 +43,7 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     /**
     /**
      * 登记日期
      * 登记日期
      */
      */
-    private LocalDateTime registerDate;
+    private LocalDate registerDate;
 
 
     /**
     /**
      * 客户简称
      * 客户简称
@@ -96,7 +98,7 @@ public class CustomerCredit extends BaseEntity implements BaseDto {
     /**
     /**
      * 注册时间
      * 注册时间
      */
      */
-    private LocalDateTime registrationTime;
+    private LocalDate registrationTime;
 
 
     /**
     /**
      * 经营年限（年）
      * 经营年限（年）

@@ -65,6 +65,9 @@ public class CorePersonnelServiceImpl extends BaseMpServiceImpl<CorePersonnelMap
         CorePersonnel data = new CorePersonnel();
         CorePersonnel data = new CorePersonnel();
         data.setId(IdUtil.getId());
         data.setId(IdUtil.getId());
         data.setCreditId(vo.getCreditId());
         data.setCreditId(vo.getCreditId());
+        if (!StringUtil.isBlank(vo.getPersonId())) {
+            data.setPersonId(vo.getPersonId());
+        }
         if (!StringUtil.isBlank(vo.getName())) {
         if (!StringUtil.isBlank(vo.getName())) {
             data.setName(vo.getName());
             data.setName(vo.getName());
         }
         }
@@ -112,6 +115,7 @@ public class CorePersonnelServiceImpl extends BaseMpServiceImpl<CorePersonnelMap
         }
         }
 
 
         LambdaUpdateWrapper<CorePersonnel> updateWrapper = Wrappers.lambdaUpdate(CorePersonnel.class)
         LambdaUpdateWrapper<CorePersonnel> updateWrapper = Wrappers.lambdaUpdate(CorePersonnel.class)
+                .set(CorePersonnel::getPersonId, vo.getPersonId())
                 .set(CorePersonnel::getCreditId, vo.getCreditId())
                 .set(CorePersonnel::getCreditId, vo.getCreditId())
                 .set(CorePersonnel::getName, StringUtil.isBlank(vo.getName()) ? null : vo.getName())
                 .set(CorePersonnel::getName, StringUtil.isBlank(vo.getName()) ? null : vo.getName())
                 .set(CorePersonnel::getSex, StringUtil.isBlank(vo.getSex()) ? null : vo.getSex())
                 .set(CorePersonnel::getSex, StringUtil.isBlank(vo.getSex()) ? null : vo.getSex())

@@ -13,6 +13,14 @@ public class CreateCorePersonnelVo implements BaseVo, Serializable {
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     /**
     /**
+     * personId前端自用id
+     */
+    @ApiModelProperty("personId")
+    @NotBlank(message = "personId不能为空！")
+    @Length(message = "personId最多允许50个字符！")
+    private String personId;
+
+    /**
      * 客户资信
      * 客户资信
      */
      */
     @ApiModelProperty(value = "客户资信", required = true)
     @ApiModelProperty(value = "客户资信", required = true)
@@ -24,6 +32,7 @@ public class CreateCorePersonnelVo implements BaseVo, Serializable {
      * 姓名
      * 姓名
      */
      */
     @ApiModelProperty("姓名")
     @ApiModelProperty("姓名")
+    @NotBlank(message = "请输入姓名！")
     @Length(message = "姓名最多允许50个字符！")
     @Length(message = "姓名最多允许50个字符！")
     private String name;
     private String name;
 
 

@@ -2,9 +2,8 @@ package com.lframework.xingyun.sc.vo.customer.credit;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
-import com.lframework.xingyun.sc.entity.CorePersonnel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import org.hibernate.validator.constraints.Length;
 import org.hibernate.validator.constraints.Length;
@@ -37,7 +36,7 @@ public class CreateCustomerCreditVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty("登记日期")
     @ApiModelProperty("登记日期")
     @TypeMismatch(message = "登记日期格式有误！")
     @TypeMismatch(message = "登记日期格式有误！")
-    private LocalDateTime registerDate;
+    private LocalDate registerDate;
 
 
     /**
     /**
      * 客户简称
      * 客户简称
@@ -49,9 +48,9 @@ public class CreateCustomerCreditVo implements BaseVo, Serializable {
     /**
     /**
      * 企业类型：经销商（distributor）、终端（terminal）
      * 企业类型：经销商（distributor）、终端（terminal）
      */
      */
-    @ApiModelProperty(value = "企业类型：经销商（distributor）、终端（terminal）", required = true)
-    @NotBlank(message = "请输入企业类型：经销商（distributor）、终端（terminal）！")
-    @Length(message = "企业类型：经销商（distributor）、终端（terminal）最多允许100个字符！")
+    @ApiModelProperty(value = "企业类型：经销商（DEALER）、终端（TERMINAL）", required = true)
+    @NotBlank(message = "请输入企业类型：经销商（DEALER）、终端（TERMINAL）！")
+    @Length(message = "企业类型：经销商（DEALER）、终端（TERMINAL）最多允许100个字符！")
     private String enterpriseType;
     private String enterpriseType;
 
 
     /**
     /**
@@ -109,7 +108,7 @@ public class CreateCustomerCreditVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty("注册时间")
     @ApiModelProperty("注册时间")
     @TypeMismatch(message = "注册时间格式有误！")
     @TypeMismatch(message = "注册时间格式有误！")
-    private LocalDateTime registrationTime;
+    private LocalDate registrationTime;
 
 
     /**
     /**
      * 经营年限（年）
      * 经营年限（年）
@@ -387,7 +386,7 @@ public class CreateCustomerCreditVo implements BaseVo, Serializable {
     private String status;
     private String status;
 
 
     /**
     /**
-     * 核心人员
+     * 核心人员（非持久化字段）
      */
      */
     @ApiModelProperty("核心人员")
     @ApiModelProperty("核心人员")
     private List<CreateCorePersonnelVo> corePersonnelList;
     private List<CreateCorePersonnelVo> corePersonnelList;

@@ -23,6 +23,15 @@ public class UpdateCorePersonnelVo implements BaseVo, Serializable {
     private String id;
     private String id;
 
 
     /**
     /**
+     * personId前端自用id
+     */
+    @ApiModelProperty("personId")
+    @NotBlank(message = "personId不能为空！")
+    @Length(message = "personId最多允许50个字符！")
+    private String personId;
+
+
+    /**
      * 客户资信
      * 客户资信
      */
      */
     @ApiModelProperty(value = "客户资信", required = true)
     @ApiModelProperty(value = "客户资信", required = true)

@@ -3,7 +3,7 @@ package com.lframework.xingyun.sc.vo.customer.credit;
 import lombok.Data;
 import lombok.Data;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
-import java.time.LocalDateTime;
+import java.time.LocalDate;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.vo.BaseVo;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import com.lframework.starter.web.core.components.validation.TypeMismatch;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -35,7 +35,7 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty("登记日期")
     @ApiModelProperty("登记日期")
     @TypeMismatch(message = "登记日期格式有误！")
     @TypeMismatch(message = "登记日期格式有误！")
-    private LocalDateTime registerDate;
+    private LocalDate registerDate;
 
 
     /**
     /**
      * 客户简称
      * 客户简称
@@ -107,7 +107,7 @@ public class UpdateCustomerCreditVo implements BaseVo, Serializable {
      */
      */
     @ApiModelProperty("注册时间")
     @ApiModelProperty("注册时间")
     @TypeMismatch(message = "注册时间格式有误！")
     @TypeMismatch(message = "注册时间格式有误！")
-    private LocalDateTime registrationTime;
+    private LocalDate registrationTime;
 
 
     /**
     /**
      * 经营年限（年）
      * 经营年限（年）

@@ -4,6 +4,7 @@
 
 
     <resultMap id="CorePersonnel" type="com.lframework.xingyun.sc.entity.CorePersonnel">
     <resultMap id="CorePersonnel" type="com.lframework.xingyun.sc.entity.CorePersonnel">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
+        <result column="person_id" property="personId"/>
         <result column="credit_id" property="creditId"/>
         <result column="credit_id" property="creditId"/>
         <result column="name" property="name"/>
         <result column="name" property="name"/>
         <result column="sex" property="sex"/>
         <result column="sex" property="sex"/>
@@ -25,6 +26,7 @@
     <sql id="CorePersonnel_sql">
     <sql id="CorePersonnel_sql">
         SELECT
         SELECT
             tb.id,
             tb.id,
+            tb.person_id,
             tb.credit_id,
             tb.credit_id,
             tb.name,
             tb.name,
             tb.sex,
             tb.sex,