Merge remote-tracking branch 'origin/master'

ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java

@@ -1,11 +1,9 @@
 package com.ruoyi.common.utils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.text.NumberFormat;
+import java.time.LocalDate;
+import java.util.*;
+
 import org.springframework.util.AntPathMatcher;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.text.StrFormatter;
@@ -26,6 +24,9 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
     /** 星号 */
     private static final char ASTERISK = '*';
 
+    private static final char[] CN_NUMBERS = {'零', '一', '二', '三', '四', '五', '六', '七', '八', '九'};
+    private static final char[] CN_UNITS = { ' ','十', '百', '千', '万'};
+
     /**
      * 获取参数不为空值
      * 
@@ -681,4 +682,50 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
         return sb.toString();
     }
+
+
+    public static String convert(int number) {
+
+        if(number>99999){
+            return "";
+        }
+
+        String[] units = {"", "十", "百", "千","万"};
+        String[] digits = {"零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖"};
+
+        StringBuilder result = new StringBuilder();
+        int unit = 0;
+
+        while (number > 0) {
+            int digit = number % 10;
+            if (digit != 0) {
+                result.insert(0, units[unit]);
+                result.insert(0, digits[digit]);
+            } else {
+                if (result.length() > 0 && result.charAt(0) != '零') {
+                    result.insert(0, digits[digit]);
+                }
+            }
+
+            number /= 10;
+            unit++;
+        }
+
+        if (result.length() == 0) {
+            result.append("零");
+        }
+
+        return result.toString();
+    }
+
+    //判断正整数
+    public static boolean isNumeric(String str){
+        for (int i = str.length();--i>=0;){
+            if (!Character.isDigit(str.charAt(i))){
+                return false;
+            }
+        }
+        return true;
+    }
+
 }

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

@@ -1173,6 +1173,12 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         //查询银行名称
         String backName = dictDataMapper.selectDictLabel("shendai_bank", loanApplication.getApplicationBank());
         params.put("backName", backName);
+        //将贷款金额转成中文
+        String chineseNum = loanApplication.getLoanApplicationNumber();
+        if(StringUtils.isNumeric(loanApplication.getLoanApplicationNumber())){
+            chineseNum = StringUtils.convert(Integer.parseInt(loanApplication.getLoanApplicationNumber()));
+        }
+        params.put("chineseNum", chineseNum);
         //获取当前年、月、日
 
 
@@ -1374,6 +1380,18 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
                 sheet = ExcelFillUtils.fillOneSheet(templatePath, fileDir, "Sheet1", list);
                 path = path + "/" + fileNameHz;
                 break;
+            case "15":
+                //评审会时间
+                params.put("enterpriseName", loanApplication.getEnterpriseName());
+                //path = path + "/委托担保申请书.doc";
+                templatePath = templatePath + "/mb/评审会通知.docx";
+                fileDir = fileDir + "/mb/temporarily/" + loanApplicationNumber;
+                //fileName = FileUploadUtils.extractFilenameLoanApplicationNumberNoHzm("担保意向函");
+                fileName = loanApplication.getEnterpriseName() + "-评审会通知";
+                fileNameHz = fileName + ".docx";
+                wordPath = WordUtil.createWord(templatePath, fileDir, fileName, params);
+                path = path + "/" + fileName + ".docx";
+                break;
             default:
                 break;
         }

ruoyi-system/src/main/java/com/ruoyi/system/domain/conference/SysUserConference.java

@@ -1,10 +1,13 @@
 package com.ruoyi.system.domain.conference;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.annotation.Excel;
 import com.ruoyi.common.core.domain.BaseEntity;
 
+import java.util.Date;
+
 /**
  * 参会人员对象 sys_user_conference
  * 
@@ -46,6 +49,22 @@ public class SysUserConference extends BaseEntity
     @Excel(name = "原因")
     private String reason;
 
+    /** 参会时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date conferenceTime;
+
+    /** 投票结果  N:否 Y:是 */
+    private String votingResult;
+
+    /** 担保额度 */
+    private String lineGuarantee;
+
+    /** 担保期限 */
+    private String guaranteePeriod;
+
+    /** 表决不通过原因 */
+    private String argument;
+
     public void setConferenceId(Long conferenceId) 
     {
         this.conferenceId = conferenceId;
@@ -119,6 +138,46 @@ public class SysUserConference extends BaseEntity
         return reason;
     }
 
+    public Date getConferenceTime() {
+        return conferenceTime;
+    }
+
+    public void setConferenceTime(Date conferenceTime) {
+        this.conferenceTime = conferenceTime;
+    }
+
+    public String getVotingResult() {
+        return votingResult;
+    }
+
+    public void setVotingResult(String votingResult) {
+        this.votingResult = votingResult;
+    }
+
+    public String getLineGuarantee() {
+        return lineGuarantee;
+    }
+
+    public void setLineGuarantee(String lineGuarantee) {
+        this.lineGuarantee = lineGuarantee;
+    }
+
+    public String getGuaranteePeriod() {
+        return guaranteePeriod;
+    }
+
+    public void setGuaranteePeriod(String guaranteePeriod) {
+        this.guaranteePeriod = guaranteePeriod;
+    }
+
+    public String getArgument() {
+        return argument;
+    }
+
+    public void setArgument(String argument) {
+        this.argument = argument;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

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

@@ -13,6 +13,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="loanApplicationNumber"    column="loan_application_number"    />
         <result property="isConference"    column="is_conference"    />
         <result property="reason"    column="reason"    />
+        <result property="conferenceTime"    column="conference_time"    />
+        <result property="votingResult"    column="voting_result"    />
+        <result property="lineGuarantee"    column="line_guarantee"    />
+        <result property="guaranteePeriod"    column="guarantee_period"    />
+        <result property="argument"    column="argument"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
@@ -21,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectSysUserConferenceVo">
-        select conference_id, user_id, id_card, real_name, loan_application_id, loan_application_number, is_conference, reason, create_by, create_time, update_by, update_time, remark from sys_user_conference
+        select conference_id, user_id, id_card, real_name, loan_application_id, loan_application_number, is_conference, reason,conference_time,voting_result,line_guarantee,guarantee_period,argument, create_by, create_time, update_by, update_time, remark from sys_user_conference
     </sql>
 
     <select id="selectSysUserConferenceList" parameterType="SysUserConference" resultMap="SysUserConferenceResult">
@@ -34,6 +39,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loanApplicationNumber != null  and loanApplicationNumber != ''"> and loan_application_number = #{loanApplicationNumber}</if>
             <if test="isConference != null  and isConference != ''"> and is_conference = #{isConference}</if>
             <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
+
+            <if test="conferenceTime != null  and conferenceTime != ''"> and conference_time = #{conferenceTime}</if>
+            <if test="votingResult != null  and votingResult != ''"> and voting_result = #{votingResult}</if>
+            <if test="lineGuarantee != null  and lineGuarantee != ''"> and line_guarantee = #{lineGuarantee}</if>
+            <if test="guaranteePeriod != null  and guaranteePeriod != ''"> and guarantee_period = #{guaranteePeriod}</if>
+            <if test="argument != null  and argument != ''"> and argument = #{argument}</if>
         </where>
         order by create_time
     </select>
@@ -53,6 +64,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loanApplicationNumber != null">loan_application_number,</if>
             <if test="isConference != null">is_conference,</if>
             <if test="reason != null">reason,</if>
+            <if test="conferenceTime != null ">conference_time ,</if>
+            <if test="votingResult != null  ">voting_result,</if>
+            <if test="lineGuarantee != null  ">line_guarantee ,</if>
+            <if test="guaranteePeriod != null  ">guarantee_period ,</if>
+            <if test="argument != null  ">argument,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>
@@ -67,6 +83,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loanApplicationNumber != null">#{loanApplicationNumber},</if>
             <if test="isConference != null">#{isConference},</if>
             <if test="reason != null">#{reason},</if>
+            <if test="conferenceTime != null ">#{conferenceTime},</if>
+            <if test="votingResult != null  ">#{votingResult},</if>
+            <if test="lineGuarantee != null  ">#{lineGuarantee},</if>
+            <if test="guaranteePeriod != null  ">#{guaranteePeriod},</if>
+            <if test="argument != null  ">#{argument},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
@@ -91,6 +112,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loanApplicationNumber != null">loan_application_number = #{loanApplicationNumber},</if>
             <if test="isConference != null">is_conference = #{isConference},</if>
             <if test="reason != null">reason = #{reason},</if>
+            <if test="conferenceTime != null ">conference_time = #{conferenceTime},</if>
+            <if test="votingResult != null  ">voting_result = #{votingResult},</if>
+            <if test="lineGuarantee != null  ">line_guarantee = #{lineGuarantee},</if>
+            <if test="guaranteePeriod != null  ">guarantee_period = #{guaranteePeriod},</if>
+            <if test="argument != null  ">argument = #{argument},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>