表格赋值

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

@@ -122,5 +122,5 @@ spring:
 
 web-office:
     convert:
-        appid: SX20240516EYFBUA
-        secret: vwJbZyZwrwaHMZKcPRFoCHyrlnTiswfI
+        appid: AK20240724JZQZVF
+        secret: vkjGMdBUEQUpkhxcwEEjEOUyXxvowmWW

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

@@ -119,5 +119,5 @@ spring:
 
 web-office:
     convert:
-        appid: SX20240516EYFBUA
-        secret: vwJbZyZwrwaHMZKcPRFoCHyrlnTiswfI
+        appid: AK20240724JZQZVF
+        secret: vkjGMdBUEQUpkhxcwEEjEOUyXxvowmWW

ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelFillUtils.java

@@ -1,4 +1,5 @@
 package com.ruoyi.common.utils.poi;
+import com.ruoyi.common.config.RuoYiConfig;
 import org.apache.poi.ss.usermodel.*;
 import org.apache.poi.ss.util.CellUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -194,5 +195,34 @@ public class ExcelFillUtils {
         return ex.substring(2,ex.length() - 1);
     }
 
+    public static void main(String[] args) {
+        String time = "2024-07-30 14:50:00";
+        String timeData = time.split(" ")[0];
+        System.out.println("生成文档路径：" + timeData);
+        // 向列表中添加数据
+                /*list.add( Map.of("name","zou" ,"age" ,18) );
+                list.add( Map.of("name","li" ,"age" ,28) );
+                list.add( Map.of("name","wang" ,"age" ,15) );
+                list.add( Map.of("name","quan" ,"age" ,19) );
+                list.add( Map.of("name","zhao" ,"age" ,98) );*/
+        /*List<Map<String,Object>> list = new ArrayList<>();
+        Map<String,Object> map = new HashMap<>();
+        map.put("name","111");
+        map.put("name1","222");
+        map.put("name2","333");
+        map.put("name3","444");
+        map.put("name4","555");
+        list.add(map);
+        //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("项目评审意见签批表");
+        String fileName = "-项目评审意见签批表";
+        String fileNameHz = fileName + ".xlsx";
+        //String templatePath = RuoYiConfig.getProfile() + "/mb/项目评审意见签批表.xlsx";
+        String templatePath = "D:\\ruoyi\\uploadPath\\mb\\项目评审意见签批表.xlsx";
+        //String fileDir = RuoYiConfig.getProfile() + "/mb/temporarily/" + fileNameHz;
+        String fileDir = "D:\\ruoyi\\uploadPath\\mb\\temporarily\\"+ fileNameHz;
+        String sheet = ExcelFillUtils.fillOneSheet(templatePath, fileDir, "Sheet1", list);
+        System.out.println("生成文档路径：" + sheet);*/
+    }
+
 }
 

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

@@ -278,7 +278,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 shareholderFj.setLoanApplicationId(loanApplication.getLoanApplicationId());
                 shareholderFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
             }
-            AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList, loanApplication.getLoanApplicationNumber(),loanApplication.getLoanApplicationId()));
+            AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList, loanApplication.getLoanApplicationNumber(), loanApplication.getLoanApplicationId()));
         }
         //反担保基础信息和附件新增
         List<GuaranteeInfo> guaranteeInfoList = loanApplication.getGuaranteeInfoList();
@@ -354,7 +354,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //shareholderFjMapper.deleteShareholderFjByLoanApplicationId(loanApplicationId);
         List<ShareholderFj> shareholderFjList = loanApplication.getShareholderFjList();
         if (shareholderFjList != null && shareholderFjList.size() > 0) {
-            AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList, loanApplication.getLoanApplicationNumber(),loanApplication.getLoanApplicationId()));
+            AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList, loanApplication.getLoanApplicationNumber(), loanApplication.getLoanApplicationId()));
             // shareholderFjMapper.batchShareholderFj(shareholderFjList);
         }
         //需要删除股东附件表数据
@@ -442,7 +442,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                     shareholderFj.setLoanApplicationId(loanApplicationId);
                     shareholderFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
                 }
-                AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList, loanApplication.getLoanApplicationNumber(),loanApplication.getLoanApplicationId()));
+                AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList, loanApplication.getLoanApplicationNumber(), loanApplication.getLoanApplicationId()));
             }
             //需要删除股东附件表数据
             if (shareholderFjIdList != null && shareholderFjIdList.length > 0) {
@@ -513,7 +513,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 shareholderFj.setLoanApplicationId(loanApplicationId);
                 shareholderFj.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
             }
-            AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList, loanApplication.getLoanApplicationNumber(),loanApplication.getLoanApplicationId()));
+            AsyncManager.me().execute(AsyncFactory.createPdfFromImagesShareholder(shareholderFjList, loanApplication.getLoanApplicationNumber(), loanApplication.getLoanApplicationId()));
             //shareholderFjMapper.batchShareholderFj(shareholderFjList);
         }
 
@@ -1177,7 +1177,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 }
             }
         }
-        if(waitRemindList!=null && waitRemindList.size()>0){
+        if (waitRemindList != null && waitRemindList.size() > 0) {
             waitRemindMapper.batchWaitRemind(waitRemindList);
         }
 
@@ -1624,25 +1624,105 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
             case "11":
                 //判断有多少公司  股东、反担保人
 
-
+                params.put("gsName", loanApplication.getEnterpriseName());
+                params.put("bgs", "本公司");
                 //params.put("enterpriseName", loanApplication.getEnterpriseName());
                 //path = path + "/委托担保申请书.doc";
                 templatePath = RuoYiConfig.getProfile() + "/mb/股东会决议.docx";
                 fileDir = RuoYiConfig.getProfile() + "/mb/temporarily/" + loanApplicationNumber;
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("股东会决议");
                 fileName = loanApplication.getEnterpriseName() + "-股东会决议";
-                fileNameHz = fileName + ".docx";
+                //fileNameHz = fileName + ".docx";
                 wordPath = WordUtil.createWord(templatePath, fileDir, fileName, params);
                 path = path + "/" + fileName + ".docx";
+
+                //生成股东公司的股东会决议
+                /*ShareholderFj shareholderFj = new ShareholderFj();
+                shareholderFj.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                List<ShareholderFj> shareholderFjs = shareholderFjMapper.selectShareholderFjList(shareholderFj);
+                int index = 1;
+                if (shareholderFjs != null && shareholderFjs.size() > 0) {
+                    for (ShareholderFj fj : shareholderFjs) {
+                        if (StringUtils.isNotEmpty(fj.getShareholderBusinessUrl())) {
+                            params.put("gsName", fj.getShareholderName());
+                            params.put("bgs", loanApplication.getEnterpriseName());
+
+                            fileDir = RuoYiConfig.getProfile() + "/" + loanApplicationNumber;
+                            //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("股东会决议");
+                            fileName = fj.getShareholderName() + "-股东会决议" + 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(fileNameHz);
+                            loanApplicationFj.setName(fileNameHz);
+                            loanApplicationFj.setUrl(RuoYiConfig.getUploadPath() + "/" + loanApplicationNumber + "/" + fileName + ".docx");
+                            loanApplicationFj.setBigType(bigType);
+                            loanApplicationFj.setType(fileType);
+                            loanApplicationFj.setCreateTime(DateUtils.getNowDate());
+                            loanApplicationFjMapper.insertLoanApplicationFj(loanApplicationFj);
+                            index++;
+                        }
+                    }
+
+                }*/
+                //生成反担保公司的股东会决议
+
                 break;
             case "12":
 
                 // 向列表中添加数据
-/*                list.add( Map.of("name","zou" ,"age" ,18) );
-                list.add( Map.of("name","li" ,"age" ,28) );
-                list.add( Map.of("name","wang" ,"age" ,15) );
-                list.add( Map.of("name","quan" ,"age" ,19) );
-                list.add( Map.of("name","zhao" ,"age" ,98) );*/
+                Map<String, Object> excelMap = new HashMap<>();
+                //申请人名称
+                excelMap.put("sqr", loanApplication.getEnterpriseName() + "   " + loanApplication.getCorporationName());
+                //公司住址
+                excelMap.put("address", sysUserEnterprise.getEnterpriseAddress());
+                //家庭住址
+                excelMap.put("fraddress", loanApplication.getCorporationAddress());
+                //申请金额
+                excelMap.put("sqje", loanApplication.getApplicationAmount());
+                //申请期限
+                excelMap.put("sqqx", loanApplication.getUsagePeriod());
+                //申请银行
+                excelMap.put("bank", loanApplication.getApplicationBank());
+                //还款方式
+                excelMap.put("hkfs", loanApplication.getRepaymentSource());
+                //参会日期
+                String timeData = loanApplication.getReviewTime().split(" ")[0];
+                String[] split = timeData.split("-");
+                excelMap.put("year", split[0]);
+                excelMap.put("month", split[1]);
+                excelMap.put("day", split[2]);
+                //查询投票信息
+                excelMap.put("ty", "");
+                excelMap.put("fj", "");
+                excelMap.put("qx", "");
+                int ty = 0;
+                int fj = 0;
+                int qx = 0;
+                SysUserConference userConference = new SysUserConference();
+                userConference.setConferenceTime(loanApplication.getReviewTime());
+                userConference.setLoanApplicationId(loanApplication.getLoanApplicationId());
+                List<SysUserConference> userConferences = sysUserConferenceMapper.selectSysUserConferenceList(userConference);
+                if (userConferences != null && userConferences.size() > 0) {
+                    for (SysUserConference conference : userConferences) {
+                        if ("Y".equals(conference.getVotingResult())) {
+                            ty++;
+                        } else if ("N".equals(conference.getVotingResult())) {
+                            fj++;
+                        } else {
+                            qx++;
+                        }
+                    }
+                    excelMap.put("ty", ty);
+                    excelMap.put("fj", fj);
+                    excelMap.put("qx", qx);
+                }
+                //贷款金额
+                excelMap.put("je", loanApplication.getActuallyAmount());
+                //贷款期限
 
                 //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("项目评审意见签批表");
                 fileName = loanApplication.getEnterpriseName() + "-项目评审意见签批表";
@@ -1694,11 +1774,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 List<SysUserConference> sysUserConferences = sysUserConferenceMapper.selectSysUserConferenceList(sysUserConference);
                 //拼接姓名
                 StringBuilder sb = new StringBuilder();
-                for (SysUserConference userConference : sysUserConferences) {
+                for (SysUserConference userConference1 : sysUserConferences) {
                     if (sb.length() > 0) {
-                        sb.append("  ").append(userConference.getRealName());
+                        sb.append("  ").append(userConference1.getRealName());
                     } else {
-                        sb.append(userConference.getRealName());
+                        sb.append(userConference1.getRealName());
                     }
 
                 }

ruoyi-system/src/main/java/com/ruoyi/system/service/conference/impl/SysUserConferenceServiceImpl.java

@@ -319,6 +319,7 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
             loanApplication.setReviewSchedule(FIV);
             loanApplication.setAuditSchedule(EIG);
             loanApplication.setLoanSchedule(SEV);
+            loanApplication.setActuallyAmount(Double.parseDouble(je));
             loanApplication.setLoanApplicationId(sysUserConference.getLoanApplicationId());
             loanApplicationMapper.updateLoanApplication(loanApplication);
             // todo 通过 业务流程表插入数据