peixh 3 лет назад
Родитель
Сommit
58a5af93a8

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

@@ -2,10 +2,13 @@ package com.huyi.service.common.companyAcc.controller;
 
 
 import com.huyi.service.common.companyAcc.service.CompanyAccService;
+import com.tianhu.common.core.constant.SalaryConstants;
 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 com.tianhu.system.api.domain.SysUser;
+import com.tianhu.system.api.model.LoginUser;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -37,7 +40,15 @@ public class companyAccController extends BaseController {
      */
     @GetMapping("/list/{zfpcrAccount}")
     public AjaxResult list(@PathVariable String zfpcrAccount) {
+        //查询当前操作员
+        LoginUser userInfo = tokenService.getLoginUser();
+        SysUser use = userInfo.getSysUser();
+        //获取企业
+        String companyId = use.getCompanyId();
         Map map = new HashMap();
+        if (!SalaryConstants.OPEX.equals(companyId)) {
+            map.put("companyId", companyId);
+        }
         if (CommonUtil.isNotEmpty(zfpcrAccount)) {
             map.put("zfpcrAccount", zfpcrAccount);
         }

+ 24 - 2
sc-service/src/main/java/com/huyi/service/financeRecord/controller/RecordSealController.java

@@ -8,6 +8,7 @@ import com.keao.tianhu.core.util.AmtUtil;
 import com.spire.doc.Document;
 import com.spire.doc.FileFormat;
 import com.tianhu.common.core.cfca.AxqCommonUtil;
+import com.tianhu.common.core.cfca.connector.HttpConnector;
 import com.tianhu.common.core.domain.R;
 import com.tianhu.common.core.utils.*;
 import com.tianhu.common.core.utils.poi.WordUtil;
@@ -85,6 +86,12 @@ public class RecordSealController extends BaseController {
     private RemoteFileService remoteFileService;
     @Autowired
     private IZcChargeInfService iZcChargeInfService;
+    @Autowired
+    private IZcFinanceInfService iZcFinanceInfService;
+    @Autowired
+    private IZcFinanceRecordService iZcFinanceRecordService;
+    @Autowired
+    private IZcFinanceProComRelService iZcFinanceProComRelService;
     /**
      * 获取合同文件
      * @param map
@@ -586,7 +593,7 @@ public class RecordSealController extends BaseController {
             String userId = "CA74686406B322C7E05311016B0A442F";
             //项目编号
             String projectCode = DateUtils.dateTimeNow();
-            JSONObject jsonObject = AxqCommonUtil.contractSigning(userId,"MM",fileName,keyWords,"0","0","250","250",projectCode,filePath);
+            JSONObject jsonObject = AxqCommonUtil.contractSigning(userId,"MM",fileName,keyWords,"0","0","250","250",projectCode,filePath,new HttpConnector("D:/anxinsign.jks", "123456", "Test", "CA4572A39DCB55ABE05311016B0A04B3"));
             /**-------- CFCA盖章 结束--------**/
             /**-------- CFCA盖章文件下载 开始--------**/
             //获取错误码
@@ -605,7 +612,7 @@ public class RecordSealController extends BaseController {
             //String path = "D:/zhuomian/cfca/";
             String path = configService.selectConfigByKey("cfca_file_path").getMsg();
             //下载文件
-            AxqCommonUtil.downloadFile(contractNo,path);
+            AxqCommonUtil.downloadFile(contractNo,path,new HttpConnector("D:/anxinsign.jks", "123456", "Test", "CA4572A39DCB55ABE05311016B0A04B3"));
             /**-------- CFCA盖章文件下载 结束--------**/
             //上传到文件服务器
             //获取token
@@ -663,6 +670,21 @@ public class RecordSealController extends BaseController {
 
     @PostMapping("/updateChargeStatus/{zfrId}")
     public AjaxResult updateChargeStatus(@PathVariable String zfrId) throws Exception {
+        //融资信息
+        ZcFinanceRecord zcFinanceRecord = iZcFinanceRecordService.getById(zfrId);
+        //融信id
+        String zfrFinanceId = zcFinanceRecord.getZfrFinanceId();
+        //融信信息
+        ZcFinanceInf zcFinanceInf = iZcFinanceInfService.getById(zfrFinanceId);
+        //授信id
+        String coreQuotaId =  zcFinanceInf.getZfiCoreQuotaId();
+        //授信信息
+        ZcFinanceProComRel zcFinanceProComRel  = iZcFinanceProComRelService.getById(coreQuotaId);
+        //融资放款方式
+        String loanType = zcFinanceProComRel.getZfpcrLoanType();
+        if ("1".equals(loanType) || "2".equals(loanType)){
+
+        }
         LambdaQueryWrapper<ZcChargeInf> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ZcChargeInf::getZciFinanceId,zfrId);
         ZcChargeInf zcChargeInf = new ZcChargeInf();

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

@@ -15,6 +15,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ON scy_id = PAI_CSTNO
             AND scy_type = '01'
         WHERE 1=1
+        <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+            and PAI_CSTNO =  #{paramMap.companyId}
+        </if>
         <if test="paramMap.zfpcrAccount != null  and paramMap.zfpcrAccount != ''">
             AND (PAI_ACCNO = #{paramMap.zfpcrAccount} OR (PAI_STATUS = '2'
             AND PAI_ACCTYPE = '00'))
@@ -35,6 +38,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ON scy_id = PBAI_CSTNO
         AND scy_type = '01'
         WHERE 1=1
+        <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+            and PBAI_CSTNO =  #{paramMap.companyId}
+        </if>
         <if test="paramMap.zfpcrAccount != null  and paramMap.zfpcrAccount != ''">
             AND (PBAI_BANKACCOUNT_ID = #{paramMap.zfpcrAccount} OR PBAI_STATUS = '0')
         </if>

+ 3 - 0
sc-service/src/main/resources/mapper/creditLine/CreditLineMapper.xml

@@ -29,7 +29,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN sys_company c
         ON c.scy_id = r.`zfpcr_company_id`
         WHERE 1=1
+        <if test="paramMap.companyId != null  and paramMap.companyId != ''">
+            and r.zfpcr_company_id =  #{paramMap.companyId}
+        </if>
         <if test="paramMap.scyName != null  and paramMap.scyName != ''">
             and c.scy_name like concat('%', #{paramMap.scyName}, '%')
         </if>