From d6775827c8a34da30838319fc18d68ffa350bb36 Mon Sep 17 00:00:00 2001 From: river <1376754470@qq.com> Date: Fri, 19 Mar 2021 14:31:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=BB=91=E5=AE=9A=E5=BE=AE?= =?UTF-8?q?=E4=BF=A1=E5=88=A4=E9=87=8D=E9=97=AE=E9=A2=98:=E5=8F=AA?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=91=98=E5=B7=A5=E6=98=AF=E5=90=A6=E9=87=8D?= =?UTF-8?q?=E5=A4=8D,=E4=B8=8D=E5=88=A4=E6=96=AD=E5=AE=A2=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/crms/CustomerAppletDao.xml | 10 +-- .../guarantee/mapper/AlCollectionMapper.java | 5 ++ .../service/IAlCollectionService.java | 2 + .../service/impl/AlCollectionServiceImpl.java | 14 +++ .../mapper/guarantee/AlCollectionMapper.xml | 10 +++ .../hrauth/service/impl/UserServiceImpl.java | 4 +- .../src/main/resources/bootstrap.properties | 88 +++++++++---------- .../financial/hrms/dao/DeptPositionDao.java | 1 + .../domain/guarantee/po/AlCollectionPO.java | 57 ++++++++++++ 9 files changed, 139 insertions(+), 52 deletions(-) create mode 100644 dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionPO.java diff --git a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml index 3d9ffcd6..3c7e37a2 100644 --- a/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml +++ b/dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml @@ -49,18 +49,14 @@ AND l.role_id = 58 - + diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java index 2e3fc555..c2702b18 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/mapper/AlCollectionMapper.java @@ -1,8 +1,12 @@ package com.daqing.financial.guarantee.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.daqing.framework.domain.guarantee.AlCollection; +import com.daqing.framework.domain.guarantee.po.AlCollectionPO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** *

@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface AlCollectionMapper extends BaseMapper { + IPage list(@Param("page") Page page, @Param("codeOrName") String codeOrName); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java index cfe2c96b..2db24fd0 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/IAlCollectionService.java @@ -3,6 +3,7 @@ package com.daqing.financial.guarantee.service; import com.baomidou.mybatisplus.extension.service.IService; import com.daqing.framework.domain.guarantee.AlCollection; +import com.daqing.framework.utils.PageUtils; /** *

@@ -14,4 +15,5 @@ import com.daqing.framework.domain.guarantee.AlCollection; */ public interface IAlCollectionService extends IService { + PageUtils list(Integer page, Integer size, String codeOrName); } diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java index 15688dcc..7fdbdaba 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/AlCollectionServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.daqing.financial.guarantee.mapper.AlCollectionMapper; import com.daqing.financial.guarantee.service.IAlCollectionService; import com.daqing.framework.domain.guarantee.AlCollection; +import com.daqing.framework.utils.PageUtils; import org.springframework.stereotype.Service; /** @@ -17,4 +18,17 @@ import org.springframework.stereotype.Service; @Service public class AlCollectionServiceImpl extends ServiceImpl implements IAlCollectionService { + /** + * 催收管理列表 + * + * @param codeOrName 客户编号或者名称 + */ + @Override + public PageUtils list(Integer page, Integer size, String codeOrName) { + if (page == null || size == null) { + page = 1; + size = 10; + } + return null; + } } diff --git a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml index a1859e41..6c0fbe37 100644 --- a/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml +++ b/dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml @@ -12,4 +12,14 @@ + + diff --git a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java index c0dc1fc5..d3a66ee5 100644 --- a/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java +++ b/dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java @@ -158,7 +158,9 @@ public class UserServiceImpl extends ServiceImpl imple log.info("openId========="+openId+"unionId===="+unionId); String md5OpenId = Md5Util.md5(openId); String md5UnionId = Md5Util.md5(unionId); - Integer countWeChatId = this.getBaseMapper().countWeChatId(md5UnionId); + // 判断要绑定的微信是否已经存在 + // Integer countWeChatId = this.getBaseMapper().countWeChatId(md5UnionId); + int countWeChatId = this.getBaseMapper().selectUserEmpCount(md5UnionId); String token = this.getBaseMapper().getTokenByUserId(Long.parseLong(state)); if (countWeChatId > 0){ try { diff --git a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties index a0715411..d36b3795 100644 --- a/dq-financial-hrms-auth/src/main/resources/bootstrap.properties +++ b/dq-financial-hrms-auth/src/main/resources/bootstrap.properties @@ -1,21 +1,21 @@ #服务名称 -spring.application.name=dq-financial-hrms-auth -#配置中心地址 -spring.cloud.nacos.config.server-addr=127.0.0.1:8848 -spring.cloud.nacos.config.file-extension=yml -#redis配置 -spring.redis.host=127.0.0.1 -spring.redis.port=6379 -spring.redis.password= -spring.redis.database=0 -spring.redis.timeout=30000 -spring.redis.jedis.pool.max-active=8 -spring.redis.jedis.pool.max-wait=-1 -spring.redis.jedis.pool.max-idle=8 -spring.redis.jedis.pool.min-idle=0 - -#本地测试环境 -spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 +#spring.application.name=dq-financial-hrms-auth +##配置中心地址 +#spring.cloud.nacos.config.server-addr=127.0.0.1:8848 +#spring.cloud.nacos.config.file-extension=yml +##redis配置 +#spring.redis.host=127.0.0.1 +#spring.redis.port=6379 +#spring.redis.password= +#spring.redis.database=0 +#spring.redis.timeout=30000 +#spring.redis.jedis.pool.max-active=8 +#spring.redis.jedis.pool.max-wait=-1 +#spring.redis.jedis.pool.max-idle=8 +#spring.redis.jedis.pool.min-idle=0 +# +##本地测试环境 +#spring.cloud.nacos.config.namespace=1520c5ea-5f15-4ac1-9eb1-d25924825b99 #线上测试环境 #spring.cloud.nacos.config.namespace=5698e60a-9d0b-433f-a69f-12b0a2d23128 @@ -33,30 +33,30 @@ ribbon.ConnectTimeout: 30000 #正式环境（prod） -#spring.application.name=dq-financial-hrms-auth -# -#spring.cloud.nacos.config.server-addr=120.78.127.12:8848 -#spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 -##spring.cloud.nacos.config.group=prod -# -#spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml -#spring.cloud.nacos.config.ext-config[0].group=prod -#spring.cloud.nacos.config.ext-config[0].refresh=true -# -#spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml -#spring.cloud.nacos.config.ext-config[1].group=prod -#spring.cloud.nacos.config.ext-config[1].refresh=true -# -#spring.cloud.nacos.config.ext-config[2].data-id=other.yml -#spring.cloud.nacos.config.ext-config[2].group=prod -#spring.cloud.nacos.config.ext-config[2].refresh=true -# -#spring.redis.host=127.0.0.1 -#spring.redis.port=6379 -#spring.redis.password=dq123456 -#spring.redis.database=0 -#spring.redis.timeout=30000 -#spring.redis.jedis.pool.max-active=8 -#spring.redis.jedis.pool.max-wait=-1 -#spring.redis.jedis.pool.max-idle=8 -#spring.redis.jedis.pool.min-idle=0 \ No newline at end of file +spring.application.name=dq-financial-hrms-auth + +spring.cloud.nacos.config.server-addr=120.78.127.12:8848 +spring.cloud.nacos.config.namespace=b590c830-7ada-44b7-968f-e8d0c81990c4 +#spring.cloud.nacos.config.group=prod + +spring.cloud.nacos.config.ext-config[0].data-id=datasource.yml +spring.cloud.nacos.config.ext-config[0].group=prod +spring.cloud.nacos.config.ext-config[0].refresh=true + +spring.cloud.nacos.config.ext-config[1].data-id=mybatis.yml +spring.cloud.nacos.config.ext-config[1].group=prod +spring.cloud.nacos.config.ext-config[1].refresh=true + +spring.cloud.nacos.config.ext-config[2].data-id=other.yml +spring.cloud.nacos.config.ext-config[2].group=prod +spring.cloud.nacos.config.ext-config[2].refresh=true + +spring.redis.host=127.0.0.1 +spring.redis.port=6379 +spring.redis.password=dq123456 +spring.redis.database=0 +spring.redis.timeout=30000 +spring.redis.jedis.pool.max-active=8 +spring.redis.jedis.pool.max-wait=-1 +spring.redis.jedis.pool.max-idle=8 +spring.redis.jedis.pool.min-idle=0 \ No newline at end of file diff --git a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptPositionDao.java b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptPositionDao.java index e0e467ba..93775b13 100644 --- a/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptPositionDao.java +++ b/dq-financial-hrms/src/main/java/com/daqing/financial/hrms/dao/DeptPositionDao.java @@ -16,6 +16,7 @@ import java.util.List; */ @Mapper public interface DeptPositionDao extends BaseMapper { + int saveBatch(@Param("list") List deptPositionList); int deleteByPositionId(@Param("positionId") Long positionId); diff --git a/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionPO.java b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionPO.java new file mode 100644 index 00000000..1af7a40f --- /dev/null +++ b/dq-framework-model/src/main/java/com/daqing/framework/domain/guarantee/po/AlCollectionPO.java @@ -0,0 +1,57 @@ +package com.daqing.framework.domain.guarantee.po; + +import lombok.Data; +import lombok.ToString; + +import java.io.Serializable; + +/** + * 催熟管理数据接收 + * + * @auther River + * @date 2021/3/18 16:55 + */ +@Data +@ToString +public class AlCollectionPO implements Serializable { + + /** + * id + */ + private Integer id; + + /** + * 客户编号 + */ + private String code; + + /** + * 客户名称 + */ + private String name; + + /** + * 联系电话 + */ + private String phone; + + /** + * 业务类别 + */ + private String type; + + /** + * 担保额度 + */ + private Double amount; + + /** + * 所属部门 + */ + private String department; + + /** + * 状态 + */ + private Integer status; +}