From a549adeacb11b33b469c88eeed06c60dc9b4d2c4 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Tue, 18 Jul 2023 09:28:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cweb/controller/BsMerController.java | 2 + .../java/com/hfkj/dao/BsMerKahunaMapper.java | 113 +++ .../com/hfkj/dao/BsMerKahunaMapperExt.java | 7 + .../com/hfkj/dao/BsMerKahunaSqlProvider.java | 290 ++++++ .../main/java/com/hfkj/dao/BsMerMapper.java | 11 +- .../java/com/hfkj/dao/BsMerSqlProvider.java | 28 + .../main/java/com/hfkj/dao/BsStoreMapper.java | 78 +- .../java/com/hfkj/dao/BsStoreSqlProvider.java | 70 ++ .../src/main/java/com/hfkj/entity/BsMer.java | 32 + .../java/com/hfkj/entity/BsMerExample.java | 130 +++ .../java/com/hfkj/entity/BsMerKahuna.java | 184 ++++ .../com/hfkj/entity/BsMerKahunaExample.java | 823 ++++++++++++++++++ .../main/java/com/hfkj/entity/BsStore.java | 82 +- .../java/com/hfkj/entity/BsStoreExample.java | 340 ++++++++ .../hfkj/service/impl/BsMerServiceImpl.java | 2 + 15 files changed, 2161 insertions(+), 31 deletions(-) create mode 100644 service/src/main/java/com/hfkj/dao/BsMerKahunaMapper.java create mode 100644 service/src/main/java/com/hfkj/dao/BsMerKahunaMapperExt.java create mode 100644 service/src/main/java/com/hfkj/dao/BsMerKahunaSqlProvider.java create mode 100644 service/src/main/java/com/hfkj/entity/BsMerKahuna.java create mode 100644 service/src/main/java/com/hfkj/entity/BsMerKahunaExample.java diff --git a/cweb/src/main/java/com/cweb/controller/BsMerController.java b/cweb/src/main/java/com/cweb/controller/BsMerController.java index 4e31412..4da6e4a 100644 --- a/cweb/src/main/java/com/cweb/controller/BsMerController.java +++ b/cweb/src/main/java/com/cweb/controller/BsMerController.java @@ -457,6 +457,8 @@ public class BsMerController { storeModel.setAgentName(mer.getAgentName()); storeModel.setSalesmanId(mer.getSalesmanId()); storeModel.setSalesmanName(mer.getSalesmanName()); + storeModel.setCreateSalesmanId(mer.getCreateSalesmanId()); + storeModel.setCreateSalesmanName(mer.getCreateSalesmanName()); storeModel.setMerId(mer.getId()); storeModel.setMerName(mer.getMerName()); storeModel.setStoreType(mer.getMerType()); diff --git a/service/src/main/java/com/hfkj/dao/BsMerKahunaMapper.java b/service/src/main/java/com/hfkj/dao/BsMerKahunaMapper.java new file mode 100644 index 0000000..e760c92 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsMerKahunaMapper.java @@ -0,0 +1,113 @@ +package com.hfkj.dao; + +import com.hfkj.entity.BsMerKahuna; +import com.hfkj.entity.BsMerKahunaExample; +import java.util.List; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.DeleteProvider; +import org.apache.ibatis.annotations.Insert; +import org.apache.ibatis.annotations.InsertProvider; +import org.apache.ibatis.annotations.Options; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Result; +import org.apache.ibatis.annotations.Results; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.SelectProvider; +import org.apache.ibatis.annotations.Update; +import org.apache.ibatis.annotations.UpdateProvider; +import org.apache.ibatis.type.JdbcType; +import org.springframework.stereotype.Repository; + +/** + * + * 代码由工具生成,请勿修改!!! + * 如果需要扩展请在其父类进行扩展 + * + **/ +@Repository +public interface BsMerKahunaMapper extends BsMerKahunaMapperExt { + @SelectProvider(type=BsMerKahunaSqlProvider.class, method="countByExample") + long countByExample(BsMerKahunaExample example); + + @DeleteProvider(type=BsMerKahunaSqlProvider.class, method="deleteByExample") + int deleteByExample(BsMerKahunaExample example); + + @Delete({ + "delete from bs_mer_kahuna", + "where id = #{id,jdbcType=BIGINT}" + }) + int deleteByPrimaryKey(Long id); + + @Insert({ + "insert into bs_mer_kahuna (mer_id, mer_no, ", + "mer_name, remark, ", + "create_time, ext_1, ", + "ext_2, ext_3)", + "values (#{merId,jdbcType=BIGINT}, #{merNo,jdbcType=VARCHAR}, ", + "#{merName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + }) + @Options(useGeneratedKeys=true,keyProperty="id") + int insert(BsMerKahuna record); + + @InsertProvider(type=BsMerKahunaSqlProvider.class, method="insertSelective") + @Options(useGeneratedKeys=true,keyProperty="id") + int insertSelective(BsMerKahuna record); + + @SelectProvider(type=BsMerKahunaSqlProvider.class, method="selectByExample") + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), + @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + List selectByExample(BsMerKahunaExample example); + + @Select({ + "select", + "id, mer_id, mer_no, mer_name, remark, create_time, ext_1, ext_2, ext_3", + "from bs_mer_kahuna", + "where id = #{id,jdbcType=BIGINT}" + }) + @Results({ + @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), + @Result(column="mer_id", property="merId", jdbcType=JdbcType.BIGINT), + @Result(column="mer_no", property="merNo", jdbcType=JdbcType.VARCHAR), + @Result(column="mer_name", property="merName", jdbcType=JdbcType.VARCHAR), + @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), + @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), + @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) + }) + BsMerKahuna selectByPrimaryKey(Long id); + + @UpdateProvider(type=BsMerKahunaSqlProvider.class, method="updateByExampleSelective") + int updateByExampleSelective(@Param("record") BsMerKahuna record, @Param("example") BsMerKahunaExample example); + + @UpdateProvider(type=BsMerKahunaSqlProvider.class, method="updateByExample") + int updateByExample(@Param("record") BsMerKahuna record, @Param("example") BsMerKahunaExample example); + + @UpdateProvider(type=BsMerKahunaSqlProvider.class, method="updateByPrimaryKeySelective") + int updateByPrimaryKeySelective(BsMerKahuna record); + + @Update({ + "update bs_mer_kahuna", + "set mer_id = #{merId,jdbcType=BIGINT},", + "mer_no = #{merNo,jdbcType=VARCHAR},", + "mer_name = #{merName,jdbcType=VARCHAR},", + "remark = #{remark,jdbcType=VARCHAR},", + "create_time = #{createTime,jdbcType=TIMESTAMP},", + "ext_1 = #{ext1,jdbcType=VARCHAR},", + "ext_2 = #{ext2,jdbcType=VARCHAR},", + "ext_3 = #{ext3,jdbcType=VARCHAR}", + "where id = #{id,jdbcType=BIGINT}" + }) + int updateByPrimaryKey(BsMerKahuna record); +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsMerKahunaMapperExt.java b/service/src/main/java/com/hfkj/dao/BsMerKahunaMapperExt.java new file mode 100644 index 0000000..2f2ca2e --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsMerKahunaMapperExt.java @@ -0,0 +1,7 @@ +package com.hfkj.dao; + +/** + * mapper扩展类 + */ +public interface BsMerKahunaMapperExt { +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsMerKahunaSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerKahunaSqlProvider.java new file mode 100644 index 0000000..c23bd34 --- /dev/null +++ b/service/src/main/java/com/hfkj/dao/BsMerKahunaSqlProvider.java @@ -0,0 +1,290 @@ +package com.hfkj.dao; + +import com.hfkj.entity.BsMerKahuna; +import com.hfkj.entity.BsMerKahunaExample.Criteria; +import com.hfkj.entity.BsMerKahunaExample.Criterion; +import com.hfkj.entity.BsMerKahunaExample; +import java.util.List; +import java.util.Map; +import org.apache.ibatis.jdbc.SQL; + +public class BsMerKahunaSqlProvider { + + public String countByExample(BsMerKahunaExample example) { + SQL sql = new SQL(); + sql.SELECT("count(*)").FROM("bs_mer_kahuna"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String deleteByExample(BsMerKahunaExample example) { + SQL sql = new SQL(); + sql.DELETE_FROM("bs_mer_kahuna"); + applyWhere(sql, example, false); + return sql.toString(); + } + + public String insertSelective(BsMerKahuna record) { + SQL sql = new SQL(); + sql.INSERT_INTO("bs_mer_kahuna"); + + if (record.getMerId() != null) { + sql.VALUES("mer_id", "#{merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.VALUES("mer_no", "#{merNo,jdbcType=VARCHAR}"); + } + + if (record.getMerName() != null) { + sql.VALUES("mer_name", "#{merName,jdbcType=VARCHAR}"); + } + + if (record.getRemark() != null) { + sql.VALUES("remark", "#{remark,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.VALUES("ext_2", "#{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.VALUES("ext_3", "#{ext3,jdbcType=VARCHAR}"); + } + + return sql.toString(); + } + + public String selectByExample(BsMerKahunaExample example) { + SQL sql = new SQL(); + if (example != null && example.isDistinct()) { + sql.SELECT_DISTINCT("id"); + } else { + sql.SELECT("id"); + } + sql.SELECT("mer_id"); + sql.SELECT("mer_no"); + sql.SELECT("mer_name"); + sql.SELECT("remark"); + sql.SELECT("create_time"); + sql.SELECT("ext_1"); + sql.SELECT("ext_2"); + sql.SELECT("ext_3"); + sql.FROM("bs_mer_kahuna"); + applyWhere(sql, example, false); + + if (example != null && example.getOrderByClause() != null) { + sql.ORDER_BY(example.getOrderByClause()); + } + + return sql.toString(); + } + + public String updateByExampleSelective(Map parameter) { + BsMerKahuna record = (BsMerKahuna) parameter.get("record"); + BsMerKahunaExample example = (BsMerKahunaExample) parameter.get("example"); + + SQL sql = new SQL(); + sql.UPDATE("bs_mer_kahuna"); + + if (record.getId() != null) { + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + } + + if (record.getMerId() != null) { + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); + } + + if (record.getMerName() != null) { + sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}"); + } + + if (record.getRemark() != null) { + sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + } + + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByExample(Map parameter) { + SQL sql = new SQL(); + sql.UPDATE("bs_mer_kahuna"); + + sql.SET("id = #{record.id,jdbcType=BIGINT}"); + sql.SET("mer_id = #{record.merId,jdbcType=BIGINT}"); + sql.SET("mer_no = #{record.merNo,jdbcType=VARCHAR}"); + sql.SET("mer_name = #{record.merName,jdbcType=VARCHAR}"); + sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); + sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); + sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); + sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); + sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); + + BsMerKahunaExample example = (BsMerKahunaExample) parameter.get("example"); + applyWhere(sql, example, true); + return sql.toString(); + } + + public String updateByPrimaryKeySelective(BsMerKahuna record) { + SQL sql = new SQL(); + sql.UPDATE("bs_mer_kahuna"); + + if (record.getMerId() != null) { + sql.SET("mer_id = #{merId,jdbcType=BIGINT}"); + } + + if (record.getMerNo() != null) { + sql.SET("mer_no = #{merNo,jdbcType=VARCHAR}"); + } + + if (record.getMerName() != null) { + sql.SET("mer_name = #{merName,jdbcType=VARCHAR}"); + } + + if (record.getRemark() != null) { + sql.SET("remark = #{remark,jdbcType=VARCHAR}"); + } + + if (record.getCreateTime() != null) { + sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); + } + + if (record.getExt1() != null) { + sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); + } + + if (record.getExt2() != null) { + sql.SET("ext_2 = #{ext2,jdbcType=VARCHAR}"); + } + + if (record.getExt3() != null) { + sql.SET("ext_3 = #{ext3,jdbcType=VARCHAR}"); + } + + sql.WHERE("id = #{id,jdbcType=BIGINT}"); + + return sql.toString(); + } + + protected void applyWhere(SQL sql, BsMerKahunaExample example, boolean includeExamplePhrase) { + if (example == null) { + return; + } + + String parmPhrase1; + String parmPhrase1_th; + String parmPhrase2; + String parmPhrase2_th; + String parmPhrase3; + String parmPhrase3_th; + if (includeExamplePhrase) { + parmPhrase1 = "%s #{example.oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{example.oredCriteria[%d].allCriteria[%d].value} and #{example.oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{example.oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{example.oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{example.oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{example.oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } else { + parmPhrase1 = "%s #{oredCriteria[%d].allCriteria[%d].value}"; + parmPhrase1_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s}"; + parmPhrase2 = "%s #{oredCriteria[%d].allCriteria[%d].value} and #{oredCriteria[%d].criteria[%d].secondValue}"; + parmPhrase2_th = "%s #{oredCriteria[%d].allCriteria[%d].value,typeHandler=%s} and #{oredCriteria[%d].criteria[%d].secondValue,typeHandler=%s}"; + parmPhrase3 = "#{oredCriteria[%d].allCriteria[%d].value[%d]}"; + parmPhrase3_th = "#{oredCriteria[%d].allCriteria[%d].value[%d],typeHandler=%s}"; + } + + StringBuilder sb = new StringBuilder(); + List oredCriteria = example.getOredCriteria(); + boolean firstCriteria = true; + for (int i = 0; i < oredCriteria.size(); i++) { + Criteria criteria = oredCriteria.get(i); + if (criteria.isValid()) { + if (firstCriteria) { + firstCriteria = false; + } else { + sb.append(" or "); + } + + sb.append('('); + List criterions = criteria.getAllCriteria(); + boolean firstCriterion = true; + for (int j = 0; j < criterions.size(); j++) { + Criterion criterion = criterions.get(j); + if (firstCriterion) { + firstCriterion = false; + } else { + sb.append(" and "); + } + + if (criterion.isNoValue()) { + sb.append(criterion.getCondition()); + } else if (criterion.isSingleValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase1, criterion.getCondition(), i, j)); + } else { + sb.append(String.format(parmPhrase1_th, criterion.getCondition(), i, j,criterion.getTypeHandler())); + } + } else if (criterion.isBetweenValue()) { + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase2, criterion.getCondition(), i, j, i, j)); + } else { + sb.append(String.format(parmPhrase2_th, criterion.getCondition(), i, j, criterion.getTypeHandler(), i, j, criterion.getTypeHandler())); + } + } else if (criterion.isListValue()) { + sb.append(criterion.getCondition()); + sb.append(" ("); + List listItems = (List) criterion.getValue(); + boolean comma = false; + for (int k = 0; k < listItems.size(); k++) { + if (comma) { + sb.append(", "); + } else { + comma = true; + } + if (criterion.getTypeHandler() == null) { + sb.append(String.format(parmPhrase3, i, j, k)); + } else { + sb.append(String.format(parmPhrase3_th, i, j, k, criterion.getTypeHandler())); + } + } + sb.append(')'); + } + } + sb.append(')'); + } + } + + if (sb.length() > 0) { + sql.WHERE(sb.toString()); + } + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/dao/BsMerMapper.java b/service/src/main/java/com/hfkj/dao/BsMerMapper.java index 9ffd4aa..163d009 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsMerMapper.java @@ -56,6 +56,7 @@ public interface BsMerMapper extends BsMerMapperExt { "lar_id_card_address, lar_id_card_period_type, ", "lar_id_card_period_start, lar_id_card_period_end, ", "complete_status, mer_status, ", + "create_salesman_id, create_salesman_name, ", "create_time, update_time, ", "ext_1, ext_2, ext_3)", "values (#{orgNo,jdbcType=VARCHAR}, #{orgName,jdbcType=VARCHAR}, ", @@ -75,6 +76,7 @@ public interface BsMerMapper extends BsMerMapperExt { "#{larIdCardAddress,jdbcType=VARCHAR}, #{larIdCardPeriodType,jdbcType=INTEGER}, ", "#{larIdCardPeriodStart,jdbcType=VARCHAR}, #{larIdCardPeriodEnd,jdbcType=VARCHAR}, ", "#{completeStatus,jdbcType=INTEGER}, #{merStatus,jdbcType=INTEGER}, ", + "#{createSalesmanId,jdbcType=BIGINT}, #{createSalesmanName,jdbcType=VARCHAR}, ", "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @@ -122,6 +124,8 @@ public interface BsMerMapper extends BsMerMapperExt { @Result(column="lar_id_card_period_end", property="larIdCardPeriodEnd", jdbcType=JdbcType.VARCHAR), @Result(column="complete_status", property="completeStatus", jdbcType=JdbcType.INTEGER), @Result(column="mer_status", property="merStatus", jdbcType=JdbcType.INTEGER), + @Result(column="create_salesman_id", property="createSalesmanId", jdbcType=JdbcType.BIGINT), + @Result(column="create_salesman_name", property="createSalesmanName", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @@ -138,7 +142,8 @@ public interface BsMerMapper extends BsMerMapperExt { "blis_period_type, blis_period_start, blis_period_end, lar_name, lar_id_card, ", "lar_id_card_portrait_img, lar_id_card_national_emblem_img, lar_id_card_address, ", "lar_id_card_period_type, lar_id_card_period_start, lar_id_card_period_end, complete_status, ", - "mer_status, create_time, update_time, ext_1, ext_2, ext_3", + "mer_status, create_salesman_id, create_salesman_name, create_time, update_time, ", + "ext_1, ext_2, ext_3", "from bs_mer", "where id = #{id,jdbcType=BIGINT}" }) @@ -178,6 +183,8 @@ public interface BsMerMapper extends BsMerMapperExt { @Result(column="lar_id_card_period_end", property="larIdCardPeriodEnd", jdbcType=JdbcType.VARCHAR), @Result(column="complete_status", property="completeStatus", jdbcType=JdbcType.INTEGER), @Result(column="mer_status", property="merStatus", jdbcType=JdbcType.INTEGER), + @Result(column="create_salesman_id", property="createSalesmanId", jdbcType=JdbcType.BIGINT), + @Result(column="create_salesman_name", property="createSalesmanName", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @@ -231,6 +238,8 @@ public interface BsMerMapper extends BsMerMapperExt { "lar_id_card_period_end = #{larIdCardPeriodEnd,jdbcType=VARCHAR},", "complete_status = #{completeStatus,jdbcType=INTEGER},", "mer_status = #{merStatus,jdbcType=INTEGER},", + "create_salesman_id = #{createSalesmanId,jdbcType=BIGINT},", + "create_salesman_name = #{createSalesmanName,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", "ext_1 = #{ext1,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java index 038b251..2f588d0 100644 --- a/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsMerSqlProvider.java @@ -164,6 +164,14 @@ public class BsMerSqlProvider { sql.VALUES("mer_status", "#{merStatus,jdbcType=INTEGER}"); } + if (record.getCreateSalesmanId() != null) { + sql.VALUES("create_salesman_id", "#{createSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getCreateSalesmanName() != null) { + sql.VALUES("create_salesman_name", "#{createSalesmanName,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.VALUES("create_time", "#{createTime,jdbcType=TIMESTAMP}"); } @@ -228,6 +236,8 @@ public class BsMerSqlProvider { sql.SELECT("lar_id_card_period_end"); sql.SELECT("complete_status"); sql.SELECT("mer_status"); + sql.SELECT("create_salesman_id"); + sql.SELECT("create_salesman_name"); sql.SELECT("create_time"); sql.SELECT("update_time"); sql.SELECT("ext_1"); @@ -390,6 +400,14 @@ public class BsMerSqlProvider { sql.SET("mer_status = #{record.merStatus,jdbcType=INTEGER}"); } + if (record.getCreateSalesmanId() != null) { + sql.SET("create_salesman_id = #{record.createSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getCreateSalesmanName() != null) { + sql.SET("create_salesman_name = #{record.createSalesmanName,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); } @@ -453,6 +471,8 @@ public class BsMerSqlProvider { sql.SET("lar_id_card_period_end = #{record.larIdCardPeriodEnd,jdbcType=VARCHAR}"); sql.SET("complete_status = #{record.completeStatus,jdbcType=INTEGER}"); sql.SET("mer_status = #{record.merStatus,jdbcType=INTEGER}"); + sql.SET("create_salesman_id = #{record.createSalesmanId,jdbcType=BIGINT}"); + sql.SET("create_salesman_name = #{record.createSalesmanName,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); @@ -604,6 +624,14 @@ public class BsMerSqlProvider { sql.SET("mer_status = #{merStatus,jdbcType=INTEGER}"); } + if (record.getCreateSalesmanId() != null) { + sql.SET("create_salesman_id = #{createSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getCreateSalesmanName() != null) { + sql.SET("create_salesman_name = #{createSalesmanName,jdbcType=VARCHAR}"); + } + if (record.getCreateTime() != null) { sql.SET("create_time = #{createTime,jdbcType=TIMESTAMP}"); } diff --git a/service/src/main/java/com/hfkj/dao/BsStoreMapper.java b/service/src/main/java/com/hfkj/dao/BsStoreMapper.java index cdde9de..3d6d12a 100644 --- a/service/src/main/java/com/hfkj/dao/BsStoreMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsStoreMapper.java @@ -48,18 +48,20 @@ public interface BsStoreMapper extends BsStoreMapperExt { "duty_people_phone, duty_people_email, ", "cash_register_img, internal_img, ", "business_license_img, other_img, ", - "alone_settle, store_type, ", - "blis_url, blis_name, ", - "blis_no, blis_reg_address, ", - "blis_period_type, blis_period_start, ", - "blis_period_end, lar_id_card, ", - "lar_name, lar_id_card_portrait_img, ", - "lar_id_card_national_emblem_img, lar_id_card_address, ", - "lar_id_card_period_type, lar_id_card_period_start, ", - "lar_id_card_period_end, `status`, ", - "create_type, create_time, ", - "update_time, ext_1, ", - "ext_2, ext_3)", + "longitude, latitude, ", + "address, alone_settle, ", + "store_type, blis_url, ", + "blis_name, blis_no, ", + "blis_reg_address, blis_period_type, ", + "blis_period_start, blis_period_end, ", + "lar_id_card, lar_name, ", + "lar_id_card_portrait_img, lar_id_card_national_emblem_img, ", + "lar_id_card_address, lar_id_card_period_type, ", + "lar_id_card_period_start, lar_id_card_period_end, ", + "`status`, create_salesman_id, ", + "create_salesman_name, create_type, ", + "create_time, update_time, ", + "ext_1, ext_2, ext_3)", "values (#{companyId,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, ", "#{agentId,jdbcType=BIGINT}, #{agentName,jdbcType=VARCHAR}, ", "#{salesmanId,jdbcType=BIGINT}, #{salesmanName,jdbcType=VARCHAR}, ", @@ -69,18 +71,20 @@ public interface BsStoreMapper extends BsStoreMapperExt { "#{dutyPeoplePhone,jdbcType=VARCHAR}, #{dutyPeopleEmail,jdbcType=VARCHAR}, ", "#{cashRegisterImg,jdbcType=VARCHAR}, #{internalImg,jdbcType=VARCHAR}, ", "#{businessLicenseImg,jdbcType=VARCHAR}, #{otherImg,jdbcType=VARCHAR}, ", - "#{aloneSettle,jdbcType=BIT}, #{storeType,jdbcType=INTEGER}, ", - "#{blisUrl,jdbcType=VARCHAR}, #{blisName,jdbcType=VARCHAR}, ", - "#{blisNo,jdbcType=VARCHAR}, #{blisRegAddress,jdbcType=VARCHAR}, ", - "#{blisPeriodType,jdbcType=INTEGER}, #{blisPeriodStart,jdbcType=VARCHAR}, ", - "#{blisPeriodEnd,jdbcType=VARCHAR}, #{larIdCard,jdbcType=VARCHAR}, ", - "#{larName,jdbcType=VARCHAR}, #{larIdCardPortraitImg,jdbcType=VARCHAR}, ", - "#{larIdCardNationalEmblemImg,jdbcType=VARCHAR}, #{larIdCardAddress,jdbcType=VARCHAR}, ", - "#{larIdCardPeriodType,jdbcType=INTEGER}, #{larIdCardPeriodStart,jdbcType=VARCHAR}, ", - "#{larIdCardPeriodEnd,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", - "#{createType,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{longitude,jdbcType=VARCHAR}, #{latitude,jdbcType=VARCHAR}, ", + "#{address,jdbcType=VARCHAR}, #{aloneSettle,jdbcType=BIT}, ", + "#{storeType,jdbcType=INTEGER}, #{blisUrl,jdbcType=VARCHAR}, ", + "#{blisName,jdbcType=VARCHAR}, #{blisNo,jdbcType=VARCHAR}, ", + "#{blisRegAddress,jdbcType=VARCHAR}, #{blisPeriodType,jdbcType=INTEGER}, ", + "#{blisPeriodStart,jdbcType=VARCHAR}, #{blisPeriodEnd,jdbcType=VARCHAR}, ", + "#{larIdCard,jdbcType=VARCHAR}, #{larName,jdbcType=VARCHAR}, ", + "#{larIdCardPortraitImg,jdbcType=VARCHAR}, #{larIdCardNationalEmblemImg,jdbcType=VARCHAR}, ", + "#{larIdCardAddress,jdbcType=VARCHAR}, #{larIdCardPeriodType,jdbcType=INTEGER}, ", + "#{larIdCardPeriodStart,jdbcType=VARCHAR}, #{larIdCardPeriodEnd,jdbcType=VARCHAR}, ", + "#{status,jdbcType=INTEGER}, #{createSalesmanId,jdbcType=BIGINT}, ", + "#{createSalesmanName,jdbcType=VARCHAR}, #{createType,jdbcType=INTEGER}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsStore record); @@ -111,6 +115,9 @@ public interface BsStoreMapper extends BsStoreMapperExt { @Result(column="internal_img", property="internalImg", jdbcType=JdbcType.VARCHAR), @Result(column="business_license_img", property="businessLicenseImg", jdbcType=JdbcType.VARCHAR), @Result(column="other_img", property="otherImg", jdbcType=JdbcType.VARCHAR), + @Result(column="longitude", property="longitude", jdbcType=JdbcType.VARCHAR), + @Result(column="latitude", property="latitude", jdbcType=JdbcType.VARCHAR), + @Result(column="address", property="address", jdbcType=JdbcType.VARCHAR), @Result(column="alone_settle", property="aloneSettle", jdbcType=JdbcType.BIT), @Result(column="store_type", property="storeType", jdbcType=JdbcType.INTEGER), @Result(column="blis_url", property="blisUrl", jdbcType=JdbcType.VARCHAR), @@ -129,6 +136,8 @@ public interface BsStoreMapper extends BsStoreMapperExt { @Result(column="lar_id_card_period_start", property="larIdCardPeriodStart", jdbcType=JdbcType.VARCHAR), @Result(column="lar_id_card_period_end", property="larIdCardPeriodEnd", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_salesman_id", property="createSalesmanId", jdbcType=JdbcType.BIGINT), + @Result(column="create_salesman_name", property="createSalesmanName", jdbcType=JdbcType.VARCHAR), @Result(column="create_type", property="createType", jdbcType=JdbcType.INTEGER), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -143,11 +152,12 @@ public interface BsStoreMapper extends BsStoreMapperExt { "id, company_id, company_name, agent_id, agent_name, salesman_id, salesman_name, ", "mer_id, mer_name, store_no, `name`, telephone, door_head_img, duty_people_name, ", "duty_people_phone, duty_people_email, cash_register_img, internal_img, business_license_img, ", - "other_img, alone_settle, store_type, blis_url, blis_name, blis_no, blis_reg_address, ", - "blis_period_type, blis_period_start, blis_period_end, lar_id_card, lar_name, ", - "lar_id_card_portrait_img, lar_id_card_national_emblem_img, lar_id_card_address, ", - "lar_id_card_period_type, lar_id_card_period_start, lar_id_card_period_end, `status`, ", - "create_type, create_time, update_time, ext_1, ext_2, ext_3", + "other_img, longitude, latitude, address, alone_settle, store_type, blis_url, ", + "blis_name, blis_no, blis_reg_address, blis_period_type, blis_period_start, blis_period_end, ", + "lar_id_card, lar_name, lar_id_card_portrait_img, lar_id_card_national_emblem_img, ", + "lar_id_card_address, lar_id_card_period_type, lar_id_card_period_start, lar_id_card_period_end, ", + "`status`, create_salesman_id, create_salesman_name, create_type, create_time, ", + "update_time, ext_1, ext_2, ext_3", "from bs_store", "where id = #{id,jdbcType=BIGINT}" }) @@ -172,6 +182,9 @@ public interface BsStoreMapper extends BsStoreMapperExt { @Result(column="internal_img", property="internalImg", jdbcType=JdbcType.VARCHAR), @Result(column="business_license_img", property="businessLicenseImg", jdbcType=JdbcType.VARCHAR), @Result(column="other_img", property="otherImg", jdbcType=JdbcType.VARCHAR), + @Result(column="longitude", property="longitude", jdbcType=JdbcType.VARCHAR), + @Result(column="latitude", property="latitude", jdbcType=JdbcType.VARCHAR), + @Result(column="address", property="address", jdbcType=JdbcType.VARCHAR), @Result(column="alone_settle", property="aloneSettle", jdbcType=JdbcType.BIT), @Result(column="store_type", property="storeType", jdbcType=JdbcType.INTEGER), @Result(column="blis_url", property="blisUrl", jdbcType=JdbcType.VARCHAR), @@ -190,6 +203,8 @@ public interface BsStoreMapper extends BsStoreMapperExt { @Result(column="lar_id_card_period_start", property="larIdCardPeriodStart", jdbcType=JdbcType.VARCHAR), @Result(column="lar_id_card_period_end", property="larIdCardPeriodEnd", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="create_salesman_id", property="createSalesmanId", jdbcType=JdbcType.BIGINT), + @Result(column="create_salesman_name", property="createSalesmanName", jdbcType=JdbcType.VARCHAR), @Result(column="create_type", property="createType", jdbcType=JdbcType.INTEGER), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP), @@ -229,6 +244,9 @@ public interface BsStoreMapper extends BsStoreMapperExt { "internal_img = #{internalImg,jdbcType=VARCHAR},", "business_license_img = #{businessLicenseImg,jdbcType=VARCHAR},", "other_img = #{otherImg,jdbcType=VARCHAR},", + "longitude = #{longitude,jdbcType=VARCHAR},", + "latitude = #{latitude,jdbcType=VARCHAR},", + "address = #{address,jdbcType=VARCHAR},", "alone_settle = #{aloneSettle,jdbcType=BIT},", "store_type = #{storeType,jdbcType=INTEGER},", "blis_url = #{blisUrl,jdbcType=VARCHAR},", @@ -247,6 +265,8 @@ public interface BsStoreMapper extends BsStoreMapperExt { "lar_id_card_period_start = #{larIdCardPeriodStart,jdbcType=VARCHAR},", "lar_id_card_period_end = #{larIdCardPeriodEnd,jdbcType=VARCHAR},", "`status` = #{status,jdbcType=INTEGER},", + "create_salesman_id = #{createSalesmanId,jdbcType=BIGINT},", + "create_salesman_name = #{createSalesmanName,jdbcType=VARCHAR},", "create_type = #{createType,jdbcType=INTEGER},", "create_time = #{createTime,jdbcType=TIMESTAMP},", "update_time = #{updateTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/BsStoreSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsStoreSqlProvider.java index 7941590..9d3a4d6 100644 --- a/service/src/main/java/com/hfkj/dao/BsStoreSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsStoreSqlProvider.java @@ -104,6 +104,18 @@ public class BsStoreSqlProvider { sql.VALUES("other_img", "#{otherImg,jdbcType=VARCHAR}"); } + if (record.getLongitude() != null) { + sql.VALUES("longitude", "#{longitude,jdbcType=VARCHAR}"); + } + + if (record.getLatitude() != null) { + sql.VALUES("latitude", "#{latitude,jdbcType=VARCHAR}"); + } + + if (record.getAddress() != null) { + sql.VALUES("address", "#{address,jdbcType=VARCHAR}"); + } + if (record.getAloneSettle() != null) { sql.VALUES("alone_settle", "#{aloneSettle,jdbcType=BIT}"); } @@ -176,6 +188,14 @@ public class BsStoreSqlProvider { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } + if (record.getCreateSalesmanId() != null) { + sql.VALUES("create_salesman_id", "#{createSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getCreateSalesmanName() != null) { + sql.VALUES("create_salesman_name", "#{createSalesmanName,jdbcType=VARCHAR}"); + } + if (record.getCreateType() != null) { sql.VALUES("create_type", "#{createType,jdbcType=INTEGER}"); } @@ -229,6 +249,9 @@ public class BsStoreSqlProvider { sql.SELECT("internal_img"); sql.SELECT("business_license_img"); sql.SELECT("other_img"); + sql.SELECT("longitude"); + sql.SELECT("latitude"); + sql.SELECT("address"); sql.SELECT("alone_settle"); sql.SELECT("store_type"); sql.SELECT("blis_url"); @@ -247,6 +270,8 @@ public class BsStoreSqlProvider { sql.SELECT("lar_id_card_period_start"); sql.SELECT("lar_id_card_period_end"); sql.SELECT("`status`"); + sql.SELECT("create_salesman_id"); + sql.SELECT("create_salesman_name"); sql.SELECT("create_type"); sql.SELECT("create_time"); sql.SELECT("update_time"); @@ -350,6 +375,18 @@ public class BsStoreSqlProvider { sql.SET("other_img = #{record.otherImg,jdbcType=VARCHAR}"); } + if (record.getLongitude() != null) { + sql.SET("longitude = #{record.longitude,jdbcType=VARCHAR}"); + } + + if (record.getLatitude() != null) { + sql.SET("latitude = #{record.latitude,jdbcType=VARCHAR}"); + } + + if (record.getAddress() != null) { + sql.SET("address = #{record.address,jdbcType=VARCHAR}"); + } + if (record.getAloneSettle() != null) { sql.SET("alone_settle = #{record.aloneSettle,jdbcType=BIT}"); } @@ -422,6 +459,14 @@ public class BsStoreSqlProvider { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } + if (record.getCreateSalesmanId() != null) { + sql.SET("create_salesman_id = #{record.createSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getCreateSalesmanName() != null) { + sql.SET("create_salesman_name = #{record.createSalesmanName,jdbcType=VARCHAR}"); + } + if (record.getCreateType() != null) { sql.SET("create_type = #{record.createType,jdbcType=INTEGER}"); } @@ -474,6 +519,9 @@ public class BsStoreSqlProvider { sql.SET("internal_img = #{record.internalImg,jdbcType=VARCHAR}"); sql.SET("business_license_img = #{record.businessLicenseImg,jdbcType=VARCHAR}"); sql.SET("other_img = #{record.otherImg,jdbcType=VARCHAR}"); + sql.SET("longitude = #{record.longitude,jdbcType=VARCHAR}"); + sql.SET("latitude = #{record.latitude,jdbcType=VARCHAR}"); + sql.SET("address = #{record.address,jdbcType=VARCHAR}"); sql.SET("alone_settle = #{record.aloneSettle,jdbcType=BIT}"); sql.SET("store_type = #{record.storeType,jdbcType=INTEGER}"); sql.SET("blis_url = #{record.blisUrl,jdbcType=VARCHAR}"); @@ -492,6 +540,8 @@ public class BsStoreSqlProvider { sql.SET("lar_id_card_period_start = #{record.larIdCardPeriodStart,jdbcType=VARCHAR}"); sql.SET("lar_id_card_period_end = #{record.larIdCardPeriodEnd,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("create_salesman_id = #{record.createSalesmanId,jdbcType=BIGINT}"); + sql.SET("create_salesman_name = #{record.createSalesmanName,jdbcType=VARCHAR}"); sql.SET("create_type = #{record.createType,jdbcType=INTEGER}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}"); @@ -584,6 +634,18 @@ public class BsStoreSqlProvider { sql.SET("other_img = #{otherImg,jdbcType=VARCHAR}"); } + if (record.getLongitude() != null) { + sql.SET("longitude = #{longitude,jdbcType=VARCHAR}"); + } + + if (record.getLatitude() != null) { + sql.SET("latitude = #{latitude,jdbcType=VARCHAR}"); + } + + if (record.getAddress() != null) { + sql.SET("address = #{address,jdbcType=VARCHAR}"); + } + if (record.getAloneSettle() != null) { sql.SET("alone_settle = #{aloneSettle,jdbcType=BIT}"); } @@ -656,6 +718,14 @@ public class BsStoreSqlProvider { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } + if (record.getCreateSalesmanId() != null) { + sql.SET("create_salesman_id = #{createSalesmanId,jdbcType=BIGINT}"); + } + + if (record.getCreateSalesmanName() != null) { + sql.SET("create_salesman_name = #{createSalesmanName,jdbcType=VARCHAR}"); + } + if (record.getCreateType() != null) { sql.SET("create_type = #{createType,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsMer.java b/service/src/main/java/com/hfkj/entity/BsMer.java index 866a407..6c6698d 100644 --- a/service/src/main/java/com/hfkj/entity/BsMer.java +++ b/service/src/main/java/com/hfkj/entity/BsMer.java @@ -188,6 +188,16 @@ public class BsMer implements Serializable { */ private Integer merStatus; + /** + * 创建业务员id + */ + private Long createSalesmanId; + + /** + * 创建业务员名称 + */ + private String createSalesmanName; + /** * 创建时间 */ @@ -486,6 +496,22 @@ public class BsMer implements Serializable { this.merStatus = merStatus; } + public Long getCreateSalesmanId() { + return createSalesmanId; + } + + public void setCreateSalesmanId(Long createSalesmanId) { + this.createSalesmanId = createSalesmanId; + } + + public String getCreateSalesmanName() { + return createSalesmanName; + } + + public void setCreateSalesmanName(String createSalesmanName) { + this.createSalesmanName = createSalesmanName; + } + public Date getCreateTime() { return createTime; } @@ -573,6 +599,8 @@ public class BsMer implements Serializable { && (this.getLarIdCardPeriodEnd() == null ? other.getLarIdCardPeriodEnd() == null : this.getLarIdCardPeriodEnd().equals(other.getLarIdCardPeriodEnd())) && (this.getCompleteStatus() == null ? other.getCompleteStatus() == null : this.getCompleteStatus().equals(other.getCompleteStatus())) && (this.getMerStatus() == null ? other.getMerStatus() == null : this.getMerStatus().equals(other.getMerStatus())) + && (this.getCreateSalesmanId() == null ? other.getCreateSalesmanId() == null : this.getCreateSalesmanId().equals(other.getCreateSalesmanId())) + && (this.getCreateSalesmanName() == null ? other.getCreateSalesmanName() == null : this.getCreateSalesmanName().equals(other.getCreateSalesmanName())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) @@ -619,6 +647,8 @@ public class BsMer implements Serializable { result = prime * result + ((getLarIdCardPeriodEnd() == null) ? 0 : getLarIdCardPeriodEnd().hashCode()); result = prime * result + ((getCompleteStatus() == null) ? 0 : getCompleteStatus().hashCode()); result = prime * result + ((getMerStatus() == null) ? 0 : getMerStatus().hashCode()); + result = prime * result + ((getCreateSalesmanId() == null) ? 0 : getCreateSalesmanId().hashCode()); + result = prime * result + ((getCreateSalesmanName() == null) ? 0 : getCreateSalesmanName().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); @@ -668,6 +698,8 @@ public class BsMer implements Serializable { sb.append(", larIdCardPeriodEnd=").append(larIdCardPeriodEnd); sb.append(", completeStatus=").append(completeStatus); sb.append(", merStatus=").append(merStatus); + sb.append(", createSalesmanId=").append(createSalesmanId); + sb.append(", createSalesmanName=").append(createSalesmanName); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); sb.append(", ext1=").append(ext1); diff --git a/service/src/main/java/com/hfkj/entity/BsMerExample.java b/service/src/main/java/com/hfkj/entity/BsMerExample.java index a8d4e6d..39f6601 100644 --- a/service/src/main/java/com/hfkj/entity/BsMerExample.java +++ b/service/src/main/java/com/hfkj/entity/BsMerExample.java @@ -2485,6 +2485,136 @@ public class BsMerExample { return (Criteria) this; } + public Criteria andCreateSalesmanIdIsNull() { + addCriterion("create_salesman_id is null"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdIsNotNull() { + addCriterion("create_salesman_id is not null"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdEqualTo(Long value) { + addCriterion("create_salesman_id =", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdNotEqualTo(Long value) { + addCriterion("create_salesman_id <>", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdGreaterThan(Long value) { + addCriterion("create_salesman_id >", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdGreaterThanOrEqualTo(Long value) { + addCriterion("create_salesman_id >=", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdLessThan(Long value) { + addCriterion("create_salesman_id <", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdLessThanOrEqualTo(Long value) { + addCriterion("create_salesman_id <=", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdIn(List values) { + addCriterion("create_salesman_id in", values, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdNotIn(List values) { + addCriterion("create_salesman_id not in", values, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdBetween(Long value1, Long value2) { + addCriterion("create_salesman_id between", value1, value2, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdNotBetween(Long value1, Long value2) { + addCriterion("create_salesman_id not between", value1, value2, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameIsNull() { + addCriterion("create_salesman_name is null"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameIsNotNull() { + addCriterion("create_salesman_name is not null"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameEqualTo(String value) { + addCriterion("create_salesman_name =", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameNotEqualTo(String value) { + addCriterion("create_salesman_name <>", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameGreaterThan(String value) { + addCriterion("create_salesman_name >", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameGreaterThanOrEqualTo(String value) { + addCriterion("create_salesman_name >=", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameLessThan(String value) { + addCriterion("create_salesman_name <", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameLessThanOrEqualTo(String value) { + addCriterion("create_salesman_name <=", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameLike(String value) { + addCriterion("create_salesman_name like", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameNotLike(String value) { + addCriterion("create_salesman_name not like", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameIn(List values) { + addCriterion("create_salesman_name in", values, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameNotIn(List values) { + addCriterion("create_salesman_name not in", values, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameBetween(String value1, String value2) { + addCriterion("create_salesman_name between", value1, value2, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameNotBetween(String value1, String value2) { + addCriterion("create_salesman_name not between", value1, value2, "createSalesmanName"); + return (Criteria) this; + } + public Criteria andCreateTimeIsNull() { addCriterion("create_time is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/entity/BsMerKahuna.java b/service/src/main/java/com/hfkj/entity/BsMerKahuna.java new file mode 100644 index 0000000..d6a217b --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/BsMerKahuna.java @@ -0,0 +1,184 @@ +package com.hfkj.entity; + +import java.io.Serializable; +import java.util.Date; + +/** + * bs_mer_kahuna + * @author + */ +/** + * + * 代码由工具生成 + * + **/ +public class BsMerKahuna implements Serializable { + /** + * 主键 + */ + private Long id; + + /** + * 商户id + */ + private Long merId; + + /** + * 商户号 + */ + private String merNo; + + /** + * 商户名称 + */ + private String merName; + + /** + * 备注 + */ + private String remark; + + /** + * 创建时间 + */ + private Date createTime; + + private String ext1; + + private String ext2; + + private String ext3; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getMerId() { + return merId; + } + + public void setMerId(Long merId) { + this.merId = merId; + } + + public String getMerNo() { + return merNo; + } + + public void setMerNo(String merNo) { + this.merNo = merNo; + } + + public String getMerName() { + return merName; + } + + public void setMerName(String merName) { + this.merName = merName; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public Date getCreateTime() { + return createTime; + } + + public void setCreateTime(Date createTime) { + this.createTime = createTime; + } + + public String getExt1() { + return ext1; + } + + public void setExt1(String ext1) { + this.ext1 = ext1; + } + + public String getExt2() { + return ext2; + } + + public void setExt2(String ext2) { + this.ext2 = ext2; + } + + public String getExt3() { + return ext3; + } + + public void setExt3(String ext3) { + this.ext3 = ext3; + } + + @Override + public boolean equals(Object that) { + if (this == that) { + return true; + } + if (that == null) { + return false; + } + if (getClass() != that.getClass()) { + return false; + } + BsMerKahuna other = (BsMerKahuna) that; + return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) + && (this.getMerId() == null ? other.getMerId() == null : this.getMerId().equals(other.getMerId())) + && (this.getMerNo() == null ? other.getMerNo() == null : this.getMerNo().equals(other.getMerNo())) + && (this.getMerName() == null ? other.getMerName() == null : this.getMerName().equals(other.getMerName())) + && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())) + && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) + && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) + && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) + && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); + result = prime * result + ((getMerId() == null) ? 0 : getMerId().hashCode()); + result = prime * result + ((getMerNo() == null) ? 0 : getMerNo().hashCode()); + result = prime * result + ((getMerName() == null) ? 0 : getMerName().hashCode()); + result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); + result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); + result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); + result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); + result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); + return result; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", merId=").append(merId); + sb.append(", merNo=").append(merNo); + sb.append(", merName=").append(merName); + sb.append(", remark=").append(remark); + sb.append(", createTime=").append(createTime); + sb.append(", ext1=").append(ext1); + sb.append(", ext2=").append(ext2); + sb.append(", ext3=").append(ext3); + sb.append(", serialVersionUID=").append(serialVersionUID); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsMerKahunaExample.java b/service/src/main/java/com/hfkj/entity/BsMerKahunaExample.java new file mode 100644 index 0000000..e65ceb2 --- /dev/null +++ b/service/src/main/java/com/hfkj/entity/BsMerKahunaExample.java @@ -0,0 +1,823 @@ +package com.hfkj.entity; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class BsMerKahunaExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + private Integer limit; + + private Long offset; + + public BsMerKahunaExample() { + 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; + } + + public void setLimit(Integer limit) { + this.limit = limit; + } + + public Integer getLimit() { + return limit; + } + + public void setOffset(Long offset) { + this.offset = offset; + } + + public Long getOffset() { + return offset; + } + + 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 andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andMerIdIsNull() { + addCriterion("mer_id is null"); + return (Criteria) this; + } + + public Criteria andMerIdIsNotNull() { + addCriterion("mer_id is not null"); + return (Criteria) this; + } + + public Criteria andMerIdEqualTo(Long value) { + addCriterion("mer_id =", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotEqualTo(Long value) { + addCriterion("mer_id <>", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThan(Long value) { + addCriterion("mer_id >", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdGreaterThanOrEqualTo(Long value) { + addCriterion("mer_id >=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThan(Long value) { + addCriterion("mer_id <", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdLessThanOrEqualTo(Long value) { + addCriterion("mer_id <=", value, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdIn(List values) { + addCriterion("mer_id in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotIn(List values) { + addCriterion("mer_id not in", values, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdBetween(Long value1, Long value2) { + addCriterion("mer_id between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerIdNotBetween(Long value1, Long value2) { + addCriterion("mer_id not between", value1, value2, "merId"); + return (Criteria) this; + } + + public Criteria andMerNoIsNull() { + addCriterion("mer_no is null"); + return (Criteria) this; + } + + public Criteria andMerNoIsNotNull() { + addCriterion("mer_no is not null"); + return (Criteria) this; + } + + public Criteria andMerNoEqualTo(String value) { + addCriterion("mer_no =", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotEqualTo(String value) { + addCriterion("mer_no <>", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoGreaterThan(String value) { + addCriterion("mer_no >", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoGreaterThanOrEqualTo(String value) { + addCriterion("mer_no >=", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLessThan(String value) { + addCriterion("mer_no <", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLessThanOrEqualTo(String value) { + addCriterion("mer_no <=", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoLike(String value) { + addCriterion("mer_no like", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotLike(String value) { + addCriterion("mer_no not like", value, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoIn(List values) { + addCriterion("mer_no in", values, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotIn(List values) { + addCriterion("mer_no not in", values, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoBetween(String value1, String value2) { + addCriterion("mer_no between", value1, value2, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNoNotBetween(String value1, String value2) { + addCriterion("mer_no not between", value1, value2, "merNo"); + return (Criteria) this; + } + + public Criteria andMerNameIsNull() { + addCriterion("mer_name is null"); + return (Criteria) this; + } + + public Criteria andMerNameIsNotNull() { + addCriterion("mer_name is not null"); + return (Criteria) this; + } + + public Criteria andMerNameEqualTo(String value) { + addCriterion("mer_name =", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotEqualTo(String value) { + addCriterion("mer_name <>", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameGreaterThan(String value) { + addCriterion("mer_name >", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameGreaterThanOrEqualTo(String value) { + addCriterion("mer_name >=", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLessThan(String value) { + addCriterion("mer_name <", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLessThanOrEqualTo(String value) { + addCriterion("mer_name <=", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameLike(String value) { + addCriterion("mer_name like", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotLike(String value) { + addCriterion("mer_name not like", value, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameIn(List values) { + addCriterion("mer_name in", values, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotIn(List values) { + addCriterion("mer_name not in", values, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameBetween(String value1, String value2) { + addCriterion("mer_name between", value1, value2, "merName"); + return (Criteria) this; + } + + public Criteria andMerNameNotBetween(String value1, String value2) { + addCriterion("mer_name not between", value1, value2, "merName"); + return (Criteria) this; + } + + public Criteria andRemarkIsNull() { + addCriterion("remark is null"); + return (Criteria) this; + } + + public Criteria andRemarkIsNotNull() { + addCriterion("remark is not null"); + return (Criteria) this; + } + + public Criteria andRemarkEqualTo(String value) { + addCriterion("remark =", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotEqualTo(String value) { + addCriterion("remark <>", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThan(String value) { + addCriterion("remark >", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkGreaterThanOrEqualTo(String value) { + addCriterion("remark >=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThan(String value) { + addCriterion("remark <", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLessThanOrEqualTo(String value) { + addCriterion("remark <=", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkLike(String value) { + addCriterion("remark like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotLike(String value) { + addCriterion("remark not like", value, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkIn(List values) { + addCriterion("remark in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotIn(List values) { + addCriterion("remark not in", values, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkBetween(String value1, String value2) { + addCriterion("remark between", value1, value2, "remark"); + return (Criteria) this; + } + + public Criteria andRemarkNotBetween(String value1, String value2) { + addCriterion("remark not between", value1, value2, "remark"); + 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 andCreateTimeNotEqualTo(Date value) { + addCriterion("create_time <>", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThan(Date value) { + addCriterion("create_time >", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) { + addCriterion("create_time >=", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThan(Date value) { + addCriterion("create_time <", value, "createTime"); + return (Criteria) this; + } + + public Criteria andCreateTimeLessThanOrEqualTo(Date value) { + addCriterion("create_time <=", value, "createTime"); + 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 andExt1IsNull() { + addCriterion("ext_1 is null"); + return (Criteria) this; + } + + public Criteria andExt1IsNotNull() { + addCriterion("ext_1 is not null"); + return (Criteria) this; + } + + public Criteria andExt1EqualTo(String value) { + addCriterion("ext_1 =", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotEqualTo(String value) { + addCriterion("ext_1 <>", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThan(String value) { + addCriterion("ext_1 >", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1GreaterThanOrEqualTo(String value) { + addCriterion("ext_1 >=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThan(String value) { + addCriterion("ext_1 <", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1LessThanOrEqualTo(String value) { + addCriterion("ext_1 <=", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Like(String value) { + addCriterion("ext_1 like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotLike(String value) { + addCriterion("ext_1 not like", value, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1In(List values) { + addCriterion("ext_1 in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotIn(List values) { + addCriterion("ext_1 not in", values, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1Between(String value1, String value2) { + addCriterion("ext_1 between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt1NotBetween(String value1, String value2) { + addCriterion("ext_1 not between", value1, value2, "ext1"); + return (Criteria) this; + } + + public Criteria andExt2IsNull() { + addCriterion("ext_2 is null"); + return (Criteria) this; + } + + public Criteria andExt2IsNotNull() { + addCriterion("ext_2 is not null"); + return (Criteria) this; + } + + public Criteria andExt2EqualTo(String value) { + addCriterion("ext_2 =", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotEqualTo(String value) { + addCriterion("ext_2 <>", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThan(String value) { + addCriterion("ext_2 >", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2GreaterThanOrEqualTo(String value) { + addCriterion("ext_2 >=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThan(String value) { + addCriterion("ext_2 <", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2LessThanOrEqualTo(String value) { + addCriterion("ext_2 <=", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Like(String value) { + addCriterion("ext_2 like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotLike(String value) { + addCriterion("ext_2 not like", value, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2In(List values) { + addCriterion("ext_2 in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotIn(List values) { + addCriterion("ext_2 not in", values, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2Between(String value1, String value2) { + addCriterion("ext_2 between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt2NotBetween(String value1, String value2) { + addCriterion("ext_2 not between", value1, value2, "ext2"); + return (Criteria) this; + } + + public Criteria andExt3IsNull() { + addCriterion("ext_3 is null"); + return (Criteria) this; + } + + public Criteria andExt3IsNotNull() { + addCriterion("ext_3 is not null"); + return (Criteria) this; + } + + public Criteria andExt3EqualTo(String value) { + addCriterion("ext_3 =", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotEqualTo(String value) { + addCriterion("ext_3 <>", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThan(String value) { + addCriterion("ext_3 >", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3GreaterThanOrEqualTo(String value) { + addCriterion("ext_3 >=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThan(String value) { + addCriterion("ext_3 <", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3LessThanOrEqualTo(String value) { + addCriterion("ext_3 <=", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Like(String value) { + addCriterion("ext_3 like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotLike(String value) { + addCriterion("ext_3 not like", value, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3In(List values) { + addCriterion("ext_3 in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotIn(List values) { + addCriterion("ext_3 not in", values, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3Between(String value1, String value2) { + addCriterion("ext_3 between", value1, value2, "ext3"); + return (Criteria) this; + } + + public Criteria andExt3NotBetween(String value1, String value2) { + addCriterion("ext_3 not between", value1, value2, "ext3"); + 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/service/src/main/java/com/hfkj/entity/BsStore.java b/service/src/main/java/com/hfkj/entity/BsStore.java index 69d785a..0ccdf09 100644 --- a/service/src/main/java/com/hfkj/entity/BsStore.java +++ b/service/src/main/java/com/hfkj/entity/BsStore.java @@ -113,6 +113,21 @@ public class BsStore implements Serializable { */ private String otherImg; + /** + * 门店地址经度 + */ + private String longitude; + + /** + * 门店地址纬度 + */ + private String latitude; + + /** + * 门店地址 + */ + private String address; + /** * 单独结算 0：否 1：是 */ @@ -199,10 +214,20 @@ public class BsStore implements Serializable { private String larIdCardPeriodEnd; /** - * 状态 0：删除 1：正常 2：停用 3：审核中 4：审核失败 + * 状态 0：删除 1：编辑中 2：正常 3：审核中 4：审核失败 5：停用 */ private Integer status; + /** + * 创建业务员id + */ + private Long createSalesmanId; + + /** + * 创建业务员名称 + */ + private String createSalesmanName; + /** * 创建方式 1：商户进件 2：商户自建 */ @@ -386,6 +411,30 @@ public class BsStore implements Serializable { this.otherImg = otherImg; } + public String getLongitude() { + return longitude; + } + + public void setLongitude(String longitude) { + this.longitude = longitude; + } + + public String getLatitude() { + return latitude; + } + + public void setLatitude(String latitude) { + this.latitude = latitude; + } + + public String getAddress() { + return address; + } + + public void setAddress(String address) { + this.address = address; + } + public Boolean getAloneSettle() { return aloneSettle; } @@ -530,6 +579,22 @@ public class BsStore implements Serializable { this.status = status; } + public Long getCreateSalesmanId() { + return createSalesmanId; + } + + public void setCreateSalesmanId(Long createSalesmanId) { + this.createSalesmanId = createSalesmanId; + } + + public String getCreateSalesmanName() { + return createSalesmanName; + } + + public void setCreateSalesmanName(String createSalesmanName) { + this.createSalesmanName = createSalesmanName; + } + public Integer getCreateType() { return createType; } @@ -610,6 +675,9 @@ public class BsStore implements Serializable { && (this.getInternalImg() == null ? other.getInternalImg() == null : this.getInternalImg().equals(other.getInternalImg())) && (this.getBusinessLicenseImg() == null ? other.getBusinessLicenseImg() == null : this.getBusinessLicenseImg().equals(other.getBusinessLicenseImg())) && (this.getOtherImg() == null ? other.getOtherImg() == null : this.getOtherImg().equals(other.getOtherImg())) + && (this.getLongitude() == null ? other.getLongitude() == null : this.getLongitude().equals(other.getLongitude())) + && (this.getLatitude() == null ? other.getLatitude() == null : this.getLatitude().equals(other.getLatitude())) + && (this.getAddress() == null ? other.getAddress() == null : this.getAddress().equals(other.getAddress())) && (this.getAloneSettle() == null ? other.getAloneSettle() == null : this.getAloneSettle().equals(other.getAloneSettle())) && (this.getStoreType() == null ? other.getStoreType() == null : this.getStoreType().equals(other.getStoreType())) && (this.getBlisUrl() == null ? other.getBlisUrl() == null : this.getBlisUrl().equals(other.getBlisUrl())) @@ -628,6 +696,8 @@ public class BsStore implements Serializable { && (this.getLarIdCardPeriodStart() == null ? other.getLarIdCardPeriodStart() == null : this.getLarIdCardPeriodStart().equals(other.getLarIdCardPeriodStart())) && (this.getLarIdCardPeriodEnd() == null ? other.getLarIdCardPeriodEnd() == null : this.getLarIdCardPeriodEnd().equals(other.getLarIdCardPeriodEnd())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getCreateSalesmanId() == null ? other.getCreateSalesmanId() == null : this.getCreateSalesmanId().equals(other.getCreateSalesmanId())) + && (this.getCreateSalesmanName() == null ? other.getCreateSalesmanName() == null : this.getCreateSalesmanName().equals(other.getCreateSalesmanName())) && (this.getCreateType() == null ? other.getCreateType() == null : this.getCreateType().equals(other.getCreateType())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime())) @@ -660,6 +730,9 @@ public class BsStore implements Serializable { result = prime * result + ((getInternalImg() == null) ? 0 : getInternalImg().hashCode()); result = prime * result + ((getBusinessLicenseImg() == null) ? 0 : getBusinessLicenseImg().hashCode()); result = prime * result + ((getOtherImg() == null) ? 0 : getOtherImg().hashCode()); + result = prime * result + ((getLongitude() == null) ? 0 : getLongitude().hashCode()); + result = prime * result + ((getLatitude() == null) ? 0 : getLatitude().hashCode()); + result = prime * result + ((getAddress() == null) ? 0 : getAddress().hashCode()); result = prime * result + ((getAloneSettle() == null) ? 0 : getAloneSettle().hashCode()); result = prime * result + ((getStoreType() == null) ? 0 : getStoreType().hashCode()); result = prime * result + ((getBlisUrl() == null) ? 0 : getBlisUrl().hashCode()); @@ -678,6 +751,8 @@ public class BsStore implements Serializable { result = prime * result + ((getLarIdCardPeriodStart() == null) ? 0 : getLarIdCardPeriodStart().hashCode()); result = prime * result + ((getLarIdCardPeriodEnd() == null) ? 0 : getLarIdCardPeriodEnd().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getCreateSalesmanId() == null) ? 0 : getCreateSalesmanId().hashCode()); + result = prime * result + ((getCreateSalesmanName() == null) ? 0 : getCreateSalesmanName().hashCode()); result = prime * result + ((getCreateType() == null) ? 0 : getCreateType().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode()); @@ -713,6 +788,9 @@ public class BsStore implements Serializable { sb.append(", internalImg=").append(internalImg); sb.append(", businessLicenseImg=").append(businessLicenseImg); sb.append(", otherImg=").append(otherImg); + sb.append(", longitude=").append(longitude); + sb.append(", latitude=").append(latitude); + sb.append(", address=").append(address); sb.append(", aloneSettle=").append(aloneSettle); sb.append(", storeType=").append(storeType); sb.append(", blisUrl=").append(blisUrl); @@ -731,6 +809,8 @@ public class BsStore implements Serializable { sb.append(", larIdCardPeriodStart=").append(larIdCardPeriodStart); sb.append(", larIdCardPeriodEnd=").append(larIdCardPeriodEnd); sb.append(", status=").append(status); + sb.append(", createSalesmanId=").append(createSalesmanId); + sb.append(", createSalesmanName=").append(createSalesmanName); sb.append(", createType=").append(createType); sb.append(", createTime=").append(createTime); sb.append(", updateTime=").append(updateTime); diff --git a/service/src/main/java/com/hfkj/entity/BsStoreExample.java b/service/src/main/java/com/hfkj/entity/BsStoreExample.java index b4ece88..0a239bf 100644 --- a/service/src/main/java/com/hfkj/entity/BsStoreExample.java +++ b/service/src/main/java/com/hfkj/entity/BsStoreExample.java @@ -1465,6 +1465,216 @@ public class BsStoreExample { return (Criteria) this; } + public Criteria andLongitudeIsNull() { + addCriterion("longitude is null"); + return (Criteria) this; + } + + public Criteria andLongitudeIsNotNull() { + addCriterion("longitude is not null"); + return (Criteria) this; + } + + public Criteria andLongitudeEqualTo(String value) { + addCriterion("longitude =", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeNotEqualTo(String value) { + addCriterion("longitude <>", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeGreaterThan(String value) { + addCriterion("longitude >", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeGreaterThanOrEqualTo(String value) { + addCriterion("longitude >=", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeLessThan(String value) { + addCriterion("longitude <", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeLessThanOrEqualTo(String value) { + addCriterion("longitude <=", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeLike(String value) { + addCriterion("longitude like", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeNotLike(String value) { + addCriterion("longitude not like", value, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeIn(List values) { + addCriterion("longitude in", values, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeNotIn(List values) { + addCriterion("longitude not in", values, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeBetween(String value1, String value2) { + addCriterion("longitude between", value1, value2, "longitude"); + return (Criteria) this; + } + + public Criteria andLongitudeNotBetween(String value1, String value2) { + addCriterion("longitude not between", value1, value2, "longitude"); + return (Criteria) this; + } + + public Criteria andLatitudeIsNull() { + addCriterion("latitude is null"); + return (Criteria) this; + } + + public Criteria andLatitudeIsNotNull() { + addCriterion("latitude is not null"); + return (Criteria) this; + } + + public Criteria andLatitudeEqualTo(String value) { + addCriterion("latitude =", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeNotEqualTo(String value) { + addCriterion("latitude <>", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeGreaterThan(String value) { + addCriterion("latitude >", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeGreaterThanOrEqualTo(String value) { + addCriterion("latitude >=", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeLessThan(String value) { + addCriterion("latitude <", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeLessThanOrEqualTo(String value) { + addCriterion("latitude <=", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeLike(String value) { + addCriterion("latitude like", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeNotLike(String value) { + addCriterion("latitude not like", value, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeIn(List values) { + addCriterion("latitude in", values, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeNotIn(List values) { + addCriterion("latitude not in", values, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeBetween(String value1, String value2) { + addCriterion("latitude between", value1, value2, "latitude"); + return (Criteria) this; + } + + public Criteria andLatitudeNotBetween(String value1, String value2) { + addCriterion("latitude not between", value1, value2, "latitude"); + return (Criteria) this; + } + + public Criteria andAddressIsNull() { + addCriterion("address is null"); + return (Criteria) this; + } + + public Criteria andAddressIsNotNull() { + addCriterion("address is not null"); + return (Criteria) this; + } + + public Criteria andAddressEqualTo(String value) { + addCriterion("address =", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotEqualTo(String value) { + addCriterion("address <>", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThan(String value) { + addCriterion("address >", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressGreaterThanOrEqualTo(String value) { + addCriterion("address >=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThan(String value) { + addCriterion("address <", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLessThanOrEqualTo(String value) { + addCriterion("address <=", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressLike(String value) { + addCriterion("address like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotLike(String value) { + addCriterion("address not like", value, "address"); + return (Criteria) this; + } + + public Criteria andAddressIn(List values) { + addCriterion("address in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotIn(List values) { + addCriterion("address not in", values, "address"); + return (Criteria) this; + } + + public Criteria andAddressBetween(String value1, String value2) { + addCriterion("address between", value1, value2, "address"); + return (Criteria) this; + } + + public Criteria andAddressNotBetween(String value1, String value2) { + addCriterion("address not between", value1, value2, "address"); + return (Criteria) this; + } + public Criteria andAloneSettleIsNull() { addCriterion("alone_settle is null"); return (Criteria) this; @@ -2675,6 +2885,136 @@ public class BsStoreExample { return (Criteria) this; } + public Criteria andCreateSalesmanIdIsNull() { + addCriterion("create_salesman_id is null"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdIsNotNull() { + addCriterion("create_salesman_id is not null"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdEqualTo(Long value) { + addCriterion("create_salesman_id =", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdNotEqualTo(Long value) { + addCriterion("create_salesman_id <>", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdGreaterThan(Long value) { + addCriterion("create_salesman_id >", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdGreaterThanOrEqualTo(Long value) { + addCriterion("create_salesman_id >=", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdLessThan(Long value) { + addCriterion("create_salesman_id <", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdLessThanOrEqualTo(Long value) { + addCriterion("create_salesman_id <=", value, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdIn(List values) { + addCriterion("create_salesman_id in", values, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdNotIn(List values) { + addCriterion("create_salesman_id not in", values, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdBetween(Long value1, Long value2) { + addCriterion("create_salesman_id between", value1, value2, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanIdNotBetween(Long value1, Long value2) { + addCriterion("create_salesman_id not between", value1, value2, "createSalesmanId"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameIsNull() { + addCriterion("create_salesman_name is null"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameIsNotNull() { + addCriterion("create_salesman_name is not null"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameEqualTo(String value) { + addCriterion("create_salesman_name =", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameNotEqualTo(String value) { + addCriterion("create_salesman_name <>", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameGreaterThan(String value) { + addCriterion("create_salesman_name >", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameGreaterThanOrEqualTo(String value) { + addCriterion("create_salesman_name >=", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameLessThan(String value) { + addCriterion("create_salesman_name <", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameLessThanOrEqualTo(String value) { + addCriterion("create_salesman_name <=", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameLike(String value) { + addCriterion("create_salesman_name like", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameNotLike(String value) { + addCriterion("create_salesman_name not like", value, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameIn(List values) { + addCriterion("create_salesman_name in", values, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameNotIn(List values) { + addCriterion("create_salesman_name not in", values, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameBetween(String value1, String value2) { + addCriterion("create_salesman_name between", value1, value2, "createSalesmanName"); + return (Criteria) this; + } + + public Criteria andCreateSalesmanNameNotBetween(String value1, String value2) { + addCriterion("create_salesman_name not between", value1, value2, "createSalesmanName"); + return (Criteria) this; + } + public Criteria andCreateTypeIsNull() { addCriterion("create_type is null"); return (Criteria) this; diff --git a/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java b/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java index 31929b3..abc5dba 100644 --- a/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/impl/BsMerServiceImpl.java @@ -113,6 +113,8 @@ public class BsMerServiceImpl implements BsMerService { mer.setAgentName(salesman.getAgentName()); mer.setSalesmanId(salesman.getId()); mer.setSalesmanName(salesman.getName()); + mer.setCreateSalesmanId(salesman.getId()); + mer.setCreateSalesmanName(salesman.getName()); mer.setRegName(merAccount.getName()); mer.setRegPhone(merAccount.getPhone()); mer.setRegEmail(merAccount.getEmail());