Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
bigdatainterservice
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
曹鹏
bigdatainterservice
Commits
1aabbd85
Commit
1aabbd85
authored
May 18, 2019
by
chentian
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
305523a3
c12cb77c
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
8 deletions
+13
-8
src/main/java/com/founder/interservice/mapper/cqxz/RyhxMapper.java
+2
-3
src/main/java/com/founder/interservice/ryhx/controller/RyhxController.java
+4
-2
src/main/java/com/founder/interservice/ryhx/service/impl/RyhxServiceImpl.java
+1
-2
src/main/resources/application-dev.yml
+5
-0
src/main/resources/mybatis/mapper/cqxz/RyhxMapper.xml
+1
-1
No files found.
src/main/java/com/founder/interservice/mapper/
xzxt
/RyhxMapper.java
→
src/main/java/com/founder/interservice/mapper/
cqxz
/RyhxMapper.java
View file @
1aabbd85
package
com
.
founder
.
interservice
.
mapper
.
xzxt
;
package
com
.
founder
.
interservice
.
mapper
.
cqxz
;
import
com.founder.interservice.ryhx.model.TbStCqhotel
;
import
com.founder.interservice.ryhx.model.TbStCqhotel
;
import
com.founder.interservice.ryhx.model.TbStCqhotelData
;
import
com.founder.interservice.ryhx.model.TbStCqwbdata
;
import
com.founder.interservice.ryhx.model.TbStCqwbdata
;
import
com.founder.interservice.ryhx.vo.TbStCqwbdataVOS
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.apache.ibatis.annotations.Mapper
;
import
org.springframework.stereotype.Repository
;
import
org.springframework.stereotype.Repository
;
import
com.founder.interservice.ryhx.model.TbStCqhotelData
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
...
...
src/main/java/com/founder/interservice/ryhx/controller/RyhxController.java
View file @
1aabbd85
...
@@ -139,7 +139,7 @@ public class RyhxController {
...
@@ -139,7 +139,7 @@ public class RyhxController {
SysDictitem
sysDictitem
=
new
SysDictitem
();
SysDictitem
sysDictitem
=
new
SysDictitem
();
List
<
TbStCqwbdata
>
tbStCqwbdataList
=
null
;
//本人上网信息
List
<
TbStCqwbdata
>
tbStCqwbdataList
=
null
;
//本人上网信息
List
<
TbStCqhotelData
>
listHotelData
=
null
;
//本人住店信息
List
<
TbStCqhotelData
>
listHotelData
=
null
;
//本人住店信息
List
<
TbStCqhotelData
>
listOtherHotelData
=
n
ull
;
//本人
同住人信息
List
<
TbStCqhotelData
>
listOtherHotelData
=
n
ew
ArrayList
<>();
//本人所有
同住人信息
try
{
try
{
if
(
zjhm
!=
null
&&
!
""
.
equals
(
zjhm
)){
if
(
zjhm
!=
null
&&
!
""
.
equals
(
zjhm
)){
//旅店住宿信息
//旅店住宿信息
...
@@ -156,7 +156,9 @@ public class RyhxController {
...
@@ -156,7 +156,9 @@ public class RyhxController {
}
}
//根据旅店信息,查询同住人员信息
//根据旅店信息,查询同住人员信息
if
(
null
!=
tbStCqhotel
)
{
if
(
null
!=
tbStCqhotel
)
{
listOtherHotelData
=
ryhxService
.
queryHotelxx
(
zjhm
,
hotelno
,
rzsj
,
roomno
);
//当前酒店同住人员信息
List
<
TbStCqhotelData
>
listOneHotelData
=
ryhxService
.
queryHotelxx
(
zjhm
,
hotelno
,
rzsj
,
roomno
);
listOtherHotelData
.
addAll
(
listOneHotelData
);
}
}
}
}
}
}
...
...
src/main/java/com/founder/interservice/ryhx/service/impl/RyhxServiceImpl.java
View file @
1aabbd85
package
com
.
founder
.
interservice
.
ryhx
.
service
.
impl
;
package
com
.
founder
.
interservice
.
ryhx
.
service
.
impl
;
import
com.founder.interservice.mapper.
xzxt
.RyhxMapper
;
import
com.founder.interservice.mapper.
cqxz
.RyhxMapper
;
import
com.founder.interservice.ryhx.model.TbStCqhotel
;
import
com.founder.interservice.ryhx.model.TbStCqhotel
;
import
com.founder.interservice.ryhx.model.TbStCqhotelData
;
import
com.founder.interservice.ryhx.model.TbStCqhotelData
;
import
com.founder.interservice.ryhx.model.TbStCqwbdata
;
import
com.founder.interservice.ryhx.model.TbStCqwbdata
;
import
com.founder.interservice.ryhx.service.RyhxService
;
import
com.founder.interservice.ryhx.service.RyhxService
;
import
com.founder.interservice.ryhx.vo.TbStCqwbdataVOS
;
import
com.founder.interservice.util.HttpUtil
;
import
com.founder.interservice.util.HttpUtil
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
...
...
src/main/resources/application-dev.yml
View file @
1aabbd85
...
@@ -10,6 +10,11 @@ spring:
...
@@ -10,6 +10,11 @@ spring:
username
:
XZXT
username
:
XZXT
password
:
XZXT
password
:
XZXT
url
:
jdbc:oracle:thin:@192.168.1.116:1521:xzxtcp
url
:
jdbc:oracle:thin:@192.168.1.116:1521:xzxtcp
cqxz
:
driver-class-name
:
oracle.jdbc.driver.OracleDriver
username
:
XZXT
password
:
XZXT
url
:
jdbc:oracle:thin:@47.92.129.99:1600:orcl
#配置jpa 使其展示sql语句
#配置jpa 使其展示sql语句
jpa
:
jpa
:
show-sql
:
true
show-sql
:
true
src/main/resources/mybatis/mapper/
xzxt
/RyhxMapper.xml
→
src/main/resources/mybatis/mapper/
cqxz
/RyhxMapper.xml
View file @
1aabbd85
<?xml version="1.0" encoding="UTF-8" ?>
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper
namespace=
"com.founder.interservice.mapper.
xzxt
.RyhxMapper"
>
<mapper
namespace=
"com.founder.interservice.mapper.
cqxz
.RyhxMapper"
>
<sql
id =
"getHoteldetail_where"
>
<sql
id =
"getHoteldetail_where"
>
<if
test=
"xxzjbh != null and xxzjbh != ''"
>
<if
test=
"xxzjbh != null and xxzjbh != ''"
>
and xxzjbh = #{xxzjbh, jdbcType=VARCHAR}
and xxzjbh = #{xxzjbh, jdbcType=VARCHAR}
...
...
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