common公共方法

sc-service/src/main/java/com/huyi/service/ServiceApplication.java

@@ -18,7 +18,7 @@ import org.springframework.cloud.client.SpringCloudApplication;
 @EnableRyFeignClients
 @SpringCloudApplication
 @SpringBootApplication
-@MapperScan("com.huyi.service.*.mapper")
+@MapperScan({"com.huyi.service.*.mapper","com.huyi.service.*.*.mapper"})
 public class ServiceApplication
 {
     public static void main(String[] args)

sc-service/src/main/java/com/huyi/service/base/entity/ZcFinanceProComRel.java

@@ -11,11 +11,11 @@ import lombok.experimental.Accessors;
 
 /**
  * <p>
- * 企业授信额度表
+ * 核心企业授信额度表
  * </p>
  *
  * @author xuefy
- * @since 2021-08-16
+ * @since 2021-08-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -62,6 +62,12 @@ public class ZcFinanceProComRel implements Serializable {
     private String zfpcrDivisionAmount;
 
     /**
+     * 有效期(0:长期, 1:定期)
+     */
+    @TableField("zfpcr_date_type")
+    private String zfpcrDateType;
+
+    /**
      * 开始日期
      */
     @TableField("zfpcr_start_date")
@@ -74,7 +80,43 @@ public class ZcFinanceProComRel implements Serializable {
     private String zfpcrEndDate;
 
     /**
-     * 状态
+     * 融资网点
+     */
+    @TableField("zfpcr_address")
+    private String zfpcrAddress;
+
+    /**
+     * 是否收取手续费(0:不收取, 1收取)
+     */
+    @TableField("zfpcr_charge")
+    private String zfpcrCharge;
+
+    /**
+     * 平台服务费收取费率
+     */
+    @TableField("zfpcr_charge_rate")
+    private String zfpcrChargeRate;
+
+    /**
+     * 核心企业还款账户账号
+     */
+    @TableField("zfpcr_account")
+    private String zfpcrAccount;
+
+    /**
+     * 融资放款方式
+     */
+    @TableField("zfpcr_loan_type")
+    private String zfpcrLoanType;
+
+    /**
+     * 记账簿托管方式
+     */
+    @TableField("zfpcr_bookkeeping_type")
+    private String zfpcrBookkeepingType;
+
+    /**
+     * 状态(00:有效 01:失效)
      */
     @TableField("zfpcr_status")
     private String zfpcrStatus;

sc-service/src/main/java/com/huyi/service/common/company/controller/companyController.java

@@ -0,0 +1,46 @@
+package com.huyi.service.common.company.controller;
+
+import com.huyi.service.common.company.service.CompanyService;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.web.controller.BaseController;
+import com.tianhu.common.core.web.domain.AjaxResult;
+import com.tianhu.common.security.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 企业controller
+ *
+ * @author ch
+ * @date 2021-8-16
+ */
+
+@RestController
+@RequestMapping("/company")
+public class companyController extends BaseController {
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private CompanyService companyService;
+
+    /**
+     * 根据类型获取公司
+     * @return
+     */
+    @GetMapping("/list/{scyType}/{scyId}")
+    public AjaxResult list(@PathVariable String scyType,@PathVariable String scyId) {
+        Map map = new HashMap();
+        map.put("scyType",scyType);
+        if (CommonUtil.isNotEmpty(scyId)) {
+            map.put("scyId", scyId);
+        }
+        List<Map> list = companyService.selectCompanyList(map);
+        return AjaxResult.success(list);
+    }
+
+
+}

sc-service/src/main/java/com/huyi/service/common/company/mapper/CompanyMapper.java

@@ -0,0 +1,21 @@
+package com.huyi.service.common.company.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface CompanyMapper {
+
+
+    /**
+     * 根据类型获取公司
+     *      *
+     * @param
+     * @return 公司集合
+     */
+    public List<Map> selectCompanyList(@Param("paramMap") Map map);
+
+}

sc-service/src/main/java/com/huyi/service/common/company/service/CompanyService.java

@@ -0,0 +1,18 @@
+package com.huyi.service.common.company.service;
+
+
+import java.util.List;
+import java.util.Map;
+
+public interface CompanyService {
+
+
+    /**
+     * 根据类型获取公司
+     *      *
+     * @param
+     * @return 公司集合
+     */
+    public List<Map> selectCompanyList(Map map);
+
+}

sc-service/src/main/java/com/huyi/service/common/company/service/impl/CompanyServiceImpl.java

@@ -0,0 +1,23 @@
+package com.huyi.service.common.company.service.impl;
+
+import com.huyi.service.common.company.mapper.CompanyMapper;
+import com.huyi.service.common.company.service.CompanyService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CompanyServiceImpl implements CompanyService {
+    @Autowired
+    private CompanyMapper companyMapper;
+
+
+    @Override
+    public List<Map> selectCompanyList(Map map) {
+        return companyMapper.selectCompanyList(map);
+    }
+
+
+}

sc-service/src/main/java/com/huyi/service/common/companyAcc/controller/companyAccController.java

@@ -0,0 +1,49 @@
+package com.huyi.service.common.companyAcc.controller;
+
+
+import com.huyi.service.common.companyAcc.service.CompanyAccService;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.web.controller.BaseController;
+import com.tianhu.common.core.web.domain.AjaxResult;
+import com.tianhu.common.security.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 企业账户controller
+ *
+ * @author ch
+ * @date 2021-8-16
+ */
+
+@RestController
+@RequestMapping("/companyAcc")
+public class companyAccController extends BaseController {
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private CompanyAccService companyAccService;
+
+    /**
+     * 查询核心企业还款账户
+     * @return
+     */
+    @GetMapping("/list/{zfpcrAccount}")
+    public AjaxResult list(@PathVariable String zfpcrAccount) {
+        Map map = new HashMap();
+        if (CommonUtil.isNotEmpty(zfpcrAccount)) {
+            map.put("zfpcrAccount", zfpcrAccount);
+        }
+        List<Map> list = companyAccService.selectCompanyAccList(map);
+        return AjaxResult.success(list);
+    }
+
+
+}

sc-service/src/main/java/com/huyi/service/common/companyAcc/mapper/CompanyAccMapper.java

@@ -0,0 +1,21 @@
+package com.huyi.service.common.companyAcc.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface CompanyAccMapper {
+
+
+    /**
+     * 查询核心企业还款账户
+     *      *
+     * @param
+     * @return 公司还款账户集合
+     */
+    public List<Map> selectCompanyAccList(@Param("paramMap") Map map);
+
+}

sc-service/src/main/java/com/huyi/service/common/companyAcc/service/CompanyAccService.java

@@ -0,0 +1,18 @@
+package com.huyi.service.common.companyAcc.service;
+
+
+import java.util.List;
+import java.util.Map;
+
+public interface CompanyAccService {
+
+
+    /**
+     * 查询核心企业还款账户
+     *      *
+     * @param
+     * @return 公司还款账户集合
+     */
+    public List<Map> selectCompanyAccList(Map map);
+
+}

sc-service/src/main/java/com/huyi/service/common/companyAcc/service/impl/CompanyAccServiceImpl.java

@@ -0,0 +1,23 @@
+package com.huyi.service.common.companyAcc.service.impl;
+
+import com.huyi.service.common.companyAcc.mapper.CompanyAccMapper;
+import com.huyi.service.common.companyAcc.service.CompanyAccService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class CompanyAccServiceImpl implements CompanyAccService {
+    @Autowired
+    private CompanyAccMapper companyAccMapper;
+
+
+    @Override
+    public List<Map> selectCompanyAccList(Map map) {
+        return companyAccMapper.selectCompanyAccList(map);
+    }
+
+
+}

sc-service/src/main/java/com/huyi/service/common/companyController.java

@@ -1,59 +0,0 @@
-package com.huyi.service.common;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.huyi.service.base.entity.SysCompany;
-import com.huyi.service.base.entity.ZcFinanceProConRel;
-import com.huyi.service.base.entity.ZcFinanceProduct;
-import com.huyi.service.base.service.ISysCompanyService;
-import com.huyi.service.base.service.IZcFinanceProConRelService;
-import com.huyi.service.base.service.IZcFinanceProductService;
-import com.huyi.service.financeProduct.service.IOwnFinanceProductService;
-import com.keao.tianhu.starter.mybatis.plus.entity.QueryRequest;
-import com.tianhu.common.core.utils.CommonUtil;
-import com.tianhu.common.core.utils.DateUtils;
-import com.tianhu.common.core.utils.IdUtils;
-import com.tianhu.common.core.web.controller.BaseController;
-import com.tianhu.common.core.web.domain.AjaxResult;
-import com.tianhu.common.log.annotation.Log;
-import com.tianhu.common.log.enums.BusinessType;
-import com.tianhu.common.security.annotation.PreAuthorize;
-import com.tianhu.common.security.service.TokenService;
-import com.tianhu.system.api.domain.SysUser;
-import com.tianhu.system.api.model.LoginUser;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * 融资产品controller
- *
- * @author ch
- * @date 2021-8-16
- */
-
-@RestController
-@RequestMapping("/company")
-public class companyController extends BaseController {
-    @Autowired
-    private TokenService tokenService;
-    @Autowired
-    private ISysCompanyService sysCompanyService;
-
-    /**
-     * 获取资方列表
-     * @return
-     */
-    @GetMapping("/list")
-    public AjaxResult list() {
-        LambdaQueryWrapper<SysCompany> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(SysCompany::getScyType,"03");
-        return AjaxResult.success(sysCompanyService.list(queryWrapper));
-    }
-
-
-}

sc-service/src/main/java/com/huyi/service/common/financeProduct/controller/FinanceProductController.java

@@ -0,0 +1,44 @@
+package com.huyi.service.common.financeProduct.controller;
+
+import com.huyi.service.common.financeProduct.service.FinanceProductService;
+import com.tianhu.common.core.domain.R;
+import com.tianhu.common.core.utils.CommonUtil;
+import com.tianhu.common.core.web.controller.BaseController;
+import com.tianhu.common.security.service.TokenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 融资产品Controller
+ *
+ * @author pxh
+ * @date 2021-02-04
+ */
+
+@RestController
+@RequestMapping("/commonFinanceProduct")
+public class FinanceProductController extends BaseController {
+    @Autowired
+    private TokenService tokenService;
+    @Autowired
+    private FinanceProductService financeProductService;
+     /**
+     * 查询融资产品列表
+     */
+    @GetMapping("/list/{zfpcrProductId}")
+    public R list(@PathVariable String zfpcrProductId) {
+        //查询当前操作员
+        Map map = new HashMap();
+        if (CommonUtil.isNotEmpty(zfpcrProductId)) {
+            map.put("zfpId", zfpcrProductId);
+        }
+        List<Map> list = financeProductService.selectFinanceProductList(map);
+        return R.ok(list);
+    }
+}
+

sc-service/src/main/java/com/huyi/service/common/financeProduct/mapper/FinanceProductMapper.java

@@ -0,0 +1,21 @@
+package com.huyi.service.common.financeProduct.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface FinanceProductMapper {
+
+
+    /**
+     * 查询融资产品列表
+     *
+     * @param
+     * @return 融资产品集合
+     */
+    public List<Map> selectFinanceProductList(@Param("paramMap") Map map);
+
+}

sc-service/src/main/java/com/huyi/service/common/financeProduct/service/FinanceProductService.java

@@ -0,0 +1,18 @@
+package com.huyi.service.common.financeProduct.service;
+
+
+import java.util.List;
+import java.util.Map;
+
+public interface FinanceProductService {
+
+
+    /**
+     * 查询融资产品列表
+     *
+     * @param
+     * @return 融资产品集合
+     */
+    public List<Map> selectFinanceProductList(Map map);
+
+}

sc-service/src/main/java/com/huyi/service/common/financeProduct/service/impl/FinanceProductServiceImpl.java

@@ -0,0 +1,23 @@
+package com.huyi.service.common.financeProduct.service.impl;
+
+import com.huyi.service.common.financeProduct.mapper.FinanceProductMapper;
+import com.huyi.service.common.financeProduct.service.FinanceProductService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class FinanceProductServiceImpl implements FinanceProductService {
+    @Autowired
+    private FinanceProductMapper financeProductMapper;
+
+
+    @Override
+    public List<Map> selectFinanceProductList(Map map) {
+        return financeProductMapper.selectFinanceProductList(map);
+    }
+
+
+}

sc-service/src/main/resources/mapper/base/ZcFinanceProComRelMapper.xml

@@ -10,8 +10,15 @@
         <result column="zfpcr_amount" property="zfpcrAmount" />
         <result column="zfpcr_rate" property="zfpcrRate" />
         <result column="zfpcr_division_amount" property="zfpcrDivisionAmount" />
+        <result column="zfpcr_date_type" property="zfpcrDateType" />
         <result column="zfpcr_start_date" property="zfpcrStartDate" />
         <result column="zfpcr_end_date" property="zfpcrEndDate" />
+        <result column="zfpcr_address" property="zfpcrAddress" />
+        <result column="zfpcr_charge" property="zfpcrCharge" />
+        <result column="zfpcr_charge_rate" property="zfpcrChargeRate" />
+        <result column="zfpcr_account" property="zfpcrAccount" />
+        <result column="zfpcr_loan_type" property="zfpcrLoanType" />
+        <result column="zfpcr_bookkeeping_type" property="zfpcrBookkeepingType" />
         <result column="zfpcr_status" property="zfpcrStatus" />
         <result column="zfpcr_profit_spare1" property="zfpcrProfitSpare1" />
         <result column="zfpcr_profit_spare2" property="zfpcrProfitSpare2" />

sc-service/src/main/resources/mapper/common/CompanyAccMapper.xml

@@ -0,0 +1,44 @@
+<?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.huyi.service.common.companyAcc.mapper.CompanyAccMapper">
+
+    <select id="selectCompanyAccList" parameterType="map" resultType="map">
+        SELECT
+          PAI_ACCNO 'value',
+          CASE  WHEN PAI_ACCNO = #{paramMap.zfpcrAccount}  THEN 0  ELSE  1  END  'flag'
+        FROM
+          pay_acc_inf
+          LEFT JOIN sys_company
+            ON scy_id = PAI_CSTNO
+            AND scy_type = '01'
+        WHERE PAI_STATUS = '2'
+          AND PAI_ACCTYPE = '00'
+        <if test="paramMap.zfpcrAccount != null  and paramMap.zfpcrAccount != ''">
+            AND (PAI_ACCNO = #{paramMap.zfpcrAccount} OR (PAI_STATUS = '2'
+            AND PAI_ACCTYPE = '00'))
+        </if>
+<!--        <if test="paramMap.zfpcrAccount != null  and paramMap.zfpcrAccount != ''">-->
+<!--            and PAI_ACCNO like concat ('%' , #{paramMap.zfpcrAccount} , '%')-->
+<!--        </if>-->
+          UNION
+
+        SELECT
+          PBAI_BANKACCOUNT_ID 'value',
+          CASE  WHEN PBAI_BANKACCOUNT_ID = #{paramMap.zfpcrAccount} THEN 0  ELSE  1  END  'flag'
+        FROM
+          pay_bank_acc_inf
+          LEFT JOIN sys_company
+            ON scy_id = PBAI_CSTNO
+        AND scy_type = '01'
+        WHERE PBAI_STATUS = '0'
+        <if test="paramMap.zfpcrAccount != null  and paramMap.zfpcrAccount != ''">
+            AND (PBAI_BANKACCOUNT_ID = #{paramMap.zfpcrAccount} OR PBAI_STATUS = '0')
+        </if>
+<!--        <if test="paramMap.zfpcrAccount != null  and paramMap.zfpcrAccount != ''">-->
+<!--            and PBAI_BANKACCOUNT_ID like concat ('%' , #{paramMap.zfpcrAccount} , '%')-->
+<!--        </if>-->
+        ORDER BY  flag ASC
+    </select>
+</mapper>

sc-service/src/main/resources/mapper/common/CompanyMapper.xml

@@ -0,0 +1,21 @@
+<?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.huyi.service.common.company.mapper.CompanyMapper">
+
+    <select id="selectCompanyList" parameterType="map" resultType="map">
+        SELECT
+            scy_id              'scyId',
+            scy_name           'scyName',
+            CASE  WHEN scy_id= #{paramMap.scyId}  THEN 0  ELSE  1  END  'flag'
+        FROM
+        sys_company
+        WHERE scy_status = '00'
+        and scy_type = #{paramMap.scyType}
+        <if test="paramMap.scyId != null  and paramMap.scyId != ''">
+            AND (scy_id= #{paramMap.scyId} OR scy_status = '00')
+        </if>
+        order by flag asc ,create_time desc
+    </select>
+</mapper>

sc-service/src/main/resources/mapper/common/FinanceProductMapper.xml

@@ -0,0 +1,21 @@
+<?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.huyi.service.common.financeProduct.mapper.FinanceProductMapper">
+
+    <select id="selectFinanceProductList" parameterType="map" resultType="map">
+        SELECT
+            zfp_id              'zfpId',
+            zfp_number          'zfpNumber',
+            zfp_name            'zfpName',
+            CASE  WHEN zfp_id= #{paramMap.zfpId}  THEN 0  ELSE  1  END  'flag'
+        FROM
+        zc_finance_product
+        WHERE zfp_status = '01'
+        <if test="paramMap.zfpId != null  and paramMap.zfpId != ''">
+            AND (zfp_id= #{paramMap.zfpId} OR zfp_status = '01')
+        </if>
+        order by flag asc ,create_time desc
+    </select>
+</mapper>