Explorar el Código

授信合同详情预览,盖章合同参数

peixh hace 4 años
padre
commit
f609c2eff8

+ 14 - 3
sc-service/src/main/java/com/huyi/service/creditLine/controller/CreditLineController.java

@@ -53,6 +53,8 @@ public class CreditLineController extends BaseController {
     private IZcFinanceContractService iZcFinanceContractService;
     @Autowired
     private IZcFinanceSupplierQuotaService iZcFinanceSupplierQuotaService;
+    @Autowired
+    private IPubFileInfService iPubFileInfService;
     public final static String REGEX = "^\\d\\.([0-9]{1,2}|[0-9][0-9])$|^[0-9]\\d{0,1}(\\.\\d{1,2}){0,1}$|^100(\\.0{1,2}){0,1}$";
 
      /**
@@ -212,9 +214,18 @@ public class CreditLineController extends BaseController {
         }
         //通过主键查询合同表
         if (id.size() > 0) {
-            LambdaQueryWrapper<ZcFinanceContract> contractWrapper = new LambdaQueryWrapper<>();
-            contractWrapper.in(ZcFinanceContract::getZfcId, id);
-            List<ZcFinanceContract> contractList = iZcFinanceContractService.findZcFinanceContracts(contractWrapper);
+            Map map1 = new HashMap();
+            map1.put("id",CommonUtil.listToStr4InSql(id));
+            List<Map> contractList = creditLineService.selectContractList(map1);
+//            LambdaQueryWrapper<ZcFinanceContract> contractWrapper = new LambdaQueryWrapper<>();
+//            contractWrapper.in(ZcFinanceContract::getZfcId, id);
+//            List<ZcFinanceContract> contractList = iZcFinanceContractService.findZcFinanceContracts(contractWrapper);
+//            for (int i = 0; i < contractList.size(); i++) {
+//                String zfcFile = contractList.get(i).getZfcFile();
+//                PubFileInf pubFileInf = iPubFileInfService.getById(zfcFile);
+//                String pfiUrl = pubFileInf.getPfiUrl();
+//
+//            }
             result.put("ticketList",contractList);
         }
         result.put("list",list);

+ 8 - 0
sc-service/src/main/java/com/huyi/service/creditLine/mapper/CreditLineMapper.java

@@ -35,4 +35,12 @@ public interface CreditLineMapper {
      * @return 授信额度集合
      */
     public IPage<Map> selectSupplierCreditList(Page<Map> page, @Param("paramMap") Map map);
+
+    /**
+     * 查询合同详情
+     *
+     * @param
+     * @return 合同集合
+     */
+    public List<Map> selectContractList(@Param("paramMap") Map map);
 }

+ 8 - 0
sc-service/src/main/java/com/huyi/service/creditLine/service/CreditLineService.java

@@ -34,4 +34,12 @@ public interface CreditLineService {
      * @return 授信额度集合
      */
     public IPage<Map> selectSupplierCreditList(Map map,QueryRequest request);
+
+    /**
+     * 查询合同详情
+     *
+     * @param
+     * @return 合同集合
+     */
+    public List<Map> selectContractList(@Param("paramMap") Map map);
 }

+ 5 - 0
sc-service/src/main/java/com/huyi/service/creditLine/service/impl/CreditLineServiceImpl.java

@@ -33,4 +33,9 @@ public class CreditLineServiceImpl implements CreditLineService {
         Page page = new Page<>(request.getPageNum(), request.getPageSize());
         return creditLineMapper.selectSupplierCreditList(page,map);
     }
+
+    @Override
+    public List<Map> selectContractList(Map map){
+        return creditLineMapper.selectContractList(map);
+    }
 }

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

@@ -269,33 +269,33 @@ public class RecordSealController extends BaseController {
                 //往word中填充数据
                 Map<String,Object> ps = new HashMap<>();
                 //开立方
-                ps.put("openName",openName);
+                ps.put(DocumentConstant.OPEN_NAME,openName);
                 //开立方社会统一代码
-                ps.put("openCode",openCode);
+                ps.put(DocumentConstant.OPEN_CODE,openCode);
                 //开立方银行
-                ps.put("openBank",openBank);
+                ps.put(DocumentConstant.OPEN_BANK,openBank);
                 //开立方账号
-                ps.put("openAccount",openAccount);
+                ps.put(DocumentConstant.OPEN_ACCOUNT,openAccount);
                 //接收方
-                ps.put("receiverName",receiverName);
+                ps.put(DocumentConstant.RECEIVER_NAME,receiverName);
                 //接收方社会统一代码
-                ps.put("receiverCode",receiverCode);
+                ps.put(DocumentConstant.RECEIVER_CODE,receiverCode);
                 //接收方银行
-                ps.put("receiverBank",receiverBank);
+                ps.put(DocumentConstant.RECEIVER_BANK,receiverBank);
                 //接收方账号
-                ps.put("receiverAccount",receiverAccount);
+                ps.put(DocumentConstant.RECEIVER_ACCOUNT,receiverAccount);
                 //小写金额
-                ps.put("zfiAmount",AmtUtil.moneyFormat(zfiAmount));
+                ps.put(DocumentConstant.ZFI_AMOUNT,AmtUtil.moneyFormat(zfiAmount));
                 //大写金额
-                ps.put("zfiAmountBig",zfiAmountBig);
+                ps.put(DocumentConstant.ZFI_AMOUNT_BIG,zfiAmountBig);
                 //起止日期
-                ps.put("stopDate",stopDate);
+                ps.put(DocumentConstant.STOP_DATE,stopDate);
                 //当前日期
-                ps.put("currecntDate",currecntDate);
+                ps.put(DocumentConstant.CURRECNT_DATE,currecntDate);
                 //还款编号
-                ps.put("zfiPaymentNumber",zfiPaymentNumber);
+                ps.put(DocumentConstant.ZFI_PAYMENT_NUMBER,zfiPaymentNumber);
                 //承诺还款日
-                ps.put("expireDate",expireDateA);
+                ps.put(DocumentConstant.EXPIRE_DATE,expireDateA);
                 //调用替换word中的变量
                 WordUtil.wordTemplate(filePath,filePath,ps);
                 //加载word示例文档

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

@@ -168,4 +168,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         and r.zfpcr_id = #{paramMap.zfpcrId}
         order by r.create_time desc
     </select>
+    <select id="selectContractList" parameterType="map" resultType="map">
+        SELECT
+          zfc_name          'zfcName',
+          zfc_node          'zfcNode',
+          pfi_url           'pfiUrl',
+          pfi_file_name     'pfiFileName'
+        FROM
+          zc_finance_contract
+          LEFT JOIN pub_file_inf
+            ON zfc_file = pfi_file_id
+        where 1=1
+        <if test="paramMap.id != null  and paramMap.id != ''">
+            and zfc_id  IN (${paramMap.id})
+        </if>
+    </select>
 </mapper>