1

ruoyi-admin/src/main/resources/application.yml

@@ -20,7 +20,7 @@ spring:
     basename: i18n/messages
   profiles:
     active: druid
-    #active: prod
+#    active: prod
   # 文件上传
   servlet:
     multipart:

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/LoanApplicationServiceImpl.java

@@ -108,8 +108,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         }
 
         //查询企业信息
-        SysUserEnterprise sysUserEnterprise = sysUserEnterpriseMapper.selectSysUserEnterpriseByEnterpriseId(loanApplication.getEnterpriseId());
-        loanApplication.setSysUserEnterprise(sysUserEnterprise);
+        if(ObjectUtils.isNotEmpty(loanApplication.getEnterpriseId())){
+            SysUserEnterprise sysUserEnterprise = sysUserEnterpriseMapper.selectSysUserEnterpriseByEnterpriseId(loanApplication.getEnterpriseId());
+            loanApplication.setSysUserEnterprise(sysUserEnterprise);
+        }
+
         //查询相关附件
         List<LoanApplicationFj> loanApplicationFjs = loanApplicationFjMapper.selectLoanApplicationFjByLoanApplicationId(loanApplicationId);
         if (loanApplicationFjs != null && loanApplicationFjs.size() > 0) {
@@ -1462,7 +1465,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         String loanApplicationNumber = loanApplication.getLoanApplicationNumber();
         Map<String, Object> params = new HashMap<>();
         //获取当前年、月、日
-        String year = DateUtils.getDate();
+        String year = DateUtils.getYear();
         String month = DateUtils.getMonth();
         String day = DateUtils.getDay();
         params.put("year", year);
@@ -1637,7 +1640,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 path = path + "/" + fileName + ".docx";
 
                 //生成股东公司的股东会决议
-                /*ShareholderFj shareholderFj = new ShareholderFj();
+                ShareholderFj shareholderFj = new ShareholderFj();
                 shareholderFj.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 List<ShareholderFj> shareholderFjs = shareholderFjMapper.selectShareholderFjList(shareholderFj);
                 int index = 1;
@@ -1656,8 +1659,8 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                             LoanApplicationFj loanApplicationFj = new LoanApplicationFj();
                             loanApplicationFj.setLoanApplicationId(loanApplication.getLoanApplicationId());
                             loanApplicationFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
-                            loanApplicationFj.setOldName(fileNameHz);
-                            loanApplicationFj.setName(fileNameHz);
+                            loanApplicationFj.setOldName(fileName + ".docx");
+                            loanApplicationFj.setName(fileName + ".docx");
                             loanApplicationFj.setUrl(RuoYiConfig.getUploadPath() + "/" + loanApplicationNumber + "/" + fileName + ".docx");
                             loanApplicationFj.setBigType(bigType);
                             loanApplicationFj.setType(fileType);
@@ -1667,8 +1670,37 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                         }
                     }
 
-                }*/
+                }
                 //生成反担保公司的股东会决议
+                GuaranteeInfo guaranteeInfo = new GuaranteeInfo();
+                guaranteeInfo.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                guaranteeInfo.setType("2");
+                List<GuaranteeInfo> guaranteeInfos = guaranteeInfoMapper.selectGuaranteeInfoList(guaranteeInfo);
+                if (guaranteeInfos != null && guaranteeInfos.size() > 0) {
+                    for (GuaranteeInfo info : guaranteeInfos) {
+                        params.put("gsName", info.getGuaranteeName());
+                        params.put("bgs", loanApplication.getEnterpriseName());
+
+                        fileDir = RuoYiConfig.getProfile() + "/" + loanApplicationNumber;
+                        //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("股东会决议");
+                        fileName = info.getGuaranteeName() + "-股东会决议" + index;
+                        //fileNameHz = fileName + ".docx";
+                        wordPath = WordUtil.createWord(templatePath, fileDir, fileName, params);
+                        //将文件存入loan_application_fj表
+                        LoanApplicationFj loanApplicationFj = new LoanApplicationFj();
+                        loanApplicationFj.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                        loanApplicationFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+                        loanApplicationFj.setOldName(fileName + ".docx");
+                        loanApplicationFj.setName(fileName + ".docx");
+                        loanApplicationFj.setUrl(RuoYiConfig.getUploadPath() + "/" + loanApplicationNumber + "/" + fileName + ".docx");
+                        loanApplicationFj.setBigType(bigType);
+                        loanApplicationFj.setType(fileType);
+                        loanApplicationFj.setCreateTime(DateUtils.getNowDate());
+                        loanApplicationFjMapper.insertLoanApplicationFj(loanApplicationFj);
+                        index++;
+                    }
+
+                }
 
                 break;
             case "12":

ruoyi-system/src/main/resources/mapper/system/ShareholderFjMapper.xml

@@ -98,9 +98,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
     </insert>
     <insert id="batchShareholderFj">
-        insert into shareholder_fj(loan_application_id, loan_application_number, shareholder_front_url, shareholder_back_url, shareholder_zx_url,shareholder_zx_url_pdf,shareholder_business_url,  create_time) values
+        insert into shareholder_fj(loan_application_id, loan_application_number, shareholder_id_card,shareholder_name,shareholder_front_url, shareholder_back_url, shareholder_zx_url,shareholder_zx_url_pdf,shareholder_business_url,  create_time) values
         <foreach item="item" index="index" collection="list" separator=",">
-            (#{item.loanApplicationId},#{item.loanApplicationNumber},#{item.shareholderFrontUrl},#{item.shareholderBackUrl},#{item.shareholderZxUrl},#{item.shareholderZxUrlPdf},#{item.shareholderBusinessUrl},sysdate())
+            (#{item.loanApplicationId},#{item.loanApplicationNumber},#{item.shareholderIdCard},#{item.shareholderName},#{item.shareholderFrontUrl},#{item.shareholderBackUrl},#{item.shareholderZxUrl},#{item.shareholderZxUrlPdf},#{item.shareholderBusinessUrl},sysdate())
         </foreach>
     </insert>