Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
T
test
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
邬友楠
test
Commits
c049c68c
Commit
c049c68c
authored
Jan 14, 2020
by
雍欢
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
兼容sqlserver order by
parent
7c950595
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
5 deletions
+9
-5
ActApplicationImpl.java
.../uasp/bpm/engine/application/impl/ActApplicationImpl.java
+4
-1
ProcUnitHandlerApplicationImpl.java
...gine/application/impl/ProcUnitHandlerApplicationImpl.java
+1
-0
bpm.xml
huigou-uasp/src/main/resources/config/uasp/query/bmp/bpm.xml
+4
-4
No files found.
huigou-uasp/src/main/java/com/huigou/uasp/bpm/engine/application/impl/ActApplicationImpl.java
View file @
c049c68c
...
@@ -395,6 +395,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
...
@@ -395,6 +395,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
QueryModel
queryModel
=
new
QueryModel
();
QueryModel
queryModel
=
new
QueryModel
();
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryProcUnitHandlersByBizId"
));
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryProcUnitHandlersByBizId"
));
queryModel
.
putParam
(
"businessKey"
,
bizId
);
queryModel
.
putParam
(
"businessKey"
,
bizId
);
queryModel
.
setDefaultOrderBy
(
"startTime"
);
Map
<
String
,
Object
>
result
=
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
Map
<
String
,
Object
>
result
=
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
boolean
supportManuscript
=
Boolean
.
valueOf
(
SystemCache
.
getParameter
(
"wf.approval.supportManuscript"
,
String
.
class
));
boolean
supportManuscript
=
Boolean
.
valueOf
(
SystemCache
.
getParameter
(
"wf.approval.supportManuscript"
,
String
.
class
));
List
<
ProcUnitHandlerManuscript
>
procUnitHandlerManuscripts
=
null
;
List
<
ProcUnitHandlerManuscript
>
procUnitHandlerManuscripts
=
null
;
...
@@ -433,6 +434,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
...
@@ -433,6 +434,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
QueryModel
queryModel
=
new
QueryModel
();
QueryModel
queryModel
=
new
QueryModel
();
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryApprovalHistoryByProcInstId"
));
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryApprovalHistoryByProcInstId"
));
queryModel
.
putParam
(
"procInstId"
,
processInstanceId
);
queryModel
.
putParam
(
"procInstId"
,
processInstanceId
);
queryModel
.
setDefaultOrderBy
(
"id"
);
return
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
return
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
}
}
...
@@ -554,6 +556,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
...
@@ -554,6 +556,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
QueryModel
queryModel
=
new
QueryModel
();
QueryModel
queryModel
=
new
QueryModel
();
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryHiTaskInstByBizCode"
));
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryHiTaskInstByBizCode"
));
queryModel
.
putParam
(
"bizCode"
,
bizCode
);
queryModel
.
putParam
(
"bizCode"
,
bizCode
);
queryModel
.
setDefaultOrderBy
(
"startTime"
);
return
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
return
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
}
}
...
@@ -566,7 +569,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
...
@@ -566,7 +569,7 @@ public class ActApplicationImpl extends BaseApplication implements ActApplicatio
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryHiTaskInstByBizCodeAndKindId"
));
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryHiTaskInstByBizCodeAndKindId"
));
queryModel
.
putParam
(
"bizCode"
,
bizCode
);
queryModel
.
putParam
(
"bizCode"
,
bizCode
);
queryModel
.
putParam
(
"kindId"
,
kindId
);
queryModel
.
putParam
(
"kindId"
,
kindId
);
queryModel
.
setDefaultOrderBy
(
"startTime"
);
return
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
return
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
}
}
...
...
huigou-uasp/src/main/java/com/huigou/uasp/bpm/engine/application/impl/ProcUnitHandlerApplicationImpl.java
View file @
c049c68c
...
@@ -296,6 +296,7 @@ public class ProcUnitHandlerApplicationImpl extends BaseApplication implements P
...
@@ -296,6 +296,7 @@ public class ProcUnitHandlerApplicationImpl extends BaseApplication implements P
QueryModel
queryModel
=
new
QueryModel
();
QueryModel
queryModel
=
new
QueryModel
();
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryProcunitHandlersByBizCode"
));
queryModel
.
setSql
(
this
.
getQuerySqlByName
(
"queryProcunitHandlersByBizCode"
));
queryModel
.
putParam
(
"bizCode"
,
bizCode
);
queryModel
.
putParam
(
"bizCode"
,
bizCode
);
queryModel
.
setDefaultOrderBy
(
"procUnitId,groupId"
);
return
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
return
this
.
sqlExecutorDao
.
executeQuery
(
queryModel
);
}
}
...
...
huigou-uasp/src/main/resources/config/uasp/query/bmp/bpm.xml
View file @
c049c68c
...
@@ -156,7 +156,7 @@
...
@@ -156,7 +156,7 @@
from act_hi_taskinst_extension te
from act_hi_taskinst_extension te
left join wf_procunithandler uh on te.proc_unit_handler_id_ = uh.id
left join wf_procunithandler uh on te.proc_unit_handler_id_ = uh.id
where te.proc_inst_id_ = :procInstId
where te.proc_inst_id_ = :procInstId
order by te.id_
<!-- order by te.id_ -->
</sql>
</sql>
<sql
name=
"queryBackTasksByBizCode"
>
<sql
name=
"queryBackTasksByBizCode"
>
select te.id_ id, te.task_def_key_ task_def_key, te.name_ as name, p.sub_proc_unit_name,
select te.id_ id, te.task_def_key_ task_def_key, te.name_ as name, p.sub_proc_unit_name,
...
@@ -317,7 +317,7 @@
...
@@ -317,7 +317,7 @@
te.need_timing_ need_timing
te.need_timing_ need_timing
from act_hi_taskinst_extension te
from act_hi_taskinst_extension te
where te.business_code_ = :bizCode
where te.business_code_ = :bizCode
order by te.start_time_
<!-- order by te.start_time_-->
</sql>
</sql>
<sql
name=
"queryHiTaskInstByBizCodeAndKindId"
>
<sql
name=
"queryHiTaskInstByBizCodeAndKindId"
>
select te.id_ id, te.proc_def_id_ proc_def_id, te.task_def_key_ task_def_key,
select te.id_ id, te.proc_def_id_ proc_def_id, te.task_def_key_ task_def_key,
...
@@ -346,7 +346,7 @@
...
@@ -346,7 +346,7 @@
from act_hi_taskinst_extension te
from act_hi_taskinst_extension te
where te.business_code_ = :bizCode
where te.business_code_ = :bizCode
and te.kind_id_ = :kindId
and te.kind_id_ = :kindId
order by te.start_time_
<!-- order by te.start_time_-->
</sql>
</sql>
<sql
name=
"taskInstRelationQuery"
>
<sql
name=
"taskInstRelationQuery"
>
select r.task_id, r.related_task_id, te.proc_inst_id_ proc_inst_id,
select r.task_id, r.related_task_id, te.proc_inst_id_ proc_inst_id,
...
@@ -479,7 +479,7 @@
...
@@ -479,7 +479,7 @@
left join wf_approvalrule r
left join wf_approvalrule r
on h.approval_rule_id = r.id
on h.approval_rule_id = r.id
where biz_code = :bizCode
where biz_code = :bizCode
order by h.proc_unit_id, group_id
<!-- order by h.proc_unit_id, group_id -->
</sql>
</sql>
<sql
name=
"queryOneTaskByBizIdAndProcUnitHandlerId"
>
<sql
name=
"queryOneTaskByBizIdAndProcUnitHandlerId"
>
select e.id_ as task_id, e.status_id_ as status_id
select e.id_ as task_id, e.status_id_ as status_id
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment