diff --git a/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp b/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp
new file mode 100644
index 000000000..e97a51bcd
--- /dev/null
+++ b/WebContent/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp
@@ -0,0 +1,36 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@page import="com.amarsoft.are.jbo.BizObject"%>
+<%@page import="com.amarsoft.are.jbo.JBOException"%>
+<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2019-05-21
+ Content:
+ History Log:
+ */
+ String contract_id=CurPage.getParameter("id");
+ String plannumber = CurPage.getParameter("plannumber");
+ String sDONo = "VI_LC_RENT_INCOME";
+ BizObject status=JBOFactory.createBizObjectQuery("jbo.app.tenwa.calc.LC_CALC_CONDITION_STATUS","contract_id=:contract_id").setParameter("contract_id", contract_id).getSingleResult(false);
+ if(status==null){
+ sDONo="LC_PAY_RENT_PLAN";
+ }
+ ASObjectModel doTemp = new ASObjectModel(sDONo);
+ if(plannumber!=null&&plannumber.length()>0&&!"null".equals(plannumber)){
+ doTemp.appendJboWhere(" and payment_number='"+plannumber+"'");
+ }
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(20);
+ dwTemp.genHTMLObjectWindow(contract_id);
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
+ String sButtons[][] = {
+
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Accounting/LoanSimulation_formal/condition_plan.jsp b/WebContent/Accounting/LoanSimulation_formal/condition_plan.jsp
index 5f9bf0c19..f6fedfeca 100644
--- a/WebContent/Accounting/LoanSimulation_formal/condition_plan.jsp
+++ b/WebContent/Accounting/LoanSimulation_formal/condition_plan.jsp
@@ -12,7 +12,7 @@
}
//参数：0.是否显示, 1.标题，2.URL，3，参数串, 4. Strip高度(默认600px)，5. 是否有关闭按钮(默认无) 6. 是否缓存(默认是)
String sTabStrip[][] = {
- {falg, "租金计划", "/Accounting/LoanSimulation_formal/RentPlanIncomeList.jsp",params, "", "", "false"},
+ {falg, "租金计划(回笼)", "/Accounting/LoanSimulation_formal/RentPlanIncomeList_new.jsp",params, "", "", "false"},
{falg.equals("true")?"false":"true", "租金计划", "/Accounting/LoanSimulation_formal/RentPlanList.jsp",params, "", "", "false"},
{"true", "资金计划", "/Accounting/LoanSimulation_formal/FundPlanList.jsp",params, "", "", "false"},
{"true", "现金流", "/Accounting/LoanSimulation_formal/CashFlowList.jsp",params, "", "", "false"},
diff --git a/WebContent/Tenwa/Core/FlowManager/CopyFileToOther.jsp b/WebContent/Tenwa/Core/FlowManager/CopyFileToOther.jsp
index 193d1f4cc..2495a3cd0 100644
--- a/WebContent/Tenwa/Core/FlowManager/CopyFileToOther.jsp
+++ b/WebContent/Tenwa/Core/FlowManager/CopyFileToOther.jsp
@@ -1,16 +1,59 @@
<%@page import="com.tenwa.reckon.copydata.FileCopyToOtherPath"%>
+<%@page import="com.tenwa.officetempalte.action.CreateOfficeAction"%>
+<%@page import="jbo.app.tenwa.doc.LC_COPYFILE_LOG"%>
+<%@page import="com.amarsoft.are.util.StringFunction"%>
<%@page import="com.amarsoft.are.jbo.JBOFactory"%>
+<%@page import="com.amarsoft.are.jbo.JBOTransaction"%>
<%@page import="com.amarsoft.are.jbo.BizObjectManager"%>
<%@page import="com.amarsoft.are.jbo.BizObjectQuery"%>
<%@page import="com.amarsoft.are.jbo.BizObject"%>
<%@ page contentType="text/html; charset=GBK"%><%@ include file="/IncludeBeginMDAJAX.jsp"%><%
-
- String param = CurPage.getParameter("contractNos");
+ //创建资料
+ String contractNos = CurPage.getParameter("contractNos");
+ String batchNos = CurPage.getParameter("batchNos");
+ String userid = CurPage.getParameter("userid");
+ String sParam = CurPage.getParameter("sParam");
+
+ String templateNo = "8c0b32eefcf349e5b5f76d898df0bbbb";
+
+
FileCopyToOtherPath cp = new FileCopyToOtherPath();
- cp.setContractNos(param);
- String result = cp.copyFile();
- out.print(result);
+ cp.setContractNos(contractNos);
+ cp.setBatchNos(batchNos);
+ cp.setUserid(userid);
+
+ CreateOfficeAction coa = new CreateOfficeAction();
+ JBOTransaction tx = JBOFactory.createJBOTransaction();
+
+ if(sParam.contains("PayFileList")){
+ cp.copyFile("PayFileList");
+ }
+ if(sParam.contains("FileList")){
+ cp.copyFile("FileList");
+ }
+ if(sParam.contains("RentPlan")){
+ String[] contractNoArray = contractNos.split("@");
+ String[] batchNoArray = batchNos.split("@");
+ for(int i=0;i<%@ include file="/IncludeEndAJAX.jsp"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp
index 0bc987d12..d37c2ad1a 100644
--- a/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Comm/LBAssetTransferRegistration/FileDownloadImportList.jsp
@@ -6,6 +6,7 @@
String PG_TITLE = "文件下载"; // 浏览器窗口标题 PG_TITLE
%>
<%
+ String userid=CurUser.getUserID();
ASObjectModel doTemp = new ASObjectModel("li_Property_import");
ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
dwTemp.Style="1"; //--设置为Grid风格--
@@ -25,8 +26,7 @@
{"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""},
{"true","","Button","excel导入","excel导入","importExcel()","","","","btn_icon_import"},
{"true","","Button","模版下载","模版下载","DiscountDownload()","","","","btn_icon_down",""},
- {"true","All","Button","生成租金计划","生成租金计划","createPlan()","","","","btn_icon_generate"},
- {"true","All","Button","测试拷贝","测试拷贝","copyPath()","","","","btn_icon_generate"},
+ {"true","All","Button","下载","下载资料","copy()","","","","btn_icon_generate"},
};
%>
<%/*~END~*/%>
@@ -42,79 +42,34 @@
<%/*~BEGIN~可编辑区~[Editable=false;CodeAreaID=List06;Describe=定义按钮事件;]~*/%>
+<%@page import="jbo.com.tenwa.entity.comm.flow.FLOW_BUSSINESS_OBJECT"%>
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2018-07-16
+ Content:
+ History Log:
+ */
+ String flowunid = CurPage.getParameter("FlowUnid");
+ String contractid = CurPage.getParameter("ContractId");
+ String customerType = CurPage.getParameter("CustomerType");
+ String falg = "false";
+ if("03".equals(customerType)){
+ falg = "true";
+ }
+ CurPage.getParameter("PrevUrl");
+ ASObjectModel doTemp = new ASObjectModel("ChangeDebitCardList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+// dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow(flowunid);
+ dwTemp.ReadOnly = "1";
+ isShowButton=true;
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"true","All","Button","生成模板","生成模板","generatepdf()","","","",""},
+ {falg,"All","Button","发起电子签约","发起电子签约","stamp()","","","",""},
+ {falg,"All","Button","查询签约结果","查询签约结果","getStatus()","","","",""},
+ {falg,"All","Button","重新发送短息","重新发送短息","sendMessageAgain()","","","","btn_icon_refresh"},
+ };
+ //sButtonPosition = "north";
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhire/ContractOnhireApplyList.jsp b/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhire/ContractOnhireApplyList.jsp
index 58bded533..bff71969c 100644
--- a/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhire/ContractOnhireApplyList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/Contract/ContractOnhire/ContractOnhireApplyList.jsp
@@ -27,7 +27,7 @@
var project_name = sReturn[4];
var payment_number = sReturn[5];
var sParams = "applyType=<%=sApplyType%>,CurUserID=<%=CurUser.getUserID()%>";
- sParams =sParams+",payment_number="+payment_number+",ProjectId="+project_id+",FlowKey="+payment_number+",ProductId="+product_id+",ContractId="+contract_id+",ProjectName="+project_name;
+ sParams =sParams+",payment_number="+payment_number+",ProjectId="+project_id+",FlowKey="+contract_number+",ProductId="+product_id+",ContractId="+contract_id+",ProjectName="+project_name;
var sReturnInfo = RunJavaMethodTrans("com.tenwa.flow.action.comm.BaseFlowStartAction","initFLow",sParams);
if(typeof(sReturnInfo)=="undefined" || sReturnInfo=="" || sReturnInfo=="_CANCEL_") return;
var sReturnInfos=sReturnInfo.split("@");
diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp
index 9da19ac25..d6dbc0368 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/generatedreminderletter/GeneratedReminderLetterList.jsp
@@ -39,6 +39,17 @@
}
String useridStr = StringUtils.join(useridList.toArray(), ",");
doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")");
+ }else if(roleList.contains("800R00000048")){
+ String userid_kj="";
+ BizObjectManager userInfoBOM = JBOFactory.getBizObjectManager("jbo.awe.USER_INFO");
+ List userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006014").getResultList(false);
+ List useridList_kj = new ArrayList();
+ for(BizObject bo : userListObject){
+ userid_kj = bo.getAttribute("userid").toString();
+ useridList_kj.add("'"+userid_kj+"'");
+ }
+ String useridStr = StringUtils.join(useridList_kj.toArray(), ",");
+ doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")");
}
//登录人属于经销商角色 401：经销商roleid
if(roleList.contains("401")){
diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
index 087823363..fff9c886e 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/overduedunning/OverdueDunningList.jsp
@@ -9,6 +9,7 @@
History Log:
*/
String userid=CurUser.getUserID();
+ String belongorg=CurUser.getBelongOrg().getOrgID();
ASObjectModel doTemp = new ASObjectModel("OverdueDunningList");
//String sCondtion=DataRightManager.getRightCondition(CurUser,"O", "contract");
//doTemp.appendJboWhere(sCondtion);
@@ -37,6 +38,17 @@
}
String useridStr = StringUtils.join(useridList.toArray(), ",");
doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")");
+ }else if(roleList.contains("800R00000048")){//800R00000048为凯捷催收角色==========8006014为凯捷经销商
+ String userid_kj="";
+ BizObjectManager userInfoBOM = JBOFactory.getBizObjectManager("jbo.awe.USER_INFO");
+ List userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006002").getResultList(false);
+ List useridList_kj = new ArrayList();
+ for(BizObject bo : userListObject){
+ userid_kj = bo.getAttribute("userid").toString();
+ useridList_kj.add("'"+userid_kj+"'");
+ }
+ String useridStr = StringUtils.join(useridList_kj.toArray(), ",");
+ doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")");
}
//登录人属于经销商角色 401：经销商roleid
if(roleList.contains("401")){
@@ -51,12 +63,17 @@
//dwTemp.setPageSize(10);
dwTemp.setPageSize(pageSize==null?10:Integer.parseInt(pageSize));
dwTemp.genHTMLObjectWindow("");
-
+
+ //凯捷催收自动分派暂时没有催款员，判断登录为凯捷催收时隐藏修改、批量修改按钮
+ String temp = "true";
+ if("8006002".equals(belongorg)){
+ temp = "false";
+ };
//0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标，CSS层叠样式 10、风格
String sButtons[][] = {
- {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""},
+ {temp,"","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""},
//{"true","","Button","批量修改","批量修改","viewAndEditAll()","","","","btn_icon_edit",""},
- {"true","","Button","批量修改","批量修改","selectPartDept()","","","","btn_icon_edit",""},
+ {temp,"","Button","批量修改","批量修改","selectPartDept()","","","","btn_icon_edit",""},
};
String orgCompany=CurUser.getOrgID();
if(orgCompany.length()>13){
diff --git a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
index d98312672..ff8281029 100644
--- a/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
+++ b/WebContent/Tenwa/Lease/Flow/RentCollection/rentcollection/rentCollectionList.jsp
@@ -36,6 +36,17 @@
}
String useridStr = StringUtils.join(useridList.toArray(), ",");
doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")");
+ }else if(roleList.contains("800R00000045")){
+ String userid_kj="";
+ BizObjectManager userInfoBOM = JBOFactory.getBizObjectManager("jbo.awe.USER_INFO");
+ List userListObject = userInfoBOM.createQuery("belongorg=:belongorg").setParameter("belongorg", "8006014").getResultList(false);
+ List useridList_kj = new ArrayList();
+ for(BizObject bo : userListObject){
+ userid_kj = bo.getAttribute("userid").toString();
+ useridList_kj.add("'"+userid_kj+"'");
+ }
+ String useridStr = StringUtils.join(useridList_kj.toArray(), ",");
+ doTemp.appendJboWhere(" and O.project_manage in (" + useridStr + ")");
}
//登录人属于经销商角色 401：经销商roleid
if(roleList.contains("401")){
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
index 29dd2eb2c..9bd039cf1 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_calc.xml
@@ -3948,6 +3948,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
index dff05b8de..ba663f8af 100644
--- a/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
+++ b/WebContent/WEB-INF/etc/jbo/jbo_doc.xml
@@ -202,8 +202,7 @@
-
-
+
diff --git a/WebContent/fileTemplate/鍌敹鍑.docx b/WebContent/fileTemplate/鍌敹鍑.docx
index fdf0d01ee..03e63de5e 100644
Binary files a/WebContent/fileTemplate/鍌敹鍑.docx and b/WebContent/fileTemplate/鍌敹鍑.docx differ
diff --git a/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NO} .xlsx b/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NO} .xlsx
new file mode 100644
index 000000000..bf48a3624
Binary files /dev/null and b/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NO} .xlsx differ
diff --git a/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NUMBER}.xlsx b/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NUMBER}.xlsx
new file mode 100644
index 000000000..e616c5a49
Binary files /dev/null and b/WebContent/fileTemplate/绉熼噾鏀粯璁″垝{CONTRACT_NUMBER}.xlsx differ
diff --git a/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java b/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java
index 204663eee..824070c8d 100644
--- a/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java
+++ b/calc/com/tenwa/reckon/copydata/FileCopyToOtherPath.java
@@ -12,6 +12,7 @@ import java.util.Map;
+
import jbo.app.tenwa.doc.LC_COPYFILE_LOG;
import org.apache.commons.io.FileUtils;
@@ -19,21 +20,35 @@ import org.apache.commons.io.FileUtils;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.util.StringFunction;
import com.amarsoft.awe.Configure;
import com.amarsoft.awe.util.Transaction;
import com.tenwa.comm.util.jboutil.DataOperatorUtil;
public class FileCopyToOtherPath {
private String contractNos;
+ private String batchNos;
+ private String userid;
+ public String getUserid() {
+ return userid;
+ }
+ public void setUserid(String userid) {
+ this.userid = userid;
+ }
public String getContractNo() {
return contractNos;
}
public void setContractNos(String contractNos) {
this.contractNos = contractNos;
}
-
- public String doCopy(String contractNo){
+ public String getBatchNos() {
+ return batchNos;
+ }
+ public void setBatchNos(String batchNos) {
+ this.batchNos = batchNos;
+ }
+ public String doCopy(String contractNo,String bacthNo,String type){
Transaction Sqlca = Transaction.createTransaction("als");
//原路径
String srcPath ;
@@ -44,11 +59,11 @@ public class FileCopyToOtherPath {
try {
Configure config = Configure.getInstance();
rootPath = config.getConfigure("FileCopyPath");
- String sql = "SELECT O.FULLPATH AS FULLPATH, CONCAT(LCI.CONTRACT_NO, '/', LDL.ONE_CLASSIFY, '/' , LDL.DOC_NAME, '/', O.FILENAME) AS TARGET_FILE_PATH FROM LB_DOCATTRIBUTE O"
+ String sql = "SELECT O.FULLPATH AS FULLPATH, CONCAT(REPLACE(LCI.CONTRACT_NO,'/','-'), '/','"+type+"','/', REPLACE(LDL.ONE_CLASSIFY,'/','-'), '/' , REPLACE(LDL.DOC_NAME,'/','-'), '/', REPLACE(O.FILENAME,'/','-')) AS TARGET_FILE_PATH FROM LB_DOCATTRIBUTE O"
+" LEFT JOIN LB_DOCLIBRARY LDL ON LDL.ID = O.LIBRARY_ID"
+" LEFT JOIN LB_DOCRELATIVE LDR ON LDL.RELATIVE_ID = LDR.ID"
+" LEFT JOIN LB_CONTRACT_INFO LCI ON LDR.CONTRACT_ID = LCI.ID"
- +" WHERE LCI.CONTRACT_NO ='"+contractNo+"'";
+ +" WHERE LCI.CONTRACT_NO ='"+contractNo+"' AND LDL.DOC_TYPE LIKE '"+type+"%'";
Map params=new HashMap();
List> pathList = DataOperatorUtil.getDataBySql(Sqlca,sql,params);
if(pathList.size()>0){
@@ -57,25 +72,28 @@ public class FileCopyToOtherPath {
destPath =rootPath+"/"+path.get("TARGET_FILE_PATH");
File srcFile = new File(srcPath);
File destFile = new File(destPath);
+ System.out.println("原路径："+srcPath);
+ System.out.println("目标路径："+destPath);
try {
- //文件拷贝，true为最后修改时间不变，fail为当前时间.
+ //文件拷贝，参数true为最后修改时间不变，fail为当前时间.
//拷贝时如果目标文件已存在，则会从新覆盖。
FileUtils.copyFile(srcFile, destFile, true);
} catch (IOException e) {
e.printStackTrace();
}
}
- System.out.println("合同"+contractNo+"一共有"+pathList.size()+"条数据！！");
+ BizObjectManager bom = JBOFactory.getBizObjectManager(LC_COPYFILE_LOG.CLASS_NAME);
+ BizObject nbom = bom.newObject();
+ nbom.setAttributeValue("CONTRACT_NO", contractNo);
+ nbom.setAttributeValue("BATCH_NO", bacthNo);
+ nbom.setAttributeValue("COPY_TYPE",type);
+ nbom.setAttributeValue("INPUTTIME",StringFunction.getTodayNow());
+ nbom.setAttributeValue("INPUTUSERID",userid);
+ bom.saveObject(nbom);
}else{
System.out.println("================"+contractNo+"没有关联到文件"+"===============");
}
- BizObjectManager bom = JBOFactory.getBizObjectManager(LC_COPYFILE_LOG.CLASS_NAME);
- BizObject nbom = bom.newObject();
- nbom.setAttributeValue("CONTRACT_NO", contractNo);
- nbom.setAttributeValue("BATCH_NO", contractNo);
- nbom.setAttributeValue("DEST_PATH", destPath);
- nbom.setAttributeValue("FILE_COUNT", pathList.size());
- bom.saveObject(nbom);
+
} catch (Exception e) {
e.printStackTrace();
return contractNo;
@@ -83,22 +101,30 @@ public class FileCopyToOtherPath {
return "Y";
}
- public String copyFile(){
+ public String copyFile(String type){
String failNo="";
+ if("PayFileList".equals(type)){
+ type="放款资料";
+ }
+ if("FileList".equals(type)){
+ type="归档资料";
+ }
List cns = Arrays.asList(contractNos.split("@"));
- for(String contractNo:cns){
- if("".equals(contractNo)||contractNo==null){
+ List bns = Arrays.asList(batchNos.split("@"));
+ for(int i=0;i lets = letManage.createQuery(" flowunid=:flowunid ").setParameter("flowunid",flowunid).getResultList(true);
+ Double advanceMoney = new Double(cleanLeasemoney);
for (BizObject let : lets) {
Double mayopeMoney = new Double(let.getAttribute("MAYOPE_MONEY").getString());
- Double advanceMoney = new Double(cleanLeasemoney);
if(mayopeMoney>=advanceMoney){
let.setAttributeValue("HAD_MONEY", advanceMoney);
let.setAttributeValue("MAYOPE_MONEY", mayopeMoney-advanceMoney);
letManage.saveObject(let);
break;
}else{
- let.setAttributeValue("HAD_MONEY", advanceMoney-mayopeMoney);
+ let.setAttributeValue("HAD_MONEY", mayopeMoney);
advanceMoney = advanceMoney-mayopeMoney;
let.setAttributeValue("MAYOPE_MONEY", 0);
letManage.saveObject(let);
diff --git a/calc/com/tenwa/reckon/util/CorpusTools.java b/calc/com/tenwa/reckon/util/CorpusTools.java
index 1645ba743..9f893973a 100644
--- a/calc/com/tenwa/reckon/util/CorpusTools.java
+++ b/calc/com/tenwa/reckon/util/CorpusTools.java
@@ -59,7 +59,7 @@ public class CorpusTools {
for (int i = 0; i < rentList.size(); i++) {
if(i + 1 == rentList.size()){
corpus_list.add(new BigDecimal(rentList.get(i).toString())
- .subtract(new BigDecimal(inteList.get(i).toString())).add(cb.getRetainage()).setScale(RentTools.getCorpusAccuracy(), BigDecimal.ROUND_HALF_UP)
+ .subtract(new BigDecimal(inteList.get(i).toString())).setScale(RentTools.getCorpusAccuracy(), BigDecimal.ROUND_HALF_UP)
.toString());
}else{
corpus_list.add(new BigDecimal(rentList.get(i).toString())
diff --git a/src_core/com/tenwa/officetempalte/exportcallback/impl/CopyFIileExportCallBack.java b/src_core/com/tenwa/officetempalte/exportcallback/impl/CopyFIileExportCallBack.java
new file mode 100644
index 000000000..8949a88e7
--- /dev/null
+++ b/src_core/com/tenwa/officetempalte/exportcallback/impl/CopyFIileExportCallBack.java
@@ -0,0 +1,74 @@
+package com.tenwa.officetempalte.exportcallback.impl;
+
+import java.io.File;
+import java.math.BigDecimal;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import jbo.app.tenwa.calc.LC_CARD_DEDUCT_INFO;
+import jbo.app.tenwa.calc.LC_CARD_EXPORT_DATA;
+import jbo.com.tenwa.entity.comm.officetempalte.BF_LABLECONFIG;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.are.jbo.JBOTransaction;
+import com.amarsoft.are.lang.DataElement;
+import com.amarsoft.are.util.StringFunction;
+import com.amarsoft.awe.util.ASResultSet;
+import com.amarsoft.awe.util.SqlObject;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.comm.exception.BusinessException;
+import com.tenwa.officetempalte.service.BaseLableDataService;
+import com.tenwa.officetempalte.serviceImp.BaseExcelCallBackServiceImpl;
+import com.tenwa.officetempalte.util.FileOperatorUtil;
+import com.tenwa.reckon.util.UUIDUtil;
+
+public class CopyFIileExportCallBack extends BaseExcelCallBackServiceImpl {
+
+ @Override
+ public void run(BizObject templateConfig, Map paramMap,
+ JBOTransaction tx) throws Exception {
+
+ BaseLableDataService dataSer=new BaseLableDataService(tx);
+ //获取模板配置
+ List exportConfig=dataSer.getTemplateExportConfig(templateConfig.getAttribute("id").getString());
+
+ Map tempModel=new HashMap();
+ tempModel.putAll(paramMap);
+
+ //获取生成文件实际路径
+ String fileName="";
+ String filePath="";
+ String fullPath="";
+ fileName=FileOperatorUtil.getFileNameByFormual(templateConfig.getAttribute("templateshowname").getString(), tempModel);
+ String uuid=UUID.randomUUID().toString().replaceAll("-", "");
+ fullPath=paramMap.get("fileSavePath")+fileName;
+ filePath=fullPath.replace(paramMap.get("fileSavePath"), "");
+ //获取模板文件
+ String tempName=templateConfig.getAttribute("templatepath").getString();
+ String rootPath=this.getClass().getResource("/").getPath();
+ rootPath=rootPath.substring(0, rootPath.indexOf("WEB-INF")-1);
+ tempName=rootPath+"/fileTemplate/"+tempName;
+ File file = new File(tempName);
+ if (file.isFile()) {
+ try {
+ //生成excel
+ this.writeDatatoTemplateExcel(templateConfig,tempName, paramMap, fullPath,exportConfig,tx);
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new BusinessException("写入word模板时出错"+e.getMessage());
+
+ }
+ } else {
+ throw new Exception(templateConfig.getAttribute("templateshowname").getString() + "没有模板");
+ }
+ //生成成功 维护关系进附件表
+ this.createRelative(templateConfig, paramMap, fileName, filePath, fullPath, tx);
+ }
+
+}
diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java
index 81d41f94b..34e9f0877 100644
--- a/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java
+++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/CreateVoucherRentIncome.java
@@ -49,13 +49,13 @@ public class CreateVoucherRentIncome {
map.put("FLOWUNID", flowunid);
// 回款-收到的租金(网银)--当月(回租)
if("PZ2018072100000024".equals(VOUCHERNO)){
- sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) /getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT,0) AS RENTMONEY,IFNULL(LRIT.CORPUS,0) AS CORPUS,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE !='') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE !='') THEN LRIT.HIRE_DATE ELSE NOW() END, '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN='Y' AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND LRIT.FLOWUNID = :FLOWUNID ";
+ sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) /getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT,0) AS RENTMONEY,IFNULL(LRIT.CORPUS,0) AS CORPUS,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE !='') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE !='') THEN LRIT.HIRE_DATE ELSE NOW() END, '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN='Y' AND IFNULL(LRIT.INTEREST, 0) > 0 AND DATE_FORMAT(NOW(), '%Y-%m') = DATE_FORMAT(lrp.plan_date, '%Y-%m') AND LRIT.FLOWUNID = :FLOWUNID ";
// 回款-收到的租金(网银)--跨月(回租)
}else if("PZ2018080400000081".equals(VOUCHERNO)){
- sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) /getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT,0) AS RENTMONEY,IFNULL(LRIT.CORPUS,0) AS CORPUS,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE !='') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE !='') THEN LRIT.HIRE_DATE ELSE NOW() END, '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN='Y' AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND LRIT.FLOWUNID = :FLOWUNID ";
+ sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'租金',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.INTEREST, 0) AS MONEY,ROUND(IFNULL(LRIT.INTEREST, 0) / getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.INTEREST, 0) - ROUND(IFNULL(LRIT.INTEREST, 0) /getTax(LCI.LEAS_FORM,'租息',LCCT.START_DATE),2)) AS MONEYTAX,IFNULL(LRIT.RENT,0) AS RENTMONEY,IFNULL(LRIT.CORPUS,0) AS CORPUS,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE !='') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE !='') THEN LRIT.HIRE_DATE ELSE NOW() END, '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LC_RENT_PLAN LRP ON LRP.CONTRACT_ID = LRIT.CONTRACT_ID AND lrp.plan_list = lrit.plan_list LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN='Y' AND IFNULL(LRIT.INTEREST, 0) > 0 AND DATE_FORMAT(NOW(), '%Y-%m') > DATE_FORMAT(lrp.plan_date, '%Y-%m') AND LRIT.FLOWUNID = :FLOWUNID ";
// 回款-收到的逾期利息(网银)--(回租)
}else if("PZ2018072100000025".equals(VOUCHERNO)) {
- sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.PENALTY, 0) AS MONEY,ROUND(IFNULL(LRIT.PENALTY, 0) / getTax (LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.PENALTY, 0) - ROUND(IFNULL(LRIT.PENALTY, 0) / getTax (LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE !='') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE !='') THEN LRIT.HIRE_DATE ELSE NOW() END, '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN='Y' AND LRIT.FLOWUNID = :FLOWUNID ";
+ sql= "SELECT ROUND((getTax (lci.LEAS_FORM,'逾期利息',LCCT.START_DATE) - 1) * 100,0) AS TAX_NUM,IFNULL(LRIT.PENALTY, 0) AS MONEY,ROUND(IFNULL(LRIT.PENALTY, 0) / getTax (LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2) AS MONEYNOTAX,(IFNULL(LRIT.PENALTY, 0) - ROUND(IFNULL(LRIT.PENALTY, 0) / getTax (LCI.LEAS_FORM,'逾期利息',LCCT.START_DATE),2)) AS MONEYTAX,DATE_FORMAT(CASE WHEN (LRIT.ACCOUNTING_DATE IS NOT NULL OR LRIT.ACCOUNTING_DATE !='') THEN LRIT.ACCOUNTING_DATE ELSE NOW() END, '%Y/%m/%d') AS ACCOUNT_DATE,DATE_FORMAT(CASE WHEN (LRIT.HIRE_DATE IS NOT NULL OR LRIT.HIRE_DATE !='') THEN LRIT.HIRE_DATE ELSE NOW() END, '%Y/%m/%d') AS FACT_DATE,LCCT.CONTRACT_ID,LCI.CONTRACT_NUMBER,LCI.PROJECT_NAME,LCI.LEAS_FORM,DI.DISTRIBUTOR_CODING DISTRIBUTOR_ID,DI.DISTRIBUTOR_NAME,DI.F_I_TYPE,CIF.CUSTOMER_NUM AS CUSTOMERID,CIF.CUSTOMERNAME,CIF.CUSTOMERTYPE,LPI.BUSINESSTYPE FROM LC_RENT_INCOME_TEMP LRIT LEFT JOIN LB_CONTRACT_INFO LCI ON LCI.ID = LRIT.CONTRACT_ID LEFT JOIN LC_CALC_CONDITION LCCT ON LCCT.CONTRACT_ID = LCI.ID LEFT JOIN DISTRIBUTOR_INFO DI ON DI.DISTRIBUTOR_NO = LCI.DISTRIBUTOR_ID LEFT JOIN LB_UNION_LESSEE LUL ON LUL.CONTRACT_ID = LCI.ID LEFT JOIN CUSTOMER_INFO CIF ON CIF.CUSTOMERID = LUL.CUSTOMER_ID LEFT JOIN LB_PROJECT_INFO LPI ON LPI.ID = LUL.PROJECT_ID WHERE LPI.BUSINESSTYPE = '1' AND LUL.IS_MAIN='Y' AND IFNULL(LRIT.PENALTY, 0) > 0 AND LRIT.FLOWUNID = :FLOWUNID ";
}
List> dataList=DataOperatorUtil.getDataBySql(Sqlca, sql, map);
diff --git a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java
index df3109a1b..25d57ff25 100644
--- a/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java
+++ b/src_tenwa/com/tenwa/flow/rent/rentincome/RentIncomeMethod.java
@@ -306,6 +306,10 @@ public class RentIncomeMethod {
if("CORPUS".equals(subtractMoneyName) || "INTEREST".equals(subtractMoneyName)){
rentMoney = rentMoney.add(new BigDecimal(0));
}
+ //暂时解决报错问题
+ if("".equals(subtractMoneyName)||subtractMoneyName==null){
+ subtractMoneyName="PENALTY";
+ }
boLRIT.setAttributeValue(subtractMoneyName, 0);
}else{
if(portionMoneys.compareTo(subtractMoney) >= 0){ //如果能正常减去,则为对应的回笼对象赋值对应值
diff --git a/src_tenwa/com/tenwa/lease/flow/project/commcheck/ChangeContractCarCheck.java b/src_tenwa/com/tenwa/lease/flow/project/commcheck/ChangeContractCarCheck.java
new file mode 100644
index 000000000..2803590e3
--- /dev/null
+++ b/src_tenwa/com/tenwa/lease/flow/project/commcheck/ChangeContractCarCheck.java
@@ -0,0 +1,59 @@
+/**
+ *
+ */
+package com.tenwa.lease.flow.project.commcheck;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import jbo.app.tenwa.customer.CUSTOMER_INFO;
+import jbo.app.tenwa.doc.LB_DOCATTRIBUTE;
+import jbo.app.tenwa.doc.LB_DOCLIBRARY;
+import jbo.app.tenwa.doc.LB_DOCRELATIVE;
+import jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST;
+import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO_TEMP;
+import jbo.com.tenwa.lease.comm.LB_UNION_LESSEE_TEMP;
+import jbo.prd.PRD_SPECIFIC_LIBRARY;
+
+import com.amarsoft.are.jbo.BizObject;
+import com.amarsoft.are.jbo.BizObjectManager;
+import com.amarsoft.are.jbo.JBOFactory;
+import com.amarsoft.awe.util.Transaction;
+import com.tenwa.template.check.DefaultBussinessCheck;
+
+/**
+ * 检查扣款授权委托书是否电子签约
+ *
+ */
+public class ChangeContractCarCheck extends DefaultBussinessCheck {
+ @Override
+ public Object run(Transaction Sqlca) throws Exception {
+ StringBuffer Message = new StringBuffer();
+ Message.append("未填写：");
+ String flowunid=this.getAttribute("ObjectNo").toString();
+ String ContractId=this.getAttribute("ContractId").toString();
+
+ BizObjectManager ldclManage=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOC_CONTRACT_LIST.CLASS_NAME, Sqlca);
+ BizObject ldcl = ldclManage.createQuery(" FLOW_UNID=:flowunid and CONTRACT_ID=:contractid and file_flag='yes' ").setParameter("flowunid", flowunid).setParameter("contractid", ContractId).getSingleResult(true);
+ if(ldcl != null){
+ if("DRAFT".equals(ldcl.getAttribute("sign_type").toString())){
+ putMsg("请先发起电子签约！");
+ setPass(false);
+ } else if ("SIGNING".equals(ldcl.getAttribute("sign_type").toString())){
+ putMsg("请先查看电子签约结果是否已经签约完成！");
+ setPass(false);
+ }else if ("COMPLETE".equals(ldcl.getAttribute("sign_type").toString())){
+ putMsg("电子签约已完成！");
+ setPass(true);
+ }else{
+ putMsg("获取签约签证状态失败，请联系管理员！");
+ setPass(true);
+ }
+ }else{
+ putMsg("请先生成直接扣款授权委托书！");
+ setPass(false);
+ }
+ return null;
+ }
+}
\ No newline at end of file