From 0363925a9f754adf3a30411bfd4444dae677798b Mon Sep 17 00:00:00 2001 From: ap007 Date: Wed, 21 Jul 2021 09:37:54 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8DNPE=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/ap/CorpusSourceCheck.java | 10 ++++++++-- .../fundchannel/doc/action/DocListAction.java | 18 ++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java index cdaa30927..0e48faa77 100644 --- a/src/com/ap/CorpusSourceCheck.java +++ b/src/com/ap/CorpusSourceCheck.java @@ -87,6 +87,9 @@ public class CorpusSourceCheck { return sResult; } String fcStage = this.getFcStageByProjectId(); + if("-2".equals(fcStage)){ + return "获取状态信息出现错误，请联系系统管理员！"; + } if ("AP".equals(fcStage)||"1".equals(fcStage)) { sResult = "S"; } else { @@ -106,9 +109,12 @@ public class CorpusSourceCheck { String sResult = null; try { String fcStage = this.getFcStageByProjectId(); + if("-2".equals(fcStage)){ + return "获取状态信息出现错误，请联系系统管理员！"; + } if("2".equals(fcStage)||"AP".equals(fcStage)){ return "S"; - }else{ + } else { sResult = "客户还未和资方签署合同"; } } catch (JBOException e) { @@ -135,7 +141,7 @@ public class CorpusSourceCheck { fcStage = "AP" ; }else{ BizObjectManager bomFR = JBOFactory.getBizObjectManager(FC_REQUEST.CLASS_NAME); - BizObject boFR = bomFR.createQuery("id=:projectId and del_flag='0'").setParameter("projectId", projectId).getSingleResult(false); + BizObject boFR = bomFR.createQuery("PROJECT_ID=:projectId and del_flag='0'").setParameter("projectId", projectId).getSingleResult(false); if(boFR!=null){ fcStage = boFR.getAttribute("FC_STAGE").toString(); } diff --git a/src_core/com/ample/fundchannel/doc/action/DocListAction.java b/src_core/com/ample/fundchannel/doc/action/DocListAction.java index 4af31a106..fa1a5ab20 100644 --- a/src_core/com/ample/fundchannel/doc/action/DocListAction.java +++ b/src_core/com/ample/fundchannel/doc/action/DocListAction.java @@ -101,12 +101,18 @@ public class DocListAction { BizObjectManager BBMbom = null; BizObject BBMBo = null; BBMbom = JBOFactory.getBizObjectManager(BT_BUSSINESS_MESSAGE.CLASS_NAME,tx); - BBMBo = BBMbom.createQuery("ID=:id").setParameter("id",messageId).getSingleResult(true); - BBMBo.setAttributeValue("is_read","has_read"); - BBMBo.setAttributeValue("message_status","has_process"); - BBMBo.setAttributeValue("read_time",currentTime); - BBMBo.setAttributeValue("finish_time",currentTime); - BBMbom.saveObject(BBMBo); + if(messageId!=null&&!"".equals(messageId)){ + BBMBo = BBMbom.createQuery("ID=:id").setParameter("id",messageId).getSingleResult(true); + }else { + BBMBo = BBMbom.createQuery("cparam like '%fcRequestId="+fcRequestId+"%'").getSingleResult(true); + } + if(BBMBo!=null){ + BBMBo.setAttributeValue("is_read","has_read"); + BBMBo.setAttributeValue("message_status","has_process"); + BBMBo.setAttributeValue("read_time",currentTime); + BBMBo.setAttributeValue("finish_time",currentTime); + BBMbom.saveObject(BBMBo); + } } public String getFrfId() { From b02379162879d88a3f436a686de6bbd20105eca0 Mon Sep 17 00:00:00 2001 From: ap007 Date: Wed, 21 Jul 2021 17:08:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B5=84=E6=96=B9=E6=8B=B7=E8=A1=A8?= =?UTF-8?q?=E5=89=8D=EF=BC=8C=E5=85=88=E5=B0=86=E5=8E=9F=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=8B=B7=E5=85=A5=E5=8E=86=E5=8F=B2=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CorpusSourceRentPlanCopy.java | 58 ++++++++++++++++--- 1 file changed, 49 insertions(+), 9 deletions(-) diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java index ea2085575..7dc9b3ecc 100644 --- a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceRentPlanCopy.java @@ -1,5 +1,6 @@ package com.tenwa.lease.app.quartzmession; +import com.amarsoft.are.ARE; import com.amarsoft.are.jbo.*; import com.amarsoft.are.util.StringFunction; import com.amarsoft.awe.util.Transaction; @@ -8,6 +9,7 @@ import com.tenwa.comm.util.jboutil.DataOperatorUtil; import com.tenwa.reckon.executor.CreateTransactionExecutor; import jbo.app.tenwa.calc.LC_CALC_CONDITION; import jbo.app.tenwa.calc.LC_RENT_PLAN; +import jbo.app.tenwa.calc.LC_RENT_PLAN_HIS; import jbo.oti.FC_FILE_PUSH; import jbo.oti.FC_YC_FILE_REPAY_PLAN; import jbo.oti.LC_PROFIT_PLAN; @@ -49,14 +51,41 @@ public class CorpusSourceRentPlanCopy implements Job { fyfrpBom = JBOFactory.getBizObjectManager(FC_YC_FILE_REPAY_PLAN.CLASS_NAME,tx); //todo 添加渠道商的选择，哪些需要拷表哪些不需要 List ffpBoList = ffpBom.createQuery("select ID,FILE_STS from O where FILE_STS='2'").getResultList(true); + if(ffpBoList.size()==0){ + ARE.getLog().info("暂时没有需要拷表的资方文件"); + return; + } + //遍历每个文件 for(BizObject ffpBo : ffpBoList){ String fcFileId = ffpBo.getAttribute("ID").toString(); - //1.更新租金计划租金信息，并获取每个文件的contract_id - String sql = "select fr.CONTRACT_ID,O.LEND_TERM,O.ANS_REPAYMENT_DATE,O.ANS_PRINCIPAL,O.ANS_INTEREST,ANS_REPAYMENT_MONEY from O left join jbo.oti.FC_REQUEST fr on O.FC_REQUEST_ID=fr.ID where fr.DEL_FLAG='0' and O.FC_FILE_ID=:fcFileId"; + String sql = "select fr.CONTRACT_ID,O.FC_REQUEST_ID,O.LEND_TERM,O.ANS_REPAYMENT_DATE,O.ANS_PRINCIPAL,O.ANS_INTEREST,ANS_REPAYMENT_MONEY from O left join jbo.oti.FC_REQUEST fr on O.FC_REQUEST_ID=fr.ID where fr.DEL_FLAG='0' and O.FC_FILE_ID=:fcFileId"; List fyfrpBoList = fyfrpBom.createQuery(sql).setParameter("fcFileId",fcFileId).getResultList(false); + if(fyfrpBoList.size()==0){ + ARE.getLog().error("未找到FC_REQUEST_ID: "+fcFileId+" 对应的资方还款计划"); + throw new Exception("未找到FC_REQUEST_ID: "+fcFileId+" 对应的资方还款计划"); + } + //获取对应的合同 + Map contractMap = this.getContractIdMap(fyfrpBoList); + if(contractMap.size()==0){ + ARE.getLog().error("未找到FC_REQUEST_ID: "+fcFileId+" 对应的合同ID"); + throw new Exception("未找到FC_REQUEST_ID: "+fcFileId+" 对应的合同ID"); + } + //0.租金计划正式表考入历史表 + for(Map.Entry entry: contractMap.entrySet()){ + Map fromCondtion=new HashMap(); + fromCondtion.put("CONTRACT_ID",entry.getKey()); - Set contractSet = this.updateRentPlan(fyfrpBoList,tx); - for(String contractId : contractSet){ + Map otherProperty=new HashMap(); + otherProperty.put("MEMO", "安鹏原正式租金计划"); + otherProperty.put("FLOWUNID", entry.getValue()); + + DataOperatorUtil.copyJBOSet(LC_RENT_PLAN.CLASS_NAME, fromCondtion, LC_RENT_PLAN_HIS.CLASS_NAME,null, otherProperty, null, Sqlca); + } + //1.更新租金计划（直接文件每条信息更新，不需要遍历） + this.updateRentPlan(fyfrpBoList,tx); + + for(Map.Entry entry: contractMap.entrySet()){ + String contractId = entry.getKey(); Map param= this.getParamByContractId(contractId,tx); //2.更新租金计划剩余本金 this.updateAllRemainCorpus(contractId,tx); @@ -86,6 +115,21 @@ public class CorpusSourceRentPlanCopy implements Job { } } + /** + * 获取对应的合同ID + * @param fyfrpBoList + * @return + * @throws JBOException + */ + public Map getContractIdMap(List fyfrpBoList) throws JBOException { + Map contractMap = new HashMap<>(); + for(BizObject bo : fyfrpBoList){ + String contractId = bo.getAttribute("CONTRACT_ID").toString(); + String fcRequestId = bo.getAttribute("FC_REQUEST_ID").toString(); + contractMap.put(contractId,fcRequestId); + } + return contractMap; + } /** * 租金计划拷贝 * @param fyfrpBoList 每个回执文件包含的租金计划信息 @@ -93,10 +137,9 @@ public class CorpusSourceRentPlanCopy implements Job { * @throws JBOException * @throws ParseException */ - public Set updateRentPlan(List fyfrpBoList,JBOTransaction tx) throws JBOException, ParseException { + public void updateRentPlan(List fyfrpBoList,JBOTransaction tx) throws JBOException, ParseException { BizObjectManager lrpBom = null; lrpBom = JBOFactory.getBizObjectManager(LC_RENT_PLAN.CLASS_NAME,tx); - Set contractSet = new HashSet<>(); //更新租金计划表 for(BizObject bo : fyfrpBoList){ //获取参数 @@ -119,10 +162,7 @@ public class CorpusSourceRentPlanCopy implements Job { lrpBo.setAttributeValue("PLAN_DATE",repaymentDate); lrpBo.setAttributeValue("RENT",repaymentMoney); lrpBom.saveObject(lrpBo); - //放进set去重 - contractSet.add(contractId); } - return contractSet; } /** From c8ab5172562d1b45dd725bc7e12e1119e0d3c3d9 Mon Sep 17 00:00:00 2001 From: ap007 Date: Fri, 23 Jul 2021 19:05:08 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B5=84=E6=96=B9=E6=94=BE=E6=AC=BE-?= =?UTF-8?q?=E5=87=AD=E8=AF=81=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../voucher/service/VoucherInfoService.java | 5 + .../FundIncomeVoucherInfoServiceImpl.java | 130 ++++++++++++++++++ ...orpusSourceFundIncomeCreateVoucherJob.java | 40 ++++++ 3 files changed, 175 insertions(+) create mode 100644 src_core/com/tenwa/voucher/service/VoucherInfoService.java create mode 100644 src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java create mode 100644 src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java diff --git a/src_core/com/tenwa/voucher/service/VoucherInfoService.java b/src_core/com/tenwa/voucher/service/VoucherInfoService.java new file mode 100644 index 000000000..65e0fef9e --- /dev/null +++ b/src_core/com/tenwa/voucher/service/VoucherInfoService.java @@ -0,0 +1,5 @@ +package com.tenwa.voucher.service; + +public interface VoucherInfoService { + void run() throws Exception; +} diff --git a/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java new file mode 100644 index 000000000..d2c786a16 --- /dev/null +++ b/src_core/com/tenwa/voucher/serviceImp/FundIncomeVoucherInfoServiceImpl.java @@ -0,0 +1,130 @@ +package com.tenwa.voucher.serviceImp; + +import com.amarsoft.are.jbo.*; +import com.amarsoft.dict.als.manage.NameManager; +import com.tenwa.comm.util.jboutil.DataOperatorUtil; +import com.tenwa.flow.util.FlowUtil; +import com.tenwa.reckon.util.DateUtil; +import com.tenwa.voucher.service.VoucherInfoService; +import jbo.app.VOUCHER_V8; + +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class FundIncomeVoucherInfoServiceImpl implements VoucherInfoService { + //todo 这个字段是自增的，更新生产时，先在生产配置，然后根据生产的编号再更改 + private static final String VOUCHER_CONFIGNO = "PZ2021072100000020";//凭证号 + private static final String EVIDENCE_MESSAGE = "凭证输出";//查看凭证表，发现只有这一个值，目前先设置为固定值 + private static final String EAS_FLAG = "0";//导入财务系统状态 默认0 (同上，只有这一个值) + public void run() { + JBOTransaction tx = null; + try { + tx = JBOFactory.createJBOTransaction(); + //凭证编号 + String voucherNo ="k" + FlowUtil.getVoucher_Number(tx); + System.out.println(voucherNo+"======"); + } catch (JBOException e) { + e.printStackTrace(); + } catch (Exception e) { + e.printStackTrace(); + }finally { + try { + tx.commit(); + } catch (JBOException e) { + e.printStackTrace(); + } + } + + + } + + public void createVoucher(List> list, JBOTransaction tx) throws Exception { + BizObjectManager bomV8 = JBOFactory.getBizObjectManager(VOUCHER_V8.CLASS_NAME,tx); + List> loanInfoList = this.getHasLoanContract(tx); + for(Map loanInfo : loanInfoList){ + loanInfo = this.getCommonParam(loanInfo,tx); + List> paramList = getParamOfVoucher(tx); + for(Map param : paramList){ + param.putAll(loanInfo); + BizObject boV8 = bomV8.newObject(); + boV8.setAttributesValue(this.getFinalParam(param)); + bomV8.saveObject(boV8); + } + } + } + public List> getHasLoanContract(JBOTransaction tx) throws Exception { + //todo 目前为邮储，九江的时候将where条件更改参数 + String sql = "select frl.loan_no,frl.customer_name,frl.loan_date,frl.loan_amt,frl.business_rate,frl.TRANS_AMT,fr.CONTRACT_ID,fr.CONTRACT_NO " + + "from fc_request_loan frl " + + "left join fc_request fr on frl.LOAN_NO = fr.FC_LOAN_ID " + + "where frl.del_flag='0' and fr.DEL_FLAG='0' and voucher_status='0' and fr.CHANNEL_NO='PSBC' "; + return DataOperatorUtil.getDataBySql(sql,tx); + } + public Map getCommonParam(Map loanInfo,JBOTransaction tx) throws Exception { + + String contractId = loanInfo.get("CONTRACT_ID"); + String voucherNo ="k" + FlowUtil.getVoucher_Number(tx); + loanInfo.put("voucherNo",voucherNo); + String userId = "administrator";//操作人 + String userName = NameManager.getUserName(userId); + loanInfo.put("userId",userId); + loanInfo.put("userName",userName); + //日期 + String loanDate = loanInfo.get("loan_date").substring(0,8); + String periodYear = loanDate.substring(0,4); + String periodMonth = loanDate.substring(4,6); + Date date = new SimpleDateFormat("yyyyMMdd").parse(loanDate); + loanDate = new SimpleDateFormat("yyyy/MM/dd").format(date); + loanInfo.put("periodYear",periodYear); + loanInfo.put("periodMonth",periodMonth); + loanInfo.put("accountingDate",loanDate); + loanInfo.put("generate_date", DateUtil.getSystemDateDetailTime()); + + return loanInfo; + } + public List> getParamOfVoucher(JBOTransaction tx) throws Exception { + String sql = "select lvl.SORT_NUMBER as sortNumber,lvl.LOAN_SUBJECT as loanSubject,CASE WHEN lvl.loan_direction = '1' THEN '1' ELSE '-1' END as entrydc,lvl.VALUE_ABSTRACT as valueAbstract,lsc.SUBJECTS_CODE as subjectsCode,lsc.SUBJECTS_NAME as subjectsName " + + "from lv_voucher_loan lvl " + + "left join LV_STACTS_CONFIG lsc on lvl.LOAN_SUBJECT=lsc.id " + + "left join lv_voucher_config lvc on lvl.VOUCHER_ID=lvc.id " + + "where lvc.VOUCHER_NO='"+VOUCHER_CONFIGNO+"'"; + return DataOperatorUtil.getDataBySql(sql,tx); + } + public Map getFinalParam(Map param){ + Map finalParam = new HashMap<>(); + finalParam.put("evidence_message",EVIDENCE_MESSAGE);//固定值：凭证输出 + finalParam.put("periodyear",param.get("periodYear")); //年 + finalParam.put("f1",param.get("accountingDate"));//会计日期 + finalParam.put("f2",param.get("subjectsCode"));//科目编码 + finalParam.put("f3",param.get("voucherNo"));//凭证编号 + finalParam.put("f5",param.get("valueAbstract"));//摘要 + finalParam.put("f6",param.get("loanSubject"));//科目表id + finalParam.put("f7",param.get("periodYear"));//借方金额 + finalParam.put("f8",param.get("periodYear"));//贷方金额 + finalParam.put("f12",param.get("userName"));//操作人 + finalParam.put("f15",param.get("accountingDate"));//日期(与会计日期相同) + finalParam.put("f47",param.get("CONTRACT_NO"));//业务合同编号 + finalParam.put("f48",param.get("periodYear"));//本方信息No + finalParam.put("f49",param.get("periodYear"));//所属公司ID（注意：实际此字段存的是code_library表中codeno='ManySubject' 的 itemno 字段） + finalParam.put("f50",param.get("periodYear"));//所属公司名称 + finalParam.put("f51",param.get("periodYear"));//会计期间-年（与上面 ‘年’ 相同） + finalParam.put("f52",param.get("periodMonth"));//会计期间-月 + finalParam.put("f59",param.get("sortNumber"));//凭证配置中排序号 + finalParam.put("f60",param.get("CONTRACT_NO"));//业务合同号，与f47相同（尚不明为何重复） + finalParam.put("f61",param.get("customer_name"));//客户名称 + finalParam.put("f62",param.get("loanSubject"));//科目表id，与f6相同（尚不明为何重复） + finalParam.put("f65",VOUCHER_CONFIGNO);//凭证配置编号 + finalParam.put("v8_status","已完整");//凭证状态 ： 已完整；未完整 + finalParam.put("generate_date",param.get("generate_date"));//创建时间 + finalParam.put("v8_flag",EAS_FLAG);//导入财务系统状态 默认0（尚不知有何逻辑，目前整个表中全部为0） + finalParam.put("module_name",param.get("subjectsName"));//凭证名称 + finalParam.put("entrydc",param.get("entrydc"));//借贷：1，借；-1，贷 + finalParam.put("inputuserid",param.get("userId"));//操作人id + + return finalParam; + } + +} diff --git a/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java new file mode 100644 index 000000000..fcfdb2a57 --- /dev/null +++ b/src_tenwa/com/tenwa/lease/app/quartzmession/CorpusSourceFundIncomeCreateVoucherJob.java @@ -0,0 +1,40 @@ +package com.tenwa.lease.app.quartzmession; + +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.are.util.StringFunction; +import com.base.util.QuartzUtil; +import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentCompensatory; +import com.tenwa.voucher.CreateVoucherProcess.InsertVoucherRentIncome; +import com.tenwa.voucher.service.VoucherInfoService; +import com.tenwa.voucher.serviceImp.FundIncomeVoucherInfoServiceImpl; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; + +/** + * 生成外资方放款凭证-定时任务 + * @author + */ +public class CorpusSourceFundIncomeCreateVoucherJob implements Job { + + @Override + public void execute(JobExecutionContext arg0) throws JobExecutionException { + String startime = StringFunction.getTodayNow(); + + Object userId = arg0.getTrigger().getJobDataMap().get("CurUserId"); + String curUserId = userId == null? "system" : userId.toString(); + JBOTransaction tx = null; + try{ + tx = JBOFactory.createJBOTransaction(); + // + VoucherInfoService voucher = new FundIncomeVoucherInfoServiceImpl(); + voucher.run(); + + QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "success", "成功", curUserId); + } catch (Exception e) { + QuartzUtil.insertLog(startime,"com.tenwa.comm.message.controller.BusinessCancelJob", "error", "失败", curUserId); + } + } + +} From fa598bbf35702f1baa812619b6a249aeb4cf70d5 Mon Sep 17 00:00:00 2001 From: ap007 Date: Mon, 26 Jul 2021 15:18:55 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E4=B8=BAtomcat7?= =?UTF-8?q?=EF=BC=8C=E7=BC=96=E8=AF=91JSP=E6=96=87=E4=BB=B6=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=94=AF=E6=8C=81=E6=B3=9B=E5=9E=8B=E7=9C=81?= =?UTF-8?q?=E7=95=A5=EF=BC=8C=E7=89=B9=E6=AD=A4=E6=94=B9=E6=AD=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WebContent/Ample/Doc/DocListUploadNew.jsp | 2 +- src/com/ap/CorpusSourceCheck.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/WebContent/Ample/Doc/DocListUploadNew.jsp b/WebContent/Ample/Doc/DocListUploadNew.jsp index e8cb04da0..cbb14b3fa 100644 --- a/WebContent/Ample/Doc/DocListUploadNew.jsp +++ b/WebContent/Ample/Doc/DocListUploadNew.jsp @@ -28,7 +28,7 @@ InputStream is = null; //当一次传多个图片时，会多次执行这个页面，下面for循环，只是将参数读取出来，将普通数据封装为map，然后将map传给写入数据库的方法。 - Map params = new HashMap<>(); + Map params = new HashMap(); for (FileItem fileItem : items) { if (fileItem.isFormField()) { // >> 普通数据 String fieldValue = fileItem.getString("utf-8"); diff --git a/src/com/ap/CorpusSourceCheck.java b/src/com/ap/CorpusSourceCheck.java index 0e48faa77..d1dd65b0f 100644 --- a/src/com/ap/CorpusSourceCheck.java +++ b/src/com/ap/CorpusSourceCheck.java @@ -90,7 +90,8 @@ public class CorpusSourceCheck { if("-2".equals(fcStage)){ return "获取状态信息出现错误，请联系系统管理员！"; } - if ("AP".equals(fcStage)||"1".equals(fcStage)) { + //1是终审成功，2是合同签署。两个可能并行，故都可以通过 + if ("AP".equals(fcStage)||"1".equals(fcStage)||"2".equals(fcStage)) { sResult = "S"; } else { sResult = "资金方尚未审批结束，请稍后再试!";