add:增加查看订单状态弹出框以及查询接口

src/main/java/com/seeyon/apps/collaboration/controller/CollaborationController.java

@@ -3744,5 +3744,34 @@ public class CollaborationController extends BaseController {
 		return modelAndView;
 	}
 
+	public ModelAndView showStateDetail(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		ModelAndView mav = new ModelAndView("apps/collaboration/showStateDetail");
+//		Integer state = Integer.valueOf(request.getParameter("state"));
+//		mav.addObject("state", state);
+		long userId = AppContext.currentUserId();
+		CtpTemplate ctpTemplate = templateManager.getTempleteByTemplateNumber("XDLC");
+		CtpTemplate ctpTemplate1 = templateManager.getTempleteByTemplateNumber("ECXDLC");
+		mav.addObject("userId", userId);
+//		mav.addObject("state", state);
+		mav.addObject("ctpTemplateId", ctpTemplate.getId());
+		mav.addObject("ctpTemplateId1", ctpTemplate1.getId());
+		return mav;
+	}
 
+	public ModelAndView stateDetail(HttpServletRequest request, HttpServletResponse response) throws Exception {
+		ModelAndView mav = new ModelAndView("apps/collaboration/stateDetail");
+		Integer state = Integer.valueOf(request.getParameter("state"));
+		FlipInfo fi = new FlipInfo();
+		Map params = new HashMap();
+		params.put("state",state);
+		params.put("ctpTemplateId",Long.parseLong(request.getParameter("ctpTemplateId")));
+		params.put("ctpTemplateId1",Long.parseLong(request.getParameter("ctpTemplateId1")));
+		params.put("userId",Long.parseLong(request.getParameter("userId")));
+		fi = colManager.getOrderStateDetailList(fi,params);
+		if (fi != null) {
+			fi.setParams(params);
+		}
+		request.setAttribute("ffstateDetail", fi);
+		return mav;
+	}
 }

src/main/java/com/seeyon/apps/collaboration/dao/ColDao.java

@@ -8,7 +8,9 @@ import java.util.Map;
 import com.seeyon.apps.collaboration.bo.QuerySummaryParam;
 import com.seeyon.apps.collaboration.po.ColSummary;
 import com.seeyon.apps.collaboration.vo.ColSummaryVO;
+import com.seeyon.apps.collaboration.vo.OrderDetailVO;
 import com.seeyon.ctp.common.exceptions.BusinessException;
+import com.seeyon.ctp.common.po.template.CtpTemplate;
 import com.seeyon.ctp.common.supervise.vo.SuperviseModelVO;
 import com.seeyon.ctp.util.FlipInfo;
 
@@ -267,5 +269,13 @@ public interface ColDao {
 	 * @return ColSummary
 	 */
 	public void updateColSummaryPullStateBySource(String source, Integer pullState) throws BusinessException;
+
+	/**
+	 * 查询印制单的信息
+	 * @param flipInfo
+	 * @param map
+	 * @return
+	 */
+	public List<OrderDetailVO> getOrderStateDetailList(FlipInfo flipInfo, Map map);
 }
 

src/main/java/com/seeyon/apps/collaboration/dao/ColDaoImpl.java

@@ -4,6 +4,7 @@ import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.*;
 
+import com.seeyon.apps.collaboration.vo.OrderDetailVO;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -62,6 +63,8 @@ import com.seeyon.ctp.util.SQLWildcardUtil;
 import com.seeyon.ctp.util.Strings;
 import com.seeyon.v3x.common.dao.paginate.Pagination;
 
+import javax.persistence.criteria.CriteriaBuilder;
+
 public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao {
 	private static final Log log = LogFactory.getLog(ColDaoImpl.class);
 	private static final Integer daysOverDue = 7;//七天内超期
@@ -928,7 +931,7 @@ public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao {
 			hasAgent = false;
 		}
         //协同列表优化，是否需要关联summary控制参数
-        boolean needSummary = true;
+        boolean needSummary = false;
 
         if(condition.get("needSummary") != null &&  "1".equals(condition.get("needSummary"))){
             needSummary = true;
@@ -4240,6 +4243,7 @@ public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao {
         DBAgent.bulkUpdate(s, m);
     }
 
+
     @Override
     public List<ColSummary> getFalseData(Integer generalState) throws BusinessException{
         StringBuilder hql=new StringBuilder();
@@ -4262,4 +4266,44 @@ public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao {
         return summarys;
     }
 
+    @Override
+    public List<OrderDetailVO> getOrderStateDetailList(FlipInfo flipInfo, Map parameterMap) {
+        StringBuilder hql=new StringBuilder();
+//        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("FROM ColSummary summary, CtpAffair affair ");
+        hql.append("WHERE summary.id = affair.objectId AND summary.templeteId IN ( :ctpTemplateId, :ctpTemplateId1) " +
+                "AND affair.state = :state " +
+                "AND affair.memberId = :userId " +
+                "ORDER BY affair.createDate DESC");
+        List result = DBAgent.find(hql.toString(), parameterMap, flipInfo);
+        List<OrderDetailVO> models = new ArrayList<OrderDetailVO>();
+        if(result == null || result.isEmpty()){
+            return models;
+        }
+        for(int i = 0; i < result.size(); i++) {
+            OrderDetailVO orderDetailVO = new OrderDetailVO();
+            Object[] object = (Object[]) result.get(i);
+            marges(object, orderDetailVO);
+            models.add(orderDetailVO);
+        }
+        return models;
+    }
+    private static void marges(Object[] object, OrderDetailVO orderDetailVO) {
+        int n = 0;
+        orderDetailVO.setSummaryId(((Number) object[n++]).longValue());
+        String subject = (String) object[n++];
+        orderDetailVO.setSubject(subject);
+        orderDetailVO.setStartMemberId(((Number) object[n]).longValue());
+        n++;
+        orderDetailVO.setCreateDate((Date) object[n]);
+        n++;
+        orderDetailVO.setUpdateDate((Date) object[n]);
+        n++;
+        orderDetailVO.setState(object[n] == null ? 0 : ((Number) object[n]).intValue());
+        n++;
+        orderDetailVO.setGeneralState(object[n] == null ? 0 : ((Number) object[n]).intValue());
+        n++;
+        orderDetailVO.setErpState(object[n] == null ? 0 : ((Number) object[n]).intValue());
+    }
 }

src/main/java/com/seeyon/apps/collaboration/manager/ColManager.java

@@ -1128,4 +1128,5 @@ public interface ColManager {
 	 */
 	public Map<String,Object> parameterChangeGetMoney(Map<String,Object> paramMap);
 
+	public FlipInfo getOrderStateDetailList(FlipInfo fi, Map param)throws BusinessException;
 }

src/main/java/com/seeyon/apps/collaboration/manager/ColManagerImpl.java

@@ -11230,4 +11230,13 @@ public class ColManagerImpl implements ColManager {
         resultMap.put("zj",100);
         return resultMap;
     }
+
+    @Override
+    public FlipInfo getOrderStateDetailList(FlipInfo flipInfo, Map map)throws BusinessException{
+        List<OrderDetailVO> result = colDao.getOrderStateDetailList(flipInfo,map);
+        if (flipInfo != null) {
+            flipInfo.setData(result);
+        }
+        return flipInfo;
+    }
 }

src/main/java/com/seeyon/apps/collaboration/vo/OrderDetailVO.java

+package com.seeyon.apps.collaboration.vo;
+
+import java.math.BigDecimal;
+import java.sql.Timestamp;
+import java.util.Date;
+
+public class OrderDetailVO {
+
+
+    private Long summaryId; //流程id
+    private String subject;  //标题
+    private Long startMemberId;  //发起人id
+    private Date createDate;  //发起时间
+    private Date updateDate;   //处理时间
+    private Integer state;   //当前流程状态
+    private Integer generalState;   // 确认状态
+    private Integer erpState;    //打印状态
+    private String stateValue;   //当前待办人
+    private String startMemberName;  //发起人
+    private Integer isUrgent;   //是否加急
+
+    public OrderDetailVO() {
+
+    }
+
+    public Long getSummaryId() {
+        return summaryId;
+    }
+
+    public void setSummaryId(Long summaryId) {
+        this.summaryId = summaryId;
+    }
+
+    public String getSubject() {
+        return subject;
+    }
+
+    public void setSubject(String subject) {
+        this.subject = subject;
+    }
+
+    public Long getStartMemberId() {
+        return startMemberId;
+    }
+
+    public void setStartMemberId(Long startMemberId) {
+        this.startMemberId = startMemberId;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public Date getUpdateDate() {
+        return updateDate;
+    }
+
+    public void setUpdateDate(Date updateDate) {
+        this.updateDate = updateDate;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
+
+    public Integer getGeneralState() {
+        return generalState;
+    }
+
+    public void setGeneralState(Integer generalState) {
+        this.generalState = generalState;
+    }
+
+    public Integer getErpState() {
+        return erpState;
+    }
+
+    public void setErpState(Integer erpState) {
+        this.erpState = erpState;
+    }
+
+    public String getStateValue() {
+        return stateValue;
+    }
+
+    public void setStateValue(String stateValue) {
+        this.stateValue = stateValue;
+    }
+
+    public String getStartMemberName() {
+        return startMemberName;
+    }
+
+    public void setStartMemberName(String startMemberName) {
+        this.startMemberName = startMemberName;
+    }
+
+    public Integer getIsUrgent() {
+        return isUrgent;
+    }
+
+    public void setIsUrgent(Integer isUrgent) {
+        this.isUrgent = isUrgent;
+    }
+
+        public OrderDetailVO(Long summaryId, String subject, Long startMemberId, Date createDate, Date updateDate, Integer state, Integer generalState, Integer erpState, String stateValue, String startMemberName, Integer isUrgent) {
+        this.summaryId = summaryId;
+        this.subject = subject;
+        this.startMemberId = startMemberId;
+        this.createDate = createDate;
+        this.updateDate = updateDate;
+        this.state = state;
+        this.generalState = generalState;
+        this.erpState = erpState;
+        this.stateValue = stateValue;
+        this.startMemberName = startMemberName;
+        this.isUrgent = isUrgent;
+    }
+
+    @Override
+    public String toString() {
+        return "OrderDetailVO{" +
+                "summaryId='" + summaryId + '\'' +
+                ", subject='" + subject + '\'' +
+                ", startMemberId='" + startMemberId + '\'' +
+                ", createDate=" + createDate +
+                ", updateDate=" + updateDate +
+                ", state=" + state +
+                ", generalState=" + generalState +
+                ", erpState=" + erpState +
+                ", stateValue='" + stateValue + '\'' +
+                ", startMemberName='" + startMemberName + '\'' +
+                ", isUrgent=" + isUrgent +
+                '}';
+    }
+}

src/main/java/com/seeyon/ctp/rest/resources/CollaborationResource.java

@@ -8367,7 +8367,7 @@ public class CollaborationResource  extends BaseResource {
 
         map.put("success", true);
         map.put("msg", "查询待打印订单成功.");
-        map.put("date", print);
+        map.put("data", print);
 
         return ok(map);
     }

src/main/webapp/WEB-INF/jsp/apps/collaboration/showStateDetail.jsp

+<%--
+ $Author:  zhaifeng$
+ $Rev:  $
+ $Date:: 2012-11-07#$:
+  
+ Copyright (C) 2012 Seeyon, Inc. All rights reserved.
+ This software is the proprietary information of Seeyon, Inc.
+ Use is subject to license terms.
+--%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ include file="/WEB-INF/jsp/common/common.jsp"%>
+<!DOCTYPE html>
+<html class="h100b over_hidden">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <!-- 查看明细日志 -->
+    <title>查看订单状态</title>
+    <style type="text/css">
+        .stadic_head_height { height: 33px; }
+        .stadic_body_top_bottom { overflow-y:hidden; bottom: 0px; top: 33px; }
+        .public_title { text-indent:1em; height:30px; line-height:30px; font-weight: bold;font-size: 14px;font-family:'Microsoft YaHei',SimHei;}
+    </style>
+    <script type="text/javascript">
+        $(document).ready(function () {
+        	//ie7兼容处理
+    		if ( $.browser.msie ){
+    			 if($.browser.version<8){
+    				var iframeObj= $("#resource");
+    				iframeObj.height(iframeObj.parent().height());
+    			 }
+    		}
+            var iframeObj= $("#resource");
+            iframeObj.height(iframeObj.parent().height());
+
+            //催办日志 绑定点击事件
+            $('#allOrder').click(function(){
+                var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+
+                "&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1 =${ctp:escapeJavascript(ctpTemplateId1)}";
+                $('#resource').attr("src",url);
+                $('#tabID li').click(function(){
+                    $('#tabID li').removeClass("current");
+                    $(this).addClass("current");
+                });
+                // exportExcelFlag = "3";
+            });
+
+            //催办日志 绑定点击事件
+            <%--$('#notStarted').click(function(){--%>
+            <%--    var url = _ctxPath + "/detaillog/detaillog.do?method=showSuperviseLog&summaryId=${ctp:escapeJavascript(summaryId)}";--%>
+            <%--    $('#resource').attr("src",url);--%>
+            <%--    $('#tabID li').click(function(){--%>
+            <%--        $('#tabID li').removeClass("current");--%>
+            <%--        $(this).addClass("current");--%>
+            <%--    });--%>
+            <%--    // exportExcelFlag = "3";--%>
+            <%--});--%>
+
+            //催办日志 绑定点击事件
+            <%--$('#cancelOrder').click(function(){--%>
+            <%--    var url = _ctxPath + "/detaillog/detaillog.do?method=showSuperviseLog&summaryId=${ctp:escapeJavascript(summaryId)}";--%>
+            <%--    $('#resource').attr("src",url);--%>
+            <%--    $('#tabID li').click(function(){--%>
+            <%--        $('#tabID li').removeClass("current");--%>
+            <%--        $(this).addClass("current");--%>
+            <%--    });--%>
+            <%--    // exportExcelFlag = "3";--%>
+            <%--});--%>
+
+            //初始化时加载显示内容
+            $('#allOrder').click();
+
+
+        });
+    </script>
+</head>
+<body class="page_color  h100b over_hidden">
+    <div class="stadic_layout">
+        <div class="stadic_layout_head stadic_head_height margin_t_5" style="background: #fafafa;">
+           <div class="clearfix">
+               <div class="common_tabs clearfix left" id="tabID">
+                   <ul class="left">
+                       <li class="current"><a href="#" class="no_b_border" id="allOrder">全部订单</a></li><%--处理明细 --%>
+                       <li><a href="#" class="no_b_border" id="notStarted">未进入生产订单</a></li><%--流程日志 --%>
+                       <li><a href="#" class="last_tab no_b_border" id="cancelOrder">作废订单</a></li><%--催办日志 --%>
+                   </ul>
+               </div>
+<%--               <div class="right margin_r_10 toolbar_l">--%>
+<%--                   <a href="#" id="exportExcel"><span class="hand ico16 xls_16"></span>${ctp:i18n("application.96.label")}</a>&nbsp;&nbsp;&lt;%&ndash;导出Excel &ndash;%&gt;--%>
+<%--                   <a href="#" id="printButton"><span class="hand ico16 print_16"></span>${ctp:escapeJavascript(summaryId)}</a>&lt;%&ndash;打印 &ndash;%&gt;--%>
+<%--               </div>--%>
+           </div>
+        </div>
+        <!-- 处理明细 -->
+        <div class="stadic_layout_body stadic_body_top_bottom " id='assd'>
+            <iframe id="resource"  width="100%" height="100%" frameborder="0" name="resource">
+<%--                <table class="flexme3" id="stateDetail"></table>--%>
+            </iframe>
+        </div>
+        
+    </div>
+</body>
+</html>
+

src/main/webapp/WEB-INF/jsp/apps/collaboration/stateDetail.jsp

+<%--
+ $Author:  zhaifeng$
+ $Rev:  $
+ $Date:: 2012-11-07#$:
+  
+ Copyright (C) 2012 Seeyon, Inc. All rights reserved.
+ This software is the proprietary information of Seeyon, Inc.
+ Use is subject to license terms.
+--%>
+<%@ page language="java" contentType="text/html; charset=UTF-8"
+    pageEncoding="UTF-8"%>
+<%@ include file="/WEB-INF/jsp/common/common.jsp"%>
+<!DOCTYPE html>
+<html class="h100b over_hidden">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>订单状态</title>
+    <script type="text/javascript">
+        $(document).ready(function () {
+            $('#stateDetail').ajaxgrid({
+                colModel: [
+                    {
+                        display: "标题",//催办人
+                        name: 'subject',
+                        // sortname : 'a.sender',
+                        sortable : true,
+                        width: '12%'
+                    }, {
+                        display: "发起人",//催办时间
+                        name: 'startMemberId',
+                        // sortname : 'a.sendTime',
+                        sortable : true,
+                        width: '18%'
+                    }, {
+                        display: "发起时间",//被催办人
+                        name: 'createDate',
+                        // sortname : 'mem.name',
+                        sortable : true,
+                        width: '12%'
+                    }, {
+                        display: "处理时间",//催办附言
+                        name: 'updateDate',
+                        // sortname : 'a.content',
+                        sortable : true,
+                        width: '50%'
+                    }],
+                isHaveIframe:true,
+                render : rend,
+                managerName : "colManager",
+                managerMethod : "getOrderStateDetailList",
+                height:$(document).height()-58,
+                resizable :false
+            });
+            // $("#showStateDetail").ajaxgridLoad(params);
+            //回调函数
+            function rend(txt, data, r, c) {
+                if(txt == null || txt === ""){
+                    return "-";
+                }
+                return txt;
+            }
+        });
+                
+    </script>
+</head>
+<body class="page_color h100b over_hidden" id='orderState'>
+    <!-- 督办日志 -->
+    <table class="flexme3" id="stateDetail"></table>
+</body>
+</html>

src/main/webapp/apps_res/collaboration/js/listDone.js

@@ -453,6 +453,12 @@ $(document).ready(function () {
         value: "1",
         click: debupCol
     });
+    //查看订单状态
+    toolbarArray.push({
+        id: "orderState",
+        name: '查看订单状态',
+        click: orderState
+    });
     if (hasDumpData == "true") {
         //当前数据
         toolbarArray.push({
@@ -983,12 +989,29 @@ function precodeCallback() {
 function debupCol() {
     $("#listDone").ajaxgridLoad(advanceQueryObj());
 }
+//查看订单状态
+function orderState() {
+    var dialog = $.dialog({
+        url : _ctxPath+'/collaboration/collaboration.do?method=showStateDetail',
+        width : 1040,
+        height : 500,
+        title :'查看印制单状态', //查看明细日志
+        // targetWindow:openType,
+        buttons : [{
+            text : $.i18n('collaboration.dialog.close'),
+            handler : function() {
+                dialog.close();
+            }
+        }]
+    });
+}
 
 function currentData() {
     //控制其他按钮样式
     toolbar.enabled("pigeonhole");
     toolbar.enabled("delete");
     toolbar.enabled("takeBack");
+    toolbar.enabled("orderState");
     toolbar.enabled("stepbackRecord");
     //toolbar.enabled("batchPrint");
     toolbar.enabled("handover");
@@ -1022,6 +1045,7 @@ function dumpData() {
     toolbar.disabled("pigeonhole");
     toolbar.disabled("delete");
     toolbar.disabled("takeBack");
+    toolbar.disabled("orderState");
     toolbar.disabled("stepbackRecord");
     //toolbar.disabled("batchPrint");
     toolbar.disabled("handover");
@@ -1266,6 +1290,7 @@ function disabledAllToolbar() {
     toolbar.disabled("pigeonhole");
     toolbar.disabled("delete");
     toolbar.disabled("takeBack");
+    toolbar.disabled("orderState");
     toolbar.disabled("resend");
     toolbar.disabled("delete");
     toolbar.disabled("stepbackRecord");