员工绑定微信判重问题:只判断员工是否重复,不判断客户

dq-financial-crms/src/main/resources/mapper/crms/CustomerAppletDao.xml

@@ -49,18 +49,14 @@
         AND l.role_id = 58
     </select>
 
-    <!-- 获取已申请额度 -->
+    <!-- 获取已申请成功的额度 -->
     <select id="getApplyMount" parameterType="integer" resultType="com.daqing.framework.domain.crms.ext.ApplicationRecordPO">
-        SELECT a.id AS id,a.create_time AS apply_date,a.amount_wide AS amount_wide,a.apply_time AS apply_time,l.status AS audit_status,
-        a.apply_amount AS apply_amount,b.business_status AS business_status
+        SELECT a.apply_amount AS apply_amount
         FROM dg_apply_amount_info AS a
         LEFT JOIN dg_business_process_status AS b
         ON a.id = b.business_id
-        LEFT JOIN dg_apply_amount_list AS l
-        ON l.business_id = a.id
         WHERE a.company_id = #{companyId}
-        AND (b.business_status = 2 OR l.status IN (1,2,3,4,5))
-        GROUP BY a.id
+        AND b.business_status = 2
     </select>
 
     <!-- 获取申请记录详情 -->

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;
 
 /**
  * <p>
@@ -15,4 +19,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface AlCollectionMapper extends BaseMapper<AlCollection> {
 
+    IPage<AlCollectionPO> list(@Param("page") Page page, @Param("codeOrName") String codeOrName);
 }

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;
 
 /**
  * <p>
@@ -14,4 +15,5 @@ import com.daqing.framework.domain.guarantee.AlCollection;
  */
 public interface IAlCollectionService extends IService<AlCollection> {
 
+    PageUtils list(Integer page, Integer size, String codeOrName);
 }

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<AlCollectionMapper, AlCollection> 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;
+    }
 }

dq-financial-guarantee/src/main/resources/mapper/guarantee/AlCollectionMapper.xml

@@ -12,4 +12,14 @@
         <result column="enclosure_file" property="enclosureFile" />
     </resultMap>
 
+    <select id="list" resultType="com.daqing.framework.domain.guarantee.po.AlCollectionPO">
+        SELECT i.id AS id,i.business_code AS code,i.customer_name AS name,i.phone AS phone,i.business_type AS type,
+               i.guarantee_amount AS amount,i.department AS department,i.payment_status AS status
+        FROM al_insurance_list AS i
+        INNER JOIN al_repayment_entry AS r
+        ON i.id = r.insurance_id
+        WHERE r.repayment_status = 3
+        GROUP BY i.id
+    </select>
+
 </mapper>

dq-financial-hrms-auth/src/main/java/com/daqing/financial/hrauth/service/impl/UserServiceImpl.java

@@ -158,7 +158,9 @@ public class UserServiceImpl extends ServiceImpl<UserLoginDao, UserEntity> 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 {

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
+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

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<DeptPositionEntity> {
+
 	int saveBatch(@Param("list") List<DeptPositionEntity> deptPositionList);
 
 	int deleteByPositionId(@Param("positionId") Long positionId);

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;
+}