Merge branch 'develop' of http://103.249.252.28:90/gaoyan/apps-collaboration into develop

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

 package com.seeyon.apps.collaboration.dao;
 
-import java.sql.Timestamp;
-import java.util.Date;
-import java.util.List;
-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;
 
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
 public interface ColDao {
     public void saveColSummary(ColSummary colSummary);
     public void saveColInfo();

src/main/java/com/seeyon/apps/thirdparyServlet/ThirdparyServlet.java

 package com.seeyon.apps.thirdparyServlet;
 
 import com.seeyon.ctp.common.AppContext;
-import com.seeyon.ctp.common.authenticate.domain.User;
 import com.seeyon.ctp.common.exceptions.BusinessException;
 import com.seeyon.ctp.common.util.XmlUtil;
 import com.seeyon.ctp.organization.bo.*;
+import com.seeyon.ctp.organization.manager.OrgManager;
 import com.seeyon.ctp.organization.manager.OrgManagerDirect;
 import com.seeyon.ctp.rest.util.MemberUtil;
 import com.seeyon.ctp.util.Datetimes;
 import com.seeyon.v3x.services.organization.AccountManager;
 import com.seeyon.v3x.services.organization.DepartmentManager;
-import net.sf.json.JSONObject;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.client.methods.CloseableHttpResponse;
@@ -20,17 +19,6 @@ import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 import org.apache.http.util.EntityUtils;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-import com.seeyon.ctp.organization.manager.OrgManager;
 import org.springframework.util.StringUtils;
 
 import javax.servlet.ServletException;
@@ -38,6 +26,16 @@ import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.text.ParseException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.TimeZone;
 
 
 

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

@@ -9,62 +9,13 @@
  */
 package com.seeyon.ctp.rest.resources;
 
-import java.io.File;
-import java.math.BigDecimal;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.*;
-
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
-import com.seeyon.apps.collaboration.vo.*;
-import com.seeyon.apps.secret.api.SecretApi;
-import com.seeyon.cap4.form.bean.*;
-import com.seeyon.cap4.form.service.CAP4FormManager;
-import com.seeyon.ctp.common.SystemEnvironment;
-import com.seeyon.ctp.common.util.XmlUtil;
-import com.seeyon.oainterface.impl.exportdata.MessageExporter;
-import com.seeyon.v3x.services.flow.impl.FlowFactoryImpl;
-import com.seeyon.v3x.services.form.FormUtils;
-import com.seeyon.v3x.services.form.bean.FormExport;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.commons.lang3.tuple.Pair;
-import org.apache.commons.logging.Log;
-import org.dom4j.Document;
-import org.dom4j.DocumentHelper;
-import org.dom4j.Element;
-import org.dom4j.io.SAXReader;
-import org.json.JSONException;
-import org.json.JSONObject;
-
 import com.seeyon.apps.agent.bo.AgentModel;
 import com.seeyon.apps.agent.bo.MemberAgentBean;
 import com.seeyon.apps.ai.event.AIRemindEvent;
 import com.seeyon.apps.collaboration.api.CollaborationApi;
-import com.seeyon.apps.collaboration.bo.BackgroundDealParamBO;
-import com.seeyon.apps.collaboration.bo.BackgroundDealResult;
-import com.seeyon.apps.collaboration.bo.ColInfo;
-import com.seeyon.apps.collaboration.bo.DeleteAjaxTranObj;
-import com.seeyon.apps.collaboration.bo.FormLockParam;
-import com.seeyon.apps.collaboration.bo.LockObject;
+import com.seeyon.apps.collaboration.bo.*;
 import com.seeyon.apps.collaboration.constants.ColConstant;
-import com.seeyon.apps.collaboration.enums.BackgroundDealType;
-import com.seeyon.apps.collaboration.enums.ColHandleType;
-import com.seeyon.apps.collaboration.enums.ColListType;
-import com.seeyon.apps.collaboration.enums.ColOpenFrom;
-import com.seeyon.apps.collaboration.enums.ColQueryCondition;
-import com.seeyon.apps.collaboration.enums.CollaborationEnum;
-import com.seeyon.apps.collaboration.enums.CommentExtAtt1Enum;
+import com.seeyon.apps.collaboration.enums.*;
 import com.seeyon.apps.collaboration.manager.ColIndexEnableImpl;
 import com.seeyon.apps.collaboration.manager.ColLockManager;
 import com.seeyon.apps.collaboration.manager.ColManager;
@@ -72,20 +23,25 @@ import com.seeyon.apps.collaboration.po.ColSummary;
 import com.seeyon.apps.collaboration.util.ColOpenFromUtil;
 import com.seeyon.apps.collaboration.util.ColOpenFromUtil.ColSummaryType;
 import com.seeyon.apps.collaboration.util.ColUtil;
+import com.seeyon.apps.collaboration.vo.*;
 import com.seeyon.apps.doc.api.DocApi;
 import com.seeyon.apps.doc.constants.DocConstants.PigeonholeType;
 import com.seeyon.apps.multicall.api.MultiCallApi;
 import com.seeyon.apps.ocip.organization.bo.IOcipOrgEntity;
 import com.seeyon.apps.project.api.ProjectApi;
 import com.seeyon.apps.project.bo.ProjectBO;
+import com.seeyon.apps.secret.api.SecretApi;
 import com.seeyon.apps.secret.util.SecretUtil;
 import com.seeyon.apps.taskmanage.util.MenuPurviewUtil;
 import com.seeyon.apps.xiaoz.bo.card.XiaozCommondCard;
 import com.seeyon.apps.xiaoz.bo.card.XiaozListCard;
+import com.seeyon.cap4.form.bean.*;
+import com.seeyon.cap4.form.service.CAP4FormManager;
 import com.seeyon.ctp.cap.api.manager.CAPFormManager;
 import com.seeyon.ctp.common.AppContext;
 import com.seeyon.ctp.common.GlobalNames;
 import com.seeyon.ctp.common.ModuleType;
+import com.seeyon.ctp.common.SystemEnvironment;
 import com.seeyon.ctp.common.affair.manager.AffairManager;
 import com.seeyon.ctp.common.affair.util.AffairUtil;
 import com.seeyon.ctp.common.authenticate.domain.User;
@@ -94,11 +50,7 @@ import com.seeyon.ctp.common.batch.bo.BatchResult;
 import com.seeyon.ctp.common.batch.manager.BatchManager;
 import com.seeyon.ctp.common.config.IConfigPublicKey;
 import com.seeyon.ctp.common.config.SystemConfig;
-import com.seeyon.ctp.common.constants.ApplicationCategoryEnum;
-import com.seeyon.ctp.common.constants.Constants;
-import com.seeyon.ctp.common.constants.CustomizeConstants;
-import com.seeyon.ctp.common.constants.Plugins;
-import com.seeyon.ctp.common.constants.SystemProperties;
+import com.seeyon.ctp.common.constants.*;
 import com.seeyon.ctp.common.content.ContentUtil;
 import com.seeyon.ctp.common.content.affair.constants.StateEnum;
 import com.seeyon.ctp.common.content.affair.constants.SubStateEnum;
@@ -153,8 +105,8 @@ import com.seeyon.ctp.common.track.manager.CtpTrackMemberManager;
 import com.seeyon.ctp.common.track.po.CtpTrackMember;
 import com.seeyon.ctp.common.usermessage.UserMessageManager;
 import com.seeyon.ctp.event.EventDispatcher;
-import com.seeyon.ctp.handover.constants.HandoverConstant;
 import com.seeyon.ctp.handover.api.HandoverManager;
+import com.seeyon.ctp.handover.constants.HandoverConstant;
 import com.seeyon.ctp.organization.bo.V3xOrgAccount;
 import com.seeyon.ctp.organization.bo.V3xOrgMember;
 import com.seeyon.ctp.organization.bo.V3xOrgPost;
@@ -172,28 +124,44 @@ import com.seeyon.ctp.rest.resources.vo.ColForwordCommentVO;
 import com.seeyon.ctp.rest.resources.vo.CollGotoParamsVO;
 import com.seeyon.ctp.rest.resources.vo.CollQueryParamsVO;
 import com.seeyon.ctp.services.ServiceException;
-import com.seeyon.ctp.util.DBAgent;
-import com.seeyon.ctp.util.DateUtil;
-import com.seeyon.ctp.util.Datetimes;
-import com.seeyon.ctp.util.FlipInfo;
-import com.seeyon.ctp.util.ParamUtil;
-import com.seeyon.ctp.util.Strings;
-import com.seeyon.ctp.util.UUIDLong;
-import com.seeyon.ctp.util.XMLCoder;
+import com.seeyon.ctp.util.*;
 import com.seeyon.ctp.util.annotation.RestInterfaceAnnotation;
 import com.seeyon.ctp.util.json.JSONUtil;
 import com.seeyon.ctp.workflow.exception.BPMException;
 import com.seeyon.ctp.workflow.wapi.WorkflowApiManager;
 import com.seeyon.oainterface.common.OAInterfaceException;
+import com.seeyon.oainterface.impl.exportdata.MessageExporter;
 import com.seeyon.v3x.common.security.AccessControlBean;
 import com.seeyon.v3x.common.security.SecurityCheck;
 import com.seeyon.v3x.common.security.SecurityCheckParam;
+import com.seeyon.v3x.services.flow.impl.FlowFactoryImpl;
+import com.seeyon.v3x.services.form.FormUtils;
+import com.seeyon.v3x.services.form.bean.FormExport;
 import com.seeyon.v3x.system.util.WaterMarkUtil;
-
 import net.joinwork.bpm.definition.BPMHumenActivity;
 import net.joinwork.bpm.definition.BPMSeeyonPolicy;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.commons.logging.Log;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.dom4j.io.SAXReader;
+import org.json.JSONException;
+import org.json.JSONObject;
 import www.seeyon.com.utils.UUIDUtil;
 
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.File;
+import java.math.BigDecimal;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.*;
+
 /**
  * <p>Title       : 协同Rest接口</p>
  * <p>Description : 协同Rest接口</p>