anpeng/apzl_leasing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改附件一览，添加提前结清，合同撤销入项目进度日志

Browse Source
This commit is contained in:
jianghongdong 2018-08-08 20:55:52 +08:00
parent 93677bb973
commit b34ab27d37
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WebContent/Tenwa/Comm/Document/LBDocumentUpload.jsp
View File

@ -12,6 +12,7 @@
myAmarsoftUpload.upload();
String oneClassify=(String)myAmarsoftUpload.getRequest().getParameter("ONE_CLASSIFY");//一级分类
oneClassify = oneClassify==null?"004001":oneClassify;
String docId=(String)myAmarsoftUpload.getRequest().getParameter("DOC_NAME"); //二级分类
String sFileName = myAmarsoftUpload.getFiles().getFile(0).getFileName(); //文件名称
String Remark= (String)myAmarsoftUpload.getRequest().getParameter("REMARK"); //备注

9
src_core/com/tenwa/doc/action/DocListInitAction.java
View File

@ -218,12 +218,11 @@ public class DocListInitAction {
String otherWhere="";
if(idlst.length()>0){
//otherWhere=" and "+table+"flow_unid='"+flowunid+"'";
otherWhere=" and O.id in("+idlst+")";
}else if(contract_id.length()>0&&"".equals(getDocType(FlowName))){
}else if(contract_id.length()>0&&!"flow".equals(getDocType(FlowName))){
otherWhere=" and "+table+"proj_id='"+proj_id+"' and ("+table+"contract_id='' or "+table+"contract_id is null or "+table+"contract_id='"+contract_id+"') ";
}else if(proj_id.length()>0&&"".equals(getDocType(FlowName))){
otherWhere=" and "+table+"proj_id='"+proj_id+"'";
}else if(proj_id.length()>0&&!"flow".equals(getDocType(FlowName))){
otherWhere=" and "+table+"proj_id='"+proj_id+"' and "+table+"objecttype='"+getDocType(FlowName)+"'";
}else{
otherWhere=" and "+table+"flow_unid='"+flowunid+"'";
}
@ -248,7 +247,7 @@ public class DocListInitAction {
if(flowno!=null){
return "flow";
}
return "";
return ds.get(0).get("FLOWNO");
}
//¸ù¾ÝKeyÁÈ¡Value
public static String GetValueByKey(String filePath, String key) {

14
src_tenwa/com/tenwa/lease/flow/project/commbusiness/SaveBusinessStatus.java
View File

@ -1,6 +1,7 @@
package com.tenwa.lease.flow.project.commbusiness;
import jbo.com.tenwa.lease.carbrand.BUSINESS_STATUS;
import jbo.com.tenwa.lease.comm.LB_CONTRACT_INFO;
import com.amarsoft.are.jbo.BizObject;
import com.amarsoft.are.jbo.BizObjectManager;
@ -24,9 +25,18 @@ public class SaveBusinessStatus extends BaseBussiness {
String userid = this.getAttribute("CurUserID").toString();
String ContractNumberOrProjectNo = "";
if(Integer.parseInt(Status)<11){
ContractNumberOrProjectNo = this.getAttribute("ProjectName").toString();
String pname = this.getAttribute("ProjectName").toString();
ContractNumberOrProjectNo = pname.substring(0, pname.indexOf("-"));
}else if(this.getAttribute("ContractNo")==null){
if(this.getAttribute("contract_number")!=null){
ContractNumberOrProjectNo = this.getAttribute("contract_number").toString();
}else{
String ContractId = this.getAttribute("ContractId").toString();
BizObject cibo = JBOFactory.getBizObjectManager(LB_CONTRACT_INFO.CLASS_NAME).createQuery("ID=:ID").setParameter("ID", ContractId).getSingleResult(false);
ContractNumberOrProjectNo = cibo.getAttribute(LB_CONTRACT_INFO.CONTRACT_NUMBER).getString();
}
}else{
ContractNumberOrProjectNo = this.getAttribute("ContractNo")==null?this.getAttribute("contract_number").toString():this.getAttribute("ContractNo").toString();
ContractNumberOrProjectNo = this.getAttribute("ContractNo").toString();
}
ASUser user = ASUser.getUser(userid, Sqlca);
BizObjectManager bsbom = JBOFactory.getBizObjectManager(BUSINESS_STATUS.CLASS_NAME, Sqlca);