Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
api
Overview
Overview
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
首航-临时账号
api
Commits
e5cfde1a
Commit
e5cfde1a
authored
Oct 21, 2020
by
java-李谡
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
申请单管理列表根据更新时间排序
parent
d680cf6b
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
22 deletions
+2
-22
VerifyManageDao.xml
resources/mapper/modules/verify/VerifyManageDao.xml
+0
-1
AirlineVerifyController.java
src/com/ejweb/modules/verify/api/AirlineVerifyController.java
+1
-15
AirlineVerifyService.java
src/com/ejweb/modules/verify/service/AirlineVerifyService.java
+0
-5
VerifyManageService.java
src/com/ejweb/modules/verify/service/VerifyManageService.java
+1
-1
No files found.
resources/mapper/modules/verify/VerifyManageDao.xml
View file @
e5cfde1a
...
...
@@ -114,7 +114,6 @@
</when>
</choose>
AND a.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode})
order by a.update_date desc
</select>
<select
id=
"detail"
resultType=
"com.ejweb.modules.verify.entity.VerifyManageDetailEntity"
>
SELECT
...
...
src/com/ejweb/modules/verify/api/AirlineVerifyController.java
View file @
e5cfde1a
...
...
@@ -193,13 +193,6 @@ public class AirlineVerifyController {
AirlineVerifyAddBean
bean
=
requestBean
.
getObjectBean
(
AirlineVerifyAddBean
.
class
);
String
message
=
airLineVerifyService
.
validate
(
bean
);
String
verifId
=
bean
.
getId
();
/* //为重开的情况时
if("1".equals(bean.getType())){
if(verifId==null||"".equals(verifId)){
message="重开时,id不能为空";
}
}*/
if
(
bean
.
getVerifyFile
()
!=
null
&&
bean
.
getVerifyFile
().
size
()
>
0
)
{
if
(
bean
.
getVerifyFile
().
size
()
!=
1
)
{
responseBean
.
setMessage
(
"编排航班计划只支持传单个文件"
);
...
...
@@ -210,24 +203,17 @@ public class AirlineVerifyController {
responseBean
.
setMessage
(
"导入文档为空"
);
responseBean
.
setStatus
(
ErrorCode
.
STATUS_CODE_4001
);
return
responseBean
;
}
else
if
(!
bean
.
getVerifyFile
().
get
(
0
).
getFileName
().
toLowerCase
(
Locale
.
ENGLISH
).
endsWith
(
"xls"
)
&&
!
bean
.
getVerifyFile
().
get
(
0
).
getFileName
().
toLowerCase
().
endsWith
(
"xlsx"
))
{
responseBean
.
setMessage
(
"编排航班计划只支持xls,xlsx"
);
responseBean
.
setStatus
(
ErrorCode
.
STATUS_CODE_4001
);
return
responseBean
;
}
}
}
if
(
message
==
null
)
{
// 通过参数校验
bean
.
setId
(
IdWorker
.
getNextId
());
airLineVerifyService
.
insert
(
bean
);
/**
* 提交申请后,则记录时间节点
*/
//提交申请后,则记录时间节点
VerifyProcessAddBean
bean1
=
new
VerifyProcessAddBean
();
bean1
.
setUserCode
(
bean
.
getUserCode
());
bean1
.
setProcessValue
(
"airline_verify"
);
...
...
src/com/ejweb/modules/verify/service/AirlineVerifyService.java
View file @
e5cfde1a
...
...
@@ -288,17 +288,13 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> {
String
appNo
=
String
.
format
(
"%03d"
,
curNum
);
applyNo
=
applyNoPre
+
appNo
;
}
else
{
applyNo
=
applyNoPre
+
"001"
;
}
bean
.
setApplyNo
(
applyNo
);
dao
.
insert
(
bean
);
dao
.
insertVerified
(
bean
);
// 发送消息
//发送审核消息
switch
(
bean
.
getVerifType
())
{
case
"01"
:
case
"02"
:
...
...
@@ -320,7 +316,6 @@ public class AirlineVerifyService extends BaseService<AirlineVerifyDao> {
connect2
.
setIsMain
(
"0"
);
connects
.
add
(
connect
);
connects
.
add
(
connect2
);
if
(
bean
.
getConnect
()
!=
null
&&
bean
.
getConnect
().
size
()
>
0
)
{
for
(
Connect
connectTmp
:
bean
.
getConnect
())
{
connectTmp
.
setId
(
IdWorker
.
getNextId
());
...
...
src/com/ejweb/modules/verify/service/VerifyManageService.java
View file @
e5cfde1a
...
...
@@ -72,7 +72,7 @@ public class VerifyManageService extends BaseService<VerifyManageDao> {
// 必须紧贴dao的查询方法
PageHelper
.
startPage
(
bean
.
getPageNo
(),
bean
.
getPageSize
());
if
(
StringUtils
.
isEmpty
(
bean
.
getSort
()))
{
PageHelper
.
orderBy
(
"
verifNo DESC
"
);
PageHelper
.
orderBy
(
"
a.update_date desc
"
);
}
else
{
PageHelper
.
orderBy
(
bean
.
getSort
());
}
...
...
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