解决方案图文件阅览下载报错问题
This commit is contained in:
parent
d28f81a738
commit
bc969529f0
Binary file not shown.
@ -62,15 +62,14 @@ public class CreateFileContorller {
|
||||
}
|
||||
String sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+id+"'" +
|
||||
") and FILENAME not like '%.xml'";
|
||||
if("control.policy".equals(method)) {
|
||||
if("control.policy".equals(method) || "process.scheme".equals(method)) {
|
||||
sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"+id+"'" +
|
||||
") and FILETYPE = 'f'";
|
||||
") and FILETYPE = 'f'";
|
||||
}
|
||||
List<RowMap> maps = DBSql.getMaps(sql_upfile);
|
||||
String upfile_ids = "";
|
||||
if (maps.size()>0){
|
||||
for (RowMap rowMap:
|
||||
maps) {
|
||||
for (RowMap rowMap: maps) {
|
||||
upfile_ids+=rowMap.getString("ID")+",";
|
||||
}
|
||||
}
|
||||
|
||||
@ -469,7 +469,7 @@ public class OaPendComponent {
|
||||
xmlDatasUtil.setReceivetime(der.substring(der.indexOf(" "),der.length()));
|
||||
if (taskInstance!=null){
|
||||
String actionName = getActionName(taskInstance);
|
||||
if (actionName.equals("确认发布")||equalsAction(GO_BACK, actionName)||equalsAction(TERMINATION,actionName)){
|
||||
if (actionName.equals("确认发布")||equalsAction(GO_BACK, actionName)||equalsAction(TERMINATION,actionName) ||actionName.equals("确认征询结果")){
|
||||
//流程结束时，归档所有任务
|
||||
xmlDatasUtil.setCurrentnodetype("1");
|
||||
//如果是终止或者废止的话,将历史记录全部更新
|
||||
|
||||
@ -113,7 +113,6 @@ public class TaskController {
|
||||
*/
|
||||
public void setUserLog(String processInstId, String userid, String logType,Connection conn) {
|
||||
|
||||
System.err.println("用户登录记录存入日志========>" + userid + "_类型:" + logType);
|
||||
if (UtilString.isNotEmpty(userid)) {
|
||||
//待阅更新已读记录
|
||||
if ("3".equals(logType)) {
|
||||
@ -159,7 +158,6 @@ public class TaskController {
|
||||
int count=SDK.getBOAPI().create("BO_ACT_ALREADY_DATAID", bo, boProcessInstance.getId(), boProcessInstance.getCreateUser());*/
|
||||
|
||||
if(update!=0){
|
||||
System.out.println("count==========="+update);
|
||||
String sql1 = "DELETE FROM BO_ACT_DATAID WHERE PROCESSID='"+processInstId+"'AND USER_ID='"+userid+"'";
|
||||
DBSql.update(conn,sql1);
|
||||
|
||||
@ -327,7 +325,7 @@ public class TaskController {
|
||||
String methodId = DBSql.getString(conn,"select PLMETHODID from APP_ACT_COE_PAL_REPOSITORY where ID= '"
|
||||
+ bo.getString("PUBLISHFILEID") + "'");
|
||||
if (UtilString.isNotEmpty(methodId)) {
|
||||
if (methodId.equals("control.policy")) {
|
||||
if (methodId.equals("control.policy") || methodId.equals("process.scheme")) {
|
||||
sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"
|
||||
+ bo.getString("PUBLISHFILEID") + "') AND FILETYPE = 'f' ORDER BY FILENAME ASC";
|
||||
}
|
||||
@ -422,9 +420,9 @@ public class TaskController {
|
||||
*/
|
||||
if (list.size() == 0 && lists.size() == 0) {
|
||||
if (list_stop.size() > 0) {
|
||||
// System.out.println("这个是作废的架构数据");
|
||||
for (BO bo : list_stop) {
|
||||
// System.out.println("开始时间》》》》》》》" + System.currentTimeMillis());
|
||||
//判别是否根据日期是否可打开链接表单
|
||||
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
String is_not_publish_sql = "SELECT id,PLVER FROM APP_ACT_COE_PAL_REPOSITORY WHERE ID ='"
|
||||
+ bo.get("STOPFILEID") + "'";
|
||||
@ -447,7 +445,7 @@ public class TaskController {
|
||||
.getString(conn,"select PLMETHODID from APP_ACT_COE_PAL_REPOSITORY where ID= '"
|
||||
+ bo.getString("STOPFILEID") + "'");
|
||||
if (UtilString.isNotEmpty(methodId)) {
|
||||
if (methodId.equals("control.policy")) {
|
||||
if (methodId.equals("control.policy") || methodId.equals("process.scheme")) {
|
||||
sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"
|
||||
+ bo.getString("STOPFILEID") + "') AND FILETYPE = 'f' ORDER BY FILENAME ASC";
|
||||
}
|
||||
@ -564,7 +562,7 @@ public class TaskController {
|
||||
String methodId = DBSql.getString(conn,"select PLMETHODID from APP_ACT_COE_PAL_REPOSITORY where ID= '"
|
||||
+ bo.getString("CHANGEDFILEIDNEW") + "'");
|
||||
if (UtilString.isNotEmpty(methodId)) {
|
||||
if (methodId.equals("control.policy")) {
|
||||
if (methodId.equals("control.policy") || methodId.equals("process.scheme")) {
|
||||
sql_upfile = "select * from APP_ACT_COE_PAL_UPFILE where palrepositoryid in (select ID from APP_ACT_COE_PAL_REPOSITORY where ID= '"
|
||||
+ bo.get("CHANGEDFILEIDNEW") + "') AND FILETYPE = 'f' ORDER BY FILENAME ASC";
|
||||
}
|
||||
@ -688,7 +686,6 @@ public class TaskController {
|
||||
BO bo_act_dataid = SDK.getBOAPI().query("BO_ACT_DATAID").addQuery("PROCESSID=", processInstId)
|
||||
.addQuery("USER_ID=", usercode).detail();
|
||||
if (bo_act_dataid!=null) {
|
||||
System.out.println("查询未读数据=============" + processInstId + "USER_ID=========" + usercode);
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put("action", "read");
|
||||
jsonObject.put("status", "1");
|
||||
@ -702,7 +699,6 @@ public class TaskController {
|
||||
String readurl = SDK.getAppAPI().getProperty("com.awspaas.user.apps.yili.integration", "readurl");
|
||||
UtilUrl uc=new UtilUrl();
|
||||
String s = uc.doPostSoap(readurl, xmlStr, "");
|
||||
System.err.println(instanceById.getTitle() + "OA待阅PC端阅读返回=======>" + s);
|
||||
String nums = DBSql.getString(conn,
|
||||
"select READNUM from BO_EU_PAL_READ_LOG where PROCESSID = '" + processInstId + "'");
|
||||
if (UtilString.isNotEmpty(nums)) {
|
||||
@ -716,7 +712,6 @@ public class TaskController {
|
||||
BO actAlreadyDataid = SDK.getBOAPI().query("BO_ACT_ALREADY_DATAID").addQuery("PROCESSID=", processInstId)
|
||||
.addQuery("USER_ID=", usercode).detail();
|
||||
if(actAlreadyDataid!=null){
|
||||
System.out.println("查询已读数据=============" + processInstId + "USER_ID=========" + usercode);
|
||||
JSONObject jsonObject = new JSONObject();
|
||||
jsonObject.put("action", "read");
|
||||
jsonObject.put("status", "1");
|
||||
|
||||
@ -596,10 +596,10 @@ public class UpfileWeb extends ActionWeb {
|
||||
if (methodId.equals("data.form")) {
|
||||
sourceAppId = "com.awspaas.user.apps.coe.pal.output.bd";
|
||||
}
|
||||
if (methodId.indexOf("process.") > -1) {
|
||||
if (methodId.indexOf("process.") > -1 && !methodId.equals("process.scheme")) {
|
||||
sourceAppId="com.actionsoft.apps.coe.pal.output.pr";
|
||||
}
|
||||
if (methodId.equals("control.policy")) {
|
||||
if (methodId.equals("control.policy") || methodId.equals("process.scheme")) {
|
||||
sourceAppId = "com.awspaas.user.apps.coe.pal.output.zd";
|
||||
}
|
||||
String filename = docFile.getName();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user