diff --git a/common/pom.xml b/common/pom.xml
index b9256f1..958b2d1 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -11,6 +11,19 @@
ywx-customer-common
+
+ org.projectlombok
+ lombok
+ provided
+
+
+ org.hibernate.validator
+ hibernate-validator
+
+
+ com.51trust.rd
+ common-model
+
\ No newline at end of file
diff --git a/common/src/main/java/com/trust/ywx/customer/common/enu/CaChannelEnum.java b/common/src/main/java/com/trust/ywx/customer/common/enu/CaChannelEnum.java
index 0892cf8..4a1cb66 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/enu/CaChannelEnum.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/enu/CaChannelEnum.java
@@ -13,7 +13,7 @@ package com.trust.ywx.customer.common.enu;
* @修改记录：
**/
public enum CaChannelEnum {
- XBY(0,"北京ca","北京数字认证股份有限公司"),
+ BJCA(0,"北京ca","北京数字认证股份有限公司"),
SZCA(1,"深圳ca","深圳ca"),
GXCA(2,"广西ca","广西壮族自治区数字证书认证中心有限公司"),
XJCA(3,"新疆ca","新疆数字证书认证中心")
diff --git a/common/src/main/java/com/trust/ywx/customer/common/enu/FirmProperEnum.java b/common/src/main/java/com/trust/ywx/customer/common/enu/FirmProperEnum.java
index f850fad..92110bf 100644
--- a/common/src/main/java/com/trust/ywx/customer/common/enu/FirmProperEnum.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/enu/FirmProperEnum.java
@@ -53,7 +53,7 @@ public enum FirmProperEnum {
//---------------------------可选配置及服务-------------------------------------
// 审核短信
//fixme 审核完成发送短信 目前存在firm_info表的send_sms，以后需要迁移到firm_info_extends表
- SMS_SEND("sms_send", "是否短信定制"), //0-否 1-是
+ SMS_SEND("sms_send", "是否短信定制"), //N-否 Y-是
SMS_CUSTOMIZE("sms_customize", "是否短信定制"), //N或者空-否 Y-是
SMS_CUSTOMIZE_CONTENT("sms_customize_content", "短信定制内容"),
diff --git a/common/src/main/java/com/trust/ywx/customer/common/enu/FirmStampEnum.java b/common/src/main/java/com/trust/ywx/customer/common/enu/FirmStampEnum.java
new file mode 100644
index 0000000..4b3d4dd
--- /dev/null
+++ b/common/src/main/java/com/trust/ywx/customer/common/enu/FirmStampEnum.java
@@ -0,0 +1,45 @@
+package com.trust.ywx.customer.common.enu;
+/***************************************************************************
+ *
+ * @文件名称: CachannelEnum.java
+ * @包 路 径： cn.org.bjca.ywq.firm.cons
+ * @版权所有：北京数字认证股份有限公司 (C) 2018
+ *
+ * @类描述:
+ * @版本: V1.5
+ * @创建人： wujunpeng
+ * @创建时间：2021年3月9日 下午7:36:58
+ *
+ * @修改记录：
+ **/
+public enum FirmStampEnum {
+ ROUND (0,"圆章"),
+ SQUARE (1,"方章"),
+ ;
+
+ private int code;
+ private String name;
+
+ FirmStampEnum(int channel, String dec) {
+ this.code = channel;
+ this.name = dec;
+ }
+
+ // 普通方法
+ public static String getName(int code) {
+ for (FirmStampEnum t : FirmStampEnum.values()) {
+ if (t.getCode() == code) {
+ return t.getName();
+ }
+ }
+ return null;
+ }
+
+ public int getCode() {
+ return code;
+ }
+
+ public String getName() {
+ return name;
+ }
+}
diff --git a/common/src/main/java/com/trust/ywx/customer/common/enu/FirmStatusEnum.java b/common/src/main/java/com/trust/ywx/customer/common/enu/FirmStatusEnum.java
new file mode 100644
index 0000000..9dd6b79
--- /dev/null
+++ b/common/src/main/java/com/trust/ywx/customer/common/enu/FirmStatusEnum.java
@@ -0,0 +1,54 @@
+package com.trust.ywx.customer.common.enu;
+
+/**
+ *
+ *
+ * @文件名称： FirmStatusEnum.java
+ * @包 路 径： com.trust.ywx.customer.common.enu
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/21 11:34
+ * @Modify：
+ */
+public enum FirmStatusEnum {
+ FIRM_SUB_NORMAL(1, "正常"),
+ FIRM_SUB_USEUP(2, "用尽"),
+ FIRM_SUB_STOP(3, "停用"),
+ FIRM_SUB_DELETE(4, "删除"),
+ FIRM_SUB_EXCESS(5, "过量"),
+ FIRM_SUB_TIMEOUT(6, "过期"),
+ FIRM_SUB_NOCONTRACT_AUTO_STOP(7, "未签约自动强制停止"),
+ FIRM_SUB_OVER_AUTO_STOP(8, "超出自动强制停止");
+
+ private int code;
+ private String dec;
+
+ private FirmStatusEnum(int code, String dec) {
+ this.code = code;
+ this.dec = dec;
+ }
+
+ public static String getDesc(int code) {
+ FirmStatusEnum[] var1 = values();
+ int var2 = var1.length;
+
+ for(int var3 = 0; var3 < var2; ++var3) {
+ FirmStatusEnum t = var1[var3];
+ if (t.code == code) {
+ return t.getDec();
+ }
+ }
+
+ return null;
+ }
+
+ public int getCode() {
+ return this.code;
+ }
+
+ public String getDec() {
+ return this.dec;
+ }
+}
diff --git a/common/src/main/java/com/trust/ywx/customer/common/enu/TempFirmStatusEnum.java b/common/src/main/java/com/trust/ywx/customer/common/enu/TempFirmStatusEnum.java
new file mode 100644
index 0000000..96c402a
--- /dev/null
+++ b/common/src/main/java/com/trust/ywx/customer/common/enu/TempFirmStatusEnum.java
@@ -0,0 +1,39 @@
+package com.trust.ywx.customer.common.enu;
+/**
+ * *************************************************************************
+ *
+ * @文件名称: FirmStatus.java
+ * @包 路 径： cn.org.bjca.ywq.config.common.status
+ * @版权所有：北京数字认证股份有限公司 (C) 2017
+ *
+ * @类描述: 厂商状态枚举
+ * @版本: V1.0
+ * @创建人： hudan
+ * @创建时间：2017年1月22日 上午10:42:38
+ * @修改记录：
+ */
+public enum TempFirmStatusEnum {
+
+ //可信任客户
+ FIRM_RIGHT(1,"正常"),
+ FIRM_STOP(3,"停用"),
+ FIRM_CREATE_STAMP(5,"已制章"),
+
+ // 临时客户
+ TEMP_UNAUTHEN(0,"未审核"),
+ TEMP_PASS(1,"审核通过"),
+ TEMP_REFUSE(2,"拒绝"),
+ TEMP_DEL(4, "删除")
+ ;
+
+ private int code;
+ private String dec;
+ private TempFirmStatusEnum(int code, String dec) {
+ this.code = code;
+ this.dec = dec;
+ }
+ public int getCode() {
+ return code;
+ }
+
+}
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/exception/BizException.java b/common/src/main/java/com/trust/ywx/customer/common/exception/BizException.java
similarity index 94%
rename from customer/src/main/java/com/trust/ywx/customer/service/exception/BizException.java
rename to common/src/main/java/com/trust/ywx/customer/common/exception/BizException.java
index a7924a1..f5eca02 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/exception/BizException.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/exception/BizException.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.exception;
+package com.trust.ywx.customer.common.exception;
import com.trust.ywx.customer.common.enu.FirmErrEum;
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/FirmPropParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/FirmPropParam.java
similarity index 92%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/request/FirmPropParam.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/manager/request/FirmPropParam.java
index 81fffc3..2ae2955 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/FirmPropParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/FirmPropParam.java
@@ -1,10 +1,9 @@
-package com.trust.ywx.customer.service.dto.request;
+package com.trust.ywx.customer.common.model.manager.request;
import com.trust.ywx.customer.common.enu.CommonStatusEnum;
import com.trust.ywx.customer.common.enu.DoctorProductTypeEnum;
import com.trust.ywx.customer.common.enu.FirmProperEnum;
import lombok.Data;
-import org.springframework.util.CollectionUtils;
import java.io.Serializable;
import java.util.HashMap;
@@ -98,12 +97,11 @@ public class FirmPropParam implements Serializable {
* see com.trust.ywx.customer.common.enums.FirmModeEnum
*/
private Integer firmMode;
-
- /**
- * 证书算法 RSA、SM2
- * fixme 目前存放与firm_info表的cert_alg。以后需要迁移到firm_info_extends表
- */
- private String certAlg;
+//
+// /**
+// * 证书算法 RSA、SM2
+// */
+// private String certAlg;
/**
* 客户白名单
@@ -112,12 +110,12 @@ public class FirmPropParam implements Serializable {
*/
private Integer isFirmWhite;
- /**
- * ca渠道类型
- * see com.trust.ywx.customer.common.enums.CaChannelEnum
- * fixme 目前存放与firm_info表的ca_channel。以后需要迁移到firm_info_extends表
- */
- private Integer caChannel;
+// /**
+// * ca渠道类型
+// * see com.trust.ywx.customer.common.enums.CaChannelEnum
+// * fixme 目前存放与firm_info表的ca_channel。以后需要迁移到firm_info_extends表
+// */
+// private Integer caChannel;
/**
* 是否允许医生挂靠
@@ -193,6 +191,7 @@ public class FirmPropParam implements Serializable {
//------------------企业图章模式-----------------;
/**
* 厂商图章类型 0 圆章 1 方章
+ * see com.trust.ywx.customer.common.enums.FirmStampEnum
*/
private Integer firmStampType;
/**
@@ -227,7 +226,7 @@ public class FirmPropParam implements Serializable {
propMap.put(FirmProperEnum.TECHPERSON_SUPPORT.getProperName(), String.valueOf(this.techSupport));
propMap.put(FirmProperEnum.TECHPERSON_SUPPORT_INFO.getProperName(), this.techSupportInfo);
propMap.put(FirmProperEnum.PUBLIC_PRODUCT_TYPE.getProperName(), String.valueOf(this.publicProductType));
- if(!CollectionUtils.isEmpty(this.getDoctorProductType())){
+ if(null != this.getDoctorProductType() && this.getDoctorProductType().size()>0){
if(this.getDoctorProductType().contains(DoctorProductTypeEnum.APP.getName())){
propMap.put(FirmProperEnum.DOCTOR_PRODUCT_APP.getProperName(), CommonStatusEnum.YES.getCode()+"");
}else{
@@ -249,8 +248,8 @@ public class FirmPropParam implements Serializable {
propMap.put(FirmProperEnum.GATEWAY_MONITOR_URL.getProperName(), this.gatewayMonitorUrl);
propMap.put(FirmProperEnum.HISCA_CALL_URL.getProperName(), this.hiscaCallUrl);
propMap.put(FirmProperEnum.FIRM_MODE.getProperName(), String.valueOf(this.firmMode));
- propMap.put(FirmProperEnum.CERT_ALG.getProperName(), this.certAlg);
- propMap.put(FirmProperEnum.CA_CHANNEL.getProperName(), String.valueOf(this.caChannel));
+// propMap.put(FirmProperEnum.CERT_ALG.getProperName(), this.certAlg);
+// propMap.put(FirmProperEnum.CA_CHANNEL.getProperName(), String.valueOf(this.caChannel));
propMap.put(FirmProperEnum.FIRM_ALLOW_USER_BIND.getProperName(), String.valueOf(this.allowUserBind));
propMap.put(FirmProperEnum.FIRM_SHOW_INBINDLIST.getProperName(), String.valueOf(this.showFirmInBindList));
propMap.put(FirmProperEnum.SMS_SEND.getProperName(), String.valueOf(this.smsSend));
diff --git a/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TempFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TempFirmParam.java
new file mode 100644
index 0000000..a7cd836
--- /dev/null
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TempFirmParam.java
@@ -0,0 +1,82 @@
+package com.trust.ywx.customer.common.model.manager.request;
+
+import lombok.Data;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import java.io.Serializable;
+
+@Data
+public class TempFirmParam implements Serializable {
+
+ private static final long serialVersionUID = 4072319794402378694L;
+ /**
+ * 客户ID
+ */
+ private String clientId;
+ /**
+ * 客户名称
+ */
+ @NotBlank(message = "客户名称不能为空")
+ @Size(max = 29, message = "客户名称最多29个字符")
+ private String firmName;
+
+ /**
+ * 客户联系人
+ */
+ @NotBlank(message = "客户联系人不能为空")
+ @Size(max = 10, message = "客户联系人最多10个字符")
+ private String firmPerson;
+
+ /**
+ * 客户联系电话
+ */
+ @NotBlank(message = "客户联系电话不能为空")
+ @Size(max = 11, message = "客户联系电话11位")
+ @Size(min = 11, message = "客户联系电话11位")
+ @Pattern(regexp = "1[0-9][0-9]\\d{8}", message = "手机号格式有误")
+ private String firmPhone;
+
+ /**
+ * 客户邮箱
+ */
+ @Email(message = "邮箱格式有误")
+ private String firmEmail;
+
+ /**
+ * 客户图标 base64
+ */
+ private String appIcon;
+
+ /**
+ * 代理商ID
+ */
+ private String agentClientId;
+
+ /**
+ * 代理商销售ID
+ */
+ private String agentSaleId;
+
+ /**
+ * 客户状态 0待审核 1审核通过 2审核拒绝 4删除
+ */
+ private String firmStatus;
+
+ /**
+ * 医生端产品形态 支持app
+ */
+ private Boolean channelApp;
+
+ /**
+ * 医生端产品形态 支持sdk
+ */
+ private Boolean channelSdk;
+
+ /**
+ * 统一社会信用代码
+ */
+ private String firmOrgCode;
+}
\ No newline at end of file
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/TrustFirmInfoParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmInfoParam.java
similarity index 95%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/request/TrustFirmInfoParam.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmInfoParam.java
index 1cce673..4766de4 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/TrustFirmInfoParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmInfoParam.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.request;
+package com.trust.ywx.customer.common.model.manager.request;
import lombok.Data;
@@ -10,7 +10,7 @@ import java.util.Date;
*
*
* @文件名称： TrustFirmParam.java
- * @包 路 径： com.trust.ywx.customer.service.dto.manager.request
+ * @包 路 径： com.trust.ywx.customer.common.model.manager.request
* @Copyright：北京数字医信责任有限公司 (C) 2022 *
* @Description:
* @Version: V1.0
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/TrustFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmParam.java
similarity index 76%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/request/TrustFirmParam.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmParam.java
index 95a6b33..47a3b66 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/TrustFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/request/TrustFirmParam.java
@@ -1,15 +1,15 @@
-package com.trust.ywx.customer.service.dto.request;
+package com.trust.ywx.customer.common.model.manager.request;
+import com.trust.ywx.customer.common.model.manager.request.FirmPropParam;
import lombok.Data;
-import javax.validation.constraints.NotEmpty;
import java.util.Date;
/**
*
*
* @文件名称： TrustFirmParam.java
- * @包 路 径： com.trust.ywx.customer.service.dto.manager.request
+ * @包 路 径： com.trust.ywx.customer.common.model.manager.request
* @Copyright：北京数字医信责任有限公司 (C) 2022 *
* @Description:
* @Version: V1.0
@@ -19,46 +19,42 @@ import java.util.Date;
*/
@Data
public class TrustFirmParam extends FirmPropParam {
- /**
- * 客户主键
- */
- private String uniqueid;
+
+ private static final long serialVersionUID = 8183777452023821497L;
/**
* 客户id
*/
- @NotEmpty(message = "客户ID不能为空")
private String clientId;
/**
* 客户名称
*/
- @NotEmpty(message = "客户名称不能为空")
private String firmName;
/**
* 第三方应用APP_SECRET
*
*/
- @NotEmpty(message = "APP_SECRET不能为空")
private String appSecret;
/**
* 客户联系电话
*/
- @NotEmpty(message = "APP_SECRET不能为空")
private String firmPhone;
+ /**
+ * 客户地址
+ */
+ private String firmAddress;
/**
* 客户联系人
*
*/
- @NotEmpty(message = "APP_SECRET不能为空")
private String firmPerson;
/**
* 证书算法 RSA/SM2
- * 改参数迁移至FirmPropParam.certAlg
*/
-// private String certAlg;
+ private String certAlg;
/**
* 客户邮箱
@@ -77,14 +73,19 @@ public class TrustFirmParam extends FirmPropParam {
/**
* 统一信用代码
*/
- @NotEmpty(message = "统一信用代码不能为空")
private String clientOrgCode;
/**
- * 审核状态
+ * 项目状态
* see com.trust.ywx.customer.common.enu.ProjectStatusEnum
*/
+
private Integer projectStatus;
+ /**
+ * 审核状态
+ * see com.trust.ywx.customer.common.enu.FirmStatusEnum
+ */
+ private Integer FirmStatus;
/**
* 信步云appid
@@ -124,7 +125,7 @@ public class TrustFirmParam extends FirmPropParam {
private String salePersonId;
/**
- * 技术支持
+ * 实施人员
*
*/
private String techPersonId;
@@ -153,9 +154,13 @@ public class TrustFirmParam extends FirmPropParam {
/**
* CA 渠道
- * 改参数迁移至FirmPropParam.caChannel
*/
-// private Integer caChannel;
+ private Integer caChannel;
+
+ /**
+ * 应用app图标
+ */
+ private String appIcon;
/**
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/BaseFirmDto.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TempFirmDto.java
similarity index 72%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/response/BaseFirmDto.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TempFirmDto.java
index d06245f..d13fc1f 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/BaseFirmDto.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TempFirmDto.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.response;
+package com.trust.ywx.customer.common.model.manager.response;
import lombok.Data;
@@ -7,7 +7,7 @@ import java.io.Serializable;
/**
*
*
- * @文件名称： AuditCustomerDto.java
+ * @文件名称： TempFirmDto.java
* @包 路 径： com.trust.ywx.customer.service.dto
* @Copyright：北京数字医信责任有限公司 (C) 2022 *
* @Description:
@@ -17,10 +17,7 @@ import java.io.Serializable;
* @Modify：
*/
@Data
-public class BaseFirmDto implements Serializable {
-
- private static final long serialVersionUID = -6610974008466276331L;
-
+public class TempFirmDto implements Serializable {
/**
* 客户主键
*/
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/TrustFirmDto.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDto.java
similarity index 83%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/response/TrustFirmDto.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDto.java
index 771d4c8..fd6b4a2 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/TrustFirmDto.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDto.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.response;
+package com.trust.ywx.customer.common.model.manager.response;
import lombok.Data;
@@ -17,7 +17,24 @@ import java.util.Date;
* @Modify：
*/
@Data
-public class TrustFirmDto extends BaseFirmDto {
+public class TrustFirmDto{
+ /**
+ * 客户主键
+ */
+ private String uniqueid;
+ /**
+ * 客户id
+ */
+ private String clientId;
+ /**
+ * 客户名称
+ */
+ private String firmName;
+
+ /**
+ * 审核状态
+ */
+ private String firmStatus;
/**
* 第三方应用APP_SECRET
@@ -39,9 +56,8 @@ public class TrustFirmDto extends BaseFirmDto {
/**
* 证书算法 RSA/SM2
- * 改参数迁移至FirmPropParam.certAlg
*/
-// private String certAlg;
+ private String certAlg;
/**
* 第三方厂商联系地址
@@ -129,9 +145,8 @@ public class TrustFirmDto extends BaseFirmDto {
/**
* CA 渠道
- * 改参数迁移至FirmPropParam.caChannel
*/
-// private Integer caChannel;
+ private Integer caChannel;
/**
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/TrustFirmWithBLOBs.java b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDtoWithBLOBs.java
similarity index 79%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/response/TrustFirmWithBLOBs.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDtoWithBLOBs.java
index 0836366..520a054 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/TrustFirmWithBLOBs.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/manager/response/TrustFirmDtoWithBLOBs.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.response;
+package com.trust.ywx.customer.common.model.manager.response;
import lombok.Data;
@@ -15,7 +15,7 @@ import lombok.Data;
* @Modify：
*/
@Data
-public class TrustFirmWithBLOBs extends TrustFirmDto {
+public class TrustFirmDtoWithBLOBs extends TrustFirmDto {
/**
* 证书
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchCrmFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchCrmFirmParam.java
similarity index 91%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchCrmFirmParam.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchCrmFirmParam.java
index d063c86..94f0692 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchCrmFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchCrmFirmParam.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.request;
+package com.trust.ywx.customer.common.model.query.request;
import com.fiftyonetrust.common.model.param.PageParam;
import lombok.Data;
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchFirmParam.java
similarity index 92%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchFirmParam.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchFirmParam.java
index 515c21e..6d61fde 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchFirmParam.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.request;
+package com.trust.ywx.customer.common.model.query.request;
import com.fiftyonetrust.common.model.param.PageParam;
import lombok.Data;
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchTrustFirmParam.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchTrustFirmParam.java
similarity index 94%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchTrustFirmParam.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchTrustFirmParam.java
index fd07f74..f8668ba 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/request/SearchTrustFirmParam.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/request/SearchTrustFirmParam.java
@@ -1,10 +1,8 @@
-package com.trust.ywx.customer.service.dto.request;
+package com.trust.ywx.customer.common.model.query.request;
import com.fiftyonetrust.common.model.param.PageParam;
import lombok.Data;
-import java.util.List;
-
/***************************************************************************
*
* @文件名称: Search1FirmParam.java
@@ -33,7 +31,7 @@ public class SearchTrustFirmParam extends PageParam{
/**
* 审核状态
*/
- private Integer firmStatus;
+ private Integer status;
/**
* 销售人员id
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/CrmFirmDto.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/response/CrmFirmDto.java
similarity index 97%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/response/CrmFirmDto.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/query/response/CrmFirmDto.java
index 684605f..2df8764 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/CrmFirmDto.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/response/CrmFirmDto.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.response;
+package com.trust.ywx.customer.common.model.query.response;
import lombok.Data;
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/OrderBusiness.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/response/OrderBusiness.java
similarity index 95%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/response/OrderBusiness.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/query/response/OrderBusiness.java
index 1cc3e0e..061da6b 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/OrderBusiness.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/response/OrderBusiness.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.response;
+package com.trust.ywx.customer.common.model.query.response;
import lombok.Data;
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/PatientClientConfig.java b/common/src/main/java/com/trust/ywx/customer/common/model/query/response/PatientClientConfig.java
similarity index 93%
rename from customer/src/main/java/com/trust/ywx/customer/service/dto/response/PatientClientConfig.java
rename to common/src/main/java/com/trust/ywx/customer/common/model/query/response/PatientClientConfig.java
index b30fd13..5a4f8cc 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/PatientClientConfig.java
+++ b/common/src/main/java/com/trust/ywx/customer/common/model/query/response/PatientClientConfig.java
@@ -1,4 +1,4 @@
-package com.trust.ywx.customer.service.dto.response;
+package com.trust.ywx.customer.common.model.query.response;
import lombok.Data;
diff --git a/customer/pom.xml b/customer/pom.xml
index 095bc46..0322591 100644
--- a/customer/pom.xml
+++ b/customer/pom.xml
@@ -142,55 +142,6 @@
${application.name}
-
-
-
- src/main/resources.${deploy.type}
-
-
- src/main/resources
-
-
-
- logback.xml
- application.properties
-
- true
-
-
- src/main/resources
-
- spring/**
- mybatis/**
- META-INF/**
-
- false
-
-
-
- src/main/resources.${deploy.type}
-
-
-
- logback.xml
- application.properties
-
- true
-
-
- src/main/resources.${deploy.type}
-
- spring/**
- mybatis/**
- base.properties
- server.properties
- redis.properties
- jdbc.properties
-
- false
-
-
-
org.apache.maven.plugins
@@ -246,6 +197,55 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/customer/src/main/java/com/trust/ywx/customer/Application.java b/customer/src/main/java/com/trust/ywx/customer/Application.java
index b49ed08..0de171c 100644
--- a/customer/src/main/java/com/trust/ywx/customer/Application.java
+++ b/customer/src/main/java/com/trust/ywx/customer/Application.java
@@ -11,6 +11,8 @@ import org.springframework.cache.annotation.EnableCaching;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.context.annotation.ComponentScans;
import org.springframework.context.annotation.ImportResource;
+import org.springframework.transaction.annotation.EnableTransactionManagement;
+
/**
*
*
@@ -26,9 +28,7 @@ import org.springframework.context.annotation.ImportResource;
@Slf4j
@ImportResource(locations = {"classpath:spring/spring-applicationContext.xml",})
//@ComponentScan(basePackages = {"com.trust.ywx.customer",})
-@SpringBootApplication(scanBasePackages = {"com.trust.ywx.customer"},exclude = {
- DataSourceAutoConfiguration.class,
- DataSourceTransactionManagerAutoConfiguration.class,})
+@SpringBootApplication(scanBasePackages = {"com.trust.ywx.customer"})
public class Application {
public static void main(String[] args) {
diff --git a/customer/src/main/java/com/trust/ywx/customer/commons/UniqueIdUtils.java b/customer/src/main/java/com/trust/ywx/customer/commons/UniqueIdUtils.java
new file mode 100644
index 0000000..0f9bf45
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/commons/UniqueIdUtils.java
@@ -0,0 +1,55 @@
+package com.trust.ywx.customer.commons;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Random;
+import java.util.UUID;
+
+/**
+ *
+ *
+ * @文件名称： UniqueIdUtils.java
+ * @包 路 径： com.trust.ywx.customer.commons
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/21 10:00
+ * @Modify：
+ */
+public class UniqueIdUtils {
+
+ /**
+ * 获取表主键
+ * 以后会删除此主键，建立一个int类型的数据库自增主键
+ * @return
+ */
+ public static String genrateUniqueId() {
+ String uuid = UUID.randomUUID().toString().replace("-", "");
+ return uuid;
+ }
+
+
+ /**
+ * 获取appSecret
+ * @return
+ */
+ public static String generateAppSecret() {
+ return generateClientId();
+ }
+ /**
+ * 获取clientId
+ * @return
+ */
+ public static String generateClientId() {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
+ Random random = new Random();
+ int randInt = random.nextInt(10) * 10;
+ if (randInt == 0) {
+ randInt = 10;
+ }
+
+ randInt += random.nextInt(10);
+ return sdf.format(new Date()) + randInt;
+ }
+}
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/DoctorProductTypeDao.java b/customer/src/main/java/com/trust/ywx/customer/dao/DoctorProductTypeDao.java
index 3067ca8..aba919f 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/DoctorProductTypeDao.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/DoctorProductTypeDao.java
@@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
+import javax.annotation.Resource;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
@@ -26,7 +27,7 @@ import java.util.stream.Collectors;
@Repository
public class DoctorProductTypeDao {
- @Autowired
+ @Resource
private FirmUsercertChannelMapper usercertChannelMapper;
public List getClientIdByProp(List clientIdList,Integer doctorProductType){
@@ -36,7 +37,7 @@ public class DoctorProductTypeDao {
if(CollectionUtils.isEmpty(list)) {
return Arrays.asList();
}
- return list.stream().map(group->{return group.getFirmId();}).collect(Collectors.toList());
+ return list.stream().map(group-> group.getFirmId()).collect(Collectors.toList());
}
public List getByClientId(String clientId){
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/FirmDao.java b/customer/src/main/java/com/trust/ywx/customer/dao/FirmDao.java
deleted file mode 100644
index eb32078..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/dao/FirmDao.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.trust.ywx.customer.dao;
-
-import com.trust.ywx.customer.common.enu.ProjectStatusEnum;
-import com.trust.ywx.customer.dao.mapper.FirmInfoMapper;
-import com.trust.ywx.customer.dao.po.FirmInfo;
-import com.trust.ywx.customer.dao.po.FirmInfoExample;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Map;
-
-/**
- *
- *
- * @文件名称： FirmDao.java
- * @包 路 径： com.trust.ywx.customer.dao
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description: 客户查询DAO fixme 每次查询都要加项目状态！=删除的。 为什么不直接物理删除呢
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/16 10:31
- * @Modify：
- */
-@Repository
-public class FirmDao {
-
- @Resource
- private FirmInfoMapper firmInfoMapper;
-
- public Long countByExample(FirmInfoExample example) {
- return firmInfoMapper.countByExample(example);
- }
-
- public List getListByIds(List clientIdList, int pageSize, int pageNo) {
- FirmInfoExample example = new FirmInfoExample();
- example.createCriteria().andClientIdIn(clientIdList).andProjectStatusNotEqualTo(ProjectStatusEnum.DEL.getCode());
- example.page(pageNo, pageSize);
- return firmInfoMapper.selectByExample(example);
- }
-
- /**
- * 根据客户Id查询客户信息
- *
- * @param clientId
- * @return
- */
- public FirmInfo getFrimByClientId(String clientId) {
- FirmInfoExample example = new FirmInfoExample();
- example.createCriteria().andClientIdEqualTo(clientId).andProjectStatusNotEqualTo(ProjectStatusEnum.DEL.getCode());
- return firmInfoMapper.selectOneByExample(example);
- }
-
- /**
- * 根据客户Id查询客户信息
- *
- * @param clientId
- * @return
- */
- public FirmInfo getFrimBLOBsByClientId(String clientId) {
- FirmInfoExample example = new FirmInfoExample();
- example.createCriteria().andClientIdEqualTo(clientId).andProjectStatusNotEqualTo(ProjectStatusEnum.DEL.getCode());
- return firmInfoMapper.selectOneByExampleWithBLOBs(example);
- }
-
-
- /**
- * 根据属性集合获取客户id
- *
- * @param propMap
- */
- public List getClientIdByProps(Map propMap) {
-// firmCustomMapper.getClientIdByProps(propMap);
- return null;
- }
-
- public int insert(FirmInfo firmInfo) {
- firmInfo.setCreateTime(null);
- firmInfo.setUpdateTime(null);
- return firmInfoMapper.insertSelective(firmInfo);
- }
-}
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/FirmExtendDao.java b/customer/src/main/java/com/trust/ywx/customer/dao/FirmExtendDao.java
index 0c6df3f..6edae97 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/FirmExtendDao.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/FirmExtendDao.java
@@ -1,13 +1,12 @@
package com.trust.ywx.customer.dao;
+import com.trust.ywx.customer.commons.UniqueIdUtils;
import com.trust.ywx.customer.dao.mapper.FirmInfoExtendMapper;
import com.trust.ywx.customer.dao.po.FirmInfoExtend;
import com.trust.ywx.customer.dao.po.FirmInfoExtendExample;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
-import org.springframework.util.StringUtils;
import javax.annotation.Resource;
import java.util.*;
@@ -31,24 +30,22 @@ public class FirmExtendDao {
@Resource
FirmInfoExtendMapper extendMapper;
- public int batchInsert(String clientId, Map propMap){
- // 先删除 fixme 要不要根据要添加的属性精准删除？
+ public int batchInsert(String clientId, Map propMap) {
+ // 先删除
FirmInfoExtendExample example = new FirmInfoExtendExample();
- example.createCriteria().andClientIdEqualTo(clientId);
- int num = extendMapper.deleteByExample(example);
- if(num>propMap.size()){
- log.warn("clientId={},删除的属性多余待添加的属性！",clientId);
- }
-
+ example.createCriteria().andClientIdEqualTo(clientId)
+ //根据传入的配置精准删除
+ .andPropNameIn(propMap.keySet().stream().collect(Collectors.toList()));
+ extendMapper.deleteByExample(example);
// 批量添加
List list = new ArrayList<>(propMap.size());
- for (Map.Entry prop:propMap.entrySet()) {
- if("null".equalsIgnoreCase(prop.getValue())){
+ for (Map.Entry prop : propMap.entrySet()) {
+ if (null == prop.getValue() || "null".equalsIgnoreCase(prop.getValue())) {
continue;
}
FirmInfoExtend po = new FirmInfoExtend();
// TODO 以后要废弃该字段，新主键为int类型，数据库递增。
- po.setUniqueid(UUID.randomUUID().toString().replace("-", ""));
+ po.setUniqueid(UniqueIdUtils.genrateUniqueId());
po.setClientId(clientId);
po.setPropName(prop.getKey());
po.setPropValue(prop.getValue());
@@ -56,34 +53,36 @@ public class FirmExtendDao {
}
return extendMapper.batchInsert(list);
}
+
/**
* 根据属性集合获取客户id
+ *
* @param propName
* @param clientIdList
*/
- public List getByPropsAndClientId(String propName,String propValue, List clientIdList){
+ public List getByPropsAndClientId(String propName, String propValue, List clientIdList) {
FirmInfoExtendExample example = new FirmInfoExtendExample();
FirmInfoExtendExample.Criteria where = example.createCriteria();
where.andPropNameEqualTo(propName).andPropValueEqualTo(propValue);
- if(!CollectionUtils.isEmpty(clientIdList)){
+ if (!CollectionUtils.isEmpty(clientIdList)) {
where.andClientIdIn(clientIdList);
}
List poList = extendMapper.selectByExample(example);
- if(CollectionUtils.isEmpty(poList)){
+ if (CollectionUtils.isEmpty(poList)) {
return Arrays.asList();
}
- return poList.stream().map(extend->{
+ return poList.stream().map(extend -> {
return extend.getClientId();
}).collect(Collectors.toList());
}
- public List getListByClientId(String clientId){
+ public List getListByClientId(String clientId) {
FirmInfoExtendExample example = new FirmInfoExtendExample();
FirmInfoExtendExample.Criteria where = example.createCriteria();
where.andClientIdEqualTo(clientId);
List poList = extendMapper.selectByExample(example);
- if(CollectionUtils.isEmpty(poList)){
+ if (CollectionUtils.isEmpty(poList)) {
return Arrays.asList();
}
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/TempFirmDao.java b/customer/src/main/java/com/trust/ywx/customer/dao/TempFirmDao.java
new file mode 100644
index 0000000..8fef97c
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/TempFirmDao.java
@@ -0,0 +1,74 @@
+package com.trust.ywx.customer.dao;
+
+import com.trust.ywx.customer.common.enu.TempFirmStatusEnum;
+import com.trust.ywx.customer.dao.mapper.FirmInfoTempMapper;
+import com.trust.ywx.customer.dao.po.FirmInfoTemp;
+import com.trust.ywx.customer.dao.po.FirmInfoTempExample;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ *
+ *
+ * @文件名称： AuditFirmDao.java
+ * @包 路 径： com.trust.ywx.customer.dao
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/21 11:40
+ * @Modify：
+ */
+@Repository
+public class TempFirmDao {
+ @Resource
+ FirmInfoTempMapper tempMapper;
+
+ public FirmInfoTemp getByClientId(String clientId){
+ FirmInfoTempExample example = new FirmInfoTempExample();
+ example.createCriteria().andClientIdEqualTo(clientId);
+ return tempMapper.selectOneByExample(example);
+ }
+
+ public int auditPass(String clientId){
+ // 将临时客户修改为已审核！
+ FirmInfoTempExample example = new FirmInfoTempExample();
+ example.createCriteria().andClientIdEqualTo(clientId).
+ andFirmStatusEqualTo(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode()+"");
+
+ FirmInfoTemp record = new FirmInfoTemp();
+ record.setFirmStatus(TempFirmStatusEnum.TEMP_PASS.getCode()+"");
+ return tempMapper.updateByExampleSelective(record,example);
+ }
+
+ public int auditReject(String clientId){
+ // 将临时客户修改为审核拒绝！
+ FirmInfoTempExample example = new FirmInfoTempExample();
+ example.createCriteria().andClientIdEqualTo(clientId).
+ andFirmStatusEqualTo(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode()+"");
+
+ FirmInfoTemp record = new FirmInfoTemp();
+ record.setFirmStatus(TempFirmStatusEnum.TEMP_REFUSE.getCode()+"");
+ return tempMapper.updateByExampleSelective(record,example);
+ }
+
+ public List getListByFirmName(String firmName) {
+ FirmInfoTempExample example = new FirmInfoTempExample();
+ example.createCriteria().andFirmNameEqualTo(firmName);
+ return tempMapper.selectByExample(example);
+ }
+
+ public int insert(FirmInfoTemp temp) {
+ temp.setCreateTime(null);
+ temp.setUpdateTime(null);
+ return tempMapper.insertSelective(temp);
+ }
+ public int update(FirmInfoTemp temp) {
+ temp.setUpdateTime(null);
+ FirmInfoTempExample example = new FirmInfoTempExample();
+ example.createCriteria().andClientIdEqualTo(temp.getClientId());
+ return tempMapper.updateByExampleSelective(temp,example);
+ }
+}
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/TrustFirmDao.java b/customer/src/main/java/com/trust/ywx/customer/dao/TrustFirmDao.java
new file mode 100644
index 0000000..96a6b8a
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/TrustFirmDao.java
@@ -0,0 +1,99 @@
+package com.trust.ywx.customer.dao;
+
+import com.trust.ywx.customer.common.enu.FirmStatusEnum;
+import com.trust.ywx.customer.common.enu.ProjectStatusEnum;
+import com.trust.ywx.customer.dao.mapper.FirmInfoMapper;
+import com.trust.ywx.customer.dao.po.FirmInfo;
+import com.trust.ywx.customer.dao.po.FirmInfoExample;
+import org.springframework.stereotype.Repository;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ *
+ *
+ * @文件名称： FirmDao.java
+ * @包 路 径： com.trust.ywx.customer.dao
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description: 客户查询DAO
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/16 10:31
+ * @Modify：
+ */
+@Repository
+public class TrustFirmDao {
+
+ @Resource
+ private FirmInfoMapper firmInfoMapper;
+
+ public List getListByOrgCode(String orgCode){
+ FirmInfoExample example = new FirmInfoExample();
+ example.createCriteria().andClientOrgCodeEqualTo(orgCode);
+ return firmInfoMapper.selectByExample(example);
+ }
+ public List getListByFirmName(String firmName){
+ FirmInfoExample example = new FirmInfoExample();
+ example.createCriteria().andFirmNameEqualTo(firmName);
+ return firmInfoMapper.selectByExample(example);
+ }
+
+ public List getListByIds(List clientIdList, int pageSize, int pageNo) {
+ FirmInfoExample example = new FirmInfoExample();
+ example.createCriteria().andClientIdIn(clientIdList);
+ example.page(pageNo, pageSize);
+ return firmInfoMapper.selectByExample(example);
+ }
+
+ /**
+ * 根据客户Id查询客户信息
+ * 已删除的客户不对外暴露
+ * @param clientId
+ * @return
+ */
+ public FirmInfo getFrimByClientId(String clientId) {
+ FirmInfoExample example = new FirmInfoExample();
+ example.createCriteria().andClientIdEqualTo(clientId);
+ return firmInfoMapper.selectOneByExample(example);
+ }
+
+ /**
+ * 根据客户Id查询客户信息
+ * 已删除的客户不对外暴露
+ * @param clientId
+ * @return
+ */
+ public FirmInfo getFirmBLOBsByClientId(String clientId) {
+ FirmInfoExample example = new FirmInfoExample();
+ example.createCriteria().andClientIdEqualTo(clientId);
+ return firmInfoMapper.selectOneByExampleWithBLOBs(example);
+ }
+
+
+ public int insert(FirmInfo firmInfo) {
+ firmInfo.setCreateTime(null);
+ firmInfo.setUpdateTime(null);
+ return firmInfoMapper.insertSelective(firmInfo);
+ }
+ public int update(FirmInfo firmInfo) {
+ firmInfo.setUpdateTime(null);
+ FirmInfoExample example = new FirmInfoExample();
+ example.createCriteria().andClientIdEqualTo(firmInfo.getClientId());
+ return firmInfoMapper.updateByExampleSelective(firmInfo,example);
+ }
+
+ /**
+ * 根据客户id删除客户
+ * @param clientId
+ * @return
+ */
+ public int deleteByClientId(String clientId) {
+ FirmInfo firmInfo = new FirmInfo();
+ firmInfo.setUpdateTime(null);
+ firmInfo.setStatus(FirmStatusEnum.FIRM_SUB_DELETE.getCode());
+ FirmInfoExample example = new FirmInfoExample();
+ example.createCriteria().andClientIdEqualTo(clientId);
+ return firmInfoMapper.updateByExampleSelective(firmInfo,example);
+ }
+}
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/mapper/FirmInfoDetailMapper.java b/customer/src/main/java/com/trust/ywx/customer/dao/mapper/FirmInfoDetailMapper.java
deleted file mode 100644
index e4cf6c4..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/dao/mapper/FirmInfoDetailMapper.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.trust.ywx.customer.dao.mapper;
-
-import com.trust.ywx.customer.dao.po.FirmInfoDetail;
-import com.trust.ywx.customer.dao.po.FirmInfoDetailExample;
-import java.util.List;
-import org.apache.ibatis.annotations.Param;
-
-public interface FirmInfoDetailMapper {
- long countByExample(FirmInfoDetailExample example);
-
- int deleteByExample(FirmInfoDetailExample example);
-
- int deleteByPrimaryKey(String uniqueid);
-
- int insert(FirmInfoDetail record);
-
- int insertSelective(FirmInfoDetail record);
-
- FirmInfoDetail selectOneByExample(FirmInfoDetailExample example);
-
- List selectByExample(FirmInfoDetailExample example);
-
- FirmInfoDetail selectByPrimaryKey(String uniqueid);
-
- int updateByExampleSelective(@Param("record") FirmInfoDetail record, @Param("example") FirmInfoDetailExample example);
-
- int updateByExample(@Param("record") FirmInfoDetail record, @Param("example") FirmInfoDetailExample example);
-
- int updateByPrimaryKeySelective(FirmInfoDetail record);
-
- int updateByPrimaryKey(FirmInfoDetail record);
-
- int batchInsert(@Param("list") List list);
-
- int batchInsertSelective(@Param("list") List list, @Param("selective") FirmInfoDetail.Column ... selective);
-}
\ No newline at end of file
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/CustomerInfo.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/CustomerInfo.java
deleted file mode 100644
index 374517b..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/CustomerInfo.java
+++ /dev/null
@@ -1,574 +0,0 @@
-package com.trust.ywx.customer.dao.po;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * Table: firm_info
- */
-@Data
-public class CustomerInfo implements Serializable {
- /**
- * 厂商的唯一标识ID
- *
- * Table: firm_info
- * Column: uniqueid
- * Nullable: false
- */
- private String uniqueid;
-
- /**
- * 第三方应用标识
- *
- * Table: firm_info
- * Column: client_id
- * Nullable: false
- */
- private String clientId;
-
- /**
- * 厂商联系人
- *
- * Table: firm_info
- * Column: firm_person
- * Nullable: false
- */
- private String firmPerson;
-
- /**
- * 第三方应用APP_SECRET
- *
- * Table: firm_info
- * Column: app_secret
- * Nullable: false
- */
- private String appSecret;
-
- /**
- * 第三方应用厂商名称
- *
- * Table: firm_info
- * Column: firm_name
- * Nullable: true
- */
- private String firmName;
-
- /**
- * 第三方厂商联系电话
- *
- * Table: firm_info
- * Column: firm_phone
- * Nullable: true
- */
- private String firmPhone;
-
- /**
- * 证书算法 RSA/SM2
- *
- * Table: firm_info
- * Column: cert_alg
- * Nullable: false
- */
- private String certAlg;
-
- /**
- * 第三方厂商联系地址
- *
- * Table: firm_info
- * Column: firm_address
- * Nullable: true
- */
- private String firmAddress;
-
- /**
- * 第三方厂商描述
- *
- * Table: firm_info
- * Column: note
- * Nullable: true
- */
- private String note;
-
- /**
- * 第三方厂商邮箱
- *
- * Table: firm_info
- * Column: firm_email
- * Nullable: true
- */
- private String firmEmail;
-
- /**
- * 第三方厂商状态
- *
- * Table: firm_info
- * Column: status
- * Nullable: true
- */
- private Integer status;
-
- /**
- * 企业组织机构号
- *
- * Table: firm_info
- * Column: client_org_code
- * Nullable: true
- */
- private String clientOrgCode;
-
- /**
- * 信步云appid
- *
- * Table: firm_info
- * Column: mssp_appid
- * Nullable: true
- */
- private String msspAppid;
-
- /**
- * 证书发放厂家
- *
- * Table: firm_info
- * Column: cert_agency
- * Nullable: true
- */
- private String certAgency;
-
- /**
- * 0 手动制章 1 自动制章
- *
- * Table: firm_info
- * Column: stamp_type
- * Nullable: true
- */
- private String stampType;
-
- /**
- * 制章名称
- *
- * Table: firm_info
- * Column: stamp_name
- * Nullable: true
- */
- private String stampName;
-
- /**
- * 外键id
- *
- * Table: firm_info
- * Column: open_id
- * Nullable: true
- */
- private String openId;
-
- /**
- * 审核完成之后是否发送短信提示
- *
- * Table: firm_info
- * Column: send_sms
- * Nullable: true
- */
- private String sendSms;
-
- /**
- * 销售人员id
- *
- * Table: firm_info
- * Column: sale_person_id
- * Nullable: true
- */
- private String salePersonId;
-
- /**
- * 技术支持
- *
- * Table: firm_info
- * Column: tech_person_id
- * Nullable: true
- */
- private String techPersonId;
-
- /**
- * 创建
- *
- * Table: firm_info
- * Column: create_time
- * Nullable: true
- */
- private Date createTime;
-
- /**
- * 修改时间
- *
- * Table: firm_info
- * Column: update_time
- * Nullable: true
- */
- private Date updateTime;
-
- /**
- * 代理厂商id
- *
- * Table: firm_info
- * Column: agent_client_id
- * Nullable: true
- */
- private String agentClientId;
-
- /**
- * 代理商销售
- *
- * Table: firm_info
- * Column: agent_sale_id
- * Nullable: true
- */
- private String agentSaleId;
-
- /**
- * Table: firm_info
- * Column: ca_channel
- * Nullable: true
- */
- private Integer caChannel;
-
- /**
- * 1正常 2试用 3消亡
- *
- * Table: firm_info
- * Column: project_status
- * Nullable: true
- */
- private Integer projectStatus;
-
- /**
- * 数字认证运营平台app_id
- *
- * Table: firm_info
- * Column: plat_app_id
- * Nullable: true
- */
- private Integer platAppId;
-
- /**
- * 第三方应用证书
- *
- * Table: firm_info
- * Column: app_cert
- * Nullable: true
- */
- private String appCert;
-
- /**
- * 第三方厂商图标
- *
- * Table: firm_info
- * Column: app_icon
- * Nullable: true
- */
- private String appIcon;
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName());
- sb.append(" [");
- sb.append("Hash = ").append(hashCode());
- sb.append(", uniqueid=").append(uniqueid);
- sb.append(", clientId=").append(clientId);
- sb.append(", firmPerson=").append(firmPerson);
- sb.append(", appSecret=").append(appSecret);
- sb.append(", firmName=").append(firmName);
- sb.append(", firmPhone=").append(firmPhone);
- sb.append(", certAlg=").append(certAlg);
- sb.append(", firmAddress=").append(firmAddress);
- sb.append(", note=").append(note);
- sb.append(", firmEmail=").append(firmEmail);
- sb.append(", status=").append(status);
- sb.append(", clientOrgCode=").append(clientOrgCode);
- sb.append(", msspAppid=").append(msspAppid);
- sb.append(", certAgency=").append(certAgency);
- sb.append(", stampType=").append(stampType);
- sb.append(", stampName=").append(stampName);
- sb.append(", openId=").append(openId);
- sb.append(", sendSms=").append(sendSms);
- sb.append(", salePersonId=").append(salePersonId);
- sb.append(", techPersonId=").append(techPersonId);
- sb.append(", createTime=").append(createTime);
- sb.append(", updateTime=").append(updateTime);
- sb.append(", agentClientId=").append(agentClientId);
- sb.append(", agentSaleId=").append(agentSaleId);
- sb.append(", caChannel=").append(caChannel);
- sb.append(", projectStatus=").append(projectStatus);
- sb.append(", platAppId=").append(platAppId);
- sb.append(", appCert=").append(appCert);
- sb.append(", appIcon=").append(appIcon);
- sb.append(", serialVersionUID=").append(serialVersionUID);
- sb.append("]");
- return sb.toString();
- }
-
- public static CustomerInfo.Builder builder() {
- return new CustomerInfo.Builder();
- }
-
- public static class Builder {
- private CustomerInfo obj;
-
- public Builder() {
- this.obj = new CustomerInfo();
- }
-
- public Builder uniqueid(String uniqueid) {
- obj.setUniqueid(uniqueid);
- return this;
- }
-
- public Builder clientId(String clientId) {
- obj.setClientId(clientId);
- return this;
- }
-
- public Builder firmPerson(String firmPerson) {
- obj.setFirmPerson(firmPerson);
- return this;
- }
-
- public Builder appSecret(String appSecret) {
- obj.setAppSecret(appSecret);
- return this;
- }
-
- public Builder firmName(String firmName) {
- obj.setFirmName(firmName);
- return this;
- }
-
- public Builder firmPhone(String firmPhone) {
- obj.setFirmPhone(firmPhone);
- return this;
- }
-
- public Builder certAlg(String certAlg) {
- obj.setCertAlg(certAlg);
- return this;
- }
-
- public Builder firmAddress(String firmAddress) {
- obj.setFirmAddress(firmAddress);
- return this;
- }
-
- public Builder note(String note) {
- obj.setNote(note);
- return this;
- }
-
- public Builder firmEmail(String firmEmail) {
- obj.setFirmEmail(firmEmail);
- return this;
- }
-
- public Builder status(Integer status) {
- obj.setStatus(status);
- return this;
- }
-
- public Builder clientOrgCode(String clientOrgCode) {
- obj.setClientOrgCode(clientOrgCode);
- return this;
- }
-
- public Builder msspAppid(String msspAppid) {
- obj.setMsspAppid(msspAppid);
- return this;
- }
-
- public Builder certAgency(String certAgency) {
- obj.setCertAgency(certAgency);
- return this;
- }
-
- public Builder stampType(String stampType) {
- obj.setStampType(stampType);
- return this;
- }
-
- public Builder stampName(String stampName) {
- obj.setStampName(stampName);
- return this;
- }
-
- public Builder openId(String openId) {
- obj.setOpenId(openId);
- return this;
- }
-
- public Builder sendSms(String sendSms) {
- obj.setSendSms(sendSms);
- return this;
- }
-
- public Builder salePersonId(String salePersonId) {
- obj.setSalePersonId(salePersonId);
- return this;
- }
-
- public Builder techPersonId(String techPersonId) {
- obj.setTechPersonId(techPersonId);
- return this;
- }
-
- public Builder createTime(Date createTime) {
- obj.setCreateTime(createTime);
- return this;
- }
-
- public Builder updateTime(Date updateTime) {
- obj.setUpdateTime(updateTime);
- return this;
- }
-
- public Builder agentClientId(String agentClientId) {
- obj.setAgentClientId(agentClientId);
- return this;
- }
-
- public Builder agentSaleId(String agentSaleId) {
- obj.setAgentSaleId(agentSaleId);
- return this;
- }
-
- public Builder caChannel(Integer caChannel) {
- obj.setCaChannel(caChannel);
- return this;
- }
-
- public Builder projectStatus(Integer projectStatus) {
- obj.setProjectStatus(projectStatus);
- return this;
- }
-
- public Builder platAppId(Integer platAppId) {
- obj.setPlatAppId(platAppId);
- return this;
- }
-
- public Builder appCert(String appCert) {
- obj.setAppCert(appCert);
- return this;
- }
-
- public Builder appIcon(String appIcon) {
- obj.setAppIcon(appIcon);
- return this;
- }
-
- public CustomerInfo build() {
- return this.obj;
- }
- }
-
- public enum Column {
- uniqueid("uniqueid", "uniqueid", "VARCHAR", false),
- clientId("client_id", "clientId", "VARCHAR", false),
- firmPerson("firm_person", "firmPerson", "VARCHAR", false),
- appSecret("app_secret", "appSecret", "VARCHAR", false),
- firmName("firm_name", "firmName", "VARCHAR", false),
- firmPhone("firm_phone", "firmPhone", "VARCHAR", false),
- certAlg("cert_alg", "certAlg", "VARCHAR", false),
- firmAddress("firm_address", "firmAddress", "VARCHAR", false),
- note("note", "note", "VARCHAR", false),
- firmEmail("firm_email", "firmEmail", "VARCHAR", false),
- status("status", "status", "INTEGER", false),
- clientOrgCode("client_org_code", "clientOrgCode", "VARCHAR", false),
- msspAppid("mssp_appid", "msspAppid", "VARCHAR", false),
- certAgency("cert_agency", "certAgency", "VARCHAR", false),
- stampType("stamp_type", "stampType", "CHAR", false),
- stampName("stamp_name", "stampName", "VARCHAR", false),
- openId("open_id", "openId", "VARCHAR", false),
- sendSms("send_sms", "sendSms", "VARCHAR", false),
- salePersonId("sale_person_id", "salePersonId", "VARCHAR", false),
- techPersonId("tech_person_id", "techPersonId", "VARCHAR", false),
- createTime("create_time", "createTime", "TIMESTAMP", false),
- updateTime("update_time", "updateTime", "TIMESTAMP", false),
- agentClientId("agent_client_id", "agentClientId", "VARCHAR", false),
- agentSaleId("agent_sale_id", "agentSaleId", "VARCHAR", false),
- caChannel("ca_channel", "caChannel", "INTEGER", false),
- projectStatus("project_status", "projectStatus", "INTEGER", false),
- platAppId("plat_app_id", "platAppId", "INTEGER", false),
- appCert("app_cert", "appCert", "LONGVARCHAR", false),
- appIcon("app_icon", "appIcon", "LONGVARCHAR", false);
-
- private static final String BEGINNING_DELIMITER = "\"";
-
- private static final String ENDING_DELIMITER = "\"";
-
- private final String column;
-
- private final boolean isColumnNameDelimited;
-
- private final String javaProperty;
-
- private final String jdbcType;
-
- public String value() {
- return this.column;
- }
-
- public String getValue() {
- return this.column;
- }
-
- public String getJavaProperty() {
- return this.javaProperty;
- }
-
- public String getJdbcType() {
- return this.jdbcType;
- }
-
- Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
- this.column = column;
- this.javaProperty = javaProperty;
- this.jdbcType = jdbcType;
- this.isColumnNameDelimited = isColumnNameDelimited;
- }
-
- public String desc() {
- return this.getEscapedColumnName() + " DESC";
- }
-
- public String asc() {
- return this.getEscapedColumnName() + " ASC";
- }
-
- public static Column[] excludes(Column ... excludes) {
- ArrayList columns = new ArrayList<>(Arrays.asList(Column.values()));
- if (excludes != null && excludes.length > 0) {
- columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
- }
- return columns.toArray(new Column[]{});
- }
-
- public static Column[] all() {
- return Column.values();
- }
-
- public String getEscapedColumnName() {
- if (this.isColumnNameDelimited) {
- return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
- } else {
- return this.column;
- }
- }
-
- public String getAliasedEscapedColumnName() {
- return this.getEscapedColumnName();
- }
- }
-}
\ No newline at end of file
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/CustomerInfoExample.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/CustomerInfoExample.java
deleted file mode 100644
index 41e5cdd..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/CustomerInfoExample.java
+++ /dev/null
@@ -1,2948 +0,0 @@
-package com.trust.ywx.customer.dao.po;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class CustomerInfoExample {
- protected String orderByClause;
-
- protected boolean distinct;
-
- protected List oredCriteria;
-
- protected Integer offset;
-
- protected Integer rows;
-
- public CustomerInfoExample() {
- oredCriteria = new ArrayList();
- }
-
- public void setOrderByClause(String orderByClause) {
- this.orderByClause = orderByClause;
- }
-
- public String getOrderByClause() {
- return orderByClause;
- }
-
- public void setDistinct(boolean distinct) {
- this.distinct = distinct;
- }
-
- public boolean isDistinct() {
- return distinct;
- }
-
- public List getOredCriteria() {
- return oredCriteria;
- }
-
- public void or(Criteria criteria) {
- oredCriteria.add(criteria);
- }
-
- public Criteria or() {
- Criteria criteria = createCriteriaInternal();
- oredCriteria.add(criteria);
- return criteria;
- }
-
- public CustomerInfoExample orderBy(String orderByClause) {
- this.setOrderByClause(orderByClause);
- return this;
- }
-
- public CustomerInfoExample orderBy(String ... orderByClauses) {
- StringBuffer sb = new StringBuffer();
- for (int i = 0; i < orderByClauses.length; i++) {
- sb.append(orderByClauses[i]);
- if (i < orderByClauses.length - 1) {
- sb.append(" , ");
- }
- }
- this.setOrderByClause(sb.toString());
- return this;
- }
-
- public Criteria createCriteria() {
- Criteria criteria = createCriteriaInternal();
- if (oredCriteria.size() == 0) {
- oredCriteria.add(criteria);
- }
- return criteria;
- }
-
- protected Criteria createCriteriaInternal() {
- Criteria criteria = new Criteria(this);
- return criteria;
- }
-
- public void clear() {
- oredCriteria.clear();
- orderByClause = null;
- distinct = false;
- rows = null;
- offset = null;
- }
-
- public void setOffset(Integer offset) {
- this.offset = offset;
- }
-
- public Integer getOffset() {
- return this.offset;
- }
-
- public void setRows(Integer rows) {
- this.rows = rows;
- }
-
- public Integer getRows() {
- return this.rows;
- }
-
- public CustomerInfoExample limit(Integer rows) {
- this.rows = rows;
- return this;
- }
-
- public CustomerInfoExample limit(Integer offset, Integer rows) {
- this.offset = offset;
- this.rows = rows;
- return this;
- }
-
- public CustomerInfoExample page(Integer page, Integer pageSize) {
- this.offset = page * pageSize;
- this.rows = pageSize;
- return this;
- }
-
- public static Criteria newAndCreateCriteria() {
- CustomerInfoExample example = new CustomerInfoExample();
- return example.createCriteria();
- }
-
- public CustomerInfoExample when(boolean condition, IExampleWhen then) {
- if (condition) {
- then.example(this);
- }
- return this;
- }
-
- public CustomerInfoExample when(boolean condition, IExampleWhen then, IExampleWhen otherwise) {
- if (condition) {
- then.example(this);
- } else {
- otherwise.example(this);
- }
- return this;
- }
-
- protected abstract static class GeneratedCriteria {
- protected List criteria;
-
- protected GeneratedCriteria() {
- super();
- criteria = new ArrayList();
- }
-
- public boolean isValid() {
- return criteria.size() > 0;
- }
-
- public List getAllCriteria() {
- return criteria;
- }
-
- public List getCriteria() {
- return criteria;
- }
-
- protected void addCriterion(String condition) {
- if (condition == null) {
- throw new RuntimeException("Value for condition cannot be null");
- }
- criteria.add(new Criterion(condition));
- }
-
- protected void addCriterion(String condition, Object value, String property) {
- if (value == null) {
- throw new RuntimeException("Value for " + property + " cannot be null");
- }
- criteria.add(new Criterion(condition, value));
- }
-
- protected void addCriterion(String condition, Object value1, Object value2, String property) {
- if (value1 == null || value2 == null) {
- throw new RuntimeException("Between values for " + property + " cannot be null");
- }
- criteria.add(new Criterion(condition, value1, value2));
- }
-
- public Criteria andUniqueidIsNull() {
- addCriterion("uniqueid is null");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidIsNotNull() {
- addCriterion("uniqueid is not null");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidEqualTo(String value) {
- addCriterion("uniqueid =", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("uniqueid = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotEqualTo(String value) {
- addCriterion("uniqueid <>", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("uniqueid <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUniqueidGreaterThan(String value) {
- addCriterion("uniqueid >", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("uniqueid > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUniqueidGreaterThanOrEqualTo(String value) {
- addCriterion("uniqueid >=", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("uniqueid >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUniqueidLessThan(String value) {
- addCriterion("uniqueid <", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("uniqueid < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUniqueidLessThanOrEqualTo(String value) {
- addCriterion("uniqueid <=", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("uniqueid <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUniqueidLike(String value) {
- addCriterion("uniqueid like", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotLike(String value) {
- addCriterion("uniqueid not like", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidIn(List values) {
- addCriterion("uniqueid in", values, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotIn(List values) {
- addCriterion("uniqueid not in", values, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidBetween(String value1, String value2) {
- addCriterion("uniqueid between", value1, value2, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotBetween(String value1, String value2) {
- addCriterion("uniqueid not between", value1, value2, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andClientIdIsNull() {
- addCriterion("client_id is null");
- return (Criteria) this;
- }
-
- public Criteria andClientIdIsNotNull() {
- addCriterion("client_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andClientIdEqualTo(String value) {
- addCriterion("client_id =", value, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_id = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientIdNotEqualTo(String value) {
- addCriterion("client_id <>", value, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_id <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientIdGreaterThan(String value) {
- addCriterion("client_id >", value, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_id > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientIdGreaterThanOrEqualTo(String value) {
- addCriterion("client_id >=", value, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_id >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientIdLessThan(String value) {
- addCriterion("client_id <", value, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_id < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientIdLessThanOrEqualTo(String value) {
- addCriterion("client_id <=", value, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_id <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientIdLike(String value) {
- addCriterion("client_id like", value, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdNotLike(String value) {
- addCriterion("client_id not like", value, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdIn(List values) {
- addCriterion("client_id in", values, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdNotIn(List values) {
- addCriterion("client_id not in", values, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdBetween(String value1, String value2) {
- addCriterion("client_id between", value1, value2, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andClientIdNotBetween(String value1, String value2) {
- addCriterion("client_id not between", value1, value2, "clientId");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonIsNull() {
- addCriterion("firm_person is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonIsNotNull() {
- addCriterion("firm_person is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonEqualTo(String value) {
- addCriterion("firm_person =", value, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_person = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonNotEqualTo(String value) {
- addCriterion("firm_person <>", value, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_person <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonGreaterThan(String value) {
- addCriterion("firm_person >", value, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_person > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonGreaterThanOrEqualTo(String value) {
- addCriterion("firm_person >=", value, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_person >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonLessThan(String value) {
- addCriterion("firm_person <", value, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_person < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonLessThanOrEqualTo(String value) {
- addCriterion("firm_person <=", value, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_person <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonLike(String value) {
- addCriterion("firm_person like", value, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonNotLike(String value) {
- addCriterion("firm_person not like", value, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonIn(List values) {
- addCriterion("firm_person in", values, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonNotIn(List values) {
- addCriterion("firm_person not in", values, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonBetween(String value1, String value2) {
- addCriterion("firm_person between", value1, value2, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andFirmPersonNotBetween(String value1, String value2) {
- addCriterion("firm_person not between", value1, value2, "firmPerson");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretIsNull() {
- addCriterion("app_secret is null");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretIsNotNull() {
- addCriterion("app_secret is not null");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretEqualTo(String value) {
- addCriterion("app_secret =", value, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("app_secret = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAppSecretNotEqualTo(String value) {
- addCriterion("app_secret <>", value, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("app_secret <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAppSecretGreaterThan(String value) {
- addCriterion("app_secret >", value, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("app_secret > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAppSecretGreaterThanOrEqualTo(String value) {
- addCriterion("app_secret >=", value, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("app_secret >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAppSecretLessThan(String value) {
- addCriterion("app_secret <", value, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("app_secret < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAppSecretLessThanOrEqualTo(String value) {
- addCriterion("app_secret <=", value, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("app_secret <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAppSecretLike(String value) {
- addCriterion("app_secret like", value, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretNotLike(String value) {
- addCriterion("app_secret not like", value, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretIn(List values) {
- addCriterion("app_secret in", values, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretNotIn(List values) {
- addCriterion("app_secret not in", values, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretBetween(String value1, String value2) {
- addCriterion("app_secret between", value1, value2, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andAppSecretNotBetween(String value1, String value2) {
- addCriterion("app_secret not between", value1, value2, "appSecret");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameIsNull() {
- addCriterion("firm_name is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameIsNotNull() {
- addCriterion("firm_name is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameEqualTo(String value) {
- addCriterion("firm_name =", value, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_name = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmNameNotEqualTo(String value) {
- addCriterion("firm_name <>", value, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_name <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmNameGreaterThan(String value) {
- addCriterion("firm_name >", value, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_name > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmNameGreaterThanOrEqualTo(String value) {
- addCriterion("firm_name >=", value, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_name >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmNameLessThan(String value) {
- addCriterion("firm_name <", value, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_name < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmNameLessThanOrEqualTo(String value) {
- addCriterion("firm_name <=", value, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_name <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmNameLike(String value) {
- addCriterion("firm_name like", value, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameNotLike(String value) {
- addCriterion("firm_name not like", value, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameIn(List values) {
- addCriterion("firm_name in", values, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameNotIn(List values) {
- addCriterion("firm_name not in", values, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameBetween(String value1, String value2) {
- addCriterion("firm_name between", value1, value2, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmNameNotBetween(String value1, String value2) {
- addCriterion("firm_name not between", value1, value2, "firmName");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneIsNull() {
- addCriterion("firm_phone is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneIsNotNull() {
- addCriterion("firm_phone is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneEqualTo(String value) {
- addCriterion("firm_phone =", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_phone = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotEqualTo(String value) {
- addCriterion("firm_phone <>", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_phone <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneGreaterThan(String value) {
- addCriterion("firm_phone >", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_phone > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneGreaterThanOrEqualTo(String value) {
- addCriterion("firm_phone >=", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_phone >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneLessThan(String value) {
- addCriterion("firm_phone <", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_phone < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneLessThanOrEqualTo(String value) {
- addCriterion("firm_phone <=", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_phone <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneLike(String value) {
- addCriterion("firm_phone like", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotLike(String value) {
- addCriterion("firm_phone not like", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneIn(List values) {
- addCriterion("firm_phone in", values, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotIn(List values) {
- addCriterion("firm_phone not in", values, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneBetween(String value1, String value2) {
- addCriterion("firm_phone between", value1, value2, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotBetween(String value1, String value2) {
- addCriterion("firm_phone not between", value1, value2, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgIsNull() {
- addCriterion("cert_alg is null");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgIsNotNull() {
- addCriterion("cert_alg is not null");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgEqualTo(String value) {
- addCriterion("cert_alg =", value, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_alg = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAlgNotEqualTo(String value) {
- addCriterion("cert_alg <>", value, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_alg <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAlgGreaterThan(String value) {
- addCriterion("cert_alg >", value, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_alg > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAlgGreaterThanOrEqualTo(String value) {
- addCriterion("cert_alg >=", value, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_alg >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAlgLessThan(String value) {
- addCriterion("cert_alg <", value, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_alg < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAlgLessThanOrEqualTo(String value) {
- addCriterion("cert_alg <=", value, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_alg <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAlgLike(String value) {
- addCriterion("cert_alg like", value, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgNotLike(String value) {
- addCriterion("cert_alg not like", value, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgIn(List values) {
- addCriterion("cert_alg in", values, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgNotIn(List values) {
- addCriterion("cert_alg not in", values, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgBetween(String value1, String value2) {
- addCriterion("cert_alg between", value1, value2, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andCertAlgNotBetween(String value1, String value2) {
- addCriterion("cert_alg not between", value1, value2, "certAlg");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressIsNull() {
- addCriterion("firm_address is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressIsNotNull() {
- addCriterion("firm_address is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressEqualTo(String value) {
- addCriterion("firm_address =", value, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_address = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressNotEqualTo(String value) {
- addCriterion("firm_address <>", value, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_address <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressGreaterThan(String value) {
- addCriterion("firm_address >", value, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_address > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressGreaterThanOrEqualTo(String value) {
- addCriterion("firm_address >=", value, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_address >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressLessThan(String value) {
- addCriterion("firm_address <", value, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_address < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressLessThanOrEqualTo(String value) {
- addCriterion("firm_address <=", value, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_address <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressLike(String value) {
- addCriterion("firm_address like", value, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressNotLike(String value) {
- addCriterion("firm_address not like", value, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressIn(List values) {
- addCriterion("firm_address in", values, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressNotIn(List values) {
- addCriterion("firm_address not in", values, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressBetween(String value1, String value2) {
- addCriterion("firm_address between", value1, value2, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andFirmAddressNotBetween(String value1, String value2) {
- addCriterion("firm_address not between", value1, value2, "firmAddress");
- return (Criteria) this;
- }
-
- public Criteria andNoteIsNull() {
- addCriterion("note is null");
- return (Criteria) this;
- }
-
- public Criteria andNoteIsNotNull() {
- addCriterion("note is not null");
- return (Criteria) this;
- }
-
- public Criteria andNoteEqualTo(String value) {
- addCriterion("note =", value, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("note = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andNoteNotEqualTo(String value) {
- addCriterion("note <>", value, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("note <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andNoteGreaterThan(String value) {
- addCriterion("note >", value, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("note > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andNoteGreaterThanOrEqualTo(String value) {
- addCriterion("note >=", value, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("note >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andNoteLessThan(String value) {
- addCriterion("note <", value, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("note < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andNoteLessThanOrEqualTo(String value) {
- addCriterion("note <=", value, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("note <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andNoteLike(String value) {
- addCriterion("note like", value, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteNotLike(String value) {
- addCriterion("note not like", value, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteIn(List values) {
- addCriterion("note in", values, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteNotIn(List values) {
- addCriterion("note not in", values, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteBetween(String value1, String value2) {
- addCriterion("note between", value1, value2, "note");
- return (Criteria) this;
- }
-
- public Criteria andNoteNotBetween(String value1, String value2) {
- addCriterion("note not between", value1, value2, "note");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailIsNull() {
- addCriterion("firm_email is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailIsNotNull() {
- addCriterion("firm_email is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailEqualTo(String value) {
- addCriterion("firm_email =", value, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_email = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailNotEqualTo(String value) {
- addCriterion("firm_email <>", value, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_email <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailGreaterThan(String value) {
- addCriterion("firm_email >", value, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_email > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailGreaterThanOrEqualTo(String value) {
- addCriterion("firm_email >=", value, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_email >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailLessThan(String value) {
- addCriterion("firm_email <", value, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_email < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailLessThanOrEqualTo(String value) {
- addCriterion("firm_email <=", value, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("firm_email <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailLike(String value) {
- addCriterion("firm_email like", value, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailNotLike(String value) {
- addCriterion("firm_email not like", value, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailIn(List values) {
- addCriterion("firm_email in", values, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailNotIn(List values) {
- addCriterion("firm_email not in", values, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailBetween(String value1, String value2) {
- addCriterion("firm_email between", value1, value2, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andFirmEmailNotBetween(String value1, String value2) {
- addCriterion("firm_email not between", value1, value2, "firmEmail");
- return (Criteria) this;
- }
-
- public Criteria andStatusIsNull() {
- addCriterion("status is null");
- return (Criteria) this;
- }
-
- public Criteria andStatusIsNotNull() {
- addCriterion("status is not null");
- return (Criteria) this;
- }
-
- public Criteria andStatusEqualTo(Integer value) {
- addCriterion("status =", value, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("status = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStatusNotEqualTo(Integer value) {
- addCriterion("status <>", value, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("status <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStatusGreaterThan(Integer value) {
- addCriterion("status >", value, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("status > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
- addCriterion("status >=", value, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("status >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStatusLessThan(Integer value) {
- addCriterion("status <", value, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("status < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStatusLessThanOrEqualTo(Integer value) {
- addCriterion("status <=", value, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("status <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStatusIn(List values) {
- addCriterion("status in", values, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusNotIn(List values) {
- addCriterion("status not in", values, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusBetween(Integer value1, Integer value2) {
- addCriterion("status between", value1, value2, "status");
- return (Criteria) this;
- }
-
- public Criteria andStatusNotBetween(Integer value1, Integer value2) {
- addCriterion("status not between", value1, value2, "status");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeIsNull() {
- addCriterion("client_org_code is null");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeIsNotNull() {
- addCriterion("client_org_code is not null");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeEqualTo(String value) {
- addCriterion("client_org_code =", value, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_org_code = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeNotEqualTo(String value) {
- addCriterion("client_org_code <>", value, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_org_code <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeGreaterThan(String value) {
- addCriterion("client_org_code >", value, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_org_code > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeGreaterThanOrEqualTo(String value) {
- addCriterion("client_org_code >=", value, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_org_code >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeLessThan(String value) {
- addCriterion("client_org_code <", value, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_org_code < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeLessThanOrEqualTo(String value) {
- addCriterion("client_org_code <=", value, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("client_org_code <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeLike(String value) {
- addCriterion("client_org_code like", value, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeNotLike(String value) {
- addCriterion("client_org_code not like", value, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeIn(List values) {
- addCriterion("client_org_code in", values, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeNotIn(List values) {
- addCriterion("client_org_code not in", values, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeBetween(String value1, String value2) {
- addCriterion("client_org_code between", value1, value2, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andClientOrgCodeNotBetween(String value1, String value2) {
- addCriterion("client_org_code not between", value1, value2, "clientOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidIsNull() {
- addCriterion("mssp_appid is null");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidIsNotNull() {
- addCriterion("mssp_appid is not null");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidEqualTo(String value) {
- addCriterion("mssp_appid =", value, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("mssp_appid = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidNotEqualTo(String value) {
- addCriterion("mssp_appid <>", value, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("mssp_appid <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidGreaterThan(String value) {
- addCriterion("mssp_appid >", value, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("mssp_appid > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidGreaterThanOrEqualTo(String value) {
- addCriterion("mssp_appid >=", value, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("mssp_appid >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidLessThan(String value) {
- addCriterion("mssp_appid <", value, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("mssp_appid < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidLessThanOrEqualTo(String value) {
- addCriterion("mssp_appid <=", value, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("mssp_appid <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidLike(String value) {
- addCriterion("mssp_appid like", value, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidNotLike(String value) {
- addCriterion("mssp_appid not like", value, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidIn(List values) {
- addCriterion("mssp_appid in", values, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidNotIn(List values) {
- addCriterion("mssp_appid not in", values, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidBetween(String value1, String value2) {
- addCriterion("mssp_appid between", value1, value2, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andMsspAppidNotBetween(String value1, String value2) {
- addCriterion("mssp_appid not between", value1, value2, "msspAppid");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyIsNull() {
- addCriterion("cert_agency is null");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyIsNotNull() {
- addCriterion("cert_agency is not null");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyEqualTo(String value) {
- addCriterion("cert_agency =", value, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_agency = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyNotEqualTo(String value) {
- addCriterion("cert_agency <>", value, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_agency <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyGreaterThan(String value) {
- addCriterion("cert_agency >", value, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_agency > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyGreaterThanOrEqualTo(String value) {
- addCriterion("cert_agency >=", value, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_agency >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyLessThan(String value) {
- addCriterion("cert_agency <", value, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_agency < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyLessThanOrEqualTo(String value) {
- addCriterion("cert_agency <=", value, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("cert_agency <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyLike(String value) {
- addCriterion("cert_agency like", value, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyNotLike(String value) {
- addCriterion("cert_agency not like", value, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyIn(List values) {
- addCriterion("cert_agency in", values, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyNotIn(List values) {
- addCriterion("cert_agency not in", values, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyBetween(String value1, String value2) {
- addCriterion("cert_agency between", value1, value2, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andCertAgencyNotBetween(String value1, String value2) {
- addCriterion("cert_agency not between", value1, value2, "certAgency");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeIsNull() {
- addCriterion("stamp_type is null");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeIsNotNull() {
- addCriterion("stamp_type is not null");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeEqualTo(String value) {
- addCriterion("stamp_type =", value, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_type = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampTypeNotEqualTo(String value) {
- addCriterion("stamp_type <>", value, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_type <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampTypeGreaterThan(String value) {
- addCriterion("stamp_type >", value, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_type > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampTypeGreaterThanOrEqualTo(String value) {
- addCriterion("stamp_type >=", value, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_type >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampTypeLessThan(String value) {
- addCriterion("stamp_type <", value, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_type < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampTypeLessThanOrEqualTo(String value) {
- addCriterion("stamp_type <=", value, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_type <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampTypeLike(String value) {
- addCriterion("stamp_type like", value, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeNotLike(String value) {
- addCriterion("stamp_type not like", value, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeIn(List values) {
- addCriterion("stamp_type in", values, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeNotIn(List values) {
- addCriterion("stamp_type not in", values, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeBetween(String value1, String value2) {
- addCriterion("stamp_type between", value1, value2, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampTypeNotBetween(String value1, String value2) {
- addCriterion("stamp_type not between", value1, value2, "stampType");
- return (Criteria) this;
- }
-
- public Criteria andStampNameIsNull() {
- addCriterion("stamp_name is null");
- return (Criteria) this;
- }
-
- public Criteria andStampNameIsNotNull() {
- addCriterion("stamp_name is not null");
- return (Criteria) this;
- }
-
- public Criteria andStampNameEqualTo(String value) {
- addCriterion("stamp_name =", value, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_name = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampNameNotEqualTo(String value) {
- addCriterion("stamp_name <>", value, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_name <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampNameGreaterThan(String value) {
- addCriterion("stamp_name >", value, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_name > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampNameGreaterThanOrEqualTo(String value) {
- addCriterion("stamp_name >=", value, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_name >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampNameLessThan(String value) {
- addCriterion("stamp_name <", value, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_name < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampNameLessThanOrEqualTo(String value) {
- addCriterion("stamp_name <=", value, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("stamp_name <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andStampNameLike(String value) {
- addCriterion("stamp_name like", value, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameNotLike(String value) {
- addCriterion("stamp_name not like", value, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameIn(List values) {
- addCriterion("stamp_name in", values, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameNotIn(List values) {
- addCriterion("stamp_name not in", values, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameBetween(String value1, String value2) {
- addCriterion("stamp_name between", value1, value2, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andStampNameNotBetween(String value1, String value2) {
- addCriterion("stamp_name not between", value1, value2, "stampName");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdIsNull() {
- addCriterion("open_id is null");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdIsNotNull() {
- addCriterion("open_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdEqualTo(String value) {
- addCriterion("open_id =", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("open_id = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotEqualTo(String value) {
- addCriterion("open_id <>", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("open_id <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andOpenIdGreaterThan(String value) {
- addCriterion("open_id >", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("open_id > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
- addCriterion("open_id >=", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("open_id >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andOpenIdLessThan(String value) {
- addCriterion("open_id <", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("open_id < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andOpenIdLessThanOrEqualTo(String value) {
- addCriterion("open_id <=", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("open_id <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andOpenIdLike(String value) {
- addCriterion("open_id like", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotLike(String value) {
- addCriterion("open_id not like", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdIn(List values) {
- addCriterion("open_id in", values, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotIn(List values) {
- addCriterion("open_id not in", values, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdBetween(String value1, String value2) {
- addCriterion("open_id between", value1, value2, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotBetween(String value1, String value2) {
- addCriterion("open_id not between", value1, value2, "openId");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsIsNull() {
- addCriterion("send_sms is null");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsIsNotNull() {
- addCriterion("send_sms is not null");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsEqualTo(String value) {
- addCriterion("send_sms =", value, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("send_sms = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSendSmsNotEqualTo(String value) {
- addCriterion("send_sms <>", value, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("send_sms <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSendSmsGreaterThan(String value) {
- addCriterion("send_sms >", value, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("send_sms > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSendSmsGreaterThanOrEqualTo(String value) {
- addCriterion("send_sms >=", value, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("send_sms >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSendSmsLessThan(String value) {
- addCriterion("send_sms <", value, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("send_sms < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSendSmsLessThanOrEqualTo(String value) {
- addCriterion("send_sms <=", value, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("send_sms <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSendSmsLike(String value) {
- addCriterion("send_sms like", value, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsNotLike(String value) {
- addCriterion("send_sms not like", value, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsIn(List values) {
- addCriterion("send_sms in", values, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsNotIn(List values) {
- addCriterion("send_sms not in", values, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsBetween(String value1, String value2) {
- addCriterion("send_sms between", value1, value2, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSendSmsNotBetween(String value1, String value2) {
- addCriterion("send_sms not between", value1, value2, "sendSms");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdIsNull() {
- addCriterion("sale_person_id is null");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdIsNotNull() {
- addCriterion("sale_person_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdEqualTo(String value) {
- addCriterion("sale_person_id =", value, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("sale_person_id = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdNotEqualTo(String value) {
- addCriterion("sale_person_id <>", value, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("sale_person_id <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdGreaterThan(String value) {
- addCriterion("sale_person_id >", value, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("sale_person_id > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdGreaterThanOrEqualTo(String value) {
- addCriterion("sale_person_id >=", value, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("sale_person_id >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdLessThan(String value) {
- addCriterion("sale_person_id <", value, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("sale_person_id < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdLessThanOrEqualTo(String value) {
- addCriterion("sale_person_id <=", value, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("sale_person_id <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdLike(String value) {
- addCriterion("sale_person_id like", value, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdNotLike(String value) {
- addCriterion("sale_person_id not like", value, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdIn(List values) {
- addCriterion("sale_person_id in", values, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdNotIn(List values) {
- addCriterion("sale_person_id not in", values, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdBetween(String value1, String value2) {
- addCriterion("sale_person_id between", value1, value2, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andSalePersonIdNotBetween(String value1, String value2) {
- addCriterion("sale_person_id not between", value1, value2, "salePersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdIsNull() {
- addCriterion("tech_person_id is null");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdIsNotNull() {
- addCriterion("tech_person_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdEqualTo(String value) {
- addCriterion("tech_person_id =", value, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("tech_person_id = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdNotEqualTo(String value) {
- addCriterion("tech_person_id <>", value, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("tech_person_id <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdGreaterThan(String value) {
- addCriterion("tech_person_id >", value, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("tech_person_id > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdGreaterThanOrEqualTo(String value) {
- addCriterion("tech_person_id >=", value, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("tech_person_id >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdLessThan(String value) {
- addCriterion("tech_person_id <", value, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("tech_person_id < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdLessThanOrEqualTo(String value) {
- addCriterion("tech_person_id <=", value, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("tech_person_id <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdLike(String value) {
- addCriterion("tech_person_id like", value, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdNotLike(String value) {
- addCriterion("tech_person_id not like", value, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdIn(List values) {
- addCriterion("tech_person_id in", values, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdNotIn(List values) {
- addCriterion("tech_person_id not in", values, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdBetween(String value1, String value2) {
- addCriterion("tech_person_id between", value1, value2, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andTechPersonIdNotBetween(String value1, String value2) {
- addCriterion("tech_person_id not between", value1, value2, "techPersonId");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeIsNull() {
- addCriterion("create_time is null");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeIsNotNull() {
- addCriterion("create_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeEqualTo(Date value) {
- addCriterion("create_time =", value, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("create_time = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeNotEqualTo(Date value) {
- addCriterion("create_time <>", value, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("create_time <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeGreaterThan(Date value) {
- addCriterion("create_time >", value, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("create_time > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("create_time >=", value, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("create_time >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeLessThan(Date value) {
- addCriterion("create_time <", value, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("create_time < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
- addCriterion("create_time <=", value, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("create_time <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeIn(List values) {
- addCriterion("create_time in", values, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeNotIn(List values) {
- addCriterion("create_time not in", values, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeBetween(Date value1, Date value2) {
- addCriterion("create_time between", value1, value2, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
- addCriterion("create_time not between", value1, value2, "createTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeIsNull() {
- addCriterion("update_time is null");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeIsNotNull() {
- addCriterion("update_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeEqualTo(Date value) {
- addCriterion("update_time =", value, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("update_time = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeNotEqualTo(Date value) {
- addCriterion("update_time <>", value, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("update_time <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeGreaterThan(Date value) {
- addCriterion("update_time >", value, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("update_time > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("update_time >=", value, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("update_time >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeLessThan(Date value) {
- addCriterion("update_time <", value, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("update_time < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
- addCriterion("update_time <=", value, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("update_time <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeIn(List values) {
- addCriterion("update_time in", values, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeNotIn(List values) {
- addCriterion("update_time not in", values, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeBetween(Date value1, Date value2) {
- addCriterion("update_time between", value1, value2, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
- addCriterion("update_time not between", value1, value2, "updateTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdIsNull() {
- addCriterion("agent_client_id is null");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdIsNotNull() {
- addCriterion("agent_client_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdEqualTo(String value) {
- addCriterion("agent_client_id =", value, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_client_id = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdNotEqualTo(String value) {
- addCriterion("agent_client_id <>", value, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_client_id <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdGreaterThan(String value) {
- addCriterion("agent_client_id >", value, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_client_id > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdGreaterThanOrEqualTo(String value) {
- addCriterion("agent_client_id >=", value, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_client_id >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdLessThan(String value) {
- addCriterion("agent_client_id <", value, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_client_id < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdLessThanOrEqualTo(String value) {
- addCriterion("agent_client_id <=", value, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_client_id <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdLike(String value) {
- addCriterion("agent_client_id like", value, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdNotLike(String value) {
- addCriterion("agent_client_id not like", value, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdIn(List values) {
- addCriterion("agent_client_id in", values, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdNotIn(List values) {
- addCriterion("agent_client_id not in", values, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdBetween(String value1, String value2) {
- addCriterion("agent_client_id between", value1, value2, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentClientIdNotBetween(String value1, String value2) {
- addCriterion("agent_client_id not between", value1, value2, "agentClientId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdIsNull() {
- addCriterion("agent_sale_id is null");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdIsNotNull() {
- addCriterion("agent_sale_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdEqualTo(String value) {
- addCriterion("agent_sale_id =", value, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_sale_id = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdNotEqualTo(String value) {
- addCriterion("agent_sale_id <>", value, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_sale_id <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdGreaterThan(String value) {
- addCriterion("agent_sale_id >", value, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_sale_id > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdGreaterThanOrEqualTo(String value) {
- addCriterion("agent_sale_id >=", value, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_sale_id >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdLessThan(String value) {
- addCriterion("agent_sale_id <", value, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_sale_id < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdLessThanOrEqualTo(String value) {
- addCriterion("agent_sale_id <=", value, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("agent_sale_id <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdLike(String value) {
- addCriterion("agent_sale_id like", value, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdNotLike(String value) {
- addCriterion("agent_sale_id not like", value, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdIn(List values) {
- addCriterion("agent_sale_id in", values, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdNotIn(List values) {
- addCriterion("agent_sale_id not in", values, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdBetween(String value1, String value2) {
- addCriterion("agent_sale_id between", value1, value2, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andAgentSaleIdNotBetween(String value1, String value2) {
- addCriterion("agent_sale_id not between", value1, value2, "agentSaleId");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelIsNull() {
- addCriterion("ca_channel is null");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelIsNotNull() {
- addCriterion("ca_channel is not null");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelEqualTo(Integer value) {
- addCriterion("ca_channel =", value, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("ca_channel = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCaChannelNotEqualTo(Integer value) {
- addCriterion("ca_channel <>", value, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("ca_channel <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCaChannelGreaterThan(Integer value) {
- addCriterion("ca_channel >", value, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("ca_channel > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCaChannelGreaterThanOrEqualTo(Integer value) {
- addCriterion("ca_channel >=", value, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("ca_channel >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCaChannelLessThan(Integer value) {
- addCriterion("ca_channel <", value, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("ca_channel < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCaChannelLessThanOrEqualTo(Integer value) {
- addCriterion("ca_channel <=", value, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("ca_channel <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andCaChannelIn(List values) {
- addCriterion("ca_channel in", values, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelNotIn(List values) {
- addCriterion("ca_channel not in", values, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelBetween(Integer value1, Integer value2) {
- addCriterion("ca_channel between", value1, value2, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andCaChannelNotBetween(Integer value1, Integer value2) {
- addCriterion("ca_channel not between", value1, value2, "caChannel");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusIsNull() {
- addCriterion("project_status is null");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusIsNotNull() {
- addCriterion("project_status is not null");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusEqualTo(Integer value) {
- addCriterion("project_status =", value, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("project_status = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusNotEqualTo(Integer value) {
- addCriterion("project_status <>", value, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("project_status <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusGreaterThan(Integer value) {
- addCriterion("project_status >", value, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("project_status > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusGreaterThanOrEqualTo(Integer value) {
- addCriterion("project_status >=", value, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("project_status >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusLessThan(Integer value) {
- addCriterion("project_status <", value, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("project_status < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusLessThanOrEqualTo(Integer value) {
- addCriterion("project_status <=", value, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("project_status <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusIn(List values) {
- addCriterion("project_status in", values, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusNotIn(List values) {
- addCriterion("project_status not in", values, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusBetween(Integer value1, Integer value2) {
- addCriterion("project_status between", value1, value2, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andProjectStatusNotBetween(Integer value1, Integer value2) {
- addCriterion("project_status not between", value1, value2, "projectStatus");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdIsNull() {
- addCriterion("plat_app_id is null");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdIsNotNull() {
- addCriterion("plat_app_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdEqualTo(Integer value) {
- addCriterion("plat_app_id =", value, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("plat_app_id = ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdNotEqualTo(Integer value) {
- addCriterion("plat_app_id <>", value, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdNotEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("plat_app_id <> ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdGreaterThan(Integer value) {
- addCriterion("plat_app_id >", value, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdGreaterThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("plat_app_id > ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdGreaterThanOrEqualTo(Integer value) {
- addCriterion("plat_app_id >=", value, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdGreaterThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("plat_app_id >= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdLessThan(Integer value) {
- addCriterion("plat_app_id <", value, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdLessThanColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("plat_app_id < ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdLessThanOrEqualTo(Integer value) {
- addCriterion("plat_app_id <=", value, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdLessThanOrEqualToColumn(CustomerInfo.Column column) {
- addCriterion(new StringBuilder("plat_app_id <= ").append(column.getEscapedColumnName()).toString());
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdIn(List values) {
- addCriterion("plat_app_id in", values, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdNotIn(List values) {
- addCriterion("plat_app_id not in", values, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdBetween(Integer value1, Integer value2) {
- addCriterion("plat_app_id between", value1, value2, "platAppId");
- return (Criteria) this;
- }
-
- public Criteria andPlatAppIdNotBetween(Integer value1, Integer value2) {
- addCriterion("plat_app_id not between", value1, value2, "platAppId");
- return (Criteria) this;
- }
- }
-
- public static class Criteria extends GeneratedCriteria {
- private CustomerInfoExample example;
-
- protected Criteria(CustomerInfoExample example) {
- super();
- this.example = example;
- }
-
- public CustomerInfoExample example() {
- return this.example;
- }
-
- public Criteria when(boolean condition, ICriteriaWhen then) {
- if (condition) {
- then.criteria(this);
- }
- return this;
- }
-
- public Criteria when(boolean condition, ICriteriaWhen then, ICriteriaWhen otherwise) {
- if (condition) {
- then.criteria(this);
- } else {
- otherwise.criteria(this);
- }
- return this;
- }
- }
-
- public static class Criterion {
- private String condition;
-
- private Object value;
-
- private Object secondValue;
-
- private boolean noValue;
-
- private boolean singleValue;
-
- private boolean betweenValue;
-
- private boolean listValue;
-
- private String typeHandler;
-
- public String getCondition() {
- return condition;
- }
-
- public Object getValue() {
- return value;
- }
-
- public Object getSecondValue() {
- return secondValue;
- }
-
- public boolean isNoValue() {
- return noValue;
- }
-
- public boolean isSingleValue() {
- return singleValue;
- }
-
- public boolean isBetweenValue() {
- return betweenValue;
- }
-
- public boolean isListValue() {
- return listValue;
- }
-
- public String getTypeHandler() {
- return typeHandler;
- }
-
- protected Criterion(String condition) {
- super();
- this.condition = condition;
- this.typeHandler = null;
- this.noValue = true;
- }
-
- protected Criterion(String condition, Object value, String typeHandler) {
- super();
- this.condition = condition;
- this.value = value;
- this.typeHandler = typeHandler;
- if (value instanceof List) {
- this.listValue = true;
- } else {
- this.singleValue = true;
- }
- }
-
- protected Criterion(String condition, Object value) {
- this(condition, value, null);
- }
-
- protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
- super();
- this.condition = condition;
- this.value = value;
- this.secondValue = secondValue;
- this.typeHandler = typeHandler;
- this.betweenValue = true;
- }
-
- protected Criterion(String condition, Object value, Object secondValue) {
- this(condition, value, secondValue, null);
- }
- }
-
- public interface ICriteriaWhen {
- void criteria(Criteria criteria);
- }
-
- public interface IExampleWhen {
- void example(com.trust.ywx.customer.dao.po.CustomerInfoExample example);
- }
-}
\ No newline at end of file
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfo.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfo.java
index 7bb9b15..9715378 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfo.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfo.java
@@ -30,7 +30,7 @@ public class FirmInfo implements Serializable {
private String clientId;
/**
- * 厂商联系人
+ * 客户联系人
*
* Table: firm_info
* Column: firm_person
@@ -52,7 +52,7 @@ public class FirmInfo implements Serializable {
*
* Table: firm_info
* Column: firm_name
- * Nullable: true
+ * Nullable: false
*/
private String firmName;
@@ -61,7 +61,7 @@ public class FirmInfo implements Serializable {
*
* Table: firm_info
* Column: firm_phone
- * Nullable: true
+ * Nullable: false
*/
private String firmPhone;
@@ -79,7 +79,7 @@ public class FirmInfo implements Serializable {
*
* Table: firm_info
* Column: firm_address
- * Nullable: true
+ * Nullable: false
*/
private String firmAddress;
@@ -88,7 +88,7 @@ public class FirmInfo implements Serializable {
*
* Table: firm_info
* Column: note
- * Nullable: true
+ * Nullable: false
*/
private String note;
@@ -108,7 +108,7 @@ public class FirmInfo implements Serializable {
* Column: status
* Nullable: true
*/
- private Integer firmStatus;
+ private Integer status;
/**
* 企业组织机构号
@@ -288,7 +288,7 @@ public class FirmInfo implements Serializable {
sb.append(", firmAddress=").append(firmAddress);
sb.append(", note=").append(note);
sb.append(", firmEmail=").append(firmEmail);
- sb.append(", firmStatus=").append(firmStatus);
+ sb.append(", status=").append(status);
sb.append(", clientOrgCode=").append(clientOrgCode);
sb.append(", msspAppid=").append(msspAppid);
sb.append(", certAgency=").append(certAgency);
@@ -373,8 +373,8 @@ public class FirmInfo implements Serializable {
return this;
}
- public Builder firmStatus(Integer firmStatus) {
- obj.setFirmStatus(firmStatus);
+ public Builder status(Integer status) {
+ obj.setStatus(status);
return this;
}
@@ -484,7 +484,7 @@ public class FirmInfo implements Serializable {
firmAddress("firm_address", "firmAddress", "VARCHAR", false),
note("note", "note", "VARCHAR", false),
firmEmail("firm_email", "firmEmail", "VARCHAR", false),
- firmStatus("status", "firmStatus", "INTEGER", false),
+ status("status", "status", "INTEGER", false),
clientOrgCode("client_org_code", "clientOrgCode", "VARCHAR", false),
msspAppid("mssp_appid", "msspAppid", "VARCHAR", false),
certAgency("cert_agency", "certAgency", "VARCHAR", false),
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoDetail.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoDetail.java
deleted file mode 100644
index 92242e3..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoDetail.java
+++ /dev/null
@@ -1,458 +0,0 @@
-package com.trust.ywx.customer.dao.po;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import lombok.Data;
-
-/**
- * Table: firm_info_detail
- */
-@Data
-public class FirmInfoDetail implements Serializable {
- /**
- * Table: firm_info_detail
- * Column: uniqueid
- * Nullable: false
- */
- private String uniqueid;
-
- /**
- * Table: firm_info_detail
- * Column: open_id
- * Nullable: true
- */
- private String openId;
-
- /**
- * 组织机构代码
- *
- * Table: firm_info_detail
- * Column: org_code_url
- * Nullable: true
- */
- private String orgCodeUrl;
-
- /**
- * 法人身份证正面
- *
- * Table: firm_info_detail
- * Column: juridical_idcard_front_url
- * Nullable: true
- */
- private String juridicalIdcardFrontUrl;
-
- /**
- * 法人身份证背面
- *
- * Table: firm_info_detail
- * Column: juridical_idcard_back_url
- * Nullable: true
- */
- private String juridicalIdcardBackUrl;
-
- /**
- * 法人临时身份证
- *
- * Table: firm_info_detail
- * Column: juridical_tmp_id_url
- * Nullable: true
- */
- private String juridicalTmpIdUrl;
-
- /**
- * 工商注册号
- *
- * Table: firm_info_detail
- * Column: firm_bus_reg_num
- * Nullable: true
- */
- private String firmBusRegNum;
-
- /**
- * 社会信用代码
- *
- * Table: firm_info_detail
- * Column: firm_soc_cre_code
- * Nullable: true
- */
- private String firmSocCreCode;
-
- /**
- * Table: firm_info_detail
- * Column: firm_org_code
- * Nullable: true
- */
- private String firmOrgCode;
-
- /**
- * 税务登记证号
- *
- * Table: firm_info_detail
- * Column: firm_tax_reg_cert_code
- * Nullable: true
- */
- private String firmTaxRegCertCode;
-
- /**
- * 经营范围
- *
- * Table: firm_info_detail
- * Column: firm_bus_scope
- * Nullable: true
- */
- private String firmBusScope;
-
- /**
- * 经营期限
- *
- * Table: firm_info_detail
- * Column: firm_bus_time
- * Nullable: true
- */
- private Date firmBusTime;
-
- /**
- * 法人归属地
- *
- * Table: firm_info_detail
- * Column: juridical_nationality
- * Nullable: true
- */
- private String juridicalNationality;
-
- /**
- * 法人身份证号
- *
- * Table: firm_info_detail
- * Column: juridical_idcard
- * Nullable: true
- */
- private String juridicalIdcard;
-
- /**
- * 法人证件有效期
- *
- * Table: firm_info_detail
- * Column: juridical_time
- * Nullable: true
- */
- private Date juridicalTime;
-
- /**
- * 代理人姓名
- *
- * Table: firm_info_detail
- * Column: agent_name
- * Nullable: true
- */
- private String agentName;
-
- /**
- * 代理人身份证号
- *
- * Table: firm_info_detail
- * Column: agent_idcard
- * Nullable: true
- */
- private String agentIdcard;
-
- /**
- * 代理人证件有效期
- *
- * Table: firm_info_detail
- * Column: agent_time
- * Nullable: true
- */
- private Date agentTime;
-
- /**
- * 企业电话
- *
- * Table: firm_info_detail
- * Column: firm_phone
- * Nullable: true
- */
- private String firmPhone;
-
- /**
- * 企业营业执照
- *
- * Table: firm_info_detail
- * Column: business_license_url
- * Nullable: true
- */
- private String businessLicenseUrl;
-
- /**
- * 法人身份证照片（实名认证获得）
- *
- * Table: firm_info_detail
- * Column: idcard_juridical_url
- * Nullable: true
- */
- private String idcardJuridicalUrl;
-
- /**
- * 代理人身份证照片（实名认证获取）
- *
- * Table: firm_info_detail
- * Column: idcard_agent_url
- * Nullable: true
- */
- private String idcardAgentUrl;
-
- private static final long serialVersionUID = 1L;
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append(getClass().getSimpleName());
- sb.append(" [");
- sb.append("Hash = ").append(hashCode());
- sb.append(", uniqueid=").append(uniqueid);
- sb.append(", openId=").append(openId);
- sb.append(", orgCodeUrl=").append(orgCodeUrl);
- sb.append(", juridicalIdcardFrontUrl=").append(juridicalIdcardFrontUrl);
- sb.append(", juridicalIdcardBackUrl=").append(juridicalIdcardBackUrl);
- sb.append(", juridicalTmpIdUrl=").append(juridicalTmpIdUrl);
- sb.append(", firmBusRegNum=").append(firmBusRegNum);
- sb.append(", firmSocCreCode=").append(firmSocCreCode);
- sb.append(", firmOrgCode=").append(firmOrgCode);
- sb.append(", firmTaxRegCertCode=").append(firmTaxRegCertCode);
- sb.append(", firmBusScope=").append(firmBusScope);
- sb.append(", firmBusTime=").append(firmBusTime);
- sb.append(", juridicalNationality=").append(juridicalNationality);
- sb.append(", juridicalIdcard=").append(juridicalIdcard);
- sb.append(", juridicalTime=").append(juridicalTime);
- sb.append(", agentName=").append(agentName);
- sb.append(", agentIdcard=").append(agentIdcard);
- sb.append(", agentTime=").append(agentTime);
- sb.append(", firmPhone=").append(firmPhone);
- sb.append(", businessLicenseUrl=").append(businessLicenseUrl);
- sb.append(", idcardJuridicalUrl=").append(idcardJuridicalUrl);
- sb.append(", idcardAgentUrl=").append(idcardAgentUrl);
- sb.append(", serialVersionUID=").append(serialVersionUID);
- sb.append("]");
- return sb.toString();
- }
-
- public static FirmInfoDetail.Builder builder() {
- return new FirmInfoDetail.Builder();
- }
-
- public static class Builder {
- private FirmInfoDetail obj;
-
- public Builder() {
- this.obj = new FirmInfoDetail();
- }
-
- public Builder uniqueid(String uniqueid) {
- obj.setUniqueid(uniqueid);
- return this;
- }
-
- public Builder openId(String openId) {
- obj.setOpenId(openId);
- return this;
- }
-
- public Builder orgCodeUrl(String orgCodeUrl) {
- obj.setOrgCodeUrl(orgCodeUrl);
- return this;
- }
-
- public Builder juridicalIdcard(String juridicalIdcard) {
- obj.setJuridicalIdcard(juridicalIdcard);
- return this;
- }
-
- public Builder juridicalIdcardFrontUrl(String juridicalIdcardFrontUrl) {
- obj.setJuridicalIdcardFrontUrl(juridicalIdcardFrontUrl);
- return this;
- }
-
- public Builder juridicalIdcardBackUrl(String juridicalIdcardBackUrl) {
- obj.setJuridicalIdcardBackUrl(juridicalIdcardBackUrl);
- return this;
- }
-
- public Builder juridicalTmpIdUrl(String juridicalTmpIdUrl) {
- obj.setJuridicalTmpIdUrl(juridicalTmpIdUrl);
- return this;
- }
-
- public Builder firmBusRegNum(String firmBusRegNum) {
- obj.setFirmBusRegNum(firmBusRegNum);
- return this;
- }
-
- public Builder firmSocCreCode(String firmSocCreCode) {
- obj.setFirmSocCreCode(firmSocCreCode);
- return this;
- }
-
- public Builder firmOrgCode(String firmOrgCode) {
- obj.setFirmOrgCode(firmOrgCode);
- return this;
- }
-
- public Builder firmTaxRegCertCode(String firmTaxRegCertCode) {
- obj.setFirmTaxRegCertCode(firmTaxRegCertCode);
- return this;
- }
-
- public Builder firmBusScope(String firmBusScope) {
- obj.setFirmBusScope(firmBusScope);
- return this;
- }
-
- public Builder firmBusTime(Date firmBusTime) {
- obj.setFirmBusTime(firmBusTime);
- return this;
- }
-
- public Builder juridicalNationality(String juridicalNationality) {
- obj.setJuridicalNationality(juridicalNationality);
- return this;
- }
-
- public Builder juridicalTime(Date juridicalTime) {
- obj.setJuridicalTime(juridicalTime);
- return this;
- }
-
- public Builder agentName(String agentName) {
- obj.setAgentName(agentName);
- return this;
- }
-
- public Builder agentIdcard(String agentIdcard) {
- obj.setAgentIdcard(agentIdcard);
- return this;
- }
-
- public Builder agentTime(Date agentTime) {
- obj.setAgentTime(agentTime);
- return this;
- }
-
- public Builder firmPhone(String firmPhone) {
- obj.setFirmPhone(firmPhone);
- return this;
- }
-
- public Builder businessLicenseUrl(String businessLicenseUrl) {
- obj.setBusinessLicenseUrl(businessLicenseUrl);
- return this;
- }
-
- public Builder idcardJuridicalUrl(String idcardJuridicalUrl) {
- obj.setIdcardJuridicalUrl(idcardJuridicalUrl);
- return this;
- }
-
- public Builder idcardAgentUrl(String idcardAgentUrl) {
- obj.setIdcardAgentUrl(idcardAgentUrl);
- return this;
- }
-
- public FirmInfoDetail build() {
- return this.obj;
- }
- }
-
- public enum Column {
- uniqueid("uniqueid", "uniqueid", "VARCHAR", false),
- openId("open_id", "openId", "VARCHAR", false),
- orgCodeUrl("org_code_url", "orgCodeUrl", "VARCHAR", false),
- juridicalIdcardFrontUrl("juridical_idcard_front_url", "juridicalIdcardFrontUrl", "VARCHAR", false),
- juridicalIdcardBackUrl("juridical_idcard_back_url", "juridicalIdcardBackUrl", "VARCHAR", false),
- juridicalTmpIdUrl("juridical_tmp_id_url", "juridicalTmpIdUrl", "VARCHAR", false),
- firmBusRegNum("firm_bus_reg_num", "firmBusRegNum", "VARCHAR", false),
- firmSocCreCode("firm_soc_cre_code", "firmSocCreCode", "VARCHAR", false),
- firmOrgCode("firm_org_code", "firmOrgCode", "VARCHAR", false),
- firmTaxRegCertCode("firm_tax_reg_cert_code", "firmTaxRegCertCode", "VARCHAR", false),
- firmBusScope("firm_bus_scope", "firmBusScope", "VARCHAR", false),
- firmBusTime("firm_bus_time", "firmBusTime", "TIMESTAMP", false),
- juridicalNationality("juridical_nationality", "juridicalNationality", "VARCHAR", false),
- juridicalIdcard("juridical_idcard", "juridicalIdcard", "VARCHAR", false),
- juridicalTime("juridical_time", "juridicalTime", "TIMESTAMP", false),
- agentName("agent_name", "agentName", "VARCHAR", false),
- agentIdcard("agent_idcard", "agentIdcard", "VARCHAR", false),
- agentTime("agent_time", "agentTime", "TIMESTAMP", false),
- firmPhone("firm_phone", "firmPhone", "VARCHAR", false),
- businessLicenseUrl("business_license_url", "businessLicenseUrl", "VARCHAR", false),
- idcardJuridicalUrl("idcard_juridical_url", "idcardJuridicalUrl", "VARCHAR", false),
- idcardAgentUrl("idcard_agent_url", "idcardAgentUrl", "VARCHAR", false);
-
- private static final String BEGINNING_DELIMITER = "\"";
-
- private static final String ENDING_DELIMITER = "\"";
-
- private final String column;
-
- private final boolean isColumnNameDelimited;
-
- private final String javaProperty;
-
- private final String jdbcType;
-
- public String value() {
- return this.column;
- }
-
- public String getValue() {
- return this.column;
- }
-
- public String getJavaProperty() {
- return this.javaProperty;
- }
-
- public String getJdbcType() {
- return this.jdbcType;
- }
-
- Column(String column, String javaProperty, String jdbcType, boolean isColumnNameDelimited) {
- this.column = column;
- this.javaProperty = javaProperty;
- this.jdbcType = jdbcType;
- this.isColumnNameDelimited = isColumnNameDelimited;
- }
-
- public String desc() {
- return this.getEscapedColumnName() + " DESC";
- }
-
- public String asc() {
- return this.getEscapedColumnName() + " ASC";
- }
-
- public static Column[] excludes(Column ... excludes) {
- ArrayList columns = new ArrayList<>(Arrays.asList(Column.values()));
- if (excludes != null && excludes.length > 0) {
- columns.removeAll(new ArrayList<>(Arrays.asList(excludes)));
- }
- return columns.toArray(new Column[]{});
- }
-
- public static Column[] all() {
- return Column.values();
- }
-
- public String getEscapedColumnName() {
- if (this.isColumnNameDelimited) {
- return new StringBuilder().append(BEGINNING_DELIMITER).append(this.column).append(ENDING_DELIMITER).toString();
- } else {
- return this.column;
- }
- }
-
- public String getAliasedEscapedColumnName() {
- return this.getEscapedColumnName();
- }
- }
-}
\ No newline at end of file
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoDetailExample.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoDetailExample.java
deleted file mode 100644
index a4b50cf..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoDetailExample.java
+++ /dev/null
@@ -1,1750 +0,0 @@
-package com.trust.ywx.customer.dao.po;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-public class FirmInfoDetailExample {
- protected String orderByClause;
-
- protected boolean distinct;
-
- protected List oredCriteria;
-
- protected Integer offset;
-
- protected Integer rows;
-
- public FirmInfoDetailExample() {
- oredCriteria = new ArrayList();
- }
-
- public void setOrderByClause(String orderByClause) {
- this.orderByClause = orderByClause;
- }
-
- public String getOrderByClause() {
- return orderByClause;
- }
-
- public void setDistinct(boolean distinct) {
- this.distinct = distinct;
- }
-
- public boolean isDistinct() {
- return distinct;
- }
-
- public List getOredCriteria() {
- return oredCriteria;
- }
-
- public void or(Criteria criteria) {
- oredCriteria.add(criteria);
- }
-
- public Criteria or() {
- Criteria criteria = createCriteriaInternal();
- oredCriteria.add(criteria);
- return criteria;
- }
-
- public Criteria createCriteria() {
- Criteria criteria = createCriteriaInternal();
- if (oredCriteria.size() == 0) {
- oredCriteria.add(criteria);
- }
- return criteria;
- }
-
- protected Criteria createCriteriaInternal() {
- Criteria criteria = new Criteria();
- return criteria;
- }
-
- public void clear() {
- oredCriteria.clear();
- orderByClause = null;
- distinct = false;
- rows = null;
- offset = null;
- }
-
- public void setOffset(Integer offset) {
- this.offset = offset;
- }
-
- public Integer getOffset() {
- return this.offset;
- }
-
- public void setRows(Integer rows) {
- this.rows = rows;
- }
-
- public Integer getRows() {
- return this.rows;
- }
-
- public FirmInfoDetailExample limit(Integer rows) {
- this.rows = rows;
- return this;
- }
-
- public FirmInfoDetailExample limit(Integer offset, Integer rows) {
- this.offset = offset;
- this.rows = rows;
- return this;
- }
-
- public FirmInfoDetailExample page(Integer page, Integer pageSize) {
- this.offset = page * pageSize;
- this.rows = pageSize;
- return this;
- }
-
- protected abstract static class GeneratedCriteria {
- protected List criteria;
-
- protected GeneratedCriteria() {
- super();
- criteria = new ArrayList();
- }
-
- public boolean isValid() {
- return criteria.size() > 0;
- }
-
- public List getAllCriteria() {
- return criteria;
- }
-
- public List getCriteria() {
- return criteria;
- }
-
- protected void addCriterion(String condition) {
- if (condition == null) {
- throw new RuntimeException("Value for condition cannot be null");
- }
- criteria.add(new Criterion(condition));
- }
-
- protected void addCriterion(String condition, Object value, String property) {
- if (value == null) {
- throw new RuntimeException("Value for " + property + " cannot be null");
- }
- criteria.add(new Criterion(condition, value));
- }
-
- protected void addCriterion(String condition, Object value1, Object value2, String property) {
- if (value1 == null || value2 == null) {
- throw new RuntimeException("Between values for " + property + " cannot be null");
- }
- criteria.add(new Criterion(condition, value1, value2));
- }
-
- public Criteria andUniqueidIsNull() {
- addCriterion("uniqueid is null");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidIsNotNull() {
- addCriterion("uniqueid is not null");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidEqualTo(String value) {
- addCriterion("uniqueid =", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotEqualTo(String value) {
- addCriterion("uniqueid <>", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidGreaterThan(String value) {
- addCriterion("uniqueid >", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidGreaterThanOrEqualTo(String value) {
- addCriterion("uniqueid >=", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidLessThan(String value) {
- addCriterion("uniqueid <", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidLessThanOrEqualTo(String value) {
- addCriterion("uniqueid <=", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidLike(String value) {
- addCriterion("uniqueid like", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotLike(String value) {
- addCriterion("uniqueid not like", value, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidIn(List values) {
- addCriterion("uniqueid in", values, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotIn(List values) {
- addCriterion("uniqueid not in", values, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidBetween(String value1, String value2) {
- addCriterion("uniqueid between", value1, value2, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andUniqueidNotBetween(String value1, String value2) {
- addCriterion("uniqueid not between", value1, value2, "uniqueid");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdIsNull() {
- addCriterion("open_id is null");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdIsNotNull() {
- addCriterion("open_id is not null");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdEqualTo(String value) {
- addCriterion("open_id =", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotEqualTo(String value) {
- addCriterion("open_id <>", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdGreaterThan(String value) {
- addCriterion("open_id >", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdGreaterThanOrEqualTo(String value) {
- addCriterion("open_id >=", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdLessThan(String value) {
- addCriterion("open_id <", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdLessThanOrEqualTo(String value) {
- addCriterion("open_id <=", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdLike(String value) {
- addCriterion("open_id like", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotLike(String value) {
- addCriterion("open_id not like", value, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdIn(List values) {
- addCriterion("open_id in", values, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotIn(List values) {
- addCriterion("open_id not in", values, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdBetween(String value1, String value2) {
- addCriterion("open_id between", value1, value2, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOpenIdNotBetween(String value1, String value2) {
- addCriterion("open_id not between", value1, value2, "openId");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlIsNull() {
- addCriterion("org_code_url is null");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlIsNotNull() {
- addCriterion("org_code_url is not null");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlEqualTo(String value) {
- addCriterion("org_code_url =", value, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlNotEqualTo(String value) {
- addCriterion("org_code_url <>", value, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlGreaterThan(String value) {
- addCriterion("org_code_url >", value, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlGreaterThanOrEqualTo(String value) {
- addCriterion("org_code_url >=", value, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlLessThan(String value) {
- addCriterion("org_code_url <", value, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlLessThanOrEqualTo(String value) {
- addCriterion("org_code_url <=", value, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlLike(String value) {
- addCriterion("org_code_url like", value, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlNotLike(String value) {
- addCriterion("org_code_url not like", value, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlIn(List values) {
- addCriterion("org_code_url in", values, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlNotIn(List values) {
- addCriterion("org_code_url not in", values, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlBetween(String value1, String value2) {
- addCriterion("org_code_url between", value1, value2, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andOrgCodeUrlNotBetween(String value1, String value2) {
- addCriterion("org_code_url not between", value1, value2, "orgCodeUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlIsNull() {
- addCriterion("juridical_idcard_front_url is null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlIsNotNull() {
- addCriterion("juridical_idcard_front_url is not null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlEqualTo(String value) {
- addCriterion("juridical_idcard_front_url =", value, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlNotEqualTo(String value) {
- addCriterion("juridical_idcard_front_url <>", value, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlGreaterThan(String value) {
- addCriterion("juridical_idcard_front_url >", value, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlGreaterThanOrEqualTo(String value) {
- addCriterion("juridical_idcard_front_url >=", value, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlLessThan(String value) {
- addCriterion("juridical_idcard_front_url <", value, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlLessThanOrEqualTo(String value) {
- addCriterion("juridical_idcard_front_url <=", value, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlLike(String value) {
- addCriterion("juridical_idcard_front_url like", value, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlNotLike(String value) {
- addCriterion("juridical_idcard_front_url not like", value, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlIn(List values) {
- addCriterion("juridical_idcard_front_url in", values, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlNotIn(List values) {
- addCriterion("juridical_idcard_front_url not in", values, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlBetween(String value1, String value2) {
- addCriterion("juridical_idcard_front_url between", value1, value2, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardFrontUrlNotBetween(String value1, String value2) {
- addCriterion("juridical_idcard_front_url not between", value1, value2, "juridicalIdcardFrontUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlIsNull() {
- addCriterion("juridical_idcard_back_url is null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlIsNotNull() {
- addCriterion("juridical_idcard_back_url is not null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlEqualTo(String value) {
- addCriterion("juridical_idcard_back_url =", value, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlNotEqualTo(String value) {
- addCriterion("juridical_idcard_back_url <>", value, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlGreaterThan(String value) {
- addCriterion("juridical_idcard_back_url >", value, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlGreaterThanOrEqualTo(String value) {
- addCriterion("juridical_idcard_back_url >=", value, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlLessThan(String value) {
- addCriterion("juridical_idcard_back_url <", value, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlLessThanOrEqualTo(String value) {
- addCriterion("juridical_idcard_back_url <=", value, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlLike(String value) {
- addCriterion("juridical_idcard_back_url like", value, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlNotLike(String value) {
- addCriterion("juridical_idcard_back_url not like", value, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlIn(List values) {
- addCriterion("juridical_idcard_back_url in", values, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlNotIn(List values) {
- addCriterion("juridical_idcard_back_url not in", values, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlBetween(String value1, String value2) {
- addCriterion("juridical_idcard_back_url between", value1, value2, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBackUrlNotBetween(String value1, String value2) {
- addCriterion("juridical_idcard_back_url not between", value1, value2, "juridicalIdcardBackUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlIsNull() {
- addCriterion("juridical_tmp_id_url is null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlIsNotNull() {
- addCriterion("juridical_tmp_id_url is not null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlEqualTo(String value) {
- addCriterion("juridical_tmp_id_url =", value, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlNotEqualTo(String value) {
- addCriterion("juridical_tmp_id_url <>", value, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlGreaterThan(String value) {
- addCriterion("juridical_tmp_id_url >", value, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlGreaterThanOrEqualTo(String value) {
- addCriterion("juridical_tmp_id_url >=", value, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlLessThan(String value) {
- addCriterion("juridical_tmp_id_url <", value, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlLessThanOrEqualTo(String value) {
- addCriterion("juridical_tmp_id_url <=", value, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlLike(String value) {
- addCriterion("juridical_tmp_id_url like", value, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlNotLike(String value) {
- addCriterion("juridical_tmp_id_url not like", value, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlIn(List values) {
- addCriterion("juridical_tmp_id_url in", values, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlNotIn(List values) {
- addCriterion("juridical_tmp_id_url not in", values, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlBetween(String value1, String value2) {
- addCriterion("juridical_tmp_id_url between", value1, value2, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTmpIdUrlNotBetween(String value1, String value2) {
- addCriterion("juridical_tmp_id_url not between", value1, value2, "juridicalTmpIdUrl");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumIsNull() {
- addCriterion("firm_bus_reg_num is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumIsNotNull() {
- addCriterion("firm_bus_reg_num is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumEqualTo(String value) {
- addCriterion("firm_bus_reg_num =", value, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumNotEqualTo(String value) {
- addCriterion("firm_bus_reg_num <>", value, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumGreaterThan(String value) {
- addCriterion("firm_bus_reg_num >", value, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumGreaterThanOrEqualTo(String value) {
- addCriterion("firm_bus_reg_num >=", value, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumLessThan(String value) {
- addCriterion("firm_bus_reg_num <", value, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumLessThanOrEqualTo(String value) {
- addCriterion("firm_bus_reg_num <=", value, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumLike(String value) {
- addCriterion("firm_bus_reg_num like", value, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumNotLike(String value) {
- addCriterion("firm_bus_reg_num not like", value, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumIn(List values) {
- addCriterion("firm_bus_reg_num in", values, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumNotIn(List values) {
- addCriterion("firm_bus_reg_num not in", values, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumBetween(String value1, String value2) {
- addCriterion("firm_bus_reg_num between", value1, value2, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusRegNumNotBetween(String value1, String value2) {
- addCriterion("firm_bus_reg_num not between", value1, value2, "firmBusRegNum");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeIsNull() {
- addCriterion("firm_soc_cre_code is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeIsNotNull() {
- addCriterion("firm_soc_cre_code is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeEqualTo(String value) {
- addCriterion("firm_soc_cre_code =", value, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeNotEqualTo(String value) {
- addCriterion("firm_soc_cre_code <>", value, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeGreaterThan(String value) {
- addCriterion("firm_soc_cre_code >", value, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeGreaterThanOrEqualTo(String value) {
- addCriterion("firm_soc_cre_code >=", value, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeLessThan(String value) {
- addCriterion("firm_soc_cre_code <", value, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeLessThanOrEqualTo(String value) {
- addCriterion("firm_soc_cre_code <=", value, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeLike(String value) {
- addCriterion("firm_soc_cre_code like", value, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeNotLike(String value) {
- addCriterion("firm_soc_cre_code not like", value, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeIn(List values) {
- addCriterion("firm_soc_cre_code in", values, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeNotIn(List values) {
- addCriterion("firm_soc_cre_code not in", values, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeBetween(String value1, String value2) {
- addCriterion("firm_soc_cre_code between", value1, value2, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmSocCreCodeNotBetween(String value1, String value2) {
- addCriterion("firm_soc_cre_code not between", value1, value2, "firmSocCreCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeIsNull() {
- addCriterion("firm_org_code is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeIsNotNull() {
- addCriterion("firm_org_code is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeEqualTo(String value) {
- addCriterion("firm_org_code =", value, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeNotEqualTo(String value) {
- addCriterion("firm_org_code <>", value, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeGreaterThan(String value) {
- addCriterion("firm_org_code >", value, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeGreaterThanOrEqualTo(String value) {
- addCriterion("firm_org_code >=", value, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeLessThan(String value) {
- addCriterion("firm_org_code <", value, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeLessThanOrEqualTo(String value) {
- addCriterion("firm_org_code <=", value, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeLike(String value) {
- addCriterion("firm_org_code like", value, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeNotLike(String value) {
- addCriterion("firm_org_code not like", value, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeIn(List values) {
- addCriterion("firm_org_code in", values, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeNotIn(List values) {
- addCriterion("firm_org_code not in", values, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeBetween(String value1, String value2) {
- addCriterion("firm_org_code between", value1, value2, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmOrgCodeNotBetween(String value1, String value2) {
- addCriterion("firm_org_code not between", value1, value2, "firmOrgCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeIsNull() {
- addCriterion("firm_tax_reg_cert_code is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeIsNotNull() {
- addCriterion("firm_tax_reg_cert_code is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeEqualTo(String value) {
- addCriterion("firm_tax_reg_cert_code =", value, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeNotEqualTo(String value) {
- addCriterion("firm_tax_reg_cert_code <>", value, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeGreaterThan(String value) {
- addCriterion("firm_tax_reg_cert_code >", value, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeGreaterThanOrEqualTo(String value) {
- addCriterion("firm_tax_reg_cert_code >=", value, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeLessThan(String value) {
- addCriterion("firm_tax_reg_cert_code <", value, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeLessThanOrEqualTo(String value) {
- addCriterion("firm_tax_reg_cert_code <=", value, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeLike(String value) {
- addCriterion("firm_tax_reg_cert_code like", value, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeNotLike(String value) {
- addCriterion("firm_tax_reg_cert_code not like", value, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeIn(List values) {
- addCriterion("firm_tax_reg_cert_code in", values, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeNotIn(List values) {
- addCriterion("firm_tax_reg_cert_code not in", values, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeBetween(String value1, String value2) {
- addCriterion("firm_tax_reg_cert_code between", value1, value2, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmTaxRegCertCodeNotBetween(String value1, String value2) {
- addCriterion("firm_tax_reg_cert_code not between", value1, value2, "firmTaxRegCertCode");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeIsNull() {
- addCriterion("firm_bus_scope is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeIsNotNull() {
- addCriterion("firm_bus_scope is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeEqualTo(String value) {
- addCriterion("firm_bus_scope =", value, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeNotEqualTo(String value) {
- addCriterion("firm_bus_scope <>", value, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeGreaterThan(String value) {
- addCriterion("firm_bus_scope >", value, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeGreaterThanOrEqualTo(String value) {
- addCriterion("firm_bus_scope >=", value, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeLessThan(String value) {
- addCriterion("firm_bus_scope <", value, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeLessThanOrEqualTo(String value) {
- addCriterion("firm_bus_scope <=", value, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeLike(String value) {
- addCriterion("firm_bus_scope like", value, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeNotLike(String value) {
- addCriterion("firm_bus_scope not like", value, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeIn(List values) {
- addCriterion("firm_bus_scope in", values, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeNotIn(List values) {
- addCriterion("firm_bus_scope not in", values, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeBetween(String value1, String value2) {
- addCriterion("firm_bus_scope between", value1, value2, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusScopeNotBetween(String value1, String value2) {
- addCriterion("firm_bus_scope not between", value1, value2, "firmBusScope");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeIsNull() {
- addCriterion("firm_bus_time is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeIsNotNull() {
- addCriterion("firm_bus_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeEqualTo(Date value) {
- addCriterion("firm_bus_time =", value, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeNotEqualTo(Date value) {
- addCriterion("firm_bus_time <>", value, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeGreaterThan(Date value) {
- addCriterion("firm_bus_time >", value, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("firm_bus_time >=", value, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeLessThan(Date value) {
- addCriterion("firm_bus_time <", value, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeLessThanOrEqualTo(Date value) {
- addCriterion("firm_bus_time <=", value, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeIn(List values) {
- addCriterion("firm_bus_time in", values, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeNotIn(List values) {
- addCriterion("firm_bus_time not in", values, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeBetween(Date value1, Date value2) {
- addCriterion("firm_bus_time between", value1, value2, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmBusTimeNotBetween(Date value1, Date value2) {
- addCriterion("firm_bus_time not between", value1, value2, "firmBusTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityIsNull() {
- addCriterion("juridical_nationality is null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityIsNotNull() {
- addCriterion("juridical_nationality is not null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityEqualTo(String value) {
- addCriterion("juridical_nationality =", value, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityNotEqualTo(String value) {
- addCriterion("juridical_nationality <>", value, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityGreaterThan(String value) {
- addCriterion("juridical_nationality >", value, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityGreaterThanOrEqualTo(String value) {
- addCriterion("juridical_nationality >=", value, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityLessThan(String value) {
- addCriterion("juridical_nationality <", value, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityLessThanOrEqualTo(String value) {
- addCriterion("juridical_nationality <=", value, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityLike(String value) {
- addCriterion("juridical_nationality like", value, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityNotLike(String value) {
- addCriterion("juridical_nationality not like", value, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityIn(List values) {
- addCriterion("juridical_nationality in", values, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityNotIn(List values) {
- addCriterion("juridical_nationality not in", values, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityBetween(String value1, String value2) {
- addCriterion("juridical_nationality between", value1, value2, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalNationalityNotBetween(String value1, String value2) {
- addCriterion("juridical_nationality not between", value1, value2, "juridicalNationality");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardIsNull() {
- addCriterion("juridical_idcard is null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardIsNotNull() {
- addCriterion("juridical_idcard is not null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardEqualTo(String value) {
- addCriterion("juridical_idcard =", value, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardNotEqualTo(String value) {
- addCriterion("juridical_idcard <>", value, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardGreaterThan(String value) {
- addCriterion("juridical_idcard >", value, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardGreaterThanOrEqualTo(String value) {
- addCriterion("juridical_idcard >=", value, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardLessThan(String value) {
- addCriterion("juridical_idcard <", value, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardLessThanOrEqualTo(String value) {
- addCriterion("juridical_idcard <=", value, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardLike(String value) {
- addCriterion("juridical_idcard like", value, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardNotLike(String value) {
- addCriterion("juridical_idcard not like", value, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardIn(List values) {
- addCriterion("juridical_idcard in", values, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardNotIn(List values) {
- addCriterion("juridical_idcard not in", values, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardBetween(String value1, String value2) {
- addCriterion("juridical_idcard between", value1, value2, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalIdcardNotBetween(String value1, String value2) {
- addCriterion("juridical_idcard not between", value1, value2, "juridicalIdcard");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeIsNull() {
- addCriterion("juridical_time is null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeIsNotNull() {
- addCriterion("juridical_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeEqualTo(Date value) {
- addCriterion("juridical_time =", value, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeNotEqualTo(Date value) {
- addCriterion("juridical_time <>", value, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeGreaterThan(Date value) {
- addCriterion("juridical_time >", value, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("juridical_time >=", value, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeLessThan(Date value) {
- addCriterion("juridical_time <", value, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeLessThanOrEqualTo(Date value) {
- addCriterion("juridical_time <=", value, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeIn(List values) {
- addCriterion("juridical_time in", values, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeNotIn(List values) {
- addCriterion("juridical_time not in", values, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeBetween(Date value1, Date value2) {
- addCriterion("juridical_time between", value1, value2, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andJuridicalTimeNotBetween(Date value1, Date value2) {
- addCriterion("juridical_time not between", value1, value2, "juridicalTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameIsNull() {
- addCriterion("agent_name is null");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameIsNotNull() {
- addCriterion("agent_name is not null");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameEqualTo(String value) {
- addCriterion("agent_name =", value, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameNotEqualTo(String value) {
- addCriterion("agent_name <>", value, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameGreaterThan(String value) {
- addCriterion("agent_name >", value, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameGreaterThanOrEqualTo(String value) {
- addCriterion("agent_name >=", value, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameLessThan(String value) {
- addCriterion("agent_name <", value, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameLessThanOrEqualTo(String value) {
- addCriterion("agent_name <=", value, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameLike(String value) {
- addCriterion("agent_name like", value, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameNotLike(String value) {
- addCriterion("agent_name not like", value, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameIn(List values) {
- addCriterion("agent_name in", values, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameNotIn(List values) {
- addCriterion("agent_name not in", values, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameBetween(String value1, String value2) {
- addCriterion("agent_name between", value1, value2, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentNameNotBetween(String value1, String value2) {
- addCriterion("agent_name not between", value1, value2, "agentName");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardIsNull() {
- addCriterion("agent_idcard is null");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardIsNotNull() {
- addCriterion("agent_idcard is not null");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardEqualTo(String value) {
- addCriterion("agent_idcard =", value, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardNotEqualTo(String value) {
- addCriterion("agent_idcard <>", value, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardGreaterThan(String value) {
- addCriterion("agent_idcard >", value, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardGreaterThanOrEqualTo(String value) {
- addCriterion("agent_idcard >=", value, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardLessThan(String value) {
- addCriterion("agent_idcard <", value, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardLessThanOrEqualTo(String value) {
- addCriterion("agent_idcard <=", value, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardLike(String value) {
- addCriterion("agent_idcard like", value, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardNotLike(String value) {
- addCriterion("agent_idcard not like", value, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardIn(List values) {
- addCriterion("agent_idcard in", values, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardNotIn(List values) {
- addCriterion("agent_idcard not in", values, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardBetween(String value1, String value2) {
- addCriterion("agent_idcard between", value1, value2, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentIdcardNotBetween(String value1, String value2) {
- addCriterion("agent_idcard not between", value1, value2, "agentIdcard");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeIsNull() {
- addCriterion("agent_time is null");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeIsNotNull() {
- addCriterion("agent_time is not null");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeEqualTo(Date value) {
- addCriterion("agent_time =", value, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeNotEqualTo(Date value) {
- addCriterion("agent_time <>", value, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeGreaterThan(Date value) {
- addCriterion("agent_time >", value, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeGreaterThanOrEqualTo(Date value) {
- addCriterion("agent_time >=", value, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeLessThan(Date value) {
- addCriterion("agent_time <", value, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeLessThanOrEqualTo(Date value) {
- addCriterion("agent_time <=", value, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeIn(List values) {
- addCriterion("agent_time in", values, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeNotIn(List values) {
- addCriterion("agent_time not in", values, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeBetween(Date value1, Date value2) {
- addCriterion("agent_time between", value1, value2, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andAgentTimeNotBetween(Date value1, Date value2) {
- addCriterion("agent_time not between", value1, value2, "agentTime");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneIsNull() {
- addCriterion("firm_phone is null");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneIsNotNull() {
- addCriterion("firm_phone is not null");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneEqualTo(String value) {
- addCriterion("firm_phone =", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotEqualTo(String value) {
- addCriterion("firm_phone <>", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneGreaterThan(String value) {
- addCriterion("firm_phone >", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneGreaterThanOrEqualTo(String value) {
- addCriterion("firm_phone >=", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneLessThan(String value) {
- addCriterion("firm_phone <", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneLessThanOrEqualTo(String value) {
- addCriterion("firm_phone <=", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneLike(String value) {
- addCriterion("firm_phone like", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotLike(String value) {
- addCriterion("firm_phone not like", value, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneIn(List values) {
- addCriterion("firm_phone in", values, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotIn(List values) {
- addCriterion("firm_phone not in", values, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneBetween(String value1, String value2) {
- addCriterion("firm_phone between", value1, value2, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andFirmPhoneNotBetween(String value1, String value2) {
- addCriterion("firm_phone not between", value1, value2, "firmPhone");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlIsNull() {
- addCriterion("business_license_url is null");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlIsNotNull() {
- addCriterion("business_license_url is not null");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlEqualTo(String value) {
- addCriterion("business_license_url =", value, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlNotEqualTo(String value) {
- addCriterion("business_license_url <>", value, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlGreaterThan(String value) {
- addCriterion("business_license_url >", value, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlGreaterThanOrEqualTo(String value) {
- addCriterion("business_license_url >=", value, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlLessThan(String value) {
- addCriterion("business_license_url <", value, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlLessThanOrEqualTo(String value) {
- addCriterion("business_license_url <=", value, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlLike(String value) {
- addCriterion("business_license_url like", value, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlNotLike(String value) {
- addCriterion("business_license_url not like", value, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlIn(List values) {
- addCriterion("business_license_url in", values, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlNotIn(List values) {
- addCriterion("business_license_url not in", values, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlBetween(String value1, String value2) {
- addCriterion("business_license_url between", value1, value2, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andBusinessLicenseUrlNotBetween(String value1, String value2) {
- addCriterion("business_license_url not between", value1, value2, "businessLicenseUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlIsNull() {
- addCriterion("idcard_juridical_url is null");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlIsNotNull() {
- addCriterion("idcard_juridical_url is not null");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlEqualTo(String value) {
- addCriterion("idcard_juridical_url =", value, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlNotEqualTo(String value) {
- addCriterion("idcard_juridical_url <>", value, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlGreaterThan(String value) {
- addCriterion("idcard_juridical_url >", value, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlGreaterThanOrEqualTo(String value) {
- addCriterion("idcard_juridical_url >=", value, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlLessThan(String value) {
- addCriterion("idcard_juridical_url <", value, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlLessThanOrEqualTo(String value) {
- addCriterion("idcard_juridical_url <=", value, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlLike(String value) {
- addCriterion("idcard_juridical_url like", value, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlNotLike(String value) {
- addCriterion("idcard_juridical_url not like", value, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlIn(List values) {
- addCriterion("idcard_juridical_url in", values, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlNotIn(List values) {
- addCriterion("idcard_juridical_url not in", values, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlBetween(String value1, String value2) {
- addCriterion("idcard_juridical_url between", value1, value2, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardJuridicalUrlNotBetween(String value1, String value2) {
- addCriterion("idcard_juridical_url not between", value1, value2, "idcardJuridicalUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlIsNull() {
- addCriterion("idcard_agent_url is null");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlIsNotNull() {
- addCriterion("idcard_agent_url is not null");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlEqualTo(String value) {
- addCriterion("idcard_agent_url =", value, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlNotEqualTo(String value) {
- addCriterion("idcard_agent_url <>", value, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlGreaterThan(String value) {
- addCriterion("idcard_agent_url >", value, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlGreaterThanOrEqualTo(String value) {
- addCriterion("idcard_agent_url >=", value, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlLessThan(String value) {
- addCriterion("idcard_agent_url <", value, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlLessThanOrEqualTo(String value) {
- addCriterion("idcard_agent_url <=", value, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlLike(String value) {
- addCriterion("idcard_agent_url like", value, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlNotLike(String value) {
- addCriterion("idcard_agent_url not like", value, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlIn(List values) {
- addCriterion("idcard_agent_url in", values, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlNotIn(List values) {
- addCriterion("idcard_agent_url not in", values, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlBetween(String value1, String value2) {
- addCriterion("idcard_agent_url between", value1, value2, "idcardAgentUrl");
- return (Criteria) this;
- }
-
- public Criteria andIdcardAgentUrlNotBetween(String value1, String value2) {
- addCriterion("idcard_agent_url not between", value1, value2, "idcardAgentUrl");
- return (Criteria) this;
- }
- }
-
- public static class Criteria extends GeneratedCriteria {
-
- protected Criteria() {
- super();
- }
- }
-
- public static class Criterion {
- private String condition;
-
- private Object value;
-
- private Object secondValue;
-
- private boolean noValue;
-
- private boolean singleValue;
-
- private boolean betweenValue;
-
- private boolean listValue;
-
- private String typeHandler;
-
- public String getCondition() {
- return condition;
- }
-
- public Object getValue() {
- return value;
- }
-
- public Object getSecondValue() {
- return secondValue;
- }
-
- public boolean isNoValue() {
- return noValue;
- }
-
- public boolean isSingleValue() {
- return singleValue;
- }
-
- public boolean isBetweenValue() {
- return betweenValue;
- }
-
- public boolean isListValue() {
- return listValue;
- }
-
- public String getTypeHandler() {
- return typeHandler;
- }
-
- protected Criterion(String condition) {
- super();
- this.condition = condition;
- this.typeHandler = null;
- this.noValue = true;
- }
-
- protected Criterion(String condition, Object value, String typeHandler) {
- super();
- this.condition = condition;
- this.value = value;
- this.typeHandler = typeHandler;
- if (value instanceof List) {
- this.listValue = true;
- } else {
- this.singleValue = true;
- }
- }
-
- protected Criterion(String condition, Object value) {
- this(condition, value, null);
- }
-
- protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
- super();
- this.condition = condition;
- this.value = value;
- this.secondValue = secondValue;
- this.typeHandler = typeHandler;
- this.betweenValue = true;
- }
-
- protected Criterion(String condition, Object value, Object secondValue) {
- this(condition, value, secondValue, null);
- }
- }
-}
\ No newline at end of file
diff --git a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoExample.java b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoExample.java
index 6c5916c..9356215 100644
--- a/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoExample.java
+++ b/customer/src/main/java/com/trust/ywx/customer/dao/po/FirmInfoExample.java
@@ -844,63 +844,63 @@ public class FirmInfoExample {
return (Criteria) this;
}
- public Criteria andFirmStatusIsNull() {
+ public Criteria andStatusIsNull() {
addCriterion("status is null");
return (Criteria) this;
}
- public Criteria andFirmStatusIsNotNull() {
+ public Criteria andStatusIsNotNull() {
addCriterion("status is not null");
return (Criteria) this;
}
- public Criteria andFirmStatusEqualTo(Integer value) {
- addCriterion("status =", value, "firmStatus");
+ public Criteria andStatusEqualTo(Integer value) {
+ addCriterion("status =", value, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusNotEqualTo(Integer value) {
- addCriterion("status <>", value, "firmStatus");
+ public Criteria andStatusNotEqualTo(Integer value) {
+ addCriterion("status <>", value, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusGreaterThan(Integer value) {
- addCriterion("status >", value, "firmStatus");
+ public Criteria andStatusGreaterThan(Integer value) {
+ addCriterion("status >", value, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusGreaterThanOrEqualTo(Integer value) {
- addCriterion("status >=", value, "firmStatus");
+ public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+ addCriterion("status >=", value, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusLessThan(Integer value) {
- addCriterion("status <", value, "firmStatus");
+ public Criteria andStatusLessThan(Integer value) {
+ addCriterion("status <", value, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusLessThanOrEqualTo(Integer value) {
- addCriterion("status <=", value, "firmStatus");
+ public Criteria andStatusLessThanOrEqualTo(Integer value) {
+ addCriterion("status <=", value, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusIn(List values) {
- addCriterion("status in", values, "firmStatus");
+ public Criteria andStatusIn(List values) {
+ addCriterion("status in", values, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusNotIn(List values) {
- addCriterion("status not in", values, "firmStatus");
+ public Criteria andStatusNotIn(List values) {
+ addCriterion("status not in", values, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusBetween(Integer value1, Integer value2) {
- addCriterion("status between", value1, value2, "firmStatus");
+ public Criteria andStatusBetween(Integer value1, Integer value2) {
+ addCriterion("status between", value1, value2, "status");
return (Criteria) this;
}
- public Criteria andFirmStatusNotBetween(Integer value1, Integer value2) {
- addCriterion("status not between", value1, value2, "firmStatus");
+ public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+ addCriterion("status not between", value1, value2, "status");
return (Criteria) this;
}
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/AuditFirmDto.java b/customer/src/main/java/com/trust/ywx/customer/service/dto/response/AuditFirmDto.java
deleted file mode 100644
index 85c6c2f..0000000
--- a/customer/src/main/java/com/trust/ywx/customer/service/dto/response/AuditFirmDto.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.trust.ywx.customer.service.dto.response;
-
-import lombok.Data;
-
-/**
- *
- *
- * @文件名称： AuditCustomerDto.java
- * @包 路 径： com.trust.ywx.customer.service.dto
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description:
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/14 20:15
- * @Modify：
- */
-@Data
-public class AuditFirmDto extends BaseFirmDto {}
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl.java b/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl.java
index 8d01955..1956f5e 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl.java
@@ -5,18 +5,18 @@ import com.fiftyonetrust.common.model.result.PageList;
import com.trust.ywx.customer.common.enu.FirmProperEnum;
import com.trust.ywx.customer.common.enu.NetworkTypeEnum;
import com.trust.ywx.customer.dao.DoctorProductTypeDao;
-import com.trust.ywx.customer.dao.FirmDao;
+import com.trust.ywx.customer.dao.TrustFirmDao;
import com.trust.ywx.customer.dao.FirmExtendDao;
import com.trust.ywx.customer.dao.FirmGroupDao;
import com.trust.ywx.customer.dao.po.FirmInfo;
import com.trust.ywx.customer.dao.po.FirmInfoExtend;
import com.trust.ywx.customer.dao.po.FirmUsercertChannel;
-import com.trust.ywx.customer.service.dto.response.TrustFirmDto;
-import com.trust.ywx.customer.service.dto.request.SearchCrmFirmParam;
-import com.trust.ywx.customer.service.dto.request.SearchFirmParam;
-import com.trust.ywx.customer.service.dto.request.SearchTrustFirmParam;
-import com.trust.ywx.customer.service.dto.response.AuditFirmDto;
-import com.trust.ywx.customer.service.dto.response.CrmFirmDto;
+import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
+import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
+import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
+import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmParam;
+import com.trust.ywx.customer.common.model.manager.response.TempFirmDto;
+import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
import com.trust.ywx.customer.service.query.FirmQueryService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -41,7 +41,7 @@ import java.util.*;
@Service
public class FirmQueryServiceImpl implements FirmQueryService {
@Autowired
- private FirmDao firmDao;
+ private TrustFirmDao trustFirmDao;
@Autowired
private FirmGroupDao firmGroupDao;
@Autowired
@@ -83,13 +83,13 @@ public class FirmQueryServiceImpl implements FirmQueryService {
@Override
public TrustFirmDto getTrustFirm(String clientId) {
- FirmInfo po = firmDao.getFrimByClientId(clientId);
+ FirmInfo po = trustFirmDao.getFrimByClientId(clientId);
return converPoToDto(po);
}
@Override
public TrustFirmDto getTrustFirmWithBLOBs(String clientId) {
- FirmInfo po = firmDao.getFrimByClientId(clientId);
+ FirmInfo po = trustFirmDao.getFrimByClientId(clientId);
return converPoToDto(po);
}
@@ -125,7 +125,7 @@ public class FirmQueryServiceImpl implements FirmQueryService {
}
@Override
- public List getAuditFirmList(SearchFirmParam param) {
+ public List getTempFirmList(SearchFirmParam param) {
return null;
}
@@ -156,12 +156,12 @@ public class FirmQueryServiceImpl implements FirmQueryService {
// clientId筛选
if (StringUtils.isNotEmpty(param.getClientId())) {
- FirmInfo firmInfo = firmDao.getFrimByClientId(param.getClientId());
+ FirmInfo firmInfo = trustFirmDao.getFrimByClientId(param.getClientId());
if (null == firmInfo) {
return Arrays.asList();
}
// 增加项目状态的判断
- if (null != param.getFirmStatus() && !Objects.equals(firmInfo.getFirmStatus(), param.getFirmStatus())) {
+ if (null != param.getProjectStatus() && !Objects.equals(firmInfo.getProjectStatus(), param.getProjectStatus())) {
return Arrays.asList();
}
// 增加实施人员的判断
@@ -244,12 +244,12 @@ public class FirmQueryServiceImpl implements FirmQueryService {
}
List firmList = null;
if (isPage) {
- firmList = firmDao.getListByIds(clientIdList, 100000, 0);
+ firmList = trustFirmDao.getListByIds(clientIdList, 100000, 0);
} else {
if (clientIdList.size() < param.getPageSize() * param.getPageNo()) {
return Arrays.asList();
}
- firmList = firmDao.getListByIds(clientIdList, param.getPageSize(), param.getPageNo());
+ firmList = trustFirmDao.getListByIds(clientIdList, param.getPageSize(), param.getPageNo());
}
List dtoList = new ArrayList<>(firmList.size());
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl_bak.java b/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl_bak.java
index f4628af..326f433 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl_bak.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/impl/FirmQueryServiceImpl_bak.java
@@ -11,12 +11,12 @@
//import com.trust.ywx.customer.dao.po.FirmInfo;
//import com.trust.ywx.customer.dao.po.FirmUsercertChannelExample;
//import com.trust.ywx.customer.service.dto.TrustFirmDto;
-//import com.trust.ywx.customer.service.dto.request.SearchCrmFirmParam;
-//import com.trust.ywx.customer.service.dto.request.SearchFirmParam;
-//import com.trust.ywx.customer.service.dto.request.SearchTrustFirmWithPageParam;
+//import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
+//import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
+//import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmWithPageParam;
//import com.trust.ywx.customer.service.dto.response.AuditFirmDto;
-//import com.trust.ywx.customer.service.dto.response.CrmFirmDto;
-//import com.trust.ywx.customer.service.exception.BizException;
+//import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
+//import com.trust.ywx.customer.common.exception.BizException;
//import com.trust.ywx.customer.service.query.FirmQueryService;
//import org.apache.commons.lang.StringUtils;
//import org.springframework.beans.BeanUtils;
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/manager/FirmManagerService.java b/customer/src/main/java/com/trust/ywx/customer/service/manager/FirmManagerService.java
index d5a5b6b..e87ebab 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/manager/FirmManagerService.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/manager/FirmManagerService.java
@@ -1,7 +1,8 @@
package com.trust.ywx.customer.service.manager;
-import com.trust.ywx.customer.service.dto.request.TrustFirmParam;
-import com.trust.ywx.customer.service.exception.BizException;
+import com.trust.ywx.customer.common.model.manager.request.TrustFirmParam;
+import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
+import com.trust.ywx.customer.common.exception.BizException;
/**
*
@@ -17,20 +18,31 @@ import com.trust.ywx.customer.service.exception.BizException;
*/
public interface FirmManagerService {
/**
+ * 初始化客户
+ * 返回clientId和appSecret
+ * @param clientId
+ * @return
+ */
+ TrustFirmDto init(String clientId);
+
+ /**
* 添加可信客户
*/
- boolean addTrustFirm(TrustFirmParam param) throws BizException;
+ boolean add(TrustFirmParam param) throws BizException;
/**
* 更新可信客户
*/
- boolean updateTrustFirm(TrustFirmParam param);
-
+ boolean update(TrustFirmParam param) throws BizException;
/**
- * 添加待审核客户
+ * 删除可信客户
+ *
+ * @param clientId
+ * @return
*/
- boolean addAuditFirm();
+ boolean delete(String clientId);
+
/**
* 添加CA渠道客户
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java b/customer/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java
new file mode 100644
index 0000000..16da562
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/service/manager/TempFirmManagerService.java
@@ -0,0 +1,55 @@
+package com.trust.ywx.customer.service.manager;
+
+import com.trust.ywx.customer.common.model.manager.request.TempFirmParam;
+import com.trust.ywx.customer.common.exception.BizException;
+
+/**
+ *
+ *
+ * @文件名称： FirmManagerService.java
+ * @包 路 径： com.trust.ywx.customer.service.manager
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/15 18:55
+ * @Modify：
+ */
+public interface TempFirmManagerService {
+
+ /**
+ * 添加临时客户
+ * 互联网医院通过开放平台自注册临时客户，会在firm_info_temp表生成client_id
+ *
+ */
+ boolean add(TempFirmParam param) throws BizException;
+
+ /**
+ * 更新临时客户
+ * @param param
+ * @return
+ * @throws BizException
+ */
+ boolean update(TempFirmParam param) throws BizException;
+
+ /**
+ * 审核临时客户
+ * @param clientId
+ * @return
+ */
+ boolean audit(String clientId) throws BizException;
+
+ /**
+ * 拒绝临时客户
+ * @param clientId
+ * @return
+ */
+ boolean reject(String clientId) throws BizException;
+
+ /**
+ * 删除临时客户
+ * @param clientId
+ * @return
+ */
+ boolean delete(String clientId);
+}
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/FirmManagerServiceImpl.java b/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/FirmManagerServiceImpl.java
index 90c5f5a..1d6ec06 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/FirmManagerServiceImpl.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/FirmManagerServiceImpl.java
@@ -1,19 +1,25 @@
package com.trust.ywx.customer.service.manager.impl;
import com.trust.ywx.customer.common.enu.FirmErrEum;
-import com.trust.ywx.customer.common.enu.ProjectStatusEnum;
-import com.trust.ywx.customer.dao.FirmDao;
+import com.trust.ywx.customer.commons.UniqueIdUtils;
import com.trust.ywx.customer.dao.FirmExtendDao;
+import com.trust.ywx.customer.dao.TrustFirmDao;
import com.trust.ywx.customer.dao.po.FirmInfo;
-import com.trust.ywx.customer.dao.po.FirmInfoExample;
-import com.trust.ywx.customer.service.dto.request.TrustFirmParam;
-import com.trust.ywx.customer.service.exception.BizException;
+import com.trust.ywx.customer.common.model.manager.request.TrustFirmParam;
+import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
+import com.trust.ywx.customer.common.exception.BizException;
import com.trust.ywx.customer.service.manager.FirmManagerService;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallback;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
*
@@ -30,92 +36,157 @@ import java.util.Map;
@Service
public class FirmManagerServiceImpl implements FirmManagerService {
@Resource
- FirmDao firmDao;
+ TransactionTemplate transactionTemplate;
+ @Resource
+ TrustFirmDao trustFirmDao;
@Resource
FirmExtendDao firmExtendDao;
+
+// @Resource
+// private Config config;
+
+ @Override
+ public TrustFirmDto init(String clientId) {
+ TrustFirmDto dto = new TrustFirmDto();
+ dto.setClientId(UniqueIdUtils.generateClientId());
+ dto.setAppSecret(UniqueIdUtils.generateAppSecret());
+ // TODO 其他默认选项
+ return dto;
+ }
+
@Override
- public boolean addTrustFirm(TrustFirmParam param) throws BizException {
- // checkBiz
- checkBiz(param);
- // doAction
- return doAdd(param);
+ public boolean add(TrustFirmParam param) throws BizException {
+ // 参数校验
+ checkParam(param);
+ // 业务校验
+ checkAddBiz(param);
+ // 执行插入
+ return doAddTrust(param);
}
- @Transactional(rollbackFor = Exception.class)
- public boolean doAdd(TrustFirmParam param) {
+ private void checkParam(TrustFirmParam param) {
+ //TODO
+ }
- // 插入firm_info表
- FirmInfo firmInfo = convertToFirmInfo(param);
- firmDao.insert(firmInfo);
+ @Override
+ public boolean update(TrustFirmParam param) throws BizException {
+ // 参数校验
+ checkParam(param);
+ // 业务校验
+ checkUpdateBiz(param);
+ // 执行插入
+ return doUpdateTrust(param);
+ }
- // 插入firm_info_extend表
- Map propMap= param.convertToMap();
- firmExtendDao.batchInsert(param.getClientId(),propMap);
+ @Override
+ public boolean delete(String clientId) {
+ // 逻辑删除可信客户
+ trustFirmDao.deleteByClientId(clientId);
return true;
}
- private FirmInfo convertToFirmInfo(TrustFirmParam param){
- FirmInfo firmInfo = FirmInfo.builder().clientId(param.getClientId())
- .appSecret(param.getAppSecret())
- .firmName(param.getFirmName())
- .firmPerson(param.getFirmPerson())
- .firmPhone(param.getFirmPhone())
- .firmEmail(param.getFirmEmail())
- .salePersonId(param.getSalePersonId())
- .techPersonId(param.getTechPersonId())
- .agentClientId(param.getAgentClientId())
- .projectStatus(param.getProjectStatus())
- .build()
- ;
+ /**
+ * 执行添加（包含事务）
+ *
+ * @param param
+ * @return
+ */
+ private boolean doAddTrust(TrustFirmParam param) {
+ transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+ @Override
+ protected void doInTransactionWithoutResult(TransactionStatus transactionStatus) {
+ // 插入firm_info表
+ FirmInfo firmInfo = convertToFirmInfo(param, true);
+ trustFirmDao.insert(firmInfo);
+
+ // 插入firm_info_extend表
+ Map propMap = param.convertToMap();
+ firmExtendDao.batchInsert(param.getClientId(), propMap);
+
+ }
+ });
+ return true;
+ }
+ private FirmInfo convertToFirmInfo(TrustFirmParam param, boolean isAdd) {
+ FirmInfo firmInfo = new FirmInfo();
+ BeanUtils.copyProperties(param, firmInfo);
+ if (isAdd) {
+ firmInfo.setUniqueid(UniqueIdUtils.genrateUniqueId());
+ }
+ firmInfo.setStatus(param.getFirmStatus());
// TODO 客户属性有几个属性在此表维护，以后要迁移至extend表。
- firmInfo.setCaChannel(param.getCaChannel());
- firmInfo.setCertAlg(param.getCertAlg());
- firmInfo.setStampType(String.valueOf(param.getUserStampAuto()));
+ firmInfo.setSendSms(param.getSmsSend() == null ? "N" : (param.getSmsSend() == 1 ? "Y" : "N"));
+ firmInfo.setStampType(param.getUserStampAuto() == null ? "0" : String.valueOf(param.getUserStampAuto()));
return firmInfo;
}
/**
- * 校验业务
+ * 校验业务-新建
+ *
* @param param
*/
- private void checkBiz(TrustFirmParam param) throws BizException {
- /**
- * 业务校验
- */
+ private void checkAddBiz(TrustFirmParam param) throws BizException {
//clientId冲突校验
- FirmInfoExample example = new FirmInfoExample();
- example.createCriteria().andClientIdEqualTo(param.getClientId()).andProjectStatusNotEqualTo(ProjectStatusEnum.DEL.getCode());
- Long num = firmDao.countByExample(example);
- if (num>0){
+ FirmInfo firmInfo = trustFirmDao.getFrimByClientId(param.getClientId());
+ if (null != firmInfo) {
throw new BizException(FirmErrEum.CLIENTID_CHECK_ERR);
}
-
// clientOrgCode冲突校验
- example.clear();
- example.createCriteria().andClientOrgCodeEqualTo(param.getClientOrgCode()).andProjectStatusNotEqualTo(ProjectStatusEnum.DEL.getCode());
- num = firmDao.countByExample(example);
- if (num>0){
+ List list = trustFirmDao.getListByOrgCode(param.getClientOrgCode());
+ if (null != list && list.size() > 0) {
throw new BizException(FirmErrEum.CLIENT_ORG_CODE_CHECK_ERR);
}
// firmName冲突校验
- example.clear();
- example.createCriteria().andFirmNameEqualTo(param.getFirmName()).andProjectStatusNotEqualTo(ProjectStatusEnum.DEL.getCode());
- num = firmDao.countByExample(example);
- if (num>0) {
+ list = trustFirmDao.getListByFirmName(param.getFirmName());
+ if (null != list && list.size() > 0) {
throw new BizException(FirmErrEum.FIRM_NAME_CHECK_ERR);
}
}
- @Override
- public boolean updateTrustFirm(TrustFirmParam param) {
- return false;
+ /**
+ * 校验业务-更新
+ *
+ * @param param
+ */
+ private void checkUpdateBiz(TrustFirmParam param) throws BizException {
+
+ //clientId冲突校验
+ FirmInfo firmInfo = trustFirmDao.getFrimByClientId(param.getClientId());
+ if (null == firmInfo) {
+ throw new BizException(FirmErrEum.FIRM_NOT_EXIST);
+ }
+
+ // clientOrgCode冲突校验
+ List list = trustFirmDao.getListByOrgCode(param.getClientOrgCode());
+ if (list != null && (list.size() > 1 || Objects.equals(param.getClientId(), list.get(0).getClientId()))) {
+ throw new BizException(FirmErrEum.CLIENT_ORG_CODE_CHECK_ERR);
+ }
+ // firmName冲突校验
+ list = trustFirmDao.getListByFirmName(param.getFirmName());
+ if (list != null && (list.size() > 1 || Objects.equals(param.getClientId(), list.get(0).getClientId()))) {
+ throw new BizException(FirmErrEum.FIRM_NAME_CHECK_ERR);
+ }
}
- @Override
- public boolean addAuditFirm() {
- return false;
+
+ private boolean doUpdateTrust(TrustFirmParam param) {
+ int num = transactionTemplate.execute(new TransactionCallback() {
+
+ @Override
+ public Integer doInTransaction(TransactionStatus transactionStatus) {
+ // 插入firm_info表
+ FirmInfo firmInfo = convertToFirmInfo(param, false);
+ int num = trustFirmDao.update(firmInfo);
+
+ // 插入firm_info_extend表
+ Map propMap = param.convertToMap();
+ firmExtendDao.batchInsert(param.getClientId(), propMap);
+ return num;
+ }
+ });
+ return num == 1;
}
@Override
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/TempFirmManagerServiceImpl.java b/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/TempFirmManagerServiceImpl.java
new file mode 100644
index 0000000..677e03a
--- /dev/null
+++ b/customer/src/main/java/com/trust/ywx/customer/service/manager/impl/TempFirmManagerServiceImpl.java
@@ -0,0 +1,222 @@
+package com.trust.ywx.customer.service.manager.impl;
+
+import com.trust.ywx.customer.common.enu.*;
+import com.trust.ywx.customer.commons.UniqueIdUtils;
+import com.trust.ywx.customer.dao.TempFirmDao;
+import com.trust.ywx.customer.dao.po.FirmInfoTemp;
+import com.trust.ywx.customer.common.model.manager.request.TempFirmParam;
+import com.trust.ywx.customer.common.model.manager.request.TrustFirmParam;
+import com.trust.ywx.customer.common.exception.BizException;
+import com.trust.ywx.customer.service.manager.FirmManagerService;
+import com.trust.ywx.customer.service.manager.TempFirmManagerService;
+import lombok.SneakyThrows;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.TransactionStatus;
+import org.springframework.transaction.support.TransactionCallbackWithoutResult;
+import org.springframework.transaction.support.TransactionTemplate;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ *
+ *
+ * @文件名称： FirmManagerServiceImpl.java
+ * @包 路 径： com.trust.ywx.customer.service.manager.impl
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description: 客户管理实现类
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/20 12:50
+ * @Modify：
+ */
+@Service
+public class TempFirmManagerServiceImpl implements TempFirmManagerService {
+ @Resource
+ TransactionTemplate transactionTemplate;
+ @Resource
+ TempFirmDao tempFirmDao;
+ @Resource
+ FirmManagerService firmManagerService;
+
+ @Override
+ public boolean add(TempFirmParam param) throws BizException {
+ // 参数校验
+ //checkParam(param);
+ // 业务校验
+ checkBiz(param);
+ // 入库
+ return doAddTemp(param);
+ }
+ @Override
+ public boolean update(TempFirmParam param) throws BizException {
+ // 参数校验
+ //checkParam(param);
+ // 业务校验
+ checkBiz(param);
+ // 入库
+ return doUpdateTemp(param);
+ }
+
+ @Override
+ public boolean audit(String clientId) throws BizException {
+ // 校验clientId
+ FirmInfoTemp tempFirm = tempFirmDao.getByClientId(clientId);
+ if (null == tempFirm) {
+ throw new BizException(FirmErrEum.FIRM_NOT_EXIST);
+ }
+
+ // 封装可信客户参数
+ TrustFirmParam trustFirmParam = buildTrustFirmParam(tempFirm);
+
+ return doAudit(trustFirmParam, tempFirm);
+ }
+
+
+ @Override
+ public boolean reject(String clientId) throws BizException {
+ // 业务校验
+ FirmInfoTemp tempFirm = tempFirmDao.getByClientId(clientId);
+ if (null == tempFirm) {
+ throw new BizException(FirmErrEum.CLIENTID_CHECK_ERR);
+ }
+
+ int num = tempFirmDao.auditReject(clientId);
+ return num == 1;
+ }
+
+ @Override
+ public boolean delete(String clientId) {
+ // fixme 此处应该为物理删除，否则客户在此添加时 客户名称就重复了
+ return true;
+ }
+
+ private boolean doUpdateTemp(TempFirmParam param) {
+ FirmInfoTemp temp = convertToTempFirm(param, false);
+ return tempFirmDao.update(temp)==1;
+ }
+
+ private void checkBiz(TempFirmParam param) throws BizException {
+ // firmName冲突校验
+ List list = tempFirmDao.getListByFirmName(param.getFirmName());
+ if (null != list && list.size() > 0) {
+ throw new BizException(FirmErrEum.FIRM_NAME_CHECK_ERR);
+ }
+ }
+
+ private boolean doAddTemp(TempFirmParam param) {
+ FirmInfoTemp temp = convertToTempFirm(param, true);
+ tempFirmDao.insert(temp);
+ return true;
+
+ }
+
+ private FirmInfoTemp convertToTempFirm(TempFirmParam param, boolean isAdd) {
+ FirmInfoTemp temp = new FirmInfoTemp();
+ BeanUtils.copyProperties(param, temp);
+ if (isAdd) {
+ temp.setUniqueid(UniqueIdUtils.genrateUniqueId());
+ temp.setClientId(UniqueIdUtils.generateClientId());
+ }else{
+ temp.setClientId(param.getClientId());
+ }
+ temp.setFirmOrgCode(param.getFirmOrgCode());
+ temp.setFirmStatus(TempFirmStatusEnum.TEMP_UNAUTHEN.getCode() + "");
+ temp.setJuridicalName(param.getFirmPerson());
+ if (param.getChannelApp() != null && true == param.getChannelApp()
+ && param.getChannelSdk() != null && true == param.getChannelSdk()) {
+ temp.setChannel("2");
+ } else if (param.getChannelSdk() != null && true == param.getChannelSdk()) {
+ temp.setChannel("1"); //sdk
+ } else if (param.getChannelApp() != null && false == param.getChannelApp()
+ && param.getChannelSdk() != null && false == param.getChannelSdk()) {
+ temp.setChannel(null);
+ } else {
+ temp.setChannel("0"); //app不能默认app，可能不选channel
+ }
+ return temp;
+
+ }
+
+ private boolean doAudit(TrustFirmParam trustFirmParam, FirmInfoTemp temp) {
+ transactionTemplate.execute(new TransactionCallbackWithoutResult() {
+ @SneakyThrows
+ @Override
+ protected void doInTransactionWithoutResult(TransactionStatus transactionStatus) {
+ // 1、添加可信客户
+ firmManagerService.add(trustFirmParam);
+ // 2、更新临时客户状态为已审核
+ int num = tempFirmDao.auditPass(temp.getClientId());
+ if (num != 1) {
+ throw new BizException(FirmErrEum.FIRM_SYN_ERR);
+ }
+ }
+ });
+ return true;
+ }
+
+ private TrustFirmParam buildTrustFirmParam(FirmInfoTemp temp) {
+ TrustFirmParam trustFirmParam = new TrustFirmParam();
+ trustFirmParam.setFirmPerson(temp.getFirmPerson()); //厂商联系人 （不是法人）
+ trustFirmParam.setFirmName(temp.getFirmName());
+ trustFirmParam.setFirmEmail(temp.getFirmEmail());
+ String phone = StringUtils.isBlank(temp.getJuridicalPhone()) ? temp.getFirmPhone() :
+ temp.getJuridicalPhone();
+ trustFirmParam.setFirmPhone(phone);
+ trustFirmParam.setFirmAddress(temp.getFirmAddress());
+ trustFirmParam.setClientOrgCode(temp.getFirmOrgCode());
+ trustFirmParam.setAgentSaleId(temp.getAgentSaleId());
+ trustFirmParam.setAppIcon(temp.getFirmLogo());
+ // 医师端产品形态
+ List doctorProTypeList = new ArrayList<>();
+ if ("1".equals(temp.getChannel())) {
+ doctorProTypeList.add(DoctorProductTypeEnum.SDK.getName());
+ } else if ("2".equals(temp.getChannel())) {
+ doctorProTypeList.add(DoctorProductTypeEnum.APP.getName());
+ doctorProTypeList.add(DoctorProductTypeEnum.SDK.getName());
+ } else {
+ doctorProTypeList.add(DoctorProductTypeEnum.APP.getName());
+
+ }
+
+ trustFirmParam.setDoctorProductType(doctorProTypeList);
+ trustFirmParam.setCertAlg("RSA");
+ trustFirmParam.setAppSecret(UniqueIdUtils.generateAppSecret());
+ // TODO 什么时候审核临时客户会携带clientId？？
+ String clientId = null;
+ if (StringUtils.isBlank(temp.getClientId())) {
+ clientId = UniqueIdUtils.generateClientId();
+ } else {
+ clientId = temp.getClientId();
+ }
+ trustFirmParam.setAgentClientId(temp.getAgentClientId());
+ trustFirmParam.setClientId(clientId);
+ trustFirmParam.setCreateTime(new Date());
+ // 手动制章默认
+ trustFirmParam.setUserStampType(CommonStatusEnum.YES.getCode());
+ // 信步云默认
+ trustFirmParam.setCertAgency("1");
+ trustFirmParam.setFirmStatus(FirmStatusEnum.FIRM_SUB_NORMAL.getCode());
+ trustFirmParam.setSmsSend(CommonStatusEnum.YES.getCode());
+ String channel = temp.getChannel();
+ if ("1".equals(channel) || "2".equals(channel)) {
+ //TODO 引入nacos
+// String msspAppid = config.getString("ywq.core.common.ywq.mssp.appid", "");
+// trustFirmParam.setMsspAppid(msspAppid);
+ }
+
+ // 客户类型：互联网医院
+ trustFirmParam.setNetworkType(NetworkTypeEnum.IT.getCode());
+ // app设置图章：可以
+ trustFirmParam.setUserStampIsAppset(CommonStatusEnum.YES.getCode());
+ // 客户图章类型：圆章
+ trustFirmParam.setFirmStampType(FirmStampEnum.ROUND.getCode());
+
+ return trustFirmParam;
+ }
+
+}
diff --git a/customer/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java b/customer/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java
index 0eb20aa..f695c9a 100644
--- a/customer/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java
+++ b/customer/src/main/java/com/trust/ywx/customer/service/query/FirmQueryService.java
@@ -1,12 +1,12 @@
package com.trust.ywx.customer.service.query;
import com.fiftyonetrust.common.model.result.PageList;
-import com.trust.ywx.customer.service.dto.response.TrustFirmDto;
-import com.trust.ywx.customer.service.dto.request.SearchCrmFirmParam;
-import com.trust.ywx.customer.service.dto.request.SearchFirmParam;
-import com.trust.ywx.customer.service.dto.request.SearchTrustFirmParam;
-import com.trust.ywx.customer.service.dto.response.AuditFirmDto;
-import com.trust.ywx.customer.service.dto.response.CrmFirmDto;
+import com.trust.ywx.customer.common.model.manager.response.TrustFirmDto;
+import com.trust.ywx.customer.common.model.query.request.SearchCrmFirmParam;
+import com.trust.ywx.customer.common.model.query.request.SearchFirmParam;
+import com.trust.ywx.customer.common.model.query.request.SearchTrustFirmParam;
+import com.trust.ywx.customer.common.model.manager.response.TempFirmDto;
+import com.trust.ywx.customer.common.model.query.response.CrmFirmDto;
import java.util.List;
import java.util.Map;
@@ -14,7 +14,7 @@ import java.util.Map;
/**
*
*
- * @文件名称： AuditCustomerService.java
+ * @文件名称： FirmQueryService.java
* @包 路 径： com.trust.ywx.customer.service.query
* @Copyright：北京数字医信责任有限公司 (C) 2022 *
* @Description:
@@ -68,12 +68,12 @@ public interface FirmQueryService {
*/
List getFirmWhite(String firmName);
- //------------------------待审核客户--------------------
+ //------------------------临时客户--------------------
/**
* 获取待审核客户列表
* @param param
*/
- List getAuditFirmList(SearchFirmParam param);
+ List getTempFirmList(SearchFirmParam param);
//-------------------------北京CA客户------------------------
diff --git a/customer/src/main/resources/generatorConfig.xml b/customer/src/main/resources/generatorConfig.xml
index 055b7ea..649a708 100644
--- a/customer/src/main/resources/generatorConfig.xml
+++ b/customer/src/main/resources/generatorConfig.xml
@@ -85,9 +85,6 @@
-
-
-
@@ -95,37 +92,28 @@
-
+
diff --git a/customer/src/main/resources/mybatis/mapper/FirmGroupMapper.xml b/customer/src/main/resources/mybatis/mapper/FirmGroupMapper.xml
index 30d4399..cf66f0d 100644
--- a/customer/src/main/resources/mybatis/mapper/FirmGroupMapper.xml
+++ b/customer/src/main/resources/mybatis/mapper/FirmGroupMapper.xml
@@ -115,17 +115,20 @@
-
- insert into firm_group (group_name, group_num, firm_id,
- firm_role, create_time, is_del
- )
- values (#{groupName,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR}, #{firmId,jdbcType=VARCHAR},
- #{firmRole,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{isDel,jdbcType=INTEGER}
- )
+
+ insert into firm_group (uniqueId, group_name, group_num,
+ firm_id, firm_role, create_time,
+ is_del)
+ values (#{uniqueid,jdbcType=VARCHAR}, #{groupName,jdbcType=VARCHAR}, #{groupId,jdbcType=VARCHAR},
+ #{firmId,jdbcType=VARCHAR}, #{firmRole,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
+ #{isDel,jdbcType=INTEGER})
-
+
insert into firm_group
+
+ uniqueId,
+
group_name,
@@ -146,6 +149,9 @@
+
+ #{uniqueid,jdbcType=VARCHAR},
+
#{groupName,jdbcType=VARCHAR},
@@ -249,7 +255,7 @@
where uniqueId = #{uniqueid,jdbcType=VARCHAR}
-
+
@@ -267,17 +273,17 @@
limit 1
-
+
insert into firm_group
- (group_name, group_num, firm_id, firm_role, create_time, is_del)
+ (uniqueId, group_name, group_num, firm_id, firm_role, create_time, is_del)
values
- (#{item.groupName,jdbcType=VARCHAR}, #{item.groupId,jdbcType=VARCHAR}, #{item.firmId,jdbcType=VARCHAR},
- #{item.firmRole,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.isDel,jdbcType=INTEGER}
- )
+ (#{item.uniqueid,jdbcType=VARCHAR}, #{item.groupName,jdbcType=VARCHAR}, #{item.groupId,jdbcType=VARCHAR},
+ #{item.firmId,jdbcType=VARCHAR}, #{item.firmRole,jdbcType=INTEGER}, #{item.createTime,jdbcType=TIMESTAMP},
+ #{item.isDel,jdbcType=INTEGER})
-
+
insert into firm_group (
${column.escapedColumnName}
@@ -287,6 +293,9 @@
(
+
+ #{item.uniqueid,jdbcType=VARCHAR}
+
#{item.groupName,jdbcType=VARCHAR}
diff --git a/customer/src/main/resources/mybatis/mapper/FirmInfoDetailMapper.xml b/customer/src/main/resources/mybatis/mapper/FirmInfoDetailMapper.xml
deleted file mode 100644
index 09e3860..0000000
--- a/customer/src/main/resources/mybatis/mapper/FirmInfoDetailMapper.xml
+++ /dev/null
@@ -1,639 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- and ${criterion.condition}
-
-
- and ${criterion.condition} #{criterion.value}
-
-
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-
-
- and ${criterion.condition}
-
- #{listItem}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- and ${criterion.condition}
-
-
- and ${criterion.condition} #{criterion.value}
-
-
- and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
-
-
- and ${criterion.condition}
-
- #{listItem}
-
-
-
-
-
-
-
-
-
-
- uniqueid, open_id, org_code_url, juridical_idcard_front_url, juridical_idcard_back_url,
- juridical_tmp_id_url, firm_bus_reg_num, firm_soc_cre_code, firm_org_code, firm_tax_reg_cert_code,
- firm_bus_scope, firm_bus_time, juridical_nationality, juridical_idcard, juridical_time,
- agent_name, agent_idcard, agent_time, firm_phone, business_license_url, idcard_juridical_url,
- idcard_agent_url
-
-
-
-
- delete from firm_info_detail
- where uniqueid = #{uniqueid,jdbcType=VARCHAR}
-
-
- delete from firm_info_detail
-
-
-
-
-
- insert into firm_info_detail (open_id, org_code_url, juridical_idcard_front_url,
- juridical_idcard_back_url, juridical_tmp_id_url,
- firm_bus_reg_num, firm_soc_cre_code, firm_org_code,
- firm_tax_reg_cert_code, firm_bus_scope, firm_bus_time,
- juridical_nationality, juridical_idcard,
- juridical_time, agent_name, agent_idcard,
- agent_time, firm_phone, business_license_url,
- idcard_juridical_url, idcard_agent_url)
- values (#{openId,jdbcType=VARCHAR}, #{orgCodeUrl,jdbcType=VARCHAR}, #{juridicalIdcardFrontUrl,jdbcType=VARCHAR},
- #{juridicalIdcardBackUrl,jdbcType=VARCHAR}, #{juridicalTmpIdUrl,jdbcType=VARCHAR},
- #{firmBusRegNum,jdbcType=VARCHAR}, #{firmSocCreCode,jdbcType=VARCHAR}, #{firmOrgCode,jdbcType=VARCHAR},
- #{firmTaxRegCertCode,jdbcType=VARCHAR}, #{firmBusScope,jdbcType=VARCHAR}, #{firmBusTime,jdbcType=TIMESTAMP},
- #{juridicalNationality,jdbcType=VARCHAR}, #{juridicalIdcard,jdbcType=VARCHAR},
- #{juridicalTime,jdbcType=TIMESTAMP}, #{agentName,jdbcType=VARCHAR}, #{agentIdcard,jdbcType=VARCHAR},
- #{agentTime,jdbcType=TIMESTAMP}, #{firmPhone,jdbcType=VARCHAR}, #{businessLicenseUrl,jdbcType=VARCHAR},
- #{idcardJuridicalUrl,jdbcType=VARCHAR}, #{idcardAgentUrl,jdbcType=VARCHAR})
-
-
- insert into firm_info_detail
-
-
- open_id,
-
-
- org_code_url,
-
-
- juridical_idcard_front_url,
-
-
- juridical_idcard_back_url,
-
-
- juridical_tmp_id_url,
-
-
- firm_bus_reg_num,
-
-
- firm_soc_cre_code,
-
-
- firm_org_code,
-
-
- firm_tax_reg_cert_code,
-
-
- firm_bus_scope,
-
-
- firm_bus_time,
-
-
- juridical_nationality,
-
-
- juridical_idcard,
-
-
- juridical_time,
-
-
- agent_name,
-
-
- agent_idcard,
-
-
- agent_time,
-
-
- firm_phone,
-
-
- business_license_url,
-
-
- idcard_juridical_url,
-
-
- idcard_agent_url,
-
-
-
-
- #{openId,jdbcType=VARCHAR},
-
-
- #{orgCodeUrl,jdbcType=VARCHAR},
-
-
- #{juridicalIdcardFrontUrl,jdbcType=VARCHAR},
-
-
- #{juridicalIdcardBackUrl,jdbcType=VARCHAR},
-
-
- #{juridicalTmpIdUrl,jdbcType=VARCHAR},
-
-
- #{firmBusRegNum,jdbcType=VARCHAR},
-
-
- #{firmSocCreCode,jdbcType=VARCHAR},
-
-
- #{firmOrgCode,jdbcType=VARCHAR},
-
-
- #{firmTaxRegCertCode,jdbcType=VARCHAR},
-
-
- #{firmBusScope,jdbcType=VARCHAR},
-
-
- #{firmBusTime,jdbcType=TIMESTAMP},
-
-
- #{juridicalNationality,jdbcType=VARCHAR},
-
-
- #{juridicalIdcard,jdbcType=VARCHAR},
-
-
- #{juridicalTime,jdbcType=TIMESTAMP},
-
-
- #{agentName,jdbcType=VARCHAR},
-
-
- #{agentIdcard,jdbcType=VARCHAR},
-
-
- #{agentTime,jdbcType=TIMESTAMP},
-
-
- #{firmPhone,jdbcType=VARCHAR},
-
-
- #{businessLicenseUrl,jdbcType=VARCHAR},
-
-
- #{idcardJuridicalUrl,jdbcType=VARCHAR},
-
-
- #{idcardAgentUrl,jdbcType=VARCHAR},
-
-
-
-
-
- update firm_info_detail
-
-
- uniqueid = #{record.uniqueid,jdbcType=VARCHAR},
-
-
- open_id = #{record.openId,jdbcType=VARCHAR},
-
-
- org_code_url = #{record.orgCodeUrl,jdbcType=VARCHAR},
-
-
- juridical_idcard_front_url = #{record.juridicalIdcardFrontUrl,jdbcType=VARCHAR},
-
-
- juridical_idcard_back_url = #{record.juridicalIdcardBackUrl,jdbcType=VARCHAR},
-
-
- juridical_tmp_id_url = #{record.juridicalTmpIdUrl,jdbcType=VARCHAR},
-
-
- firm_bus_reg_num = #{record.firmBusRegNum,jdbcType=VARCHAR},
-
-
- firm_soc_cre_code = #{record.firmSocCreCode,jdbcType=VARCHAR},
-
-
- firm_org_code = #{record.firmOrgCode,jdbcType=VARCHAR},
-
-
- firm_tax_reg_cert_code = #{record.firmTaxRegCertCode,jdbcType=VARCHAR},
-
-
- firm_bus_scope = #{record.firmBusScope,jdbcType=VARCHAR},
-
-
- firm_bus_time = #{record.firmBusTime,jdbcType=TIMESTAMP},
-
-
- juridical_nationality = #{record.juridicalNationality,jdbcType=VARCHAR},
-
-
- juridical_idcard = #{record.juridicalIdcard,jdbcType=VARCHAR},
-
-
- juridical_time = #{record.juridicalTime,jdbcType=TIMESTAMP},
-
-
- agent_name = #{record.agentName,jdbcType=VARCHAR},
-
-
- agent_idcard = #{record.agentIdcard,jdbcType=VARCHAR},
-
-
- agent_time = #{record.agentTime,jdbcType=TIMESTAMP},
-
-
- firm_phone = #{record.firmPhone,jdbcType=VARCHAR},
-
-
- business_license_url = #{record.businessLicenseUrl,jdbcType=VARCHAR},
-
-
- idcard_juridical_url = #{record.idcardJuridicalUrl,jdbcType=VARCHAR},
-
-
- idcard_agent_url = #{record.idcardAgentUrl,jdbcType=VARCHAR},
-
-
-
-
-
-
-
- update firm_info_detail
- set uniqueid = #{record.uniqueid,jdbcType=VARCHAR},
- open_id = #{record.openId,jdbcType=VARCHAR},
- org_code_url = #{record.orgCodeUrl,jdbcType=VARCHAR},
- juridical_idcard_front_url = #{record.juridicalIdcardFrontUrl,jdbcType=VARCHAR},
- juridical_idcard_back_url = #{record.juridicalIdcardBackUrl,jdbcType=VARCHAR},
- juridical_tmp_id_url = #{record.juridicalTmpIdUrl,jdbcType=VARCHAR},
- firm_bus_reg_num = #{record.firmBusRegNum,jdbcType=VARCHAR},
- firm_soc_cre_code = #{record.firmSocCreCode,jdbcType=VARCHAR},
- firm_org_code = #{record.firmOrgCode,jdbcType=VARCHAR},
- firm_tax_reg_cert_code = #{record.firmTaxRegCertCode,jdbcType=VARCHAR},
- firm_bus_scope = #{record.firmBusScope,jdbcType=VARCHAR},
- firm_bus_time = #{record.firmBusTime,jdbcType=TIMESTAMP},
- juridical_nationality = #{record.juridicalNationality,jdbcType=VARCHAR},
- juridical_idcard = #{record.juridicalIdcard,jdbcType=VARCHAR},
- juridical_time = #{record.juridicalTime,jdbcType=TIMESTAMP},
- agent_name = #{record.agentName,jdbcType=VARCHAR},
- agent_idcard = #{record.agentIdcard,jdbcType=VARCHAR},
- agent_time = #{record.agentTime,jdbcType=TIMESTAMP},
- firm_phone = #{record.firmPhone,jdbcType=VARCHAR},
- business_license_url = #{record.businessLicenseUrl,jdbcType=VARCHAR},
- idcard_juridical_url = #{record.idcardJuridicalUrl,jdbcType=VARCHAR},
- idcard_agent_url = #{record.idcardAgentUrl,jdbcType=VARCHAR}
-
-
-
-
-
- update firm_info_detail
-
-
- open_id = #{openId,jdbcType=VARCHAR},
-
-
- org_code_url = #{orgCodeUrl,jdbcType=VARCHAR},
-
-
- juridical_idcard_front_url = #{juridicalIdcardFrontUrl,jdbcType=VARCHAR},
-
-
- juridical_idcard_back_url = #{juridicalIdcardBackUrl,jdbcType=VARCHAR},
-
-
- juridical_tmp_id_url = #{juridicalTmpIdUrl,jdbcType=VARCHAR},
-
-
- firm_bus_reg_num = #{firmBusRegNum,jdbcType=VARCHAR},
-
-
- firm_soc_cre_code = #{firmSocCreCode,jdbcType=VARCHAR},
-
-
- firm_org_code = #{firmOrgCode,jdbcType=VARCHAR},
-
-
- firm_tax_reg_cert_code = #{firmTaxRegCertCode,jdbcType=VARCHAR},
-
-
- firm_bus_scope = #{firmBusScope,jdbcType=VARCHAR},
-
-
- firm_bus_time = #{firmBusTime,jdbcType=TIMESTAMP},
-
-
- juridical_nationality = #{juridicalNationality,jdbcType=VARCHAR},
-
-
- juridical_idcard = #{juridicalIdcard,jdbcType=VARCHAR},
-
-
- juridical_time = #{juridicalTime,jdbcType=TIMESTAMP},
-
-
- agent_name = #{agentName,jdbcType=VARCHAR},
-
-
- agent_idcard = #{agentIdcard,jdbcType=VARCHAR},
-
-
- agent_time = #{agentTime,jdbcType=TIMESTAMP},
-
-
- firm_phone = #{firmPhone,jdbcType=VARCHAR},
-
-
- business_license_url = #{businessLicenseUrl,jdbcType=VARCHAR},
-
-
- idcard_juridical_url = #{idcardJuridicalUrl,jdbcType=VARCHAR},
-
-
- idcard_agent_url = #{idcardAgentUrl,jdbcType=VARCHAR},
-
-
- where uniqueid = #{uniqueid,jdbcType=VARCHAR}
-
-
- update firm_info_detail
- set open_id = #{openId,jdbcType=VARCHAR},
- org_code_url = #{orgCodeUrl,jdbcType=VARCHAR},
- juridical_idcard_front_url = #{juridicalIdcardFrontUrl,jdbcType=VARCHAR},
- juridical_idcard_back_url = #{juridicalIdcardBackUrl,jdbcType=VARCHAR},
- juridical_tmp_id_url = #{juridicalTmpIdUrl,jdbcType=VARCHAR},
- firm_bus_reg_num = #{firmBusRegNum,jdbcType=VARCHAR},
- firm_soc_cre_code = #{firmSocCreCode,jdbcType=VARCHAR},
- firm_org_code = #{firmOrgCode,jdbcType=VARCHAR},
- firm_tax_reg_cert_code = #{firmTaxRegCertCode,jdbcType=VARCHAR},
- firm_bus_scope = #{firmBusScope,jdbcType=VARCHAR},
- firm_bus_time = #{firmBusTime,jdbcType=TIMESTAMP},
- juridical_nationality = #{juridicalNationality,jdbcType=VARCHAR},
- juridical_idcard = #{juridicalIdcard,jdbcType=VARCHAR},
- juridical_time = #{juridicalTime,jdbcType=TIMESTAMP},
- agent_name = #{agentName,jdbcType=VARCHAR},
- agent_idcard = #{agentIdcard,jdbcType=VARCHAR},
- agent_time = #{agentTime,jdbcType=TIMESTAMP},
- firm_phone = #{firmPhone,jdbcType=VARCHAR},
- business_license_url = #{businessLicenseUrl,jdbcType=VARCHAR},
- idcard_juridical_url = #{idcardJuridicalUrl,jdbcType=VARCHAR},
- idcard_agent_url = #{idcardAgentUrl,jdbcType=VARCHAR}
- where uniqueid = #{uniqueid,jdbcType=VARCHAR}
-
-
-
-
-
-
-
-
-
-
- insert into firm_info_detail
- (open_id, org_code_url, juridical_idcard_front_url, juridical_idcard_back_url, juridical_tmp_id_url,
- firm_bus_reg_num, firm_soc_cre_code, firm_org_code, firm_tax_reg_cert_code, firm_bus_scope,
- firm_bus_time, juridical_nationality, juridical_idcard, juridical_time, agent_name,
- agent_idcard, agent_time, firm_phone, business_license_url, idcard_juridical_url,
- idcard_agent_url)
- values
-
- (#{item.openId,jdbcType=VARCHAR}, #{item.orgCodeUrl,jdbcType=VARCHAR}, #{item.juridicalIdcardFrontUrl,jdbcType=VARCHAR},
- #{item.juridicalIdcardBackUrl,jdbcType=VARCHAR}, #{item.juridicalTmpIdUrl,jdbcType=VARCHAR},
- #{item.firmBusRegNum,jdbcType=VARCHAR}, #{item.firmSocCreCode,jdbcType=VARCHAR},
- #{item.firmOrgCode,jdbcType=VARCHAR}, #{item.firmTaxRegCertCode,jdbcType=VARCHAR},
- #{item.firmBusScope,jdbcType=VARCHAR}, #{item.firmBusTime,jdbcType=TIMESTAMP},
- #{item.juridicalNationality,jdbcType=VARCHAR}, #{item.juridicalIdcard,jdbcType=VARCHAR},
- #{item.juridicalTime,jdbcType=TIMESTAMP}, #{item.agentName,jdbcType=VARCHAR}, #{item.agentIdcard,jdbcType=VARCHAR},
- #{item.agentTime,jdbcType=TIMESTAMP}, #{item.firmPhone,jdbcType=VARCHAR}, #{item.businessLicenseUrl,jdbcType=VARCHAR},
- #{item.idcardJuridicalUrl,jdbcType=VARCHAR}, #{item.idcardAgentUrl,jdbcType=VARCHAR}
- )
-
-
-
- insert into firm_info_detail (
-
- ${column.escapedColumnName}
-
- )
- values
-
- (
-
-
- #{item.openId,jdbcType=VARCHAR}
-
-
- #{item.orgCodeUrl,jdbcType=VARCHAR}
-
-
- #{item.juridicalIdcardFrontUrl,jdbcType=VARCHAR}
-
-
- #{item.juridicalIdcardBackUrl,jdbcType=VARCHAR}
-
-
- #{item.juridicalTmpIdUrl,jdbcType=VARCHAR}
-
-
- #{item.firmBusRegNum,jdbcType=VARCHAR}
-
-
- #{item.firmSocCreCode,jdbcType=VARCHAR}
-
-
- #{item.firmOrgCode,jdbcType=VARCHAR}
-
-
- #{item.firmTaxRegCertCode,jdbcType=VARCHAR}
-
-
- #{item.firmBusScope,jdbcType=VARCHAR}
-
-
- #{item.firmBusTime,jdbcType=TIMESTAMP}
-
-
- #{item.juridicalNationality,jdbcType=VARCHAR}
-
-
- #{item.juridicalIdcard,jdbcType=VARCHAR}
-
-
- #{item.juridicalTime,jdbcType=TIMESTAMP}
-
-
- #{item.agentName,jdbcType=VARCHAR}
-
-
- #{item.agentIdcard,jdbcType=VARCHAR}
-
-
- #{item.agentTime,jdbcType=TIMESTAMP}
-
-
- #{item.firmPhone,jdbcType=VARCHAR}
-
-
- #{item.businessLicenseUrl,jdbcType=VARCHAR}
-
-
- #{item.idcardJuridicalUrl,jdbcType=VARCHAR}
-
-
- #{item.idcardAgentUrl,jdbcType=VARCHAR}
-
-
- )
-
-
-
\ No newline at end of file
diff --git a/customer/src/main/resources/mybatis/mapper/FirmInfoExtendMapper.xml b/customer/src/main/resources/mybatis/mapper/FirmInfoExtendMapper.xml
index 1a56e71..9712941 100644
--- a/customer/src/main/resources/mybatis/mapper/FirmInfoExtendMapper.xml
+++ b/customer/src/main/resources/mybatis/mapper/FirmInfoExtendMapper.xml
@@ -110,15 +110,18 @@
-
- insert into firm_info_extend (client_id, prop_name, prop_value
- )
- values (#{clientId,jdbcType=VARCHAR}, #{propName,jdbcType=VARCHAR}, #{propValue,jdbcType=VARCHAR}
- )
+
+ insert into firm_info_extend (uniqueid, client_id, prop_name,
+ prop_value)
+ values (#{uniqueid,jdbcType=VARCHAR}, #{clientId,jdbcType=VARCHAR}, #{propName,jdbcType=VARCHAR},
+ #{propValue,jdbcType=VARCHAR})
-
+
insert into firm_info_extend
+
+ uniqueid,
+
client_id,
@@ -130,6 +133,9 @@
+
+ #{uniqueid,jdbcType=VARCHAR},
+
#{clientId,jdbcType=VARCHAR},
@@ -200,7 +206,7 @@
where uniqueid = #{uniqueid,jdbcType=VARCHAR}
-
+
@@ -218,16 +224,16 @@
limit 1
-
+
insert into firm_info_extend
- (client_id, prop_name, prop_value)
+ (uniqueid, client_id, prop_name, prop_value)
values
- (#{item.clientId,jdbcType=VARCHAR}, #{item.propName,jdbcType=VARCHAR}, #{item.propValue,jdbcType=VARCHAR}
- )
+ (#{item.uniqueid,jdbcType=VARCHAR}, #{item.clientId,jdbcType=VARCHAR}, #{item.propName,jdbcType=VARCHAR},
+ #{item.propValue,jdbcType=VARCHAR})
-
+
insert into firm_info_extend (
${column.escapedColumnName}
@@ -237,6 +243,9 @@
(
+
+ #{item.uniqueid,jdbcType=VARCHAR}
+
#{item.clientId,jdbcType=VARCHAR}
diff --git a/customer/src/main/resources/mybatis/mapper/FirmInfoMapper.xml b/customer/src/main/resources/mybatis/mapper/FirmInfoMapper.xml
index 6280a40..110204d 100644
--- a/customer/src/main/resources/mybatis/mapper/FirmInfoMapper.xml
+++ b/customer/src/main/resources/mybatis/mapper/FirmInfoMapper.xml
@@ -9,7 +9,7 @@
-
+
@@ -34,7 +34,7 @@
-
+
@@ -221,31 +221,34 @@
-
- insert into firm_info (client_id, firm_person, app_secret,
- firm_name, firm_phone, cert_alg,
- firm_address, note, firm_email,
- status, client_org_code, mssp_appid,
- cert_agency, stamp_type, stamp_name,
- open_id, send_sms, sale_person_id,
- tech_person_id, create_time, update_time,
- agent_client_id, agent_sale_id, ca_channel,
- project_status, plat_app_id, app_cert,
- app_icon)
- values (#{clientId,jdbcType=VARCHAR}, #{firmPerson,jdbcType=VARCHAR}, #{appSecret,jdbcType=VARCHAR},
- #{firmName,jdbcType=VARCHAR}, #{firmPhone,jdbcType=VARCHAR}, #{certAlg,jdbcType=VARCHAR},
- #{firmAddress,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR}, #{firmEmail,jdbcType=VARCHAR},
- #{firmStatus,jdbcType=INTEGER}, #{clientOrgCode,jdbcType=VARCHAR}, #{msspAppid,jdbcType=VARCHAR},
- #{certAgency,jdbcType=VARCHAR}, #{stampType,jdbcType=CHAR}, #{stampName,jdbcType=VARCHAR},
- #{openId,jdbcType=VARCHAR}, #{sendSms,jdbcType=VARCHAR}, #{salePersonId,jdbcType=VARCHAR},
- #{techPersonId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP},
- #{agentClientId,jdbcType=VARCHAR}, #{agentSaleId,jdbcType=VARCHAR}, #{caChannel,jdbcType=INTEGER},
- #{projectStatus,jdbcType=INTEGER}, #{platAppId,jdbcType=INTEGER}, #{appCert,jdbcType=LONGVARCHAR},
- #{appIcon,jdbcType=LONGVARCHAR})
+
+ insert into firm_info (uniqueid, client_id, firm_person,
+ app_secret, firm_name, firm_phone,
+ cert_alg, firm_address, note,
+ firm_email, status, client_org_code,
+ mssp_appid, cert_agency, stamp_type,
+ stamp_name, open_id, send_sms,
+ sale_person_id, tech_person_id, create_time,
+ update_time, agent_client_id, agent_sale_id,
+ ca_channel, project_status, plat_app_id,
+ app_cert, app_icon)
+ values (#{uniqueid,jdbcType=VARCHAR}, #{clientId,jdbcType=VARCHAR}, #{firmPerson,jdbcType=VARCHAR},
+ #{appSecret,jdbcType=VARCHAR}, #{firmName,jdbcType=VARCHAR}, #{firmPhone,jdbcType=VARCHAR},
+ #{certAlg,jdbcType=VARCHAR}, #{firmAddress,jdbcType=VARCHAR}, #{note,jdbcType=VARCHAR},
+ #{firmEmail,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, #{clientOrgCode,jdbcType=VARCHAR},
+ #{msspAppid,jdbcType=VARCHAR}, #{certAgency,jdbcType=VARCHAR}, #{stampType,jdbcType=CHAR},
+ #{stampName,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}, #{sendSms,jdbcType=VARCHAR},
+ #{salePersonId,jdbcType=VARCHAR}, #{techPersonId,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
+ #{updateTime,jdbcType=TIMESTAMP}, #{agentClientId,jdbcType=VARCHAR}, #{agentSaleId,jdbcType=VARCHAR},
+ #{caChannel,jdbcType=INTEGER}, #{projectStatus,jdbcType=INTEGER}, #{platAppId,jdbcType=INTEGER},
+ #{appCert,jdbcType=LONGVARCHAR}, #{appIcon,jdbcType=LONGVARCHAR})
-
+
insert into firm_info
+
+ uniqueid,
+
client_id,
@@ -273,7 +276,7 @@
firm_email,
-
+
status,
@@ -332,6 +335,9 @@
+
+ #{uniqueid,jdbcType=VARCHAR},
+
#{clientId,jdbcType=VARCHAR},
@@ -359,8 +365,8 @@
#{firmEmail,jdbcType=VARCHAR},
-
- #{firmStatus,jdbcType=INTEGER},
+
+ #{status,jdbcType=INTEGER},
#{clientOrgCode,jdbcType=VARCHAR},
@@ -457,8 +463,8 @@
firm_email = #{record.firmEmail,jdbcType=VARCHAR},
-
- status = #{record.firmStatus,jdbcType=INTEGER},
+
+ status = #{record.status,jdbcType=INTEGER},
client_org_code = #{record.clientOrgCode,jdbcType=VARCHAR},
@@ -531,7 +537,7 @@
firm_address = #{record.firmAddress,jdbcType=VARCHAR},
note = #{record.note,jdbcType=VARCHAR},
firm_email = #{record.firmEmail,jdbcType=VARCHAR},
- status = #{record.firmStatus,jdbcType=INTEGER},
+ status = #{record.status,jdbcType=INTEGER},
client_org_code = #{record.clientOrgCode,jdbcType=VARCHAR},
mssp_appid = #{record.msspAppid,jdbcType=VARCHAR},
cert_agency = #{record.certAgency,jdbcType=VARCHAR},
@@ -566,7 +572,7 @@
firm_address = #{record.firmAddress,jdbcType=VARCHAR},
note = #{record.note,jdbcType=VARCHAR},
firm_email = #{record.firmEmail,jdbcType=VARCHAR},
- status = #{record.firmStatus,jdbcType=INTEGER},
+ status = #{record.status,jdbcType=INTEGER},
client_org_code = #{record.clientOrgCode,jdbcType=VARCHAR},
mssp_appid = #{record.msspAppid,jdbcType=VARCHAR},
cert_agency = #{record.certAgency,jdbcType=VARCHAR},
@@ -617,8 +623,8 @@
firm_email = #{firmEmail,jdbcType=VARCHAR},
-
- status = #{firmStatus,jdbcType=INTEGER},
+
+ status = #{status,jdbcType=INTEGER},
client_org_code = #{clientOrgCode,jdbcType=VARCHAR},
@@ -688,7 +694,7 @@
firm_address = #{firmAddress,jdbcType=VARCHAR},
note = #{note,jdbcType=VARCHAR},
firm_email = #{firmEmail,jdbcType=VARCHAR},
- status = #{firmStatus,jdbcType=INTEGER},
+ status = #{status,jdbcType=INTEGER},
client_org_code = #{clientOrgCode,jdbcType=VARCHAR},
mssp_appid = #{msspAppid,jdbcType=VARCHAR},
cert_agency = #{certAgency,jdbcType=VARCHAR},
@@ -720,7 +726,7 @@
firm_address = #{firmAddress,jdbcType=VARCHAR},
note = #{note,jdbcType=VARCHAR},
firm_email = #{firmEmail,jdbcType=VARCHAR},
- status = #{firmStatus,jdbcType=INTEGER},
+ status = #{status,jdbcType=INTEGER},
client_org_code = #{clientOrgCode,jdbcType=VARCHAR},
mssp_appid = #{msspAppid,jdbcType=VARCHAR},
cert_agency = #{certAgency,jdbcType=VARCHAR},
@@ -740,7 +746,7 @@
where uniqueid = #{uniqueid,jdbcType=VARCHAR}
-
+
@@ -772,28 +778,29 @@
limit 1
-
+
insert into firm_info
- (client_id, firm_person, app_secret, firm_name, firm_phone, cert_alg, firm_address,
+ (uniqueid, client_id, firm_person, app_secret, firm_name, firm_phone, cert_alg, firm_address,
note, firm_email, status, client_org_code, mssp_appid, cert_agency, stamp_type,
stamp_name, open_id, send_sms, sale_person_id, tech_person_id, create_time, update_time,
agent_client_id, agent_sale_id, ca_channel, project_status, plat_app_id, app_cert,
app_icon)
values
- (#{item.clientId,jdbcType=VARCHAR}, #{item.firmPerson,jdbcType=VARCHAR}, #{item.appSecret,jdbcType=VARCHAR},
- #{item.firmName,jdbcType=VARCHAR}, #{item.firmPhone,jdbcType=VARCHAR}, #{item.certAlg,jdbcType=VARCHAR},
- #{item.firmAddress,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR}, #{item.firmEmail,jdbcType=VARCHAR},
- #{item.firmStatus,jdbcType=INTEGER}, #{item.clientOrgCode,jdbcType=VARCHAR}, #{item.msspAppid,jdbcType=VARCHAR},
- #{item.certAgency,jdbcType=VARCHAR}, #{item.stampType,jdbcType=CHAR}, #{item.stampName,jdbcType=VARCHAR},
- #{item.openId,jdbcType=VARCHAR}, #{item.sendSms,jdbcType=VARCHAR}, #{item.salePersonId,jdbcType=VARCHAR},
- #{item.techPersonId,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP},
- #{item.agentClientId,jdbcType=VARCHAR}, #{item.agentSaleId,jdbcType=VARCHAR}, #{item.caChannel,jdbcType=INTEGER},
- #{item.projectStatus,jdbcType=INTEGER}, #{item.platAppId,jdbcType=INTEGER}, #{item.appCert,jdbcType=LONGVARCHAR},
- #{item.appIcon,jdbcType=LONGVARCHAR})
+ (#{item.uniqueid,jdbcType=VARCHAR}, #{item.clientId,jdbcType=VARCHAR}, #{item.firmPerson,jdbcType=VARCHAR},
+ #{item.appSecret,jdbcType=VARCHAR}, #{item.firmName,jdbcType=VARCHAR}, #{item.firmPhone,jdbcType=VARCHAR},
+ #{item.certAlg,jdbcType=VARCHAR}, #{item.firmAddress,jdbcType=VARCHAR}, #{item.note,jdbcType=VARCHAR},
+ #{item.firmEmail,jdbcType=VARCHAR}, #{item.status,jdbcType=INTEGER}, #{item.clientOrgCode,jdbcType=VARCHAR},
+ #{item.msspAppid,jdbcType=VARCHAR}, #{item.certAgency,jdbcType=VARCHAR}, #{item.stampType,jdbcType=CHAR},
+ #{item.stampName,jdbcType=VARCHAR}, #{item.openId,jdbcType=VARCHAR}, #{item.sendSms,jdbcType=VARCHAR},
+ #{item.salePersonId,jdbcType=VARCHAR}, #{item.techPersonId,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
+ #{item.updateTime,jdbcType=TIMESTAMP}, #{item.agentClientId,jdbcType=VARCHAR},
+ #{item.agentSaleId,jdbcType=VARCHAR}, #{item.caChannel,jdbcType=INTEGER}, #{item.projectStatus,jdbcType=INTEGER},
+ #{item.platAppId,jdbcType=INTEGER}, #{item.appCert,jdbcType=LONGVARCHAR}, #{item.appIcon,jdbcType=LONGVARCHAR}
+ )
-
+
insert into firm_info (
${column.escapedColumnName}
@@ -803,6 +810,9 @@
(
+
+ #{item.uniqueid,jdbcType=VARCHAR}
+
#{item.clientId,jdbcType=VARCHAR}
@@ -831,7 +841,7 @@
#{item.firmEmail,jdbcType=VARCHAR}
- #{item.firmStatus,jdbcType=INTEGER}
+ #{item.status,jdbcType=INTEGER}
#{item.clientOrgCode,jdbcType=VARCHAR}
diff --git a/customer/src/main/resources/mybatis/mapper/FirmInfoTempMapper.xml b/customer/src/main/resources/mybatis/mapper/FirmInfoTempMapper.xml
index c816d90..01516c1 100644
--- a/customer/src/main/resources/mybatis/mapper/FirmInfoTempMapper.xml
+++ b/customer/src/main/resources/mybatis/mapper/FirmInfoTempMapper.xml
@@ -240,9 +240,9 @@
-
- insert into firm_info_temp (open_id, business_license_url, org_code_url,
- juridical_idcard_front_url, juridical_idcard_back_url,
+
+ insert into firm_info_temp (uniqueid, open_id, business_license_url,
+ org_code_url, juridical_idcard_front_url, juridical_idcard_back_url,
juridical_tmp_id_url, firm_name, firm_bus_reg_num,
firm_soc_cre_code, firm_addr, firm_org_code,
firm_tax_reg_cert_code, firm_bus_scope, firm_bus_time,
@@ -254,8 +254,8 @@
agent_client_id, agent_sale_id, firm_client_id,
create_time, update_time, firm_person,
firm_logo)
- values (#{openId,jdbcType=VARCHAR}, #{businessLicenseUrl,jdbcType=VARCHAR}, #{orgCodeUrl,jdbcType=VARCHAR},
- #{juridicalIdcardFrontUrl,jdbcType=VARCHAR}, #{juridicalIdcardBackUrl,jdbcType=VARCHAR},
+ values (#{uniqueid,jdbcType=VARCHAR}, #{openId,jdbcType=VARCHAR}, #{businessLicenseUrl,jdbcType=VARCHAR},
+ #{orgCodeUrl,jdbcType=VARCHAR}, #{juridicalIdcardFrontUrl,jdbcType=VARCHAR}, #{juridicalIdcardBackUrl,jdbcType=VARCHAR},
#{juridicalTmpIdUrl,jdbcType=VARCHAR}, #{firmName,jdbcType=VARCHAR}, #{firmBusRegNum,jdbcType=VARCHAR},
#{firmSocCreCode,jdbcType=VARCHAR}, #{firmAddress,jdbcType=VARCHAR}, #{firmOrgCode,jdbcType=VARCHAR},
#{firmTaxRegCertCode,jdbcType=VARCHAR}, #{firmBusScope,jdbcType=VARCHAR}, #{firmBusTime,jdbcType=TIMESTAMP},
@@ -268,9 +268,12 @@
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{firmPerson,jdbcType=VARCHAR},
#{firmLogo,jdbcType=LONGVARCHAR})
-
+
insert into firm_info_temp
+
+ uniqueid,
+
open_id,
@@ -381,6 +384,9 @@
+
+ #{uniqueid,jdbcType=VARCHAR},
+
#{openId,jdbcType=VARCHAR},
@@ -895,7 +901,7 @@
where uniqueid = #{uniqueid,jdbcType=VARCHAR}
-
+
@@ -927,21 +933,21 @@
limit 1
-
+
insert into firm_info_temp
- (open_id, business_license_url, org_code_url, juridical_idcard_front_url, juridical_idcard_back_url,
- juridical_tmp_id_url, firm_name, firm_bus_reg_num, firm_soc_cre_code, firm_addr,
- firm_org_code, firm_tax_reg_cert_code, firm_bus_scope, firm_bus_time, juridical_nationality,
- juridical_name, juridical_phone, juridical_idcard, juridical_time, agent_name,
- agent_idcard, agent_time, firm_phone, firm_email, realname_check, firm_status,
+ (uniqueid, open_id, business_license_url, org_code_url, juridical_idcard_front_url,
+ juridical_idcard_back_url, juridical_tmp_id_url, firm_name, firm_bus_reg_num, firm_soc_cre_code,
+ firm_addr, firm_org_code, firm_tax_reg_cert_code, firm_bus_scope, firm_bus_time,
+ juridical_nationality, juridical_name, juridical_phone, juridical_idcard, juridical_time,
+ agent_name, agent_idcard, agent_time, firm_phone, firm_email, realname_check, firm_status,
juridical_realname_check, agent_phone, channel, agent_client_id, agent_sale_id,
firm_client_id, create_time, update_time, firm_person, firm_logo)
values
- (#{item.openId,jdbcType=VARCHAR}, #{item.businessLicenseUrl,jdbcType=VARCHAR}, #{item.orgCodeUrl,jdbcType=VARCHAR},
- #{item.juridicalIdcardFrontUrl,jdbcType=VARCHAR}, #{item.juridicalIdcardBackUrl,jdbcType=VARCHAR},
- #{item.juridicalTmpIdUrl,jdbcType=VARCHAR}, #{item.firmName,jdbcType=VARCHAR},
- #{item.firmBusRegNum,jdbcType=VARCHAR}, #{item.firmSocCreCode,jdbcType=VARCHAR},
+ (#{item.uniqueid,jdbcType=VARCHAR}, #{item.openId,jdbcType=VARCHAR}, #{item.businessLicenseUrl,jdbcType=VARCHAR},
+ #{item.orgCodeUrl,jdbcType=VARCHAR}, #{item.juridicalIdcardFrontUrl,jdbcType=VARCHAR},
+ #{item.juridicalIdcardBackUrl,jdbcType=VARCHAR}, #{item.juridicalTmpIdUrl,jdbcType=VARCHAR},
+ #{item.firmName,jdbcType=VARCHAR}, #{item.firmBusRegNum,jdbcType=VARCHAR}, #{item.firmSocCreCode,jdbcType=VARCHAR},
#{item.firmAddress,jdbcType=VARCHAR}, #{item.firmOrgCode,jdbcType=VARCHAR}, #{item.firmTaxRegCertCode,jdbcType=VARCHAR},
#{item.firmBusScope,jdbcType=VARCHAR}, #{item.firmBusTime,jdbcType=TIMESTAMP},
#{item.juridicalNationality,jdbcType=VARCHAR}, #{item.juridicalName,jdbcType=VARCHAR},
@@ -955,7 +961,7 @@
)
-
+
insert into firm_info_temp (
${column.escapedColumnName}
@@ -965,6 +971,9 @@
(
+
+ #{item.uniqueid,jdbcType=VARCHAR}
+
#{item.openId,jdbcType=VARCHAR}
diff --git a/customer/src/main/resources/mybatis/mapper/FirmOauthTokenMapper.xml b/customer/src/main/resources/mybatis/mapper/FirmOauthTokenMapper.xml
index 9a88941..1e01ba8 100644
--- a/customer/src/main/resources/mybatis/mapper/FirmOauthTokenMapper.xml
+++ b/customer/src/main/resources/mybatis/mapper/FirmOauthTokenMapper.xml
@@ -126,17 +126,22 @@
-
- insert into firm_oauth_token (client_id, access_token, access_token_expires,
- call_num, scope, create_time,
- update_time, app_secret)
- values (#{clientId,jdbcType=CHAR}, #{accessToken,jdbcType=CHAR}, #{accessTokenExpires,jdbcType=INTEGER},
- #{callNum,jdbcType=INTEGER}, #{scope,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP},
- #{updateTime,jdbcType=TIMESTAMP}, #{appSecret,jdbcType=VARCHAR})
+
+ insert into firm_oauth_token (uniqueid, client_id, access_token,
+ access_token_expires, call_num, scope,
+ create_time, update_time, app_secret
+ )
+ values (#{uniqueid,jdbcType=CHAR}, #{clientId,jdbcType=CHAR}, #{accessToken,jdbcType=CHAR},
+ #{accessTokenExpires,jdbcType=INTEGER}, #{callNum,jdbcType=INTEGER}, #{scope,jdbcType=VARCHAR},
+ #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{appSecret,jdbcType=VARCHAR}
+ )
-
+
insert into firm_oauth_token
+
+ uniqueid,
+
client_id,
@@ -163,6 +168,9 @@
+
+ #{uniqueid,jdbcType=CHAR},
+
#{clientId,jdbcType=CHAR},
@@ -288,7 +296,7 @@
where uniqueid = #{uniqueid,jdbcType=CHAR}
-
+
@@ -306,18 +314,19 @@
limit 1
-
+
insert into firm_oauth_token
- (client_id, access_token, access_token_expires, call_num, scope, create_time, update_time,
- app_secret)
+ (uniqueid, client_id, access_token, access_token_expires, call_num, scope, create_time,
+ update_time, app_secret)
values
- (#{item.clientId,jdbcType=CHAR}, #{item.accessToken,jdbcType=CHAR}, #{item.accessTokenExpires,jdbcType=INTEGER},
- #{item.callNum,jdbcType=INTEGER}, #{item.scope,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP},
- #{item.updateTime,jdbcType=TIMESTAMP}, #{item.appSecret,jdbcType=VARCHAR})
+ (#{item.uniqueid,jdbcType=CHAR}, #{item.clientId,jdbcType=CHAR}, #{item.accessToken,jdbcType=CHAR},
+ #{item.accessTokenExpires,jdbcType=INTEGER}, #{item.callNum,jdbcType=INTEGER},
+ #{item.scope,jdbcType=VARCHAR}, #{item.createTime,jdbcType=TIMESTAMP}, #{item.updateTime,jdbcType=TIMESTAMP},
+ #{item.appSecret,jdbcType=VARCHAR})
-
+
insert into firm_oauth_token (
${column.escapedColumnName}
@@ -327,6 +336,9 @@
(
+
+ #{item.uniqueid,jdbcType=CHAR}
+
#{item.clientId,jdbcType=CHAR}
diff --git a/customer/src/main/resources/mybatis/mapper/FirmUsercertChannelMapper.xml b/customer/src/main/resources/mybatis/mapper/FirmUsercertChannelMapper.xml
index aff064f..9bc6b79 100644
--- a/customer/src/main/resources/mybatis/mapper/FirmUsercertChannelMapper.xml
+++ b/customer/src/main/resources/mybatis/mapper/FirmUsercertChannelMapper.xml
@@ -114,15 +114,18 @@
-
- insert into firm_usercert_channel (clientid, firm_id, channel_type
- )
- values (#{clientid,jdbcType=VARCHAR}, #{firmId,jdbcType=VARCHAR}, #{channelType,jdbcType=BIT}
- )
+
+ insert into firm_usercert_channel (uniqueid, clientid, firm_id,
+ channel_type)
+ values (#{uniqueid,jdbcType=VARCHAR}, #{clientid,jdbcType=VARCHAR}, #{firmId,jdbcType=VARCHAR},
+ #{channelType,jdbcType=BIT})
-
+
insert into firm_usercert_channel
+
+ uniqueid,
+
clientid,
@@ -134,6 +137,9 @@
+
+ #{uniqueid,jdbcType=VARCHAR},
+
#{clientid,jdbcType=VARCHAR},
@@ -204,7 +210,7 @@
where uniqueid = #{uniqueid,jdbcType=VARCHAR}
-
+
@@ -222,16 +228,16 @@
limit 1
-
+
insert into firm_usercert_channel
- (clientid, firm_id, channel_type)
+ (uniqueid, clientid, firm_id, channel_type)
values
- (#{item.clientid,jdbcType=VARCHAR}, #{item.firmId,jdbcType=VARCHAR}, #{item.channelType,jdbcType=BIT}
- )
+ (#{item.uniqueid,jdbcType=VARCHAR}, #{item.clientid,jdbcType=VARCHAR}, #{item.firmId,jdbcType=VARCHAR},
+ #{item.channelType,jdbcType=BIT})
-
+
insert into firm_usercert_channel (
${column.escapedColumnName}
@@ -241,6 +247,9 @@
(
+
+ #{item.uniqueid,jdbcType=VARCHAR}
+
#{item.clientid,jdbcType=VARCHAR}
diff --git a/customer/src/test/java/com/trust/ywx/customer/ApplicationTests.java b/customer/src/test/java/com/trust/ywx/customer/ApplicationTests.java
index b0b9d7a..8a98c3a 100644
--- a/customer/src/test/java/com/trust/ywx/customer/ApplicationTests.java
+++ b/customer/src/test/java/com/trust/ywx/customer/ApplicationTests.java
@@ -6,17 +6,16 @@ import com.trust.ywx.customer.dao.po.FirmInfo;
import com.trust.ywx.customer.dao.po.FirmInfoExample;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
+import javax.annotation.Resource;
import java.util.List;
@Slf4j
@SpringBootTest(classes = Application.class)
class ApplicationTests {
- @Autowired
+ @Resource
FirmInfoMapper firmInfoMapper;
@Test
void contextLoads() {
diff --git a/customer/src/test/java/com/trust/ywx/customer/FirmServiceTests.java b/customer/src/test/java/com/trust/ywx/customer/FirmServiceTests.java
new file mode 100644
index 0000000..c136e3b
--- /dev/null
+++ b/customer/src/test/java/com/trust/ywx/customer/FirmServiceTests.java
@@ -0,0 +1,56 @@
+package com.trust.ywx.customer;
+
+import com.trust.ywx.customer.common.enu.CaChannelEnum;
+import com.trust.ywx.customer.common.enu.CommonStatusEnum;
+import com.trust.ywx.customer.common.enu.ProjectStatusEnum;
+import com.trust.ywx.customer.common.model.manager.request.TrustFirmParam;
+import com.trust.ywx.customer.common.exception.BizException;
+import com.trust.ywx.customer.service.manager.FirmManagerService;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import javax.annotation.Resource;
+
+/**
+ *
+ *
+ * @文件名称： FirmServiceTests.java
+ * @包 路 径： com.trust.ywx.customer
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/20 17:19
+ * @Modify：
+ */
+
+@Slf4j
+@SpringBootTest(classes = Application.class)
+public class FirmServiceTests {
+ @Resource
+ FirmManagerService firmManagerService;
+
+ @Test
+ public void addTest() throws BizException {
+ TrustFirmParam param = new TrustFirmParam();
+ param.setClientId("12345");
+ param.setAppSecret("123456");
+ param.setClientOrgCode("678910");
+ param.setFirmName("莆田医院");
+ param.setProjectStatus(ProjectStatusEnum.NORMAL.getCode());
+ param.setCaChannel(CaChannelEnum.BJCA.getChannel());
+
+ param.setTechSupport(CommonStatusEnum.NO.getCode());
+ param.setSmsSend(CommonStatusEnum.YES.getCode());
+ param.setSmsCustomize(CommonStatusEnum.YES.getCode());
+ param.setSmsCustomizeContent("我的短信我做主");
+ firmManagerService.add(param);
+ System.out.println("success");
+ }
+
+ @Test
+ public void delTest(){
+ firmManagerService.delete("12345");
+ }
+}
diff --git a/customer/src/test/java/com/trust/ywx/customer/StreamTests.java b/customer/src/test/java/com/trust/ywx/customer/StreamTests.java
new file mode 100644
index 0000000..d6e6666
--- /dev/null
+++ b/customer/src/test/java/com/trust/ywx/customer/StreamTests.java
@@ -0,0 +1,29 @@
+package com.trust.ywx.customer;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ *
+ *
+ * @文件名称： StreamTests.java
+ * @包 路 径： com.trust.ywx.customer
+ * @Copyright：北京数字医信责任有限公司 (C) 2022 *
+ * @Description:
+ * @Version: V1.0
+ * @Author： hanzhenchao
+ * @Date：2022/6/21 9:55
+ * @Modify：
+ */
+public class StreamTests {
+ public static void main(String[] args) {
+ Map map = new HashMap<>();
+ map.put("a",1);
+ map.put("b",1);
+ map.put("c",1);
+ List list = map.keySet().stream().collect(Collectors.toList());
+ System.out.println(list);
+ }
+}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/TrustCustomerService.java b/facade/src/main/java/com/trust/ywx/customer/service/TrustCustomerService.java
deleted file mode 100644
index 16d42c7..0000000
--- a/facade/src/main/java/com/trust/ywx/customer/service/TrustCustomerService.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.trust.ywx.customer.service;
-
-import com.trust.ywx.customer.service.dto.TrustCustomerInfoDto;
-import com.trust.ywx.customer.service.exception.BizException;
-
-/**
- *
- *
- * @文件名称： TrustCustomerService.java
- * @包 路 径： com.trust.ywx.customer.service.exceptions
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description: 可信客户服务类
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/11 21:15
- * @Modify：
- */
-public interface TrustCustomerService {
-
- /**
- * 添加可信客户
- * @param customerInfoDto
- */
- void addTrustCustomer(TrustCustomerInfoDto customerInfoDto) throws BizException;
-
- /**
- * 根据clientId查询可信客户信息
- * @param clientId
- * @return
- */
- TrustCustomerInfoDto getCustomerInfo(String clientId);
-
-
-
-}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/dto/SearchCustomerParam.java b/facade/src/main/java/com/trust/ywx/customer/service/dto/SearchCustomerParam.java
deleted file mode 100644
index d7750cb..0000000
--- a/facade/src/main/java/com/trust/ywx/customer/service/dto/SearchCustomerParam.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.trust.ywx.customer.service.dto;
-
-import com.fiftyonetrust.common.model.param.PageParam;
-import lombok.Data;
-
-import java.io.Serializable;
-
-/***************************************************************************
- *
- * @文件名称: Search1FirmParam.java
- * @包 路 径： cn.org.bjca.ywq.api.param.req
- * @版权所有：北京数字认证股份有限公司 (C) 2017
- *
- * @类描述:
- * @版本: V1.5
- * @创建人： hbx
- * @创建时间：2017年3月13日 下午1:54:17
- */
-@Data
-public class SearchCustomerParam extends PageParam {
- /**
- * 客户名称
- */
- private String customerName;
- /**
- * 代理商id
- */
- private String agentClientId;
- /**
- * 审核状态
- */
- private String status;
-
-}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/dto/SearchTrustCustomerParam.java b/facade/src/main/java/com/trust/ywx/customer/service/dto/SearchTrustCustomerParam.java
deleted file mode 100644
index 8aec750..0000000
--- a/facade/src/main/java/com/trust/ywx/customer/service/dto/SearchTrustCustomerParam.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.trust.ywx.customer.service.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/***************************************************************************
- *
- * @文件名称: Search1FirmParam.java
- * @包 路 径： cn.org.bjca.ywq.api.param.req
- * @版权所有：北京数字认证股份有限公司 (C) 2017
- *
- * @类描述:
- * @版本: V1.5
- * @创建人： hbx
- * @创建时间：2017年3月13日 下午1:54:17
- */
-@Data
-public class SearchTrustCustomerParam extends SearchCustomerParam{
- /**
- * 客户clientId
- */
- private String clientId;
-
- /**
- * 客户类型：互联网医院、实体医院等
- */
- private List networkType;
- /**
- * 公众产品形态 SDK\H5
- */
- private List publicProductType;
- /**
- *
- */
- private List channelType;
- /**
- * 证书状态：无证书、正常、已过期、待更新
- */
- private Integer certStatus;
- /**
- * 销售人员id
- */
- private String saleId;
-
- /**
- * 实施人员id
- */
- private String techId;
- /**
- * 计费模式 0正常 1异常
- */
- private String chargingMode;
-
- /**
- * 客户编号/合同方/合同号
- */
- private String likeCron;
-
- /**
- * 厂商组id
- */
- private String groupNum;
-
- /**
- * 项目状态 1、正常/2、试用/3、消亡
- */
- private Integer projectStatus;
-
-}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/dto/TrustCustomerInfoDto.java b/facade/src/main/java/com/trust/ywx/customer/service/dto/TrustCustomerInfoDto.java
deleted file mode 100644
index d2714d9..0000000
--- a/facade/src/main/java/com/trust/ywx/customer/service/dto/TrustCustomerInfoDto.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package com.trust.ywx.customer.service.dto;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- *
- *
- * @文件名称： CustomerInfoDto.java
- * @包 路 径： com.trust.ywx.customer.service.exceptions
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description: 可信客户对象
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/11 21:15
- * @Modify：
- */
-@Data
-public class TrustCustomerInfoDto implements Serializable {
-
- private static final long serialVersionUID = -4441680353421919686L;
- /**
- * 厂商唯一标识
- */
- private String clientId;
-
- /**
- * 厂商是否制章
- */
- private String isStamp;
-
- /**
- * 是否拒签 true 允许
- */
-
- private String reject;
- /**
- * 是否作废 true 允许
- */
-
- private String invalid;
- /**
- * 计费模式（0:正常 1：异常）
- */
- private String chargingMode;
-
- private String chargingRemark;
-
- private String feeModel;
-
- /**
- * app渠道
- */
- private String appChecked;
-
- /**
- * sdk渠道
- */
- private String sdkChecked;
-
- /**
- * 是否定制短信内容
- */
- private String smsCustomize;
-
- /**
- * 定制短信的内容
- */
- private String smsCustomizeContent;
-
- /**
- * 公众签名拍照
- */
- private String wxIsPhoto;
-
- /**
- * 是否需要审核签章
- */
- private String stampIsCheck;
-
- /**
- * 不允许appp设置签章
- */
- private String stampIsAppset;
-
- /**
- * 内控平台名称
- */
- private String hiscaName;
-
- /**
- * 内控平台logo图片
- */
- private String hiscaLogo;
-
- /**
- * 内控平台宣传图片
- */
- private String hiscaPublicity;
-
- /**
- * 内控平台回调地址
- */
- private String hiscaCallUrl;
- /**
- * 公众端产品类型
- */
- private String publicProductType;
-
- /**
- * 网络类型
- */
- private String networkType="";
- /**
- * 网络类型
- */
- private String gatewayVersion;
- /**
- * 内控监控地址
- */
- private String hiscaMonitorUrl;
- /**
- * 网络类型
- */
- private String gatewayMonitorUrl;
-
- /**
- * 用户图章样式类型 stamp默认图章 stamp1样式1 stamp2样式2
- */
- private String userStampType = "stamp";
-
- /**
- * 用户图章压缩 0压缩（默认） 1不压缩
- */
- private String userStampCompress = "0";
-
- /**
- * 厂商图章类型 0 圆章 1 方章
- */
- private Integer stampType;
- /**
- * 厂商图章时间戳 0否 1是
- */
- private Integer firmStampTS;
- /**
- * 子厂商图章时间戳 0否 1是
- */
- private Integer departStampTS;
- /**
- * 厂商类型 0 普通 1冠新 默认0
- */
- private Integer firmMode;
-
- private String faceDetect;
-
- private String caType;
-
- //厂商是否允许挂靠，默认不允许，除非在IDM选中允许挂靠
- private String allowUserBind = "0";
- //是否在挂靠医院列表里展示
- private String showFirm = "0";
- //个人pdf增加水印
- private String personPdfWater = "0";
- //附件pdf增加水印
- private String appendPdfWater = "0";
- //患者签名产品形态（app sdk h5 applet 多个逗号分隔）
- private String[] patientSignPlatform;
-// private PatientClientConfig appletConfig;
-
- private String techPersonSupport = "0";
- private String techSupportInfo = "";
-
- /**
- * 所属厂商组
- */
- private String firmGroup;
- /**
- * 厂商控制自动签 默认关闭“false”
- */
- private String selfSignByFirm;
-}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/exception/BizException.java b/facade/src/main/java/com/trust/ywx/customer/service/exception/BizException.java
deleted file mode 100644
index 48fc298..0000000
--- a/facade/src/main/java/com/trust/ywx/customer/service/exception/BizException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package com.trust.ywx.customer.service.exception;
-/**
- *
- *
- * @文件名称： BizException.java
- * @包 路 径： com.trust.ywx.customer.service.exceptions
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description: 客户服务返回的业务异常
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/11 21:15
- * @Modify：
- */
-public class BizException extends Exception {
- private static final long serialVersionUID = -6272782690484117542L;
- private String status;
-
- public BizException(String status, String message) {
- super(message);
- this.status = status;
- }
-
- public String getStatus() {
- return status;
- }
-
- public String getMessage(){
- return super.getMessage();
- }
-}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/filter/DubboCustomerExtendsInvokeFilter.java b/facade/src/main/java/com/trust/ywx/customer/service/filter/DubboCustomerExtendsInvokeFilter.java
deleted file mode 100644
index 26bf42a..0000000
--- a/facade/src/main/java/com/trust/ywx/customer/service/filter/DubboCustomerExtendsInvokeFilter.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.trust.ywx.customer.service.filter;
-
-
-import com.trust.ywx.customer.service.dto.TrustCustomerInfoDto;
-import org.apache.dubbo.common.constants.CommonConstants;
-import org.apache.dubbo.common.extension.Activate;
-import org.apache.dubbo.common.extension.SPI;
-import org.apache.dubbo.common.logger.Logger;
-import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.rpc.*;
-
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- *
- *
- * @文件名称： DubboCustomerInvokeFilter.java
- * @包 路 径： com.trust.ywx.customer.service.exceptions
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description: 可信客户的配置属性很多，为了防止业务方频繁调用造成服务端压力，在此增加过滤器，拦截获取配置属性方法，从本地缓存获取并返回。
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/11 21:15
- * @Modify：
- */
-public class DubboCustomerExtendsInvokeFilter implements Filter {
- public DubboCustomerExtendsInvokeFilter() {
- }
- /**
- * 将客户全量信息缓存在本地，当调用者获取某个配置项时，在此偷梁换柱！
- * key=clientId
- * value=CustomerInfoDto
- */
- private Map customerInfoMap = new ConcurrentHashMap();
-
- private static final List filterMethodList = Arrays.asList("getCustomerInfo");
- @Override
- public Result invoke(Invoker invoker, Invocation invocation) throws RpcException {
-// System.out.println(" client 我进来啦 开始了......");
-// if(filterMethodList.contains(invocation.getMethodName())){
- Object[] arguments = invocation.getArguments();
- String clientId = (String) arguments[0];
- TrustCustomerInfoDto customer = customerInfoMap.get(clientId);
-// if(customer!=null){
-//// customer.getClass().getMethod(invocation.getMethodName(),"")
-// CompletableFuture b = new CompletableFuture();
-// AsyncRpcResult asyncRpcResult = new AsyncRpcResult(b,invocation);
-// asyncRpcResult.setValue(customer);
-// return asyncRpcResult;
-// }else{
-// //异步刷新
-//// refreshCache();
-// System.out.println("aaaaaaaaaaaaaaaaaaaa");
- customer = new TrustCustomerInfoDto();
- customer.setClientId("我是客户端代码，调用我啊 ");
- customer.setAllowUserBind("111111111111");
- return AsyncRpcResult.newDefaultAsyncResult(customer, invocation);
-// }
-// }
-// Result r =
-// return invoker.invoke(invocation);
- }
-}
diff --git a/facade/src/main/java/com/trust/ywx/customer/service/query/CustomerService.java b/facade/src/main/java/com/trust/ywx/customer/service/query/CustomerService.java
deleted file mode 100644
index 40c13d5..0000000
--- a/facade/src/main/java/com/trust/ywx/customer/service/query/CustomerService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.trust.ywx.customer.service.query;
-
-import com.trust.ywx.customer.service.dto.SearchCustomerParam;
-
-/**
- *
- *
- * @文件名称： AuditCustomerService.java
- * @包 路 径： com.trust.ywx.customer.service.query
- * @Copyright：北京数字医信责任有限公司 (C) 2022 *
- * @Description:
- * @Version: V1.0
- * @Author： hanzhenchao
- * @Date：2022/6/14 19:34
- * @Modify：
- */
-public interface CustomerService {
-
- void getCustomerList(SearchCustomerParam param);
-
-}
diff --git a/facade/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter b/facade/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
index a303723..dd19e03 100644
--- a/facade/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
+++ b/facade/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.rpc.Filter
@@ -1,2 +1 @@
dubboProviderFilter=com.trust.ywx.customer.service.filter.DubboProviderFilter
-dubboCustomerExtendsInvokeFilter=com.trust.ywx.customer.service.filter.DubboCustomerExtendsInvokeFilter
\ No newline at end of file