楚江ERP-客户基本信息调整

@@ -54,22 +54,22 @@ public class CustomerImportListener extends ExcelImportListener<CustomerImportMo
       throw new DefaultClientException(
       throw new DefaultClientException(
           "第" + context.readRowHolder().getRowIndex() + "行“名称”不能为空");
           "第" + context.readRowHolder().getRowIndex() + "行“名称”不能为空");
     }
     }
-    if (StringUtil.isBlank(data.getMnemonicCode())) {
-      throw new DefaultClientException(
-          "第" + context.readRowHolder().getRowIndex() + "行“简码”不能为空");
-    }
-    if (StringUtil.isBlank(data.getSettleType())) {
-      throw new DefaultClientException(
-          "第" + context.readRowHolder().getRowIndex() + "行“结算方式”不能为空");
-    }
-    SettleType settleType = EnumUtil.getByDesc(SettleType.class, data.getSettleType());
-    if (settleType == null) {
-      throw new DefaultClientException(
-          "第" + context.readRowHolder().getRowIndex() + "行“结算方式”只能填写“"
-              + CollectionUtil.join(
-              EnumUtil.getDescs(SettleType.class), "、") + "”");
-    }
-    data.setSettleTypeEnum(settleType);
+//    if (StringUtil.isBlank(data.getMnemonicCode())) {
+//      throw new DefaultClientException(
+//          "第" + context.readRowHolder().getRowIndex() + "行“简码”不能为空");
+//    }
+//    if (StringUtil.isBlank(data.getSettleType())) {
+//      throw new DefaultClientException(
+//          "第" + context.readRowHolder().getRowIndex() + "行“结算方式”不能为空");
+//    }
+//    SettleType settleType = EnumUtil.getByDesc(SettleType.class, data.getSettleType());
+//    if (settleType == null) {
+//      throw new DefaultClientException(
+//          "第" + context.readRowHolder().getRowIndex() + "行“结算方式”只能填写“"
+//              + CollectionUtil.join(
+//              EnumUtil.getDescs(SettleType.class), "、") + "”");
+//    }
+//    data.setSettleTypeEnum(settleType);
 
 
     if (!StringUtil.isBlank(data.getCity())) {
     if (!StringUtil.isBlank(data.getCity())) {
       String[] arr = data.getCity().split("/");
       String[] arr = data.getCity().split("/");
@@ -128,7 +128,7 @@ public class CustomerImportListener extends ExcelImportListener<CustomerImportMo
 
 
       record.setCode(data.getCode());
       record.setCode(data.getCode());
       record.setName(data.getName());
       record.setName(data.getName());
-      record.setMnemonicCode(data.getMnemonicCode());
+//      record.setMnemonicCode(data.getMnemonicCode());
       record.setContact(data.getContact());
       record.setContact(data.getContact());
       record.setTelephone(data.getTelephone());
       record.setTelephone(data.getTelephone());
       record.setEmail(data.getEmail());
       record.setEmail(data.getEmail());

@@ -33,9 +33,9 @@ public class CustomerImportModel implements ExcelModel {
   /**
   /**
    * 简码
    * 简码
    */
    */
-  @ExcelRequired
-  @ExcelProperty("简码")
-  private String mnemonicCode;
+//  @ExcelRequired
+//  @ExcelProperty("简码")
+//  private String mnemonicCode;
 
 
   /**
   /**
    * 联系人
    * 联系人
@@ -88,9 +88,9 @@ public class CustomerImportModel implements ExcelModel {
   /**
   /**
    * 结算方式
    * 结算方式
    */
    */
-  @ExcelRequired
-  @ExcelProperty("结算方式")
-  private String settleType;
+//  @ExcelRequired
+//  @ExcelProperty("结算方式")
+//  private String settleType;
 
 
   /**
   /**
    * 结算方式枚举
    * 结算方式枚举

@@ -145,7 +145,7 @@ public class CustomerServiceImpl extends BaseMpServiceImpl<CustomerMapper, Custo
     if (!StringUtil.isBlank(vo.getAddress())) {
     if (!StringUtil.isBlank(vo.getAddress())) {
       data.setAddress(vo.getAddress());
       data.setAddress(vo.getAddress());
     }
     }
-    data.setSettleType(EnumUtil.getByCode(SettleType.class, vo.getSettleType()));
+//    data.setSettleType(EnumUtil.getByCode(SettleType.class, vo.getSettleType()));
     if (!StringUtil.isBlank(vo.getCreditCode())) {
     if (!StringUtil.isBlank(vo.getCreditCode())) {
       data.setCreditCode(vo.getCreditCode());
       data.setCreditCode(vo.getCreditCode());
     }
     }

@@ -35,7 +35,7 @@ public class CreateCustomerVo implements BaseVo, Serializable {
    * 简码
    * 简码
    */
    */
   @ApiModelProperty(value = "简码", required = true)
   @ApiModelProperty(value = "简码", required = true)
-  @NotBlank(message = "请输入简码！")
+//  @NotBlank(message = "请输入简码！")
   private String mnemonicCode;
   private String mnemonicCode;
 
 
   /**
   /**
@@ -85,7 +85,7 @@ public class CreateCustomerVo implements BaseVo, Serializable {
    * 结算方式
    * 结算方式
    */
    */
   @ApiModelProperty(value = "结算方式", required = true)
   @ApiModelProperty(value = "结算方式", required = true)
-  @NotNull(message = "请选择结算方式！")
+//  @NotNull(message = "请选择结算方式！")
   @IsEnum(message = "请选择结算方式！", enumClass = SettleType.class)
   @IsEnum(message = "请选择结算方式！", enumClass = SettleType.class)
   private Integer settleType;
   private Integer settleType;
 
 

@@ -61,7 +61,7 @@
         <where>
         <where>
             <if test="vo != null">
             <if test="vo != null">
                 <if test="vo.code != null and vo.code != ''">
                 <if test="vo.code != null and vo.code != ''">
-                    AND code = #{vo.code}
+                    AND code like CONCAT('%', #{vo.code}, '%')
                 </if>
                 </if>
                 <if test="vo.name != null and vo.name != ''">
                 <if test="vo.name != null and vo.name != ''">
                     AND name LIKE CONCAT('%', #{vo.name}, '%')
                     AND name LIKE CONCAT('%', #{vo.name}, '%')