Skip to content

A
apps-collaboration
Commit fecf3f46 authored by gaoyingwei's avatar gaoyingwei
Browse files
Options

update：更新查询订单状态接口

parent f37fe56e
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 4 deletions
src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java
View file @ fecf3f46
...@@ -3927,10 +3927,14 @@ public class CollaborationController extends BaseController { ...@@ -3927,10 +3927,14 @@ public class CollaborationController extends BaseController {
long userId = AppContext.currentUserId(); long userId = AppContext.currentUserId();
CtpTemplate ctpTemplate = templateManager.getTempleteByTemplateNumber("XDLC"); CtpTemplate ctpTemplate = templateManager.getTempleteByTemplateNumber("XDLC");
CtpTemplate ctpTemplate1 = templateManager.getTempleteByTemplateNumber("ECXDLC"); CtpTemplate ctpTemplate1 = templateManager.getTempleteByTemplateNumber("ECXDLC");
CtpTemplate ctpTemplate2 = templateManager.getTempleteByTemplateNumber("XDLCQT");
CtpTemplate ctpTemplate3 = templateManager.getTempleteByTemplateNumber("ECXDLCQT");
mav.addObject("userId", userId); mav.addObject("userId", userId);
// mav.addObject("state", state); // mav.addObject("state", state);
mav.addObject("ctpTemplateId", ctpTemplate.getId()); mav.addObject("ctpTemplateId", ctpTemplate.getId());
mav.addObject("ctpTemplateId1", ctpTemplate1.getId()); mav.addObject("ctpTemplateId1", ctpTemplate1.getId());
mav.addObject("ctpTemplateId2", ctpTemplate2.getId());
mav.addObject("ctpTemplateId3", ctpTemplate3.getId());
return mav; return mav;
} }
...@@ -3942,6 +3946,8 @@ public class CollaborationController extends BaseController { ...@@ -3942,6 +3946,8 @@ public class CollaborationController extends BaseController {
params.put("state",state); params.put("state",state);
params.put("ctpTemplateId",Long.parseLong(request.getParameter("ctpTemplateId"))); params.put("ctpTemplateId",Long.parseLong(request.getParameter("ctpTemplateId")));
params.put("ctpTemplateId1",Long.parseLong(request.getParameter("ctpTemplateId1"))); params.put("ctpTemplateId1",Long.parseLong(request.getParameter("ctpTemplateId1")));
params.put("ctpTemplateId2",Long.parseLong(request.getParameter("ctpTemplateId2")));
params.put("ctpTemplateId3",Long.parseLong(request.getParameter("ctpTemplateId3")));
params.put("userId",Long.parseLong(request.getParameter("userId"))); params.put("userId",Long.parseLong(request.getParameter("userId")));
params.put("orderState",Integer.valueOf(request.getParameter("orderState"))); params.put("orderState",Integer.valueOf(request.getParameter("orderState")));
fi = colManager.getOrderStateDetailList(fi,params); fi = colManager.getOrderStateDetailList(fi,params);
......
src/main/java/com/seeyon/apps/collaboration/dao/ColDaoImpl.java
View file @ fecf3f46
...@@ -4272,7 +4272,7 @@ public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao { ...@@ -4272,7 +4272,7 @@ public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao {
// Map<String,Object> parameterMap = new HashMap<String, Object>(); // Map<String,Object> parameterMap = new HashMap<String, Object>();
hql.append("SELECT affair.objectId, affair.subject, summary.startMemberId, summary.createDate, affair.updateDate, summary.state, summary.generalState, summary.erpState "); hql.append("SELECT affair.objectId, affair.subject, summary.startMemberId, summary.createDate, affair.updateDate, summary.state, summary.generalState, summary.erpState ");
hql.append("FROM ColSummary summary, CtpAffair affair "); hql.append("FROM ColSummary summary, CtpAffair affair ");
hql.append("WHERE summary.id = affair.objectId AND summary.templeteId IN ( :ctpTemplateId, :ctpTemplateId1) " + hql.append("WHERE summary.id = affair.objectId AND summary.templeteId IN ( :ctpTemplateId, :ctpTemplateId1, :ctpTemplateId2, :ctpTemplateId3) " +
"AND affair.state = :state " + "AND affair.state = :state " +
"AND affair.memberId = :userId "); "AND affair.memberId = :userId ");
if ((parameterMap.get("orderState").toString()).equals("1")) //全部订单 if ((parameterMap.get("orderState").toString()).equals("1")) //全部订单
......
src/main/java/com/seeyon/apps/collaboration/manager/ColManagerImpl.java
View file @ fecf3f46
...@@ -11303,6 +11303,8 @@ public class ColManagerImpl implements ColManager { ...@@ -11303,6 +11303,8 @@ public class ColManagerImpl implements ColManager {
map.put("state",Integer.valueOf(map.get("state").toString())); map.put("state",Integer.valueOf(map.get("state").toString()));
map.put("ctpTemplateId",Long.parseLong(map.get("ctpTemplateId").toString())); map.put("ctpTemplateId",Long.parseLong(map.get("ctpTemplateId").toString()));
map.put("ctpTemplateId1",Long.parseLong(map.get("ctpTemplateId1").toString())); map.put("ctpTemplateId1",Long.parseLong(map.get("ctpTemplateId1").toString()));
map.put("ctpTemplateId2",Long.parseLong(map.get("ctpTemplateId2").toString()));
map.put("ctpTemplateId3",Long.parseLong(map.get("ctpTemplateId3").toString()));
map.put("userId",Long.parseLong(map.get("userId").toString())); map.put("userId",Long.parseLong(map.get("userId").toString()));
map.put("orderState",Integer.valueOf(map.get("orderState").toString())); map.put("orderState",Integer.valueOf(map.get("orderState").toString()));
List<OrderDetailVO> result = colDao.getOrderStateDetailList(flipInfo,map); List<OrderDetailVO> result = colDao.getOrderStateDetailList(flipInfo,map);
......
src/main/webapp/WEB-INF/jsp/apps/collaboration/showStateDetail.jsp
View file @ fecf3f46
...@@ -36,7 +36,9 @@ ...@@ -36,7 +36,9 @@
//催办日志 绑定点击事件 //催办日志 绑定点击事件
$('#allOrder').click(function(){ $('#allOrder').click(function(){
var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+ var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+
"&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}&orderState=1"; "&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}"+
"&ctpTemplateId2=${ctp:escapeJavascript(ctpTemplateId2)}&ctpTemplateId3=${ctp:escapeJavascript(ctpTemplateId3)}" +
"&orderState=1";
$('#resource').attr("src",url); $('#resource').attr("src",url);
$('#tabID li').click(function(){ $('#tabID li').click(function(){
$('#tabID li').removeClass("current"); $('#tabID li').removeClass("current");
...@@ -48,7 +50,9 @@ ...@@ -48,7 +50,9 @@
//催办日志 绑定点击事件 //催办日志 绑定点击事件
$('#notStarted').click(function(){ $('#notStarted').click(function(){
var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+ var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+
"&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}&orderState=0"; "&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}"+
"&ctpTemplateId2=${ctp:escapeJavascript(ctpTemplateId2)}&ctpTemplateId3=${ctp:escapeJavascript(ctpTemplateId3)}" +
"&orderState=0";
$('#resource').attr("src",url); $('#resource').attr("src",url);
$('#tabID li').click(function(){ $('#tabID li').click(function(){
$('#tabID li').removeClass("current"); $('#tabID li').removeClass("current");
...@@ -60,7 +64,9 @@ ...@@ -60,7 +64,9 @@
//催办日志 绑定点击事件 //催办日志 绑定点击事件
$('#cancelOrder').click(function(){ $('#cancelOrder').click(function(){
var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+ var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+
"&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}&orderState=3"; "&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}"+
"&ctpTemplateId2=${ctp:escapeJavascript(ctpTemplateId2)}&ctpTemplateId3=${ctp:escapeJavascript(ctpTemplateId3)}" +
"&orderState=3";
$('#resource').attr("src",url); $('#resource').attr("src",url);
$('#tabID li').click(function(){ $('#tabID li').click(function(){
$('#tabID li').removeClass("current"); $('#tabID li').removeClass("current");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment