diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_info.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_info.jsp new file mode 100644 index 000000000..8f99e24b7 --- /dev/null +++ b/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_info.jsp @@ -0,0 +1,89 @@ +<%@page import="com.itextpdf.text.log.SysoCounter"%> +<%@ page contentType="text/html; charset=GBK"%> +<%@include file="/Frame/resources/include/include_begin_info.jspf"%><% + + String id = CurPage.getParameter("id");//ID + String flowunid = CurPage.getParameter("flowunid");//流程编号 + String phaseNo = CurPage.getAttribute("phaseNo"); //流程节点 + String taskno=CurPage.getParameter("taskno"); //流程节点ID + String userid=CurPage.getParameter("userid");//当前登录人 + String orgid=CurPage.getParameter("orgid");//当前登录部门 + + + String username = Sqlca.getString("select username from user_info ui where userid = '"+userid+"'"); + String orgname = Sqlca.getString("select orgname from org_info oi where orgid = '"+orgid+"'"); + + //判断修改人是否为提交人 + String comm = "select case when phaseno = '"+phaseNo+"' and inputuser = '"+userid+"' then 'false' else 'true' end as comm from communication where id = '"+id+"'"; + + String sPrevUrl = CurPage.getParameter("PrevUrl"); + if(sPrevUrl == null) sPrevUrl = "/Tenwa/Customer/Lessee/Comm/Communication/Communication_list.jsp"; + String sTempletNo = "COMMUNICATION_INFO";//--模板号-- + ASObjectModel doTemp = new ASObjectModel(sTempletNo); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage, doTemp,request); + dwTemp.Style = "2";//freeform + //dwTemp.ReadOnly = "0";//只读模式 + dwTemp.genHTMLObjectWindow(CurPage.getParameter("ID")); + + String sButtons[][] = { + {"true", "All", "Button", "保存","保存所有修改", "saveRecord()", "", "", "", ""}, + }; +%><%@ include file="/Frame/resources/include/ui/include_info.jspf"%> + +<%@ include file="/Frame/resources/include/include_end.jspf"%> diff --git a/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_list.jsp b/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_list.jsp new file mode 100644 index 000000000..296f1ff8e --- /dev/null +++ b/WebContent/Tenwa/Customer/Lessee/Comm/Communication/Communication_list.jsp @@ -0,0 +1,68 @@ +<%@ page contentType="text/html; charset=GBK"%> +<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><% + + //String PG_TITLE = "微信对公账号维护"; // 浏览器窗口标题 PG_TITLE + + String flowunid = CurPage.getParameter("ObjectNo");//流程编号 + String phaseNo = CurPage.getAttribute("PhaseNo"); //流程节点 + String taskno=CurPage.getParameter("TaskNo"); //流程节点ID + String userid = CurPage.getUserId();//当前登录人 + String orgid = CurPage.getUser().getOrgID();//当前登录部门 + + String communicationid = Sqlca.getString("select id from communication where flowunid = '"+flowunid+"' and phaseno = '"+phaseNo+"'"); + + ASObjectModel doTemp = new ASObjectModel("COMMUNICATION_LIST"); + ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request); + dwTemp.Style="1"; //--设置为Grid风格-- + //dwTemp.MultiSelect = true; //多选 + dwTemp.ReadOnly = "1"; //只读模式 + dwTemp.setPageSize(20); + dwTemp.genHTMLObjectWindow(flowunid); + String sButtons[][] = { + {"true","All","Button","123新增","123新增","newRecord()","","","","btn_icon_add",""}, + {"true","","Button","修改","修改","viewAndEdit()","","","","btn_icon_edit",""}, + //{"true","All","Button","删除","删除","deleteRecord()","","","","btn_icon_delete",""}, + }; +%><%@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/Project/BusinessApplication/ApprovalForm.jsp b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp index 641fd5092..0ae270ab4 100644 --- a/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp +++ b/WebContent/Tenwa/Lease/Flow/Project/BusinessApplication/ApprovalForm.jsp @@ -687,7 +687,6 @@ }); //拒单理由 var vo = getItemValue(0,0,"secondchoice"); - console.log("========================"+vo); if(vo=="0010"||vo=="0040"){ showItem(0,"VETO"); setItemRequired(0,"VETO",true); diff --git a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml index 8e631b760..5c4dd0476 100644 --- a/WebContent/WEB-INF/etc/jbo/jbo_comm.xml +++ b/WebContent/WEB-INF/etc/jbo/jbo_comm.xml @@ -1004,6 +1004,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/src_core/com/tenwa/voucher/CreateVoucherProcess/Communicationsave.java b/src_core/com/tenwa/voucher/CreateVoucherProcess/Communicationsave.java new file mode 100644 index 000000000..81330c80d --- /dev/null +++ b/src_core/com/tenwa/voucher/CreateVoucherProcess/Communicationsave.java @@ -0,0 +1,102 @@ +package com.tenwa.voucher.CreateVoucherProcess; + +import com.amarsoft.are.jbo.JBOException; +import com.amarsoft.are.jbo.JBOFactory; +import com.amarsoft.are.jbo.JBOTransaction; +import com.amarsoft.awe.util.SqlObject; +import com.amarsoft.awe.util.Transaction; + +public class Communicationsave { + + private String id; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + private String flowunid; + public String getFlowunid() { + return flowunid; + } + + public void setFlowunid(String flowunid) { + this.flowunid = flowunid; + } + private String phaseNo; + public String getPhaseNo() { + return phaseNo; + } + public void setPhaseNo(String phaseNo) { + this.phaseNo = phaseNo; + } + private String taskno; + public String getTaskno() { + return taskno; + } + public void setTaskno(String taskno) { + this.taskno = taskno; + } + + private String userid; + public String getUserid() { + return userid; + } + public void setUserid(String userid) { + this.userid = userid; + } + + private String orgid; + public String getOrgid() { + return orgid; + } + public void setOrgid(String orgid) { + this.orgid = orgid; + } + private String remark; + public String getRemark() { + return remark; + } + public void setRemark(String remark) { + this.remark = remark; + } + private String time; + public String getTime() { + return time; + } + public void setTime(String time) { + this.time = time; + } + + + public String soleVerify(JBOTransaction tx) throws Exception { + tx= JBOFactory.createJBOTransaction(); + String returns="true"; + String id = this.id; + String taskno = this.taskno; + String flowunid = this.flowunid; + String phaseNo = this.phaseNo; + String userid = this.userid; + String orgid = this.orgid; + String remark = this.remark; + try { + Transaction sqlca = Transaction.createTransaction(tx); + String ssql = "insert into communication(id,taskno,flowunid,phaseno,inputuser,inputorg,inputtime,remark)"+ + "VALUES(replace(uuid(),'-',''),'"+taskno+"','"+flowunid+"','"+phaseNo+"','"+userid+"','"+orgid+"',replace(now(),'-','/'),'"+remark+"')"; + + SqlObject sqlObject = new SqlObject(ssql); + sqlca.executeSQL(sqlObject); + tx.commit(); + return returns; + } catch (JBOException e) { + e.printStackTrace(); + returns = "false"; + return returns; + } + } + + +} diff --git a/src_jbo/jbo/com/tenwa/entity/comm/flow/COMMUNICATION.java b/src_jbo/jbo/com/tenwa/entity/comm/flow/COMMUNICATION.java new file mode 100644 index 000000000..a5e3fa585 --- /dev/null +++ b/src_jbo/jbo/com/tenwa/entity/comm/flow/COMMUNICATION.java @@ -0,0 +1,76 @@ +package jbo.com.tenwa.entity.comm.flow; + +import java.lang.String; + +/** + * 放款订单信息 - JBO命名常量类

+ * Note: This file is generated by ADE tools, dont modify it.
+ + */ +public interface COMMUNICATION { + + /** + * 放款订单信息

+ * 代表本类映射的BizObjectClass + */ + public static final String CLASS_NAME = "jbo.com.tenwa.entity.comm.flow.COMMUNICATION"; + /** + * ID STRING(32)
+ */ + public static final String id = "id"; + /** + * 流程节点ID STRING(32)
+ */ + public static final String taskno = "taskno"; + /** + * 流程编号 STRING(32)
+ */ + public static final String flowunid = "flowunid"; + + /** + * 流程节点 STRING(32)
+ */ + public static final String phaseno = "phaseno"; + + /** + * 录入人 STRING(200)
+ */ + public static final String inputuser = "inputuser"; + + /** + * 录入部门 STRING(200)
+ */ + public static final String inputorg = "inputorg"; + + /** + * 录入时间 STRING(10
+ */ + public static final String inputtime = "inputtime"; + + /** + * 修改人 STRING(32)
+ */ + public static final String updateuser = "updateuser"; + + /** + * 修改时间 STRING(32)
+ */ + public static final String updatetime = "updatetime"; + + /** + * 备注信息 STRING(1000)
+ */ + public static final String remark = "remark"; + + /** + * 录入人名称 STRING(1000)
+ */ + public static final String username = "username"; + + /** + * 录入部门名称 STRING(1000)
+ */ + public static final String orgname = "orgname"; + + +}