update:修改查看订单弹出框以及查询接口

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

@@ -3767,10 +3767,9 @@ public class CollaborationController extends BaseController {
 		params.put("ctpTemplateId",Long.parseLong(request.getParameter("ctpTemplateId")));
 		params.put("ctpTemplateId1",Long.parseLong(request.getParameter("ctpTemplateId1")));
 		params.put("userId",Long.parseLong(request.getParameter("userId")));
+		params.put("orderState",Integer.valueOf(request.getParameter("orderState")));
 		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/ColDaoImpl.java

@@ -4274,8 +4274,14 @@ public class ColDaoImpl extends BaseHibernateDao<ColSummary> implements ColDao {
         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");
+                "AND affair.memberId = :userId ");
+        if ((parameterMap.get("orderState").toString()).equals("1"))   //全部订单
+            hql.append("and 1 = :orderState ");
+        if ((parameterMap.get("orderState").toString()).equals("0"))    //未进入生产订单
+            hql.append("and summary.pullState = :orderState and summary.generalState = 1 and summary.erpState = 0 ");
+        if ((parameterMap.get("orderState").toString()).equals("3"))    //作废订单
+            hql.append("and summary.generalState = :orderState ");
+        hql.append("ORDER BY affair.createDate DESC");
         List result = DBAgent.find(hql.toString(), parameterMap, flipInfo);
         List<OrderDetailVO> models = new ArrayList<OrderDetailVO>();
         if(result == null || result.isEmpty()){

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

@@ -28,6 +28,7 @@ import net.joinwork.bpm.definition.BPMProcess;
 import net.joinwork.bpm.engine.wapi.WorkflowBpmContext;
 import org.springframework.web.servlet.ModelAndView;
 
+import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.util.Date;
 import java.util.List;
@@ -1128,5 +1129,5 @@ public interface ColManager {
 	 */
 	public Map<String,Object> parameterChangeGetMoney(Map<String,Object> paramMap);
 
-	public FlipInfo getOrderStateDetailList(FlipInfo fi, Map param)throws BusinessException;
+	public FlipInfo getOrderStateDetailList(FlipInfo fi, Map param) throws  Exception;
 }

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

@@ -24,6 +24,8 @@ import com.seeyon.apps.supervision.api.SupervisionApi;
 import com.seeyon.apps.supervision.util.SupervisionBootUtil;
 import com.seeyon.apps.webmail.api.WebmailApi;
 import com.seeyon.cap4.form.api.FormApi4Cap4;
+import com.seeyon.cap4.form.bean.FormDataMasterBean;
+import com.seeyon.cap4.form.service.CAP4FormManager;
 import com.seeyon.ctp.cap.api.constant.CAPFormEnum;
 import com.seeyon.ctp.cap.api.manager.CAPFormManager;
 import com.seeyon.ctp.common.AppContext;
@@ -127,6 +129,7 @@ import com.seeyon.ctp.workflow.messageRule.manager.MessageRuleManager;
 import com.seeyon.ctp.workflow.util.AjaxJsonUtil;
 import com.seeyon.ctp.workflow.wapi.WorkflowApiManager;
 import com.seeyon.ctp.workflow.wapi.WorkflowFormDataMapManager;
+import com.seeyon.ocip.exchange.model.col.Affair;
 import com.seeyon.v3x.common.security.AccessControlBean;
 import com.seeyon.v3x.common.security.SecurityCheck;
 import com.seeyon.v3x.peoplerelate.domain.PeopleRelate;
@@ -214,7 +217,15 @@ public class ColManagerImpl implements ColManager {
 	private OfficeTransManager officeTransManager;
     private AttitudeManager attitudeManager;
     private ColReceiverManager colReceiverManager;
-    
+    private CAP4FormManager cap4FormManager;
+
+    public CAP4FormManager getCap4FormManager() {
+        return cap4FormManager;
+    }
+
+    public void setCap4FormManager(CAP4FormManager cap4FormManager) {
+        this.cap4FormManager = cap4FormManager;
+    }
      
     public OfficeTransManager getOfficeTransManager() {
 		return officeTransManager;
@@ -11231,10 +11242,39 @@ public class ColManagerImpl implements ColManager {
         return resultMap;
     }
 
+    @AjaxAccess
     @Override
-    public FlipInfo getOrderStateDetailList(FlipInfo flipInfo, Map map)throws BusinessException{
+    public FlipInfo getOrderStateDetailList(FlipInfo flipInfo, Map map) throws Exception {
+        map.put("state",Integer.valueOf(map.get("state").toString()));
+        map.put("ctpTemplateId",Long.parseLong(map.get("ctpTemplateId").toString()));
+        map.put("ctpTemplateId1",Long.parseLong(map.get("ctpTemplateId1").toString()));
+        map.put("userId",Long.parseLong(map.get("userId").toString()));
+        map.put("orderState",Integer.valueOf(map.get("orderState").toString()));
         List<OrderDetailVO> result = colDao.getOrderStateDetailList(flipInfo,map);
+        for (OrderDetailVO orderDetail : result) {
+            V3xOrgMember member = orgManager.getMemberById(orderDetail.getStartMemberId());
+            orderDetail.setStartMemberName(member.getName());
+            if (orderDetail.getState().equals(3))
+                orderDetail.setStateValue("已结束");
+            else if (orderDetail.getState().equals(1))
+                orderDetail.setStateValue("已终止");
+            else if (orderDetail.getState().equals(0)){
+                CtpAffair ctpAffair = affairManager.getAffairs(orderDetail.getSummaryId(),StateEnum.col_pending).get(0);
+                V3xOrgMember orgMember = orgManager.getMemberById(ctpAffair.getMemberId());
+                orderDetail.setStateValue(member.getName());
+            }else
+                orderDetail.setStateValue("");
+            ColSummary summary = getColSummaryById(orderDetail.getSummaryId());
+            Long formappid = summary.getFormAppid() ;
+            Long formrecordid = summary.getFormRecordid() ;
+            com.seeyon.cap4.form.bean.FormBean formBean = cap4FormManager.getForm(formappid, false) ;
+            FormDataMasterBean master = cap4FormManager.getDataMasterBeanById(formrecordid, formBean, null) ;
+            String namekeyurgent = master.getFormTable().getFieldMap4Display().get("加急").getName();
+            String urgent = (String)master.getAllDataMap().get(namekeyurgent);
+            orderDetail.setIsUrgent(Integer.valueOf(urgent));
+        }
         if (flipInfo != null) {
+            flipInfo.setParams(map);
             flipInfo.setData(result);
         }
         return flipInfo;

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

@@ -36,7 +36,7 @@
             //催办日志 绑定点击事件
             $('#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)}";
+                "&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}&orderState=1";
                 $('#resource').attr("src",url);
                 $('#tabID li').click(function(){
                     $('#tabID li').removeClass("current");
@@ -46,26 +46,28 @@
             });
 
             //催办日志 绑定点击事件
-            <%--$('#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";--%>
-            <%--});--%>
+            $('#notStarted').click(function(){
+                var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+
+                    "&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}&orderState=0";
+                $('#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";--%>
-            <%--});--%>
+            $('#cancelOrder').click(function(){
+                var url = _ctxPath + "/collaboration/collaboration.do?method=stateDetail&state=4&userId=${ctp:escapeJavascript(userId)}"+
+                    "&ctpTemplateId=${ctp:escapeJavascript(ctpTemplateId)}&ctpTemplateId1=${ctp:escapeJavascript(ctpTemplateId1)}&orderState=3";
+                $('#resource').attr("src",url);
+                $('#tabID li').click(function(){
+                    $('#tabID li').removeClass("current");
+                    $(this).addClass("current");
+                });
+                // exportExcelFlag = "3";
+            });
 
             //初始化时加载显示内容
             $('#allOrder').click();

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

@@ -24,13 +24,13 @@
                         name: 'subject',
                         // sortname : 'a.sender',
                         sortable : true,
-                        width: '12%'
+                        width: '16%'
                     }, {
                         display: "发起人",//催办时间
-                        name: 'startMemberId',
+                        name: 'startMemberName',
                         // sortname : 'a.sendTime',
                         sortable : true,
-                        width: '18%'
+                        width: '12%'
                     }, {
                         display: "发起时间",//被催办人
                         name: 'createDate',
@@ -42,7 +42,31 @@
                         name: 'updateDate',
                         // sortname : 'a.content',
                         sortable : true,
-                        width: '50%'
+                        width: '12%'
+                    }, {
+                        display: "当前待办人",//催办附言
+                        name: 'stateValue',
+                        // sortname : 'a.content',
+                        sortable : true,
+                        width: '10%'
+                    }, {
+                        display: "确认状态",//催办附言
+                        name: 'generalState',
+                        // sortname : 'a.content',
+                        sortable : true,
+                        width: '10%'
+                    }, {
+                        display: "打印状态",//催办附言
+                        name: 'erpState',
+                        // sortname : 'a.content',
+                        sortable : true,
+                        width: '10%'
+                    }, {
+                        display: "是否加急",//催办附言
+                        name: 'isUrgent',
+                        // sortname : 'a.content',
+                        sortable : true,
+                        width: '10%'
                     }],
                 isHaveIframe:true,
                 render : rend,
@@ -57,6 +81,34 @@
                 if(txt == null || txt === ""){
                     return "-";
                 }
+                if (c === 5){
+                    if (txt === 0)
+                        return '待确认';
+                    if (txt === 1)
+                        return '已确认';
+                    if (txt === 2)
+                        return '协商';
+                    if (txt === 3)
+                        return '作废';
+                    if (txt === 4)
+                        return '推送失败';
+                    if (txt === 5)
+                        return '推送失败';
+                }
+                if (c === 6){
+                    if (txt === 0)
+                        return '待生产';
+                    if (txt === 1)
+                        return '生产中';
+                    if (txt === 3)
+                        return '生产完成';
+                }
+                if (c === 7){
+                    if (txt === 0)
+                        return '否';
+                    if (txt === 1)
+                        return '是';
+                }
                 return txt;
             }
         });