新增 全局审核意见，每步操作都有记录

ruoyi-common/pom.xml

@@ -17,6 +17,7 @@
 
 
     <dependencies>
+
         <!--   pdf文件处理包导入     -->
         <dependency>
             <groupId>org.apache.pdfbox</groupId>

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

@@ -647,6 +647,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
      */
     @Override
     public AjaxResult ss(LoanApplication loanApplication) {
+        Long loanApplicationId = loanApplication.getLoanApplicationId();
         //先判断当前人是否是A角色或者B角色
         Long userId = SecurityUtils.getUserId();
         Long aLong = loanApplication.getaUserId();
@@ -654,23 +655,70 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         if (!Objects.equals(userId, aLong) || !Objects.equals(userId, bLong)) {
             return AjaxResult.error("当前您无权限申诉，请联系管理员");
         }
-        //申诉中判断评审会进度不是1等待上会，则重置为1
-        loanApplication.setReviewSchedule(ONE);
-        //进入待审核
-        loanApplication.setAuditType(ONE);
-        loanApplicationMapper.updateLoanApplication(loanApplication);
-        //删除基础附件外的所有附件
-        //loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndBigType(loanApplication.getLoanApplicationId());
+        //判断当前项目是否是在申诉状态
+        String auditType = loanApplication.getAuditType();
+        if (!FOR.equals(auditType)) {
+            return AjaxResult.error("当前项目无需申诉或状态异常");
+        }
+        //判断是否是放弃申诉 如果AB角色都放弃申诉则项目结束 = 放到回收站
+        String ssType = loanApplication.getSsType();
+        if (ONE.equals(ssType)) {
+            //申诉中判断评审会进度不是1等待上会，则重置为1
+            loanApplication.setReviewSchedule(ONE);
+            //进入待审核
+            loanApplication.setAuditType(ONE);
+            loanApplicationMapper.updateLoanApplication(loanApplication);
+            //删除基础附件外的所有附件
+            //loanApplicationFjMapper.deleteLoanApplicationFjByLoanApplicationIdAndBigType(loanApplication.getLoanApplicationId());
 
-        //业务审核意见
-        ReviewComments reviewComments = new ReviewComments();
-        reviewComments.setLoanApplicationId(loanApplication.getLoanApplicationId());
-        reviewComments.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
-        reviewComments.setAuditSchedule(TWO);
-        reviewComments.setAuditType(FOR);
-        reviewComments.setAuditTime(DateUtils.getNowDate());
-        reviewComments.setCreateBy(SecurityUtils.getUsername());
-        reviewCommentsMapper.insertReviewComments(reviewComments);
+            //业务审核意见
+            ReviewComments reviewComments = new ReviewComments();
+            reviewComments.setLoanApplicationId(loanApplicationId);
+            reviewComments.setLoanApplicationNumber(loanApplication.getLoanApplicationNumber());
+            reviewComments.setAuditSchedule(TWO);
+            reviewComments.setAuditType(FOR);
+            reviewComments.setAuditTime(DateUtils.getNowDate());
+            reviewComments.setCreateBy(SecurityUtils.getUsername());
+            reviewCommentsMapper.insertReviewComments(reviewComments);
+        } else if (TWO.equals(ssType)) {
+            //放弃申诉需要AB角色都要放弃
+            //先判断是A还是B角色
+            String key = loanApplicationId + ":ss:";
+            if (Objects.equals(userId, aLong)) {
+                Object cacheObjectA = redisCache.getCacheObject(key + A);
+                if (ObjectUtils.isNotEmpty(cacheObjectA)){
+                    //
+                    return AjaxResult.error("请勿重复放弃");
+                }else {
+                    //A是空则查询B
+                    Object cacheObjectB = redisCache.getCacheObject(key + B);
+                    if (ObjectUtils.isNotEmpty(cacheObjectB)){
+                        //修改项目状态到回收站
+                        loanApplication.setLoanApplicationType(THR);
+                        loanApplicationMapper.updateLoanApplication(loanApplication);
+                    }else {
+                        redisCache.setCacheObject(key+A, aLong);
+                    }
+                }
+            }
+            if (Objects.equals(userId, bLong)) {
+                Object cacheObjectB = redisCache.getCacheObject(key + B);
+                if (ObjectUtils.isNotEmpty(cacheObjectB)){
+                    //
+                    return AjaxResult.error("请勿重复放弃");
+                }else {
+                    //B是空则查询A
+                    Object cacheObjectA = redisCache.getCacheObject(key + A);
+                    if (ObjectUtils.isNotEmpty(cacheObjectA)){
+                        //修改项目状态到回收站
+                        loanApplication.setLoanApplicationType(THR);
+                        loanApplicationMapper.updateLoanApplication(loanApplication);
+                    }else {
+                        redisCache.setCacheObject(key+B, aLong);
+                    }
+                }
+            }
+        }
         return AjaxResult.success();
     }
 
@@ -725,11 +773,11 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         LoanApplication application = new LoanApplication();
         application.setLoanApplicationId(loanApplication.getLoanApplicationId());
         application.setAuditType(ONE);
-        if (SEV.equals(loanSchedule)){
+        if (SEV.equals(loanSchedule)) {
             application.setLoanSchedule(EIG);
             application.setAuditSchedule(NIN);
         }
-        if (EIG.equals(loanSchedule)){
+        if (EIG.equals(loanSchedule)) {
             application.setLoanSchedule(NIN);
             application.setAuditSchedule(TEN);
         }
@@ -1177,7 +1225,7 @@ public class LoanApplicationServiceImpl implements ILoanApplicationService {
         params.put("backName", backName);
         //将贷款金额转成中文
         String chineseNum = loanApplication.getLoanApplicationNumber();
-        if(StringUtils.isNumeric(loanApplication.getLoanApplicationNumber())){
+        if (StringUtils.isNumeric(loanApplication.getLoanApplicationNumber())) {
             chineseNum = StringUtils.convert(Integer.parseInt(loanApplication.getLoanApplicationNumber()));
         }
         params.put("chineseNum", chineseNum);

ruoyi-system/src/main/java/com/ruoyi/system/domain/loan/LoanApplication.java

@@ -1,14 +1,10 @@
 package com.ruoyi.system.domain.loan;
 
-import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.system.domain.enterprise.SysUserEnterprise;
-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;
 
@@ -295,6 +291,11 @@ public class LoanApplication extends BaseEntity
 
     private String bigType;
 
+    /**
+     * 不在数据库的字段，判断是否放弃申诉 1：正常申诉 2：放弃申诉
+     */
+    private String ssType;
+
     /**
      * 全体股东信息附件
      */
@@ -323,116 +324,76 @@ public class LoanApplication extends BaseEntity
      */
     private Map<String,List<LoanApplicationFj>> otherFj;
 
-    public String getReviewTime() {
-        return reviewTime;
-    }
-
-    public void setReviewTime(String reviewTime) {
-        this.reviewTime = reviewTime;
-    }
-
-    public String getReviewSchedule() {
-        return reviewSchedule;
-    }
-
-    public void setReviewSchedule(String reviewSchedule) {
-        this.reviewSchedule = reviewSchedule;
-    }
-
-    public Long getfUserId() {
-        return fUserId;
-    }
-
-    public void setfUserId(Long fUserId) {
-        this.fUserId = fUserId;
-    }
-
-    public String getfUserName() {
-        return fUserName;
-    }
-
-    public void setfUserName(String fUserName) {
-        this.fUserName = fUserName;
-    }
-
-    public String getaAuthorize() {
-        return aAuthorize;
-    }
-
-    public void setaAuthorize(String aAuthorize) {
-        this.aAuthorize = aAuthorize;
-    }
-
-    public String getGuaranteeShareholderName() {
-        return guaranteeShareholderName;
+    public Long getLoanApplicationId() {
+        return loanApplicationId;
     }
 
-    public void setGuaranteeShareholderName(String guaranteeShareholderName) {
-        this.guaranteeShareholderName = guaranteeShareholderName;
+    public void setLoanApplicationId(Long loanApplicationId) {
+        this.loanApplicationId = loanApplicationId;
     }
 
-    public String getGuaranteeShareholderIdCard() {
-        return guaranteeShareholderIdCard;
+    public String getLoanApplicationNumber() {
+        return loanApplicationNumber;
     }
 
-    public void setGuaranteeShareholderIdCard(String guaranteeShareholderIdCard) {
-        this.guaranteeShareholderIdCard = guaranteeShareholderIdCard;
+    public void setLoanApplicationNumber(String loanApplicationNumber) {
+        this.loanApplicationNumber = loanApplicationNumber;
     }
 
-    public String getFileType() {
-        return fileType;
+    public String getApplicationType() {
+        return applicationType;
     }
 
-    public void setFileType(String fileType) {
-        this.fileType = fileType;
+    public void setApplicationType(String applicationType) {
+        this.applicationType = applicationType;
     }
 
-    public String getBigType() {
-        return bigType;
+    public Double getApplicationAmount() {
+        return applicationAmount;
     }
 
-    public void setBigType(String bigType) {
-        this.bigType = bigType;
+    public void setApplicationAmount(Double applicationAmount) {
+        this.applicationAmount = applicationAmount;
     }
 
-    public String getType() {
-        return type;
+    public String getApplicationBank() {
+        return applicationBank;
     }
 
-    public void setType(String type) {
-        this.type = type;
+    public void setApplicationBank(String applicationBank) {
+        this.applicationBank = applicationBank;
     }
 
-    public String getApplicationType() {
-        return applicationType;
+    public String getUsagePeriod() {
+        return usagePeriod;
     }
 
-    public void setApplicationType(String applicationType) {
-        this.applicationType = applicationType;
+    public void setUsagePeriod(String usagePeriod) {
+        this.usagePeriod = usagePeriod;
     }
 
-    public String getCorporationAddress() {
-        return corporationAddress;
+    public String getPurposeFunds() {
+        return purposeFunds;
     }
 
-    public void setCorporationAddress(String corporationAddress) {
-        this.corporationAddress = corporationAddress;
+    public void setPurposeFunds(String purposeFunds) {
+        this.purposeFunds = purposeFunds;
     }
 
-    public String getCorporationExpirationDate() {
-        return corporationExpirationDate;
+    public String getRepaymentSource() {
+        return repaymentSource;
     }
 
-    public void setCorporationExpirationDate(String corporationExpirationDate) {
-        this.corporationExpirationDate = corporationExpirationDate;
+    public void setRepaymentSource(String repaymentSource) {
+        this.repaymentSource = repaymentSource;
     }
 
-    public SysUserEnterprise getSysUserEnterprise() {
-        return sysUserEnterprise;
+    public String getEnterpriseName() {
+        return enterpriseName;
     }
 
-    public void setSysUserEnterprise(SysUserEnterprise sysUserEnterprise) {
-        this.sysUserEnterprise = sysUserEnterprise;
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
     }
 
     public Long getEnterpriseId() {
@@ -443,541 +404,430 @@ public class LoanApplication extends BaseEntity
         this.enterpriseId = enterpriseId;
     }
 
-
-    public Map<String, List<LoanApplicationFj>> getBasicFj() {
-        return basicFj;
-    }
-
-    public void setBasicFj(Map<String, List<LoanApplicationFj>> basicFj) {
-        this.basicFj = basicFj;
-    }
-
-    public Map<String, List<LoanApplicationFj>> getDeclareFj() {
-        return declareFj;
-    }
-
-    public void setDeclareFj(Map<String, List<LoanApplicationFj>> declareFj) {
-        this.declareFj = declareFj;
-    }
-
-    public Map<String, List<LoanApplicationFj>> getFileFj() {
-        return fileFj;
-    }
-
-    public void setFileFj(Map<String, List<LoanApplicationFj>> fileFj) {
-        this.fileFj = fileFj;
+    public SysUserEnterprise getSysUserEnterprise() {
+        return sysUserEnterprise;
     }
 
-    public Map<String, List<LoanApplicationFj>> getOtherFj() {
-        return otherFj;
+    public void setSysUserEnterprise(SysUserEnterprise sysUserEnterprise) {
+        this.sysUserEnterprise = sysUserEnterprise;
     }
 
-    public void setOtherFj(Map<String, List<LoanApplicationFj>> otherFj) {
-        this.otherFj = otherFj;
+    public String getCategoryType() {
+        return categoryType;
     }
 
-    public String getLoanScheduleName() {
-        return loanScheduleName;
+    public void setCategoryType(String categoryType) {
+        this.categoryType = categoryType;
     }
 
-    public void setLoanScheduleName(String loanScheduleName) {
-        this.loanScheduleName = loanScheduleName;
+    public String getIsMake() {
+        return isMake;
     }
 
-    public List<ShareholderFj> getShareholderFjList() {
-        return shareholderFjList;
+    public void setIsMake(String isMake) {
+        this.isMake = isMake;
     }
 
-    public void setShareholderFjList(List<ShareholderFj> shareholderFjList) {
-        this.shareholderFjList = shareholderFjList;
+    public String getIsNew() {
+        return isNew;
     }
 
-    public List<LoanApplicationFj> getLoanApplicationFjList() {
-        return loanApplicationFjList;
+    public void setIsNew(String isNew) {
+        this.isNew = isNew;
     }
 
-    public void setLoanApplicationFjList(List<LoanApplicationFj> loanApplicationFjList) {
-        this.loanApplicationFjList = loanApplicationFjList;
+    public String getIsSmall() {
+        return isSmall;
     }
 
-    public void setLoanApplicationId(Long loanApplicationId)
-    {
-        this.loanApplicationId = loanApplicationId;
+    public void setIsSmall(String isSmall) {
+        this.isSmall = isSmall;
     }
 
-    public Long getLoanApplicationId() 
-    {
-        return loanApplicationId;
-    }
-    public void setLoanApplicationNumber(String loanApplicationNumber) 
-    {
-        this.loanApplicationNumber = loanApplicationNumber;
+    public String getIsDuty() {
+        return isDuty;
     }
 
-    public String getLoanApplicationNumber() 
-    {
-        return loanApplicationNumber;
+    public void setIsDuty(String isDuty) {
+        this.isDuty = isDuty;
     }
 
-    public Double getApplicationAmount() {
-        return applicationAmount;
+    public String getCompanyIntroduction() {
+        return companyIntroduction;
     }
 
-    public void setApplicationAmount(Double applicationAmount) {
-        this.applicationAmount = applicationAmount;
+    public void setCompanyIntroduction(String companyIntroduction) {
+        this.companyIntroduction = companyIntroduction;
     }
 
-    public void setApplicationBank(String applicationBank)
-    {
-        this.applicationBank = applicationBank;
+    public String getCustomerType() {
+        return customerType;
     }
 
-    public String getApplicationBank() 
-    {
-        return applicationBank;
-    }
-    public void setUsagePeriod(String usagePeriod) 
-    {
-        this.usagePeriod = usagePeriod;
+    public void setCustomerType(String customerType) {
+        this.customerType = customerType;
     }
 
-    public String getUsagePeriod() 
-    {
-        return usagePeriod;
-    }
-    public void setPurposeFunds(String purposeFunds) 
-    {
-        this.purposeFunds = purposeFunds;
+    public String getCorporationFront() {
+        return corporationFront;
     }
 
-    public String getPurposeFunds() 
-    {
-        return purposeFunds;
-    }
-    public void setRepaymentSource(String repaymentSource) 
-    {
-        this.repaymentSource = repaymentSource;
+    public void setCorporationFront(String corporationFront) {
+        this.corporationFront = corporationFront;
     }
 
-    public String getRepaymentSource() 
-    {
-        return repaymentSource;
-    }
-    public void setEnterpriseName(String enterpriseName) 
-    {
-        this.enterpriseName = enterpriseName;
+    public String getCorporationBack() {
+        return corporationBack;
     }
 
-    public String getEnterpriseName() 
-    {
-        return enterpriseName;
-    }
-    public void setCategoryType(String categoryType) 
-    {
-        this.categoryType = categoryType;
+    public void setCorporationBack(String corporationBack) {
+        this.corporationBack = corporationBack;
     }
 
-    public String getCategoryType() 
-    {
-        return categoryType;
-    }
-    public void setIsMake(String isMake) 
-    {
-        this.isMake = isMake;
+    public String getCorporationName() {
+        return corporationName;
     }
 
-    public String getIsMake() 
-    {
-        return isMake;
-    }
-    public void setIsNew(String isNew) 
-    {
-        this.isNew = isNew;
+    public void setCorporationName(String corporationName) {
+        this.corporationName = corporationName;
     }
 
-    public String getIsNew() 
-    {
-        return isNew;
-    }
-    public void setIsSmall(String isSmall) 
-    {
-        this.isSmall = isSmall;
+    public String getCorporationIdCard() {
+        return corporationIdCard;
     }
 
-    public String getIsSmall() 
-    {
-        return isSmall;
-    }
-    public void setIsDuty(String isDuty) 
-    {
-        this.isDuty = isDuty;
+    public void setCorporationIdCard(String corporationIdCard) {
+        this.corporationIdCard = corporationIdCard;
     }
 
-    public String getIsDuty() 
-    {
-        return isDuty;
-    }
-    public void setCompanyIntroduction(String companyIntroduction) 
-    {
-        this.companyIntroduction = companyIntroduction;
+    public String getCorporationPhone() {
+        return corporationPhone;
     }
 
-    public String getCompanyIntroduction() 
-    {
-        return companyIntroduction;
-    }
-    public void setCustomerType(String customerType) 
-    {
-        this.customerType = customerType;
+    public void setCorporationPhone(String corporationPhone) {
+        this.corporationPhone = corporationPhone;
     }
 
-    public String getCustomerType() 
-    {
-        return customerType;
-    }
-    public void setCorporationFront(String corporationFront) 
-    {
-        this.corporationFront = corporationFront;
+    public String getCorporationAddress() {
+        return corporationAddress;
     }
 
-    public String getCorporationFront() 
-    {
-        return corporationFront;
-    }
-    public void setCorporationBack(String corporationBack) 
-    {
-        this.corporationBack = corporationBack;
+    public void setCorporationAddress(String corporationAddress) {
+        this.corporationAddress = corporationAddress;
     }
 
-    public String getCorporationBack() 
-    {
-        return corporationBack;
-    }
-    public void setCorporationName(String corporationName) 
-    {
-        this.corporationName = corporationName;
+    public String getCorporationExpirationDate() {
+        return corporationExpirationDate;
     }
 
-    public String getCorporationName() 
-    {
-        return corporationName;
-    }
-    public void setCorporationIdCard(String corporationIdCard) 
-    {
-        this.corporationIdCard = corporationIdCard;
+    public void setCorporationExpirationDate(String corporationExpirationDate) {
+        this.corporationExpirationDate = corporationExpirationDate;
     }
 
-    public String getCorporationIdCard() 
-    {
-        return corporationIdCard;
-    }
-    public void setCorporationPhone(String corporationPhone) 
-    {
-        this.corporationPhone = corporationPhone;
+    public String getFamilyPopulation() {
+        return familyPopulation;
     }
 
-    public String getCorporationPhone() 
-    {
-        return corporationPhone;
-    }
-    public void setFamilyPopulation(String familyPopulation) 
-    {
+    public void setFamilyPopulation(String familyPopulation) {
         this.familyPopulation = familyPopulation;
     }
 
-    public String getFamilyPopulation() 
-    {
-        return familyPopulation;
+    public String getCorporationJob() {
+        return corporationJob;
     }
-    public void setCorporationJob(String corporationJob) 
-    {
+
+    public void setCorporationJob(String corporationJob) {
         this.corporationJob = corporationJob;
     }
 
-    public String getCorporationJob() 
-    {
-        return corporationJob;
+    public String getIsLoan() {
+        return isLoan;
     }
-    public void setIsLoan(String isLoan) 
-    {
+
+    public void setIsLoan(String isLoan) {
         this.isLoan = isLoan;
     }
 
-    public String getIsLoan() 
-    {
-        return isLoan;
+    public String getReceivablePay() {
+        return receivablePay;
     }
-    public void setReceivablePay(String receivablePay) 
-    {
+
+    public void setReceivablePay(String receivablePay) {
         this.receivablePay = receivablePay;
     }
 
-    public String getReceivablePay() 
-    {
-        return receivablePay;
+    public String getBusinessSituation() {
+        return businessSituation;
     }
-    public void setBusinessSituation(String businessSituation) 
-    {
+
+    public void setBusinessSituation(String businessSituation) {
         this.businessSituation = businessSituation;
     }
 
-    public String getBusinessSituation() 
-    {
-        return businessSituation;
+    public String getBusinessEfficiency() {
+        return businessEfficiency;
     }
-    public void setBusinessEfficiency(String businessEfficiency) 
-    {
+
+    public void setBusinessEfficiency(String businessEfficiency) {
         this.businessEfficiency = businessEfficiency;
     }
 
-    public String getBusinessEfficiency() 
-    {
-        return businessEfficiency;
+    public String getCorporationMaritalStatus() {
+        return corporationMaritalStatus;
     }
-    public void setCorporationMaritalStatus(String corporationMaritalStatus) 
-    {
+
+    public void setCorporationMaritalStatus(String corporationMaritalStatus) {
         this.corporationMaritalStatus = corporationMaritalStatus;
     }
 
-    public String getCorporationMaritalStatus() 
-    {
-        return corporationMaritalStatus;
+    public String getSpouseFront() {
+        return spouseFront;
     }
-    public void setSpouseFront(String spouseFront) 
-    {
+
+    public void setSpouseFront(String spouseFront) {
         this.spouseFront = spouseFront;
     }
 
-    public String getSpouseFront() 
-    {
-        return spouseFront;
+    public String getSpouseBack() {
+        return spouseBack;
     }
-    public void setSpouseBack(String spouseBack) 
-    {
+
+    public void setSpouseBack(String spouseBack) {
         this.spouseBack = spouseBack;
     }
 
-    public String getSpouseBack() 
-    {
-        return spouseBack;
+    public String getSpouseName() {
+        return spouseName;
     }
-    public void setSpouseName(String spouseName) 
-    {
+
+    public void setSpouseName(String spouseName) {
         this.spouseName = spouseName;
     }
 
-    public String getSpouseName() 
-    {
-        return spouseName;
+    public String getSpouseIdCard() {
+        return spouseIdCard;
     }
-    public void setSpouseIdCard(String spouseIdCard) 
-    {
+
+    public void setSpouseIdCard(String spouseIdCard) {
         this.spouseIdCard = spouseIdCard;
     }
 
-    public String getSpouseIdCard() 
-    {
-        return spouseIdCard;
+    public String getSpousePhone() {
+        return spousePhone;
     }
-    public void setSpousePhone(String spousePhone) 
-    {
+
+    public void setSpousePhone(String spousePhone) {
         this.spousePhone = spousePhone;
     }
 
-    public String getSpousePhone() 
-    {
-        return spousePhone;
+    public String getGuaranteeType() {
+        return guaranteeType;
     }
-    public void setGuaranteeType(String guaranteeType) 
-    {
+
+    public void setGuaranteeType(String guaranteeType) {
         this.guaranteeType = guaranteeType;
     }
 
-    public String getGuaranteeType() 
-    {
-        return guaranteeType;
+    public String getGuaranteeFront() {
+        return guaranteeFront;
     }
-    public void setGuaranteeFront(String guaranteeFront) 
-    {
+
+    public void setGuaranteeFront(String guaranteeFront) {
         this.guaranteeFront = guaranteeFront;
     }
 
-    public String getGuaranteeFront() 
-    {
-        return guaranteeFront;
+    public String getGuaranteeBack() {
+        return guaranteeBack;
     }
-    public void setGuaranteeBack(String guaranteeBack) 
-    {
+
+    public void setGuaranteeBack(String guaranteeBack) {
         this.guaranteeBack = guaranteeBack;
     }
 
-    public String getGuaranteeBack() 
-    {
-        return guaranteeBack;
+    public String getGuaranteeName() {
+        return guaranteeName;
     }
-    public void setGuaranteeName(String guaranteeName) 
-    {
+
+    public void setGuaranteeName(String guaranteeName) {
         this.guaranteeName = guaranteeName;
     }
 
-    public String getGuaranteeName() 
-    {
-        return guaranteeName;
+    public String getGuaranteeIdCard() {
+        return guaranteeIdCard;
     }
-    public void setGuaranteeIdCard(String guaranteeIdCard) 
-    {
+
+    public void setGuaranteeIdCard(String guaranteeIdCard) {
         this.guaranteeIdCard = guaranteeIdCard;
     }
 
-    public String getGuaranteeIdCard() 
-    {
-        return guaranteeIdCard;
+    public String getGuaranteePhone() {
+        return guaranteePhone;
     }
-    public void setGuaranteePhone(String guaranteePhone) 
-    {
+
+    public void setGuaranteePhone(String guaranteePhone) {
         this.guaranteePhone = guaranteePhone;
     }
 
-    public String getGuaranteePhone() 
-    {
-        return guaranteePhone;
+    public String getGuaranteeMaritalStatus() {
+        return guaranteeMaritalStatus;
     }
-    public void setGuaranteeMaritalStatus(String guaranteeMaritalStatus) 
-    {
+
+    public void setGuaranteeMaritalStatus(String guaranteeMaritalStatus) {
         this.guaranteeMaritalStatus = guaranteeMaritalStatus;
     }
 
-    public String getGuaranteeMaritalStatus() 
-    {
-        return guaranteeMaritalStatus;
+    public String getGuaranteeSpouseFront() {
+        return guaranteeSpouseFront;
     }
-    public void setGuaranteeSpouseFront(String guaranteeSpouseFront) 
-    {
+
+    public void setGuaranteeSpouseFront(String guaranteeSpouseFront) {
         this.guaranteeSpouseFront = guaranteeSpouseFront;
     }
 
-    public String getGuaranteeSpouseFront() 
-    {
-        return guaranteeSpouseFront;
+    public String getGuaranteeSpouseBack() {
+        return guaranteeSpouseBack;
     }
-    public void setGuaranteeSpouseBack(String guaranteeSpouseBack) 
-    {
+
+    public void setGuaranteeSpouseBack(String guaranteeSpouseBack) {
         this.guaranteeSpouseBack = guaranteeSpouseBack;
     }
 
-    public String getGuaranteeSpouseBack() 
-    {
-        return guaranteeSpouseBack;
+    public String getGuaranteeSpouseName() {
+        return guaranteeSpouseName;
     }
-    public void setGuaranteeSpouseName(String guaranteeSpouseName) 
-    {
+
+    public void setGuaranteeSpouseName(String guaranteeSpouseName) {
         this.guaranteeSpouseName = guaranteeSpouseName;
     }
 
-    public String getGuaranteeSpouseName() 
-    {
-        return guaranteeSpouseName;
+    public String getGuaranteeSpouseIdCard() {
+        return guaranteeSpouseIdCard;
     }
-    public void setGuaranteeSpouseIdCard(String guaranteeSpouseIdCard) 
-    {
+
+    public void setGuaranteeSpouseIdCard(String guaranteeSpouseIdCard) {
         this.guaranteeSpouseIdCard = guaranteeSpouseIdCard;
     }
 
-    public String getGuaranteeSpouseIdCard() 
-    {
-        return guaranteeSpouseIdCard;
+    public String getGuaranteeSpousePhone() {
+        return guaranteeSpousePhone;
     }
-    public void setGuaranteeSpousePhone(String guaranteeSpousePhone) 
-    {
+
+    public void setGuaranteeSpousePhone(String guaranteeSpousePhone) {
         this.guaranteeSpousePhone = guaranteeSpousePhone;
     }
 
-    public String getGuaranteeSpousePhone() 
-    {
-        return guaranteeSpousePhone;
+    public String getGuaranteeShareholderName() {
+        return guaranteeShareholderName;
     }
-    public void setUserId(Long userId) 
-    {
-        this.userId = userId;
+
+    public void setGuaranteeShareholderName(String guaranteeShareholderName) {
+        this.guaranteeShareholderName = guaranteeShareholderName;
+    }
+
+    public String getGuaranteeShareholderIdCard() {
+        return guaranteeShareholderIdCard;
     }
 
-    public Long getUserId() 
-    {
+    public void setGuaranteeShareholderIdCard(String guaranteeShareholderIdCard) {
+        this.guaranteeShareholderIdCard = guaranteeShareholderIdCard;
+    }
+
+    public Long getUserId() {
         return userId;
     }
-    public void setIdCard(String idCard) 
-    {
-        this.idCard = idCard;
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
     }
 
-    public String getIdCard() 
-    {
+    public String getIdCard() {
         return idCard;
     }
-    public void setApplicationTime(Date applicationTime) 
-    {
-        this.applicationTime = applicationTime;
+
+    public void setIdCard(String idCard) {
+        this.idCard = idCard;
     }
 
-    public Date getApplicationTime() 
-    {
+    public Date getApplicationTime() {
         return applicationTime;
     }
-    public void setFileTime(Date fileTime) 
-    {
-        this.fileTime = fileTime;
+
+    public void setApplicationTime(Date applicationTime) {
+        this.applicationTime = applicationTime;
     }
 
-    public Date getFileTime() 
-    {
+    public Date getFileTime() {
         return fileTime;
     }
-    public void setLoanSchedule(String loanSchedule) 
-    {
-        this.loanSchedule = loanSchedule;
+
+    public void setFileTime(Date fileTime) {
+        this.fileTime = fileTime;
     }
 
-    public String getLoanSchedule() 
-    {
+    public String getReviewTime() {
+        return reviewTime;
+    }
+
+    public void setReviewTime(String reviewTime) {
+        this.reviewTime = reviewTime;
+    }
+
+    public String getLoanSchedule() {
         return loanSchedule;
     }
-    public void setAuditSchedule(String auditSchedule) 
-    {
-        this.auditSchedule = auditSchedule;
+
+    public void setLoanSchedule(String loanSchedule) {
+        this.loanSchedule = loanSchedule;
+    }
+
+    public String getLoanScheduleName() {
+        return loanScheduleName;
     }
 
-    public String getAuditSchedule() 
-    {
+    public void setLoanScheduleName(String loanScheduleName) {
+        this.loanScheduleName = loanScheduleName;
+    }
+
+    public String getAuditSchedule() {
         return auditSchedule;
     }
-    public void setAuditType(String auditType) 
-    {
-        this.auditType = auditType;
+
+    public void setAuditSchedule(String auditSchedule) {
+        this.auditSchedule = auditSchedule;
     }
 
-    public String getAuditType() 
-    {
+    public String getAuditType() {
         return auditType;
     }
-    public void setLoanApplicationType(String loanApplicationType) 
-    {
-        this.loanApplicationType = loanApplicationType;
+
+    public void setAuditType(String auditType) {
+        this.auditType = auditType;
+    }
+
+    public String getReviewSchedule() {
+        return reviewSchedule;
     }
 
-    public String getLoanApplicationType() 
-    {
+    public void setReviewSchedule(String reviewSchedule) {
+        this.reviewSchedule = reviewSchedule;
+    }
+
+    public String getLoanApplicationType() {
         return loanApplicationType;
     }
-    public void setaUserId(Long aUserId) 
-    {
-        this.aUserId = aUserId;
+
+    public void setLoanApplicationType(String loanApplicationType) {
+        this.loanApplicationType = loanApplicationType;
     }
 
-    public Long getaUserId() 
-    {
+    public Long getaUserId() {
         return aUserId;
     }
 
+    public void setaUserId(Long aUserId) {
+        this.aUserId = aUserId;
+    }
+
     public String getaUserName() {
         return aUserName;
     }
@@ -986,6 +836,14 @@ public class LoanApplication extends BaseEntity
         this.aUserName = aUserName;
     }
 
+    public String getaAuthorize() {
+        return aAuthorize;
+    }
+
+    public void setaAuthorize(String aAuthorize) {
+        this.aAuthorize = aAuthorize;
+    }
+
     public Long getbUserId() {
         return bUserId;
     }
@@ -1001,4 +859,100 @@ public class LoanApplication extends BaseEntity
     public void setbUserName(String bUserName) {
         this.bUserName = bUserName;
     }
+
+    public Long getfUserId() {
+        return fUserId;
+    }
+
+    public void setfUserId(Long fUserId) {
+        this.fUserId = fUserId;
+    }
+
+    public String getfUserName() {
+        return fUserName;
+    }
+
+    public void setfUserName(String fUserName) {
+        this.fUserName = fUserName;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public String getFileType() {
+        return fileType;
+    }
+
+    public void setFileType(String fileType) {
+        this.fileType = fileType;
+    }
+
+    public String getBigType() {
+        return bigType;
+    }
+
+    public void setBigType(String bigType) {
+        this.bigType = bigType;
+    }
+
+    public String getSsType() {
+        return ssType;
+    }
+
+    public void setSsType(String ssType) {
+        this.ssType = ssType;
+    }
+
+    public List<ShareholderFj> getShareholderFjList() {
+        return shareholderFjList;
+    }
+
+    public void setShareholderFjList(List<ShareholderFj> shareholderFjList) {
+        this.shareholderFjList = shareholderFjList;
+    }
+
+    public List<LoanApplicationFj> getLoanApplicationFjList() {
+        return loanApplicationFjList;
+    }
+
+    public void setLoanApplicationFjList(List<LoanApplicationFj> loanApplicationFjList) {
+        this.loanApplicationFjList = loanApplicationFjList;
+    }
+
+    public Map<String, List<LoanApplicationFj>> getBasicFj() {
+        return basicFj;
+    }
+
+    public void setBasicFj(Map<String, List<LoanApplicationFj>> basicFj) {
+        this.basicFj = basicFj;
+    }
+
+    public Map<String, List<LoanApplicationFj>> getDeclareFj() {
+        return declareFj;
+    }
+
+    public void setDeclareFj(Map<String, List<LoanApplicationFj>> declareFj) {
+        this.declareFj = declareFj;
+    }
+
+    public Map<String, List<LoanApplicationFj>> getFileFj() {
+        return fileFj;
+    }
+
+    public void setFileFj(Map<String, List<LoanApplicationFj>> fileFj) {
+        this.fileFj = fileFj;
+    }
+
+    public Map<String, List<LoanApplicationFj>> getOtherFj() {
+        return otherFj;
+    }
+
+    public void setOtherFj(Map<String, List<LoanApplicationFj>> otherFj) {
+        this.otherFj = otherFj;
+    }
 }

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

@@ -10,9 +10,13 @@ import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.SysUserRole;
 import com.ruoyi.system.domain.conference.SysUserConference;
 import com.ruoyi.system.domain.loan.LoanApplication;
+import com.ruoyi.system.domain.remind.WaitRemind;
+import com.ruoyi.system.domain.review.ReviewComments;
 import com.ruoyi.system.mapper.LoanApplicationMapper;
+import com.ruoyi.system.mapper.ReviewCommentsMapper;
 import com.ruoyi.system.mapper.SysUserMapper;
 import com.ruoyi.system.service.ISysDictTypeService;
 import com.ruoyi.system.service.conference.ISysUserConferenceService;
@@ -21,6 +25,8 @@ import org.springframework.stereotype.Service;
 import com.ruoyi.system.mapper.SysUserConferenceMapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import static com.ruoyi.common.constant.CommonConstants.*;
+
 /**
  * 参会人员Service业务层处理
  *
@@ -41,6 +47,9 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
     @Autowired
     private ISysDictTypeService dictTypeService;
 
+    @Autowired
+    private ReviewCommentsMapper reviewCommentsMapper;
+
     /**
      * 查询参会人员
      *
@@ -195,11 +204,20 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         if(bl && sysUserConference.getVotingResult().equals("N")){
             //修改主表信息 未通过
             LoanApplication loanApplication = new LoanApplication();
-            loanApplication.setAuditType("4");
-            loanApplication.setReviewSchedule("6");
+            loanApplication.setAuditType(FOR);
+            loanApplication.setReviewSchedule(SIX);
+            loanApplication.setLoanApplicationId(sysUserConference.getLoanApplicationId());
             loanApplicationMapper.updateLoanApplication(loanApplication);
             // todo 未通过 业务流程表插入数据
-
+            //业务审核意见
+            ReviewComments reviewComments = new ReviewComments();
+            reviewComments.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            reviewComments.setLoanApplicationNumber(sysUserConference.getLoanApplicationNumber());
+            reviewComments.setAuditSchedule(SEV);
+            reviewComments.setAuditType(FOR);
+            reviewComments.setAuditTime(DateUtils.getNowDate());
+            reviewComments.setCreateBy(SecurityUtils.getUsername());
+            reviewCommentsMapper.insertReviewComments(reviewComments);
             return AjaxResult.success("成功");
         }
         //除了本人外是否全部投票
@@ -226,10 +244,20 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         if(bty>=2){
             //修改主表信息 未通过
             LoanApplication loanApplication = new LoanApplication();
-            loanApplication.setAuditType("4");
-            loanApplication.setReviewSchedule("6");
+            loanApplication.setAuditType(FOR);
+            loanApplication.setReviewSchedule(SIX);
+            loanApplication.setLoanApplicationId(sysUserConference.getLoanApplicationId());
             loanApplicationMapper.updateLoanApplication(loanApplication);
             // todo 未通过 业务流程表插入数据
+            //业务审核意见
+            ReviewComments reviewComments = new ReviewComments();
+            reviewComments.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            reviewComments.setLoanApplicationNumber(sysUserConference.getLoanApplicationNumber());
+            reviewComments.setAuditSchedule(SEV);
+            reviewComments.setAuditType(FOR);
+            reviewComments.setAuditTime(DateUtils.getNowDate());
+            reviewComments.setCreateBy(SecurityUtils.getUsername());
+            reviewCommentsMapper.insertReviewComments(reviewComments);
 
             return AjaxResult.success("成功");
         }
@@ -237,14 +265,22 @@ public class SysUserConferenceServiceImpl implements ISysUserConferenceService {
         if(b && bty<2){
             //修改主表信息 通过
             LoanApplication loanApplication = new LoanApplication();
-            loanApplication.setAuditType("1");
-            loanApplication.setReviewSchedule("5");
-            loanApplication.setAuditSchedule("8");
-            loanApplication.setLoanSchedule("7");
+            loanApplication.setAuditType(ONE);
+            loanApplication.setReviewSchedule(FIV);
+            loanApplication.setAuditSchedule(EIG);
+            loanApplication.setLoanSchedule(SEV);
+            loanApplication.setLoanApplicationId(sysUserConference.getLoanApplicationId());
             loanApplicationMapper.updateLoanApplication(loanApplication);
             // todo 通过 业务流程表插入数据
-
-
+            //业务审核意见
+            ReviewComments reviewComments = new ReviewComments();
+            reviewComments.setLoanApplicationId(loanApplication.getLoanApplicationId());
+            reviewComments.setLoanApplicationNumber(sysUserConference.getLoanApplicationNumber());
+            reviewComments.setAuditSchedule(SEV);
+            reviewComments.setAuditType(TWO);
+            reviewComments.setAuditTime(DateUtils.getNowDate());
+            reviewComments.setCreateBy(SecurityUtils.getUsername());
+            reviewCommentsMapper.insertReviewComments(reviewComments);
             return AjaxResult.success("成功");
         }