Merge remote-tracking branch 'origin/develop' into workflow

db/uasp.postgresql.sql

@@ -91,6 +91,19 @@ SET default_tablespace = '';
 
 SET default_with_oids = false;
 
+  create table tmp_sa_i18nproperties
+   (	tmp_id varchar(32 ) not null,
+	batch_number varchar(64 ),
+	status varchar(64 ),
+	message varchar(512 ),
+	code varchar(128 ),
+	value1 varchar(512 ),
+	value2 varchar(512 ),
+	value3 varchar(512 ),
+	value4 varchar(512 ),
+	value5 varchar(512 )
+   )
+
 --
 -- Name: act_ge_bytearray; Type: TABLE; Schema: public; Owner: postgres
 --

huigou-uasp/src/main/java/com/huigou/uasp/bpm/engine/application/impl/ActApplicationImpl.java

@@ -378,6 +378,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
         QueryModel queryModel = new QueryModel();
         queryModel.setSql(this.getQuerySqlByName("queryProcUnitHandlersByBizId"));
         queryModel.putParam("businessKey", bizId);
+        queryModel.setDefaultOrderBy("startTime");
         Map<String, Object> result = this.sqlExecutorDao.executeQuery(queryModel);
         boolean supportManuscript = Boolean.valueOf(SystemCache.getParameter("wf.approval.supportManuscript", String.class));
         List<ProcUnitHandlerManuscript> procUnitHandlerManuscripts = null;
@@ -416,6 +417,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
         QueryModel queryModel = new QueryModel();
         queryModel.setSql(this.getQuerySqlByName("queryApprovalHistoryByProcInstId"));
         queryModel.putParam("procInstId", processInstanceId);
+        queryModel.setDefaultOrderBy("id");
         return this.sqlExecutorDao.executeQuery(queryModel);
     }
 
@@ -542,6 +544,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
         QueryModel queryModel = new QueryModel();
         queryModel.setSql(this.getQuerySqlByName("queryHiTaskInstByBizCode"));
         queryModel.putParam("bizCode", bizCode);
+        queryModel.setDefaultOrderBy("startTime");
         return this.sqlExecutorDao.executeQuery(queryModel);
     }
 
@@ -554,7 +557,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
         queryModel.setSql(this.getQuerySqlByName("queryHiTaskInstByBizCodeAndKindId"));
         queryModel.putParam("bizCode", bizCode);
         queryModel.putParam("kindId", kindId);
-
+        queryModel.setDefaultOrderBy("startTime");
         return this.sqlExecutorDao.executeQuery(queryModel);
     }
 

huigou-uasp/src/main/java/com/huigou/uasp/bpm/engine/application/impl/ProcUnitHandlerApplicationImpl.java

@@ -296,6 +296,7 @@ public class ProcUnitHandlerApplicationImpl extends BaseApplication implements P
         QueryModel queryModel = new QueryModel();
         queryModel.setSql(this.getQuerySqlByName("queryProcunitHandlersByBizCode"));
         queryModel.putParam("bizCode", bizCode);
+        queryModel.setDefaultOrderBy("procUnitId,groupId");
 
         return this.sqlExecutorDao.executeQuery(queryModel);
     }

huigou-uasp/src/main/resources/config/uasp/query/bmp/bpm.xml

@@ -156,7 +156,7 @@
 			  from act_hi_taskinst_extension te
 			   left join wf_procunithandler uh on te.proc_unit_handler_id_ = uh.id
 			 where te.proc_inst_id_ = :procInstId
-			 order by te.id_	
+<!--			 order by te.id_	-->
 		</sql>
 		<sql name="queryBackTasksByBizCode">
 			select te.id_ id,  te.task_def_key_ task_def_key, te.name_ as name, p.sub_proc_unit_name,
@@ -317,7 +317,7 @@
 			       te.need_timing_ need_timing
 			  from act_hi_taskinst_extension te
 			 where te.business_code_ = :bizCode
-			 order by te.start_time_
+<!--			 order by te.start_time_-->
 		</sql>
 		<sql name="queryHiTaskInstByBizCodeAndKindId">
 			select te.id_ id, te.proc_def_id_ proc_def_id, te.task_def_key_ task_def_key,
@@ -346,7 +346,7 @@
 			  from act_hi_taskinst_extension te
 			 where te.business_code_ = :bizCode
 			   and te.kind_id_ = :kindId
-			 order by te.start_time_
+<!--			 order by te.start_time_-->
 		</sql>
 		<sql name="taskInstRelationQuery">
 			select r.task_id, r.related_task_id, te.proc_inst_id_ proc_inst_id,
@@ -479,7 +479,7 @@
 			  left join wf_approvalrule r
 			    on h.approval_rule_id = r.id
 			 where biz_code = :bizCode
-			 order by h.proc_unit_id, group_id	
+<!--			 order by h.proc_unit_id, group_id	-->
 		</sql>
 		<sql name="queryOneTaskByBizIdAndProcUnitHandlerId">
 			select e.id_ as task_id, e.status_id_ as status_id