feat:新增下拉框的用户/供应商列表

src/main/java/com/winhc/repal/controller/RepalCustomerController.java

@@ -10,12 +10,16 @@ import com.winhc.repal.model.dto.RepalCustomerQueryDTO;
 import com.winhc.repal.model.dto.RepalCustomerUpdateDTO;
 import com.winhc.repal.model.vo.RepalCustomerDetailVO;
 import com.winhc.repal.model.vo.RepalCustomerInfoVO;
+import com.winhc.repal.model.vo.RepalCustomerSimpleVO;
 import com.winhc.repal.service.RepalCustomerService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author Aaron
  * @date 2022/4/19 13:08
@@ -28,6 +32,12 @@ public class RepalCustomerController extends BaseController {
     @Autowired
     private RepalCustomerService repalCustomerService;
 
+    @ApiOperation("客户/供应商下拉框")
+    @GetMapping(value = "/list")
+    public BeanResponse<List<RepalCustomerSimpleVO>> getCustList(@ApiParam("1客户 2供应商") @RequestParam("custType")Integer custType){
+        return BeanResponse.success(CodeMsg.SUCCESS,repalCustomerService.getCustList(custType));
+    }
+
     @ApiOperation("分页查询客户")
     @GetMapping(value = "/cust/page")
     public BeanResponse<VOPage<RepalCustomerInfoVO>> getRepalCustPage(RepalCustomerQueryDTO dto){

src/main/java/com/winhc/repal/entity/RepalDynamic.java

@@ -0,0 +1,62 @@
+package com.winhc.repal.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @description RepalDynamic实体对象
+ * @author Generator
+ * @date 2022-05-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("REPAL_DYNAMIC")
+@ApiModel(value="RepalDynamic实体对象", description="催款动态")
+public class RepalDynamic implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "ID", type = IdType.AUTO)
+    private Long id;
+
+    @ApiModelProperty(value = "成员id")
+    @TableField("MEMBER_ID")
+    private Long memberId;
+
+    @ApiModelProperty(value = "账款id")
+    @TableField("REPAL_BILL_ID")
+    private Long repalBillId;
+
+    @ApiModelProperty(value = "动态类型 1短信 2律师函 3咨询 4诉讼 5其他")
+    @TableField("DYNAMIC_TYPE")
+    private Integer dynamicType;
+
+    @ApiModelProperty(value = "动态内容")
+    @TableField("DYNAMIC_DESC")
+    private String dynamicDesc;
+
+    @ApiModelProperty(value = "动态时间")
+    @TableField("TIME_CREATED")
+    private LocalDateTime timeCreated;
+
+    @ApiModelProperty(value = "联系人")
+    @TableField("LINK_MAN")
+    private String linkMan;
+
+    @ApiModelProperty(value = "律师服务id")
+    @TableField("LAWYER_SERVICE_ID")
+    private Long lawyerServiceId;
+
+
+}

src/main/java/com/winhc/repal/model/vo/RepalCustomerSimpleVO.java

@@ -0,0 +1,31 @@
+package com.winhc.repal.model.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * @author Aaron
+ * @date 2022/5/6 17:27
+ * @description
+ */
+@Data
+@Accessors(chain = true)
+@ApiModel("客户下拉框")
+public class RepalCustomerSimpleVO {
+    @ApiModelProperty(value = "客户id")
+    private Long custId;
+
+    @ApiModelProperty(value = "客户名称")
+    private String custName;
+
+    @ApiModelProperty(value = "客户性质 1企业 2个人 3政府事业单位")
+    private Integer custProperty;
+
+    @ApiModelProperty(value = "1客户  2供应商")
+    private Integer custType;
+
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+}

src/main/java/com/winhc/repal/repository/RepalDynamicMapper.java

@@ -0,0 +1,13 @@
+package com.winhc.repal.repository;
+
+import com.winhc.repal.entity.RepalDynamic;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @description RepalDynamic Mapper 接口
+ * @author Generator
+ * @date 2022-05-06
+ */
+public interface RepalDynamicMapper extends BaseMapper<RepalDynamic> {
+
+}

src/main/java/com/winhc/repal/service/RepalCustomerService.java

@@ -9,6 +9,9 @@ import com.winhc.repal.model.dto.RepalCustomerQueryDTO;
 import com.winhc.repal.model.dto.RepalCustomerUpdateDTO;
 import com.winhc.repal.model.vo.RepalCustomerDetailVO;
 import com.winhc.repal.model.vo.RepalCustomerInfoVO;
+import com.winhc.repal.model.vo.RepalCustomerSimpleVO;
+
+import java.util.List;
 
 
 /**
@@ -17,6 +20,11 @@ import com.winhc.repal.model.vo.RepalCustomerInfoVO;
  * @date 2022-04-08
  */
 public interface RepalCustomerService extends IService<RepalCustomer> {
+     /**
+      * 根据组织编号查询客户列表
+      * @return
+      */
+     List<RepalCustomerSimpleVO> getCustList(Integer custType);
 
      /**
       * 分页查询客户

src/main/java/com/winhc/repal/service/RepalDynamicService.java

@@ -0,0 +1,14 @@
+package com.winhc.repal.service;
+
+import com.winhc.repal.entity.RepalDynamic;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+
+/**
+ * @description RepalDynamic 接口类
+ * @author Generator
+ * @date 2022-05-06
+ */
+public interface RepalDynamicService extends IService<RepalDynamic> {
+
+}

src/main/java/com/winhc/repal/service/impl/RepalCustomerServiceImpl.java

@@ -19,6 +19,7 @@ import com.winhc.repal.cloud.vo.FinanceDynamicNumVO;
 import com.winhc.repal.entity.*;
 import com.winhc.repal.enums.*;
 import com.winhc.repal.model.bo.RepalCustomerInfoBO;
+import com.winhc.repal.model.bo.UserContextBO;
 import com.winhc.repal.model.dto.*;
 import com.winhc.repal.model.vo.*;
 import com.winhc.repal.repository.RepalCustomerMapper;
@@ -82,7 +83,28 @@ public class RepalCustomerServiceImpl extends ServiceImpl<RepalCustomerMapper, R
     @Autowired
     private RepalRolePermissionService repalRolePermissionService;
 
-     @Override
+    @Override
+    public List<RepalCustomerSimpleVO> getCustList(Integer custType) {
+        //不校验权限，返回全部客户供应商列表
+        UserContextBO userContextBO = UserContextUtil.getUser();
+        Long repalGroupId = repalGroupMemberService.getUserGroupId(userContextBO.getUserId());
+        List<RepalCustomer> repalCustomers = list(Wrappers.lambdaQuery(RepalCustomer.class)
+                .eq(RepalCustomer::getRepalGroupId,repalGroupId)
+                .eq(RepalCustomer::getDeleted,Dict.DeletedStatusEnunm.否.getCode())
+                .eq(RepalCustomer::getCustType,custType));
+        if(CollUtil.isEmpty(repalCustomers)){
+            return new ArrayList<>();
+        }
+        List<RepalCustomerSimpleVO> result = new ArrayList<>(repalCustomers.size());
+        for(RepalCustomer repalCustomer:repalCustomers){
+            RepalCustomerSimpleVO repalCustomerSimpleVO = new RepalCustomerSimpleVO();
+            result.add(repalCustomerSimpleVO);
+            BeanUtils.copyProperties(repalCustomer,repalCustomerSimpleVO);
+        }
+        return result;
+    }
+
+    @Override
      public VOPage<RepalCustomerInfoVO> find(RepalCustomerQueryDTO dto,UserBean userBean) {
          //权限
          boolean allFlag = repalRolePermissionService.checkUserPermission(UserContextUtil.getUser().getUserId(),

src/main/java/com/winhc/repal/service/impl/RepalDynamicServiceImpl.java

@@ -0,0 +1,17 @@
+package com.winhc.repal.service.impl;
+
+import com.winhc.repal.entity.RepalDynamic;
+import com.winhc.repal.repository.RepalDynamicMapper;
+import com.winhc.repal.service.RepalDynamicService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * @description RepalDynamic 接口实现类
+ * @author Generator
+ * @date 2022-05-06
+ */
+@Service
+public class RepalDynamicServiceImpl extends ServiceImpl<RepalDynamicMapper, RepalDynamic> implements RepalDynamicService {
+
+}

src/main/resources/mapper/RepalCustomerMapper.xml

@@ -14,9 +14,13 @@
         FROM
             REPAL_CUSTOMER A
         LEFT JOIN REPAL_BILL B ON A.CUST_ID = B.CUSTOMER_ID AND B.DELETED = 0
+        <if test="billType != null">
+            AND B.REPAL_BILL_TYPE = #{billType}
+        </if>
         WHERE A.REPAL_GROUP_ID = #{groupId}
-        AND B.REPAL_BILL_TYPE = #{billType}
-        AND A.CUST_TYPE = #{custType}
+        <if test="custType != null">
+            AND A.CUST_TYPE = #{custType}
+        </if>
         <if test="!allFlag">
             AND EXISTS (SELECT 1 FROM REPAL_CUST_CHARGE_REL C WHERE A.CUST_ID = C.CUST_ID AND C.MEMBER_USER_ID = #{userId})
         </if>

src/main/resources/mapper/RepalDynamicMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.winhc.repal.repository.RepalDynamicMapper">
+
+</mapper>