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
1704adc1
Commit
1704adc1
authored
Mar 29, 2020
by
Lenovo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
调机修改
parent
bc0ee881
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
480 additions
and
202 deletions
+480
-202
RouteVerifyDao.xml
resources/mapper/modules/route/RouteVerifyDao.xml
+3
-11
CondationDao.xml
resources/mapper/modules/verify/CondationDao.xml
+16
-8
VerifyConditionDao.xml
resources/mapper/modules/verify/VerifyConditionDao.xml
+2
-2
VerifyFeedbackDao.xml
resources/mapper/modules/verify/VerifyFeedbackDao.xml
+1
-1
mybatis-config.xml
resources/mybatis-config.xml
+1
-1
RouteVerifyController.java
src/com/ejweb/modules/route/api/RouteVerifyController.java
+0
-0
VerifyCheckBean.java
src/com/ejweb/modules/route/bean/VerifyCheckBean.java
+12
-1
VerifyStatusBean.java
src/com/ejweb/modules/route/bean/VerifyStatusBean.java
+11
-2
RouteVerifyDao.java
src/com/ejweb/modules/route/dao/RouteVerifyDao.java
+2
-1
RouteVerifyDetailEntity.java
src/com/ejweb/modules/route/entity/RouteVerifyDetailEntity.java
+145
-0
RouteVerifyService.java
src/com/ejweb/modules/route/service/RouteVerifyService.java
+0
-0
VerifyFeedbackController.java
src/com/ejweb/modules/verify/api/VerifyFeedbackController.java
+72
-57
ConditionDetailBean.java
src/com/ejweb/modules/verify/bean/ConditionDetailBean.java
+10
-9
ConditionDao.java
src/com/ejweb/modules/verify/dao/ConditionDao.java
+24
-14
ConditionDetailData.java
src/com/ejweb/modules/verify/data/ConditionDetailData.java
+57
-0
ConditionDetailEntity.java
src/com/ejweb/modules/verify/entity/ConditionDetailEntity.java
+18
-17
FullVerifyConditionEntity.java
src/com/ejweb/modules/verify/entity/FullVerifyConditionEntity.java
+11
-0
VerifyFeedbackDetailEntity.java
src/com/ejweb/modules/verify/entity/VerifyFeedbackDetailEntity.java
+24
-21
ConditionService.java
src/com/ejweb/modules/verify/service/ConditionService.java
+7
-1
VerifyFeedbackService.java
src/com/ejweb/modules/verify/service/VerifyFeedbackService.java
+64
-56
No files found.
resources/mapper/modules/route/RouteVerifyDao.xml
View file @
1704adc1
...
...
@@ -83,21 +83,15 @@
AND frv.verif_id = #{verifId}
</select>
<!-- 获取论证表详情 -->
<select
id=
"detail"
resultType=
"com.ejweb.modules.route.entity.RouteVerifyEntity"
>
<select
id=
"detail"
resultType=
"com.ejweb.modules.route.entity.RouteVerifyEntity"
>
SELECT
(t.id) conditionId,
s.id,
verify_status,
s.`condition`,
s.remarks,
s.depart_id,
s.form_text,
t.remarks AS conditionRemarks,
case WHEN t.is_feed!='0' THEN DATE_FORMAT(t.update_date, '%Y-%m-%d')
else '' end conditionDate,
s.status
s.form_text,
s.status
FROM foc_route_verify s
LEFT JOIN foc_verify_condition t ON s.id = t.route_id
WHERE 1 = 1
<if
test=
"verifId != null and verifId != ''"
>
AND s.verif_id = #{verifId}
...
...
@@ -110,8 +104,6 @@
<if
test=
"departId != null and departId != ''"
>
AND s.depart_id =#{departId}
</if>
ORDER BY t.create_date desc
LIMIT 1
</select>
<select
id=
"findByVerifIdUserCode"
resultMap=
"BaseResultMap"
>
...
...
resources/mapper/modules/verify/CondationDao.xml
View file @
1704adc1
...
...
@@ -15,7 +15,7 @@
roundtrip_type,
a.verif_status AS verifStatus,
a.verif_type AS verifType,
s.id AS conditionId,
--
s.id AS conditionId,
a.start_time AS sailingDate,
DATE_FORMAT(a.create_date, '%Y-%m-%d') AS createDate
</sql>
...
...
@@ -71,6 +71,7 @@
<if
test=
"aircraftType != null and aircraftType != ''"
>
AND a.aircraft_type = #{aircraftType}
</if>
GROUP BY s.verif_id,s.depart_id
<!-- AND a.depart_id = (SELECT depart_id FROM sys_user_profiles WHERE user_id = #{userCode}) -->
</select>
...
...
@@ -84,18 +85,25 @@
<select
id=
"getDetail"
resultType=
"com.ejweb.modules.verify.entity.ConditionDetailEntity"
>
SELECT
a.verif_id AS verifId,
a.condition,
a.depart_id AS departId,
q.depart_name AS departName,
a.verify_status AS verifyStatus,
a.id AS routeId,
p.id AS conditionId
a.id AS routeId
from foc_route_verify a
LEFT JOIN foc_verify_condition p ON a.id=p.route_id AND is_feed='0'
LEFT JOIN foc_user_depart q ON a.depart_id=q.id
WHERE a.del_flag = #{DEL_FLAG_NORMAL}
AND p.id= #{conditionId}
WHERE a.del_flag = #{DEL_FLAG_NORMAL} and a.verif_id=#{verifId} and a.depart_id=#{departId};
</select>
<select
id=
"findByVerifyIdAndDepartId"
resultType=
"com.ejweb.modules.verify.data.ConditionDetailData"
>
select id as conditionId,
`condition`,
is_feed as feedStatus,
case WHEN is_feed!='0' THEN DATE_FORMAT(update_date, '%Y-%m-%d')
else '' end conditionDate
from foc_verify_condition
where depart_id=#{departId}
and verif_id=#{verifId}
</select>
<insert
id=
"insertfeedback"
>
...
...
resources/mapper/modules/verify/VerifyConditionDao.xml
View file @
1704adc1
...
...
@@ -39,12 +39,12 @@
<insert
id=
"insert"
parameterType=
"com.ejweb.modules.verify.entity.FullVerifyConditionEntity"
>
insert into foc_verify_condition (id, parent_id, route_id,
verif_id, depart_id, condition_status,
verif_id, depart_id, condition_status,
`condition`,
create_by, create_date, update_by,
update_date, remarks, complete,
is_feed)
values (#{id,jdbcType=VARCHAR}, #{parentId,jdbcType=VARCHAR}, #{routeId,jdbcType=VARCHAR},
#{verifId,jdbcType=VARCHAR}, #{departId,jdbcType=VARCHAR}, #{conditionStatus,jdbcType=VARCHAR},
#{verifId,jdbcType=VARCHAR}, #{departId,jdbcType=VARCHAR}, #{conditionStatus,jdbcType=VARCHAR},
#{condition,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR}, #{createDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=VARCHAR},
#{updateDate,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR}, #{complete,jdbcType=CHAR},
#{isFeed,jdbcType=CHAR})
...
...
resources/mapper/modules/verify/VerifyFeedbackDao.xml
View file @
1704adc1
...
...
@@ -244,7 +244,7 @@
FROM foc_route_verify a
LEFT JOIN foc_airline_verify s ON a.verif_id=s.id
LEFT JOIN foc_verify_condition t ON a.id=t.route_id
WHERE
WHERE
a.del_flag = #{DEL_FLAG_NORMAL}
AND t.id = #{conditionId}
...
...
resources/mybatis-config.xml
View file @
1704adc1
...
...
@@ -37,6 +37,6 @@
<setting
name=
"jdbcTypeForNull"
value=
"NULL"
/>
<!--打印sql-->
<
!--<setting name="logImpl" value="STDOUT_LOGGING"/>--
>
<
setting
name=
"logImpl"
value=
"STDOUT_LOGGING"
/
>
</settings>
</configuration>
src/com/ejweb/modules/route/api/RouteVerifyController.java
View file @
1704adc1
This diff is collapsed.
Click to expand it.
src/com/ejweb/modules/route/bean/VerifyCheckBean.java
View file @
1704adc1
package
com
.
ejweb
.
modules
.
route
.
bean
;
import
com.ejweb.modules.verify.entity.FullVerifyConditionEntity
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
com.ejweb.core.base.GenericBean
;
import
java.util.List
;
public
class
VerifyCheckBean
extends
GenericBean
{
@NotEmpty
(
message
=
"verifyStatus字段不能为空"
)
...
...
@@ -21,6 +24,8 @@ public class VerifyCheckBean extends GenericBean {
private
String
userCode
;
//用户ID
private
String
condition
;
//verifyStatus为02、03时必填
private
List
<
FullVerifyConditionEntity
>
conditions
;
private
String
complete
;
@NotEmpty
(
message
=
"verifId字段不能为空"
)
...
...
@@ -67,5 +72,11 @@ public class VerifyCheckBean extends GenericBean {
this
.
conditionId
=
conditionId
;
}
public
List
<
FullVerifyConditionEntity
>
getConditions
()
{
return
conditions
;
}
public
void
setConditions
(
List
<
FullVerifyConditionEntity
>
conditions
)
{
this
.
conditions
=
conditions
;
}
}
src/com/ejweb/modules/route/bean/VerifyStatusBean.java
View file @
1704adc1
package
com
.
ejweb
.
modules
.
route
.
bean
;
import
com.ejweb.core.base.GenericBean
;
import
com.ejweb.modules.verify.entity.FullVerifyConditionEntity
;
import
org.hibernate.validator.constraints.NotEmpty
;
import
java.util.List
;
...
...
@@ -22,6 +23,8 @@ public class VerifyStatusBean extends GenericBean {
private
String
userCode
;
//用户ID
private
String
condition
;
//verifyStatus为02、03时必填
private
List
<
FullVerifyConditionEntity
>
conditions
;
private
String
formText
;
//自定义表单内容
...
...
@@ -97,6 +100,12 @@ public class VerifyStatusBean extends GenericBean {
public
void
setRouteFile
(
List
<
Map
<
String
,
String
>>
routeFile
)
{
this
.
routeFile
=
routeFile
;
}
public
List
<
FullVerifyConditionEntity
>
getConditions
()
{
return
conditions
;
}
public
void
setConditions
(
List
<
FullVerifyConditionEntity
>
conditions
)
{
this
.
conditions
=
conditions
;
}
}
src/com/ejweb/modules/route/dao/RouteVerifyDao.java
View file @
1704adc1
...
...
@@ -10,6 +10,7 @@ import com.ejweb.modules.route.bean.RouteVerifyBean;
import
com.ejweb.modules.route.bean.RouteVerifyDetailBean
;
import
com.ejweb.modules.route.bean.VerifyStatusBean
;
import
com.ejweb.modules.route.entity.FullRouteVerifyEntity
;
import
com.ejweb.modules.route.entity.RouteVerifyDetailEntity
;
import
com.ejweb.modules.route.entity.RouteVerifyEntity
;
import
com.ejweb.modules.verify.bean.AirlineVerifyUpdateStatusBean
;
import
com.ejweb.modules.verify.entity.RouteverifyEntity
;
...
...
@@ -20,7 +21,7 @@ public interface RouteVerifyDao extends BaseDao{
List
<
FullRouteVerifyEntity
>
fullList
(
RouteVerifyBean
bean
);
RouteVerifyEntity
detail
(
RouteVerifyDetailBean
bean
);
RouteVerifyEntity
detail
(
RouteVerifyDetailBean
bean
);
/**
* 根据id获取foc_route_verify数据,userCode获取depart_id与本数据的depart_id比较
...
...
src/com/ejweb/modules/route/entity/RouteVerifyDetailEntity.java
0 → 100644
View file @
1704adc1
package
com
.
ejweb
.
modules
.
route
.
entity
;
import
com.ejweb.modules.verify.data.ConditionDetailData
;
import
java.util.List
;
import
java.util.Map
;
/**
* @Author: lisu
* @Date: 2020/3/29 19:00
* @Description: java类作用描述
*/
public
class
RouteVerifyDetailEntity
{
private
String
id
;
private
String
verifId
;
private
String
verifyStatus
;
private
String
departId
;
private
String
depName
;
private
String
verifType
;
private
String
departName
;
private
String
formText
;
private
String
remarks
;
//状态 0 草稿 1 发布
private
String
status
;
private
List
<
ConditionDetailData
>
conditions
;
private
List
<
Map
<
String
,
String
>>
routeFile
;
private
List
<
Map
<
String
,
String
>>
history
;
public
List
<
Map
<
String
,
String
>>
getHistory
()
{
return
history
;
}
public
void
setHistory
(
List
<
Map
<
String
,
String
>>
history
)
{
this
.
history
=
history
;
}
public
String
getDepName
()
{
return
depName
;
}
public
void
setDepName
(
String
depName
)
{
this
.
depName
=
depName
;
}
public
String
getVerifType
()
{
return
verifType
;
}
public
void
setVerifType
(
String
verifType
)
{
this
.
verifType
=
verifType
;
}
public
String
getId
()
{
return
id
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
String
getVerifId
()
{
return
verifId
;
}
public
void
setVerifId
(
String
verifId
)
{
this
.
verifId
=
verifId
;
}
public
String
getVerifyStatus
()
{
return
verifyStatus
;
}
public
void
setVerifyStatus
(
String
verifyStatus
)
{
this
.
verifyStatus
=
verifyStatus
;
}
public
String
getDepartId
()
{
return
departId
;
}
public
void
setDepartId
(
String
departId
)
{
this
.
departId
=
departId
;
}
public
String
getFormText
()
{
return
formText
;
}
public
void
setFormText
(
String
formText
)
{
this
.
formText
=
formText
;
}
public
String
getRemarks
()
{
return
remarks
;
}
public
void
setRemarks
(
String
remarks
)
{
this
.
remarks
=
remarks
;
}
public
String
getDepartName
()
{
return
departName
;
}
public
void
setDepartName
(
String
departName
)
{
this
.
departName
=
departName
;
}
public
String
getStatus
()
{
return
status
;
}
public
void
setStatus
(
String
status
)
{
this
.
status
=
status
;
}
public
List
<
Map
<
String
,
String
>>
getRouteFile
()
{
return
routeFile
;
}
public
void
setRouteFile
(
List
<
Map
<
String
,
String
>>
routeFile
)
{
this
.
routeFile
=
routeFile
;
}
public
List
<
ConditionDetailData
>
getConditions
()
{
return
conditions
;
}
public
void
setConditions
(
List
<
ConditionDetailData
>
conditions
)
{
this
.
conditions
=
conditions
;
}
}
src/com/ejweb/modules/route/service/RouteVerifyService.java
View file @
1704adc1
This diff is collapsed.
Click to expand it.
src/com/ejweb/modules/verify/api/VerifyFeedbackController.java
View file @
1704adc1
This diff is collapsed.
Click to expand it.
src/com/ejweb/modules/verify/bean/ConditionDetailBean.java
View file @
1704adc1
...
...
@@ -17,9 +17,10 @@ import com.ejweb.core.base.GenericBean;
public
class
ConditionDetailBean
extends
GenericBean
{
public
static
final
String
DEL_FLAG_NORMAL
=
"0"
;
@NotEmpty
(
message
=
"verifId不能为空"
)
private
String
verifId
;
private
String
conditionId
;
@NotEmpty
(
message
=
"departId不能为空"
)
private
String
departId
;
@NotEmpty
(
message
=
"userCode不能为空"
)
private
String
userCode
;
public
String
getVerifId
()
{
...
...
@@ -28,18 +29,18 @@ public class ConditionDetailBean extends GenericBean {
public
void
setVerifId
(
String
verifId
)
{
this
.
verifId
=
verifId
;
}
public
String
getConditionId
()
{
return
conditionId
;
}
public
void
setConditionId
(
String
conditionId
)
{
this
.
conditionId
=
conditionId
;
}
public
String
getUserCode
()
{
return
userCode
;
}
public
void
setUserCode
(
String
userCode
)
{
this
.
userCode
=
userCode
;
}
public
String
getDepartId
()
{
return
departId
;
}
public
void
setDepartId
(
String
departId
)
{
this
.
departId
=
departId
;
}
}
src/com/ejweb/modules/verify/dao/ConditionDao.java
View file @
1704adc1
/**
*
*
*/
package
com
.
ejweb
.
modules
.
verify
.
dao
;
import
java.util.List
;
import
java.util.Map
;
import
com.ejweb.core.base.BaseDao
;
import
com.ejweb.modules.verify.bean.ConditionBean
;
import
com.ejweb.modules.verify.bean.ConditionDetailBean
;
import
com.ejweb.modules.verify.bean.ConditionUpdateBean
;
import
com.ejweb.modules.verify.bean.FeedbackAddBean
;
import
com.ejweb.modules.verify.data.ConditionDetailData
;
import
com.ejweb.modules.verify.entity.ConditionDetailEntity
;
import
com.ejweb.modules.verify.entity.ConditionEntity
;
import
org.apache.ibatis.annotations.Param
;
import
java.util.List
;
import
java.util.Map
;
/**
*
*
* @team IT Team
* @author zhanglg
* @version 1.0
* @time
2016年9月12日
* @time 2016年9月12日
*/
public
interface
ConditionDao
extends
BaseDao
{
List
<
ConditionEntity
>
findList
(
ConditionBean
bean
);
int
insertfeedback
(
FeedbackAddBean
feedbean
);
int
updateFeedback
(
ConditionUpdateBean
bean
);
int
deleteFeedback
(
ConditionUpdateBean
bean
);
ConditionDetailEntity
getDetail
(
ConditionDetailBean
bean
);
List
<
ConditionEntity
>
findAllList
(
ConditionBean
bean
);
Map
<
String
,
String
>
getCondition
(
String
conditionId
);
public
interface
ConditionDao
extends
BaseDao
{
List
<
ConditionEntity
>
findList
(
ConditionBean
bean
);
int
insertfeedback
(
FeedbackAddBean
feedbean
);
int
updateFeedback
(
ConditionUpdateBean
bean
);
int
deleteFeedback
(
ConditionUpdateBean
bean
);
ConditionDetailEntity
getDetail
(
ConditionDetailBean
bean
);
List
<
ConditionDetailData
>
findByVerifyIdAndDepartId
(
@Param
(
value
=
"verifId"
)
String
verifId
,
@Param
(
value
=
"departId"
)
String
departId
);
List
<
ConditionEntity
>
findAllList
(
ConditionBean
bean
);
Map
<
String
,
String
>
getCondition
(
String
conditionId
);
}
src/com/ejweb/modules/verify/data/ConditionDetailData.java
0 → 100644
View file @
1704adc1
package
com
.
ejweb
.
modules
.
verify
.
data
;
import
java.util.List
;
import
java.util.Map
;
/**
* @Author: lisu
* @Date: 2020/3/29 14:49
* @Description: java类作用描述
*/
public
class
ConditionDetailData
{
private
String
conditionId
;
private
String
condition
;
private
String
conditionDate
;
private
int
feedStatus
;
private
List
<
Map
<
String
,
String
>>
departIds
;
public
String
getConditionId
()
{
return
conditionId
;
}
public
void
setConditionId
(
String
conditionId
)
{
this
.
conditionId
=
conditionId
;
}
public
String
getCondition
()
{
return
condition
;
}
public
void
setCondition
(
String
condition
)
{
this
.
condition
=
condition
;
}
public
int
getFeedStatus
()
{
return
feedStatus
;
}
public
void
setFeedStatus
(
int
feedStatus
)
{
this
.
feedStatus
=
feedStatus
;
}
public
String
getConditionDate
()
{
return
conditionDate
;
}
public
void
setConditionDate
(
String
conditionDate
)
{
this
.
conditionDate
=
conditionDate
;
}
public
List
<
Map
<
String
,
String
>>
getDepartIds
()
{
return
departIds
;
}
public
void
setDepartIds
(
List
<
Map
<
String
,
String
>>
departIds
)
{
this
.
departIds
=
departIds
;
}
}
src/com/ejweb/modules/verify/entity/ConditionDetailEntity.java
View file @
1704adc1
...
...
@@ -5,6 +5,9 @@ package com.ejweb.modules.verify.entity;
import
com.ejweb.core.base.BaseEntity
;
import
com.ejweb.modules.verify.data.ConditionDetailData
;
import
java.util.List
;
/**
* 审核详情页
...
...
@@ -17,24 +20,17 @@ import com.ejweb.core.base.BaseEntity;
public
class
ConditionDetailEntity
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
verifId
;
private
String
conditionId
;
private
String
routeId
;
private
String
routeId
;
private
String
departId
;
// 部门id
private
String
departName
;
// 部门名称
private
String
condition
;
// 条件描述
private
String
verifyStatus
;
// 论证状态
private
List
<
ConditionDetailData
>
conditions
;
public
String
getVerifId
()
{
return
verifId
;
}
public
void
setVerifId
(
String
verifId
)
{
this
.
verifId
=
verifId
;
}
public
String
getConditionId
()
{
return
conditionId
;
}
public
void
setConditionId
(
String
conditionId
)
{
this
.
conditionId
=
conditionId
;
}
public
String
getRouteId
()
{
return
routeId
;
}
...
...
@@ -53,20 +49,25 @@ public class ConditionDetailEntity extends BaseEntity {
public
void
setDepartName
(
String
departName
)
{
this
.
departName
=
departName
;
}
public
String
getCondition
()
{
return
condition
;
}
public
void
setCondition
(
String
condition
)
{
this
.
condition
=
condition
;
}
// public String getCondition() {
// return condition;
// }
// public void setCondition(String condition) {
// this.condition = condition;
// }
public
String
getVerifyStatus
()
{
return
verifyStatus
;
}
public
void
setVerifyStatus
(
String
verifyStatus
)
{
this
.
verifyStatus
=
verifyStatus
;
}
public
List
<
ConditionDetailData
>
getConditions
()
{
return
conditions
;
}
public
void
setConditions
(
List
<
ConditionDetailData
>
conditions
)
{
this
.
conditions
=
conditions
;
}
}
src/com/ejweb/modules/verify/entity/FullVerifyConditionEntity.java
View file @
1704adc1
...
...
@@ -29,6 +29,8 @@ public class FullVerifyConditionEntity {
private
String
isFeed
;
private
String
condition
;
public
String
getId
()
{
return
id
;
}
...
...
@@ -132,4 +134,12 @@ public class FullVerifyConditionEntity {
public
void
setIsFeed
(
String
isFeed
)
{
this
.
isFeed
=
isFeed
;
}
public
String
getCondition
()
{
return
condition
;
}
public
void
setCondition
(
String
condition
)
{
this
.
condition
=
condition
;
}
}
\ No newline at end of file
src/com/ejweb/modules/verify/entity/VerifyFeedbackDetailEntity.java
View file @
1704adc1
package
com
.
ejweb
.
modules
.
verify
.
entity
;
import
java.util.List
;
import
java.util.Map
;
import
com.ejweb.core.base.BaseEntity
;
import
com.ejweb.modules.verify.data.ConditionDetailData
;
import
java.util.List
;
/**
* 航线论证entity
* @author huhy
*
* @author huhy
*/
public
class
VerifyFeedbackDetailEntity
extends
BaseEntity
{
private
static
final
long
serialVersionUID
=
1L
;
private
String
verifId
;
private
String
departType
;
private
String
condition
;
private
String
departType
;
private
String
verifyStatus
;
private
String
departId
;
private
String
verifNo
;
private
List
<
Map
<
String
,
String
>>
departIds
;
private
List
<
ConditionDetailData
>
conditions
;
public
String
getVerifId
()
{
return
verifId
;
}
public
void
setVerifId
(
String
verifId
)
{
this
.
verifId
=
verifId
;
}
public
String
getDepartType
()
{
return
departType
;
}
public
void
setDepartType
(
String
departType
)
{
this
.
departType
=
departType
;
}
public
String
getCondition
()
{
return
condition
;
}
public
void
setCondition
(
String
condition
)
{
this
.
condition
=
condition
;
}
public
String
getVerifyStatus
()
{
return
verifyStatus
;
}
public
void
setVerifyStatus
(
String
verifyStatus
)
{
this
.
verifyStatus
=
verifyStatus
;
}
public
List
<
Map
<
String
,
String
>>
getDepartIds
()
{
return
departIds
;
}
public
void
setDepartIds
(
List
<
Map
<
String
,
String
>>
departIds
)
{
this
.
departIds
=
departIds
;
}
public
String
getDepartId
()
{
return
departId
;
}
public
void
setDepartId
(
String
departId
)
{
this
.
departId
=
departId
;
}
public
String
getVerifNo
()
{
return
verifNo
;
}
public
void
setVerifNo
(
String
verifNo
)
{
this
.
verifNo
=
verifNo
;
}
public
List
<
ConditionDetailData
>
getConditions
()
{
return
conditions
;
}
public
void
setConditions
(
List
<
ConditionDetailData
>
conditions
)
{
this
.
conditions
=
conditions
;
}
}
src/com/ejweb/modules/verify/service/ConditionService.java
View file @
1704adc1
...
...
@@ -14,6 +14,7 @@ import com.ejweb.modules.verify.bean.*;
import
com.ejweb.modules.verify.bean.ConditionUpdateBean.DepartIds
;
import
com.ejweb.modules.verify.dao.AirlineVerifyDao
;
import
com.ejweb.modules.verify.dao.ConditionDao
;
import
com.ejweb.modules.verify.data.ConditionDetailData
;
import
com.ejweb.modules.verify.entity.AirlineVerifyDetailEntity
;
import
com.ejweb.modules.verify.entity.ConditionDetailEntity
;
import
com.ejweb.modules.verify.entity.ConditionEntity
;
...
...
@@ -150,7 +151,12 @@ public class ConditionService extends BaseService<ConditionDao> {
}
public
ConditionDetailEntity
getDetail
(
ConditionDetailBean
bean
)
{
return
dao
.
getDetail
(
bean
);
ConditionDetailEntity
conditionDetailEntity
=
dao
.
getDetail
(
bean
);
if
(
conditionDetailEntity
!=
null
)
{
List
<
ConditionDetailData
>
conditionDetailData
=
dao
.
findByVerifyIdAndDepartId
(
bean
.
getVerifId
(),
bean
.
getDepartId
());
conditionDetailEntity
.
setConditions
(
conditionDetailData
);
}
return
conditionDetailEntity
;
}
/**
...
...
src/com/ejweb/modules/verify/service/VerifyFeedbackService.java
View file @
1704adc1
/**
*
*
*/
package
com
.
ejweb
.
modules
.
verify
.
service
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
com.ejweb.core.base.BaseService
;
import
com.ejweb.core.base.PageEntity
;
import
com.ejweb.core.exception.RecordNotExistException
;
...
...
@@ -27,45 +17,54 @@ import com.ejweb.modules.verify.entity.VerifyFeedbackDetailEntity;
import
com.ejweb.modules.verify.entity.VerifyFeedbackEntity
;
import
com.github.pagehelper.PageHelper
;
import
com.github.pagehelper.PageInfo
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.transaction.annotation.Transactional
;
import
java.util.ArrayList
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
/**
*
*
* @team IT Team
* @author zhanglg
* @version 1.0
* @time
2016年9月13日
* @time 2016年9月13日
*/
@Service
@Transactional
(
readOnly
=
true
)
public
class
VerifyFeedbackService
extends
BaseService
<
VerifyFeedbackDao
>{
public
class
VerifyFeedbackService
extends
BaseService
<
VerifyFeedbackDao
>
{
@Autowired
AirlineVerifyDao
verifyDao
;
public
PageEntity
<
VerifyFeedbackEntity
>
findList
(
VerifyFeedbackBean
bean
)
{
PageInfo
<
VerifyFeedbackEntity
>
pageInfo
=
null
;
// 必须紧贴dao的查询方法
PageHelper
.
startPage
(
bean
.
getPageNo
(),
bean
.
getPageSize
());
if
(
StringUtils
.
isEmpty
(
bean
.
getSort
()))
{
if
(
StringUtils
.
isEmpty
(
bean
.
getSort
()))
{
PageHelper
.
orderBy
(
" verifNo DESC"
);
}
else
PageHelper
.
orderBy
(
bean
.
getSort
());
List
<
VerifyFeedbackEntity
>
list
=
dao
.
findlist3
(
bean
);
pageInfo
=
new
PageInfo
<
VerifyFeedbackEntity
>(
list
);
if
(
pageInfo
.
getPages
()<
bean
.
getPageNo
()){
// 页码大于总页数,则返回NULL
}
else
PageHelper
.
orderBy
(
bean
.
getSort
());
List
<
VerifyFeedbackEntity
>
list
=
dao
.
findlist3
(
bean
);
pageInfo
=
new
PageInfo
<
VerifyFeedbackEntity
>(
list
);
if
(
pageInfo
.
getPages
()
<
bean
.
getPageNo
())
{
// 页码大于总页数,则返回NULL
return
null
;
}
list
=
pageInfo
.
getList
();
list
=
pageInfo
.
getList
();
if
(
list
==
null
||
list
.
size
()
==
0
)
{
// 如果没有数据则返回NULL
return
null
;
}
for
(
VerifyFeedbackEntity
entity:
list
)
{
List
<
Map
<
String
,
String
>>
list1
=
verifyDao
.
getConnectList
(
entity
.
getVerifId
());
List
<
Map
<
String
,
String
>>
list2
=
new
ArrayList
<
Map
<
String
,
String
>>();
for
(
Map
<
String
,
String
>
map:
list1
)
{
Map
<
String
,
String
>
map2
=
new
HashMap
<
String
,
String
>();
for
(
VerifyFeedbackEntity
entity
:
list
)
{
List
<
Map
<
String
,
String
>>
list1
=
verifyDao
.
getConnectList
(
entity
.
getVerifId
());
List
<
Map
<
String
,
String
>>
list2
=
new
ArrayList
<
Map
<
String
,
String
>>();
for
(
Map
<
String
,
String
>
map
:
list1
)
{
Map
<
String
,
String
>
map2
=
new
HashMap
<
String
,
String
>();
map2
.
put
(
"flightNo"
,
map
.
get
(
"flightNo"
));
map2
.
put
(
"depIata"
,
map
.
get
(
"depIata"
));
map2
.
put
(
"arrIata"
,
map
.
get
(
"arrIata"
));
...
...
@@ -75,9 +74,9 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{
entity
.
setConnect
(
list2
);
entity
.
setTypeList
(
verifyDao
.
getTypeList
(
entity
.
getVerifId
()));
entity
.
setDepName
(
verifyDao
.
getConnetList
(
entity
.
getVerifId
()));
String
typelist
=
verifyDao
.
getTypeList1
(
entity
.
getVerifId
());
if
(
StringUtils
.
isNoneBlank
(
typelist
))
entity
.
setAircraftName
(
entity
.
getAircraftName
()
+
":"
+
typelist
);
String
typelist
=
verifyDao
.
getTypeList1
(
entity
.
getVerifId
());
if
(
StringUtils
.
isNoneBlank
(
typelist
))
entity
.
setAircraftName
(
entity
.
getAircraftName
()
+
":"
+
typelist
);
}
PageEntity
<
VerifyFeedbackEntity
>
page
=
new
PageEntity
<
VerifyFeedbackEntity
>();
...
...
@@ -88,61 +87,70 @@ public class VerifyFeedbackService extends BaseService<VerifyFeedbackDao>{
page
.
setList
(
list
);
return
page
;
}
public
VerifyFeedbackDetailEntity
getDetail
(
VerifyFeedbackDetailBean
bean
){
if
(
"01"
.
equals
(
bean
.
getDepartType
())){
public
VerifyFeedbackDetailEntity
getDetail
(
VerifyFeedbackDetailBean
bean
)
{
if
(
"01"
.
equals
(
bean
.
getDepartType
()))
{
return
dao
.
getDetail1
(
bean
);
}
else
if
(
"02"
.
equals
(
bean
.
getDepartType
()))
{
}
else
if
(
"02"
.
equals
(
bean
.
getDepartType
()))
{
return
dao
.
getDetail2
(
bean
);
}
else
{
}
else
{
return
null
;
}
}
public
VerifyFeedbackDetailEntity
getDetailList
(
VerifyFeedbackDetailBean
bean
)
{
VerifyFeedbackDetailEntity
feed
=
dao
.
getDetail1
(
bean
);
if
(
feed
==
null
)
{
return
null
;
}
}
public
VerifyFeedbackDetailEntity
getDetailList
(
VerifyFeedbackDetailBean
bean
){
VerifyFeedbackDetailEntity
feed
=
dao
.
getDetail1
(
bean
);
if
(
feed
==
null
)
return
null
;
feed
.
setDepartIds
(
dao
.
getDetailList
(
bean
));
return
feed
;
}
public
FullRouteVerifyEntity
checkRouteVerifyExist
(
VerifyFeedbackUpdateBean
bean
){
}
public
FullRouteVerifyEntity
checkRouteVerifyExist
(
VerifyFeedbackUpdateBean
bean
)
{
FullRouteVerifyEntity
fullRouteVerifyEntity
=
dao
.
checkRouteVerifyExist
(
bean
);
if
(
fullRouteVerifyEntity
==
null
)
if
(
fullRouteVerifyEntity
==
null
)
{
throw
new
RecordNotExistException
(
"updateRemote 方法不存在verify_id:"
+
bean
);
}
return
fullRouteVerifyEntity
;
}
public
Boolean
updateFeedback
(
VerifyFeedbackUpdateBean
bean
){
public
Boolean
updateFeedback
(
VerifyFeedbackUpdateBean
bean
)
{
bean
.
setFeedbackStatus
(
"01"
);
int
n
=
dao
.
updateFeedback
(
bean
);
if
(
n
==
0
)
if
(
n
==
0
)
{
return
false
;
if
(
dao
.
getFeedbackStatus
(
bean
)==
0
){
// 所有部门都已经反馈
}
// 所有部门都已经反馈
if
(
dao
.
getFeedbackStatus
(
bean
)
==
0
)
{
dao
.
updateCondition
(
bean
);
}
return
true
;
}
/**
*
*
* @author zhanglg
* @time
2016年9月20日
* @time 2016年9月20日
* @param bean
* @return
*/
public
List
<
VerifyFeedbackEntity
>
findAllList
(
VerifyFeedbackBean
bean
)
{
// TODO Auto-generated method stub
return
dao
.
findAllList
(
bean
);
}
/**
*
*
* @author zhanglg
* @time
2016年10月7日
* @time 2016年10月7日
* @param bean
*/
@Transactional
(
readOnly
=
false
)
public
void
updateStatus
(
VerifyFeedbackStatusBean
bean
)
{
dao
.
updateStatus
(
bean
);
}
}
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