Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
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
youjj
cloud-platform
Commits
f43081ed
Commit
f43081ed
authored
Aug 22, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
d7d0d288
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
33 additions
and
0 deletions
+33
-0
TourGoodVerificationBiz.java
...a/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java
+4
-0
TourGoodVerificationMapper.java
...xxfc/platform/tour/mapper/TourGoodVerificationMapper.java
+3
-0
TourVerificationController.java
...m/xxfc/platform/tour/rest/TourVerificationController.java
+5
-0
TourGoodVerificationMapper.xml
.../src/main/resources/mapper/TourGoodVerificationMapper.xml
+21
-0
No files found.
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodVerificationBiz.java
View file @
f43081ed
...
@@ -125,6 +125,10 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
...
@@ -125,6 +125,10 @@ public class TourGoodVerificationBiz extends BaseBiz<TourGoodVerificationMapper,
}
}
return
ObjectRestResponse
.
succ
(
list
);
return
ObjectRestResponse
.
succ
(
list
);
}
}
//获取路线核销信息
public
ObjectRestResponse
getVerification
(
Integer
verificationId
){
return
ObjectRestResponse
.
succ
(
mapper
.
getVerification
(
verificationId
));
}
}
}
\ No newline at end of file
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/mapper/TourGoodVerificationMapper.java
View file @
f43081ed
...
@@ -65,4 +65,7 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
...
@@ -65,4 +65,7 @@ public interface TourGoodVerificationMapper extends Mapper<TourGoodVerification>
//获取时间列表
//获取时间列表
List
<
TourVerificationInfoVo
>
getSpeList
(
@Param
(
"goodId"
)
Integer
goodId
,
@Param
(
"siteId"
)
Integer
siteId
,
@Param
(
"companyId"
)
Integer
companyId
);
List
<
TourVerificationInfoVo
>
getSpeList
(
@Param
(
"goodId"
)
Integer
goodId
,
@Param
(
"siteId"
)
Integer
siteId
,
@Param
(
"companyId"
)
Integer
companyId
);
//获取核销路线信息
TourVerificationInfoVo
getVerification
(
@Param
(
"verificationId"
)
Integer
verificationId
);
}
}
xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/rest/TourVerificationController.java
View file @
f43081ed
...
@@ -45,4 +45,9 @@ public class TourVerificationController extends TourBaseController<TourGoodVerif
...
@@ -45,4 +45,9 @@ public class TourVerificationController extends TourBaseController<TourGoodVerif
return
baseBiz
.
getVerificationList
(
tourVerificationInfoVo
);
return
baseBiz
.
getVerificationList
(
tourVerificationInfoVo
);
}
}
@GetMapping
(
"/info/{id}"
)
public
ObjectRestResponse
getList
(
@PathVariable
Integer
id
){
return
baseBiz
.
getVerification
(
id
);
}
}
}
\ No newline at end of file
xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodVerificationMapper.xml
View file @
f43081ed
...
@@ -111,5 +111,26 @@
...
@@ -111,5 +111,26 @@
p.start_time
p.start_time
</select>
</select>
<!--获取核销信息-->
<select
id=
"getVerification"
resultType=
"com.xxfc.platform.tour.vo.TourVerificationInfoVo"
>
SELECT
DISTINCT
v.id as verificationId,
v.spe_id as speId,
p.start_time as startTime,
p.end_time as endTime,
CONCAT(date_format(p.start_time,'%Y-%m-%d'), '~', date_format(p.end_time, '%Y-%m-%d')) as time,
s.id as siteId,
s.name as siteName,
s.company_id as companyId,
v.good_id as goodId,
g.`name` as goodName
FROM
tour_good_verification v
LEFT JOIN tour_good_site s on v.site_id=s.id
LEFT JOIN tour_good_spe_price p ON v.spe_id=p.id
LEFT JOIN tour_good g ON v.good_id=g.id
WHERE v.id=#{verificationId}
</select>
</mapper>
</mapper>
\ No newline at end of file
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