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
be343ca5
Commit
be343ca5
authored
Oct 01, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加出行统计接口
parent
1d491cef
Changes
18
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
832 additions
and
11 deletions
+832
-11
OrderFeign.java
...c/main/java/com/xxfc/platform/order/feign/OrderFeign.java
+4
-0
OrderListBiz.java
...in/java/com/xxfc/platform/order/biz/rpc/OrderListBiz.java
+51
-0
BaseOrderMapper.java
.../java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
+4
-0
OrderListController.java
...c/platform/order/rest/background/OrderListController.java
+26
-0
BaseOrderMapper.xml
...rder-server/src/main/resources/mapper/BaseOrderMapper.xml
+21
-3
VehicleCountType.java
.../com/xxfc/platform/vehicle/constant/VehicleCountType.java
+62
-0
VehicleCountRecord.java
.../com/xxfc/platform/vehicle/entity/VehicleCountRecord.java
+81
-0
ExcelParamDto.java
...in/java/com/xxfc/platform/vehicle/pojo/ExcelParamDto.java
+12
-0
VehicleBookRecordVo.java
...a/com/xxfc/platform/vehicle/pojo/VehicleBookRecordVo.java
+3
-0
pom.xml
xx-vehicle/xx-vehicle-server/pom.xml
+5
-0
VehicleBookRecordBiz.java
...a/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java
+24
-6
VehicleCountRecordBiz.java
.../com/xxfc/platform/vehicle/biz/VehicleCountRecordBiz.java
+430
-0
VehicleBookRecordMapper.java
...xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java
+3
-0
VehicleCountRecordMapper.java
...xfc/platform/vehicle/mapper/VehicleCountRecordMapper.java
+13
-0
VehicleCountRecordController.java
...c/platform/vehicle/rest/VehicleCountRecordController.java
+33
-0
generatorConfig.xml
...cle-server/src/main/resources/builder/generatorConfig.xml
+2
-2
VehicleBookRecordMapper.xml
...ver/src/main/resources/mapper/VehicleBookRecordMapper.xml
+20
-0
VehicleCountRecordMapper.xml
...er/src/main/resources/mapper/VehicleCountRecordMapper.xml
+38
-0
No files found.
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java
View file @
be343ca5
...
@@ -3,6 +3,7 @@ package com.xxfc.platform.order.feign;
...
@@ -3,6 +3,7 @@ package com.xxfc.platform.order.feign;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.github.wxiaoqi.security.common.vo.GoodDataVO
;
import
com.github.wxiaoqi.security.common.vo.GoodDataVO
;
import
com.xxfc.platform.order.entity.BaseOrder
;
import
com.xxfc.platform.order.entity.BaseOrder
;
import
com.xxfc.platform.order.pojo.order.OrderPageVO
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.common.RestResponse
;
import
com.xxfc.platform.vehicle.entity.*
;
import
com.xxfc.platform.vehicle.entity.*
;
import
com.xxfc.platform.vehicle.pojo.*
;
import
com.xxfc.platform.vehicle.pojo.*
;
...
@@ -21,4 +22,7 @@ import java.util.Set;
...
@@ -21,4 +22,7 @@ import java.util.Set;
public
interface
OrderFeign
{
public
interface
OrderFeign
{
@GetMapping
(
"/baseOrder/count"
)
@GetMapping
(
"/baseOrder/count"
)
public
ObjectRestResponse
<
Integer
>
baseOrderCount
(
@RequestParam
(
"hasMemberRight"
)
Integer
hasMemberRight
,
@RequestParam
(
"multiStatus"
)
String
multiStatus
,
@RequestParam
(
"multiTypes"
)
String
multiTypes
,
@RequestParam
(
"userId"
)
Integer
userId
);
public
ObjectRestResponse
<
Integer
>
baseOrderCount
(
@RequestParam
(
"hasMemberRight"
)
Integer
hasMemberRight
,
@RequestParam
(
"multiStatus"
)
String
multiStatus
,
@RequestParam
(
"multiTypes"
)
String
multiTypes
,
@RequestParam
(
"userId"
)
Integer
userId
);
@GetMapping
(
"/count/list"
)
public
ObjectRestResponse
<
List
<
OrderPageVO
>>
getOrderList
(
@RequestParam
(
"dateTime"
)
Long
dateTime
,
@RequestParam
(
"type"
)
Integer
type
,
@RequestParam
(
"status"
)
Integer
status
);
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/rpc/OrderListBiz.java
0 → 100644
View file @
be343ca5
package
com
.
xxfc
.
platform
.
order
.
biz
.
rpc
;
import
com.github.wxiaoqi.security.common.biz.BaseBiz
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.order.contant.enumerate.OrderTypeEnum
;
import
com.xxfc.platform.order.entity.BaseOrder
;
import
com.xxfc.platform.order.mapper.BaseOrderMapper
;
import
com.xxfc.platform.order.pojo.order.OrderPageVO
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.stereotype.Service
;
import
java.util.HashMap
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.TimeZone
;
@Service
public
class
OrderListBiz
extends
BaseBiz
<
BaseOrderMapper
,
BaseOrder
>
{
/**
*
* @param dateTime 筛选的时间
* @param type 筛选的类型, 1,租车,2,旅游
* @return
*/
public
ObjectRestResponse
<
List
<
OrderPageVO
>>
getOrderList
(
Long
dateTime
,
Integer
type
,
Integer
status
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
if
(
dateTime
!=
null
)
{
map
.
put
(
"startTime"
,
getDayStart
(
dateTime
));
map
.
put
(
"endTime"
,
getDayStart
(
dateTime
)
+
3600
*
24
*
1000
);
}
map
.
put
(
"status"
,
status
);
if
(
type
==
OrderTypeEnum
.
RENT_VEHICLE
.
getCode
())
{
//租车
List
<
OrderPageVO
>
list
=
mapper
.
selectAllRentVehicleOrder
(
map
);
return
ObjectRestResponse
.
succ
(
list
);
}
else
if
(
type
==
OrderTypeEnum
.
TOUR
.
getCode
())
{
List
<
OrderPageVO
>
list
=
mapper
.
selectAllTourOrder
(
map
);
return
ObjectRestResponse
.
succ
(
list
);
}
else
{
return
ObjectRestResponse
.
succ
();
}
}
public
static
Long
getDayStart
(
Long
datetime
)
{
long
current
=
datetime
;
long
zero
=
current
/
(
1000
*
3600
*
24
)
*
(
1000
*
3600
*
24
)
-
TimeZone
.
getDefault
().
getRawOffset
();
return
zero
;
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
View file @
be343ca5
...
@@ -28,4 +28,8 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
...
@@ -28,4 +28,8 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
public
OrderPageVO
getOrderDetail
(
String
no
);
public
OrderPageVO
getOrderDetail
(
String
no
);
public
List
<
OrderPageVO
>
selectAllRentVehicleOrder
(
Map
<
String
,
Object
>
paramMap
);
public
List
<
OrderPageVO
>
selectAllTourOrder
(
Map
<
String
,
Object
>
paramMap
);
}
}
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/background/OrderListController.java
0 → 100644
View file @
be343ca5
package
com
.
xxfc
.
platform
.
order
.
rest
.
background
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.order.biz.rpc.OrderListBiz
;
import
com.xxfc.platform.order.pojo.order.OrderPageVO
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestParam
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.List
;
@RestController
@RequestMapping
(
value
=
"/count"
)
public
class
OrderListController
{
@Autowired
OrderListBiz
orderListBiz
;
@GetMapping
(
"/list"
)
public
ObjectRestResponse
<
List
<
OrderPageVO
>>
getOrderList
(
@RequestParam
(
"dateTime"
)
Long
dateTime
,
@RequestParam
(
"type"
)
Integer
type
,
@RequestParam
(
"status"
)
Integer
status
)
{
return
orderListBiz
.
getOrderList
(
dateTime
,
type
,
status
);
}
}
xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
View file @
be343ca5
...
@@ -127,9 +127,6 @@
...
@@ -127,9 +127,6 @@
</foreach>
</foreach>
</if>
</if>
<if
test=
"userId != null"
>
and b.user_id = #{userId}
</if>
<if
test=
"status != null"
>
<if
test=
"status != null"
>
and b.status = #{status}
and b.status = #{status}
</if>
</if>
...
@@ -251,5 +248,26 @@
...
@@ -251,5 +248,26 @@
where no = #{no}
where no = #{no}
</select>
</select>
<select
id=
"selectAllRentVehicleOrder"
parameterType=
"Map"
resultMap=
"orderPageMap"
>
select b.*
from base_order b
LEFT JOIN order_rent_vehicle_detail r on r.order_id = b.id
where b.type = 2 and b.status
>
= 4
<if
test=
"startTime != null and status == 1"
>
and r.start_time between #{startTime} and #{endTime}
</if>
<if
test=
"startTime != null and status == 2"
>
and r.start_time between #{startTime} and #{endTime}
</if>
</select>
<select
id=
"selectAllTourOrder"
parameterType=
"Map"
resultMap=
"orderPageMap"
>
select b.*
from base_order b
LEFT JOIN order_tour_detail r on r.order_id = b.id
where b.type = 2 and b.status
>
= 4
<if
test=
"startTime != null"
>
and r.start_time between #{startTime} and #{endTime}
</if>
</select>
</mapper>
</mapper>
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/VehicleCountType.java
0 → 100644
View file @
be343ca5
package
com
.
xxfc
.
platform
.
vehicle
.
constant
;
import
java.util.HashMap
;
import
java.util.Map
;
public
enum
VehicleCountType
{
RENT_VEHICLE
(
1
,
"租车用车"
),
TOUR
(
2
,
"旅游用车"
),
INNER
(
3
,
"内部用车"
),
;
/**
* 编码
*/
private
Integer
code
;
/**
* 类型描述
*/
private
String
desc
;
public
static
Map
<
Integer
,
VehicleCountType
>
codeAndDesc
=
new
HashMap
<
Integer
,
VehicleCountType
>();
//Maps.newHashMap();
static
{
for
(
VehicleCountType
enumE
:
VehicleCountType
.
values
()){
codeAndDesc
.
put
(
enumE
.
getCode
(),
enumE
);
}
}
VehicleCountType
(
Integer
code
,
String
desc
){
this
.
code
=
code
;
this
.
desc
=
desc
;
}
public
Integer
getCode
()
{
return
code
;
}
public
void
setCode
(
Integer
code
)
{
this
.
code
=
code
;
}
public
String
getDesc
()
{
return
desc
;
}
public
void
setDesc
(
String
desc
)
{
this
.
desc
=
desc
;
}
public
static
Boolean
exists
(
Integer
code
){
return
codeAndDesc
.
containsKey
(
code
);
}
public
static
VehicleCountType
get
(
Integer
code
)
{
for
(
VehicleCountType
enumE
:
VehicleCountType
.
values
())
{
if
(
enumE
.
getCode
().
equals
(
code
))
{
return
enumE
;
}
}
return
null
;
}
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleCountRecord.java
0 → 100644
View file @
be343ca5
package
com
.
xxfc
.
platform
.
vehicle
.
entity
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
lombok.Data
;
import
org.springframework.format.annotation.DateTimeFormat
;
import
javax.persistence.*
;
import
java.util.Date
;
@Table
(
name
=
"vehicle_count_record"
)
@Data
public
class
VehicleCountRecord
{
@Id
private
Integer
id
;
private
Integer
type
;
/**
* 应出车数量
*/
@Column
(
name
=
"departure_num"
)
private
Integer
departureNum
;
/**
* 实际出车数量
*/
@Column
(
name
=
"actual_departure_num"
)
private
Integer
actualDepartureNum
;
/**
* 延期交车数量
*/
@Column
(
name
=
"after_departure_num"
)
private
Integer
afterDepartureNum
;
/**
* 提前交车数
*/
@Column
(
name
=
"before_departure_num"
)
private
Integer
beforeDepartureNum
;
/**
* 应还车数量
*/
@Column
(
name
=
"arrival_num"
)
private
Integer
arrivalNum
;
/**
* 未提前还车数量
*/
@Column
(
name
=
"actual_arrival_num"
)
private
Integer
actualArrivalNum
;
/**
* 延后还车数量
*/
@Column
(
name
=
"after_arrival_num"
)
private
Integer
afterArrivalNum
;
/**
* 提前还车数量
*/
@Column
(
name
=
"before_arrival_num"
)
private
Integer
beforeArrivalNum
;
/**
* 统计日期 yyyy-MM-dd
*/
@DateTimeFormat
(
pattern
=
"yyyy-MM-dd"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd"
)
private
Date
countDate
;
@Transient
private
String
startTime
;
@Transient
private
String
endTime
;
}
\ No newline at end of file
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/ExcelParamDto.java
0 → 100644
View file @
be343ca5
package
com
.
xxfc
.
platform
.
vehicle
.
pojo
;
import
lombok.Data
;
import
java.util.List
;
@Data
public
class
ExcelParamDto
{
List
<
Object
[]>
data
;
String
[]
header
;
String
name
;
}
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordVo.java
View file @
be343ca5
...
@@ -40,4 +40,7 @@ public class VehicleBookRecordVo extends VehicleBookRecord {
...
@@ -40,4 +40,7 @@ public class VehicleBookRecordVo extends VehicleBookRecord {
List
<
VehicleUpkeepItem
>
vehicleUpkeepItems
;
List
<
VehicleUpkeepItem
>
vehicleUpkeepItems
;
private
String
userCompanyName
;
}
}
xx-vehicle/xx-vehicle-server/pom.xml
View file @
be343ca5
...
@@ -29,6 +29,11 @@
...
@@ -29,6 +29,11 @@
<artifactId>
xx-universal-api
</artifactId>
<artifactId>
xx-universal-api
</artifactId>
<version>
2.0-SNAPSHOT
</version>
<version>
2.0-SNAPSHOT
</version>
</dependency>
</dependency>
<dependency>
<groupId>
com.xxfc.platform
</groupId>
<artifactId>
xx-order-api
</artifactId>
<version>
2.0-SNAPSHOT
</version>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java
View file @
be343ca5
...
@@ -149,7 +149,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
...
@@ -149,7 +149,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
vehicleBookRecordQueryVo
.
setCompanyIds
(
companyList
);
vehicleBookRecordQueryVo
.
setCompanyIds
(
companyList
);
Query
query
=
new
Query
(
vehicleBookRecordQueryVo
);
Query
query
=
new
Query
(
vehicleBookRecordQueryVo
);
PageDataVO
<
VehicleBookRecordVo
>
pageDataVO
=
PageDataVO
.
pageInfo
(
query
,
()
->
mapper
.
getBookRecordInfo
(
query
.
getSuper
()));
PageDataVO
<
VehicleBookRecordVo
>
pageDataVO
=
PageDataVO
.
pageInfo
(
query
,
()
->
mapper
.
getBookRecordInfo
(
query
.
getSuper
()));
getupKeeps
(
pageDataVO
.
getData
());
getupKeeps
(
pageDataVO
.
getData
()
,
userDTO
);
return
RestResponse
.
suc
(
pageDataVO
);
return
RestResponse
.
suc
(
pageDataVO
);
}
}
...
@@ -198,7 +198,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
...
@@ -198,7 +198,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
List
<
VehicleBookRecordVo
>
list
=
mapper
.
getBookRecordInfo
(
query
.
getSuper
());
List
<
VehicleBookRecordVo
>
list
=
mapper
.
getBookRecordInfo
(
query
.
getSuper
());
removeStatus3
(
list
);
removeStatus3
(
list
);
PageInfo
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageInfo
=
new
PageInfo
<>(
list
);
PageInfo
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageInfo
=
new
PageInfo
<>(
list
);
getupKeeps
(
vehicleBookRecordVoPageInfo
.
getList
());
getupKeeps
(
vehicleBookRecordVoPageInfo
.
getList
()
,
userDTO
);
PageDataVO
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageDataVO
=
PageDataVO
.
pageInfo
(
vehicleBookRecordVoPageInfo
);
PageDataVO
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageDataVO
=
PageDataVO
.
pageInfo
(
vehicleBookRecordVoPageInfo
);
vehicleBookRecordVoPageDataVO
.
setPageNum
(
pageNo
);
vehicleBookRecordVoPageDataVO
.
setPageNum
(
pageNo
);
vehicleBookRecordVoPageDataVO
.
setPageSize
(
pageSize
);
vehicleBookRecordVoPageDataVO
.
setPageSize
(
pageSize
);
...
@@ -213,7 +213,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
...
@@ -213,7 +213,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
List
<
VehicleBookRecordVo
>
list
=
mapper
.
getBookRecordInfo
(
query
.
getSuper
());
List
<
VehicleBookRecordVo
>
list
=
mapper
.
getBookRecordInfo
(
query
.
getSuper
());
removeStatus5
(
list
);
removeStatus5
(
list
);
PageInfo
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageInfo
=
new
PageInfo
<>(
list
);
PageInfo
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageInfo
=
new
PageInfo
<>(
list
);
getupKeeps
(
vehicleBookRecordVoPageInfo
.
getList
());
getupKeeps
(
vehicleBookRecordVoPageInfo
.
getList
()
,
userDTO
);
PageDataVO
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageDataVO
=
PageDataVO
.
pageInfo
(
vehicleBookRecordVoPageInfo
);
PageDataVO
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageDataVO
=
PageDataVO
.
pageInfo
(
vehicleBookRecordVoPageInfo
);
vehicleBookRecordVoPageDataVO
.
setPageNum
(
pageNo
);
vehicleBookRecordVoPageDataVO
.
setPageNum
(
pageNo
);
vehicleBookRecordVoPageDataVO
.
setPageSize
(
pageSize
);
vehicleBookRecordVoPageDataVO
.
setPageSize
(
pageSize
);
...
@@ -228,7 +228,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
...
@@ -228,7 +228,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
List
<
VehicleBookRecordVo
>
list
=
mapper
.
getBookRecordInfo
(
query
.
getSuper
());
List
<
VehicleBookRecordVo
>
list
=
mapper
.
getBookRecordInfo
(
query
.
getSuper
());
removeStatus7
(
list
);
removeStatus7
(
list
);
PageInfo
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageInfo
=
new
PageInfo
<>(
list
);
PageInfo
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageInfo
=
new
PageInfo
<>(
list
);
getupKeeps
(
vehicleBookRecordVoPageInfo
.
getList
());
getupKeeps
(
vehicleBookRecordVoPageInfo
.
getList
()
,
userDTO
);
PageDataVO
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageDataVO
=
PageDataVO
.
pageInfo
(
vehicleBookRecordVoPageInfo
);
PageDataVO
<
VehicleBookRecordVo
>
vehicleBookRecordVoPageDataVO
=
PageDataVO
.
pageInfo
(
vehicleBookRecordVoPageInfo
);
vehicleBookRecordVoPageDataVO
.
setPageNum
(
pageNo
);
vehicleBookRecordVoPageDataVO
.
setPageNum
(
pageNo
);
vehicleBookRecordVoPageDataVO
.
setPageSize
(
pageSize
);
vehicleBookRecordVoPageDataVO
.
setPageSize
(
pageSize
);
...
@@ -239,7 +239,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
...
@@ -239,7 +239,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
}
}
Query
query
=
new
Query
(
vehicleBookRecordQueryVo
);
Query
query
=
new
Query
(
vehicleBookRecordQueryVo
);
PageDataVO
<
VehicleBookRecordVo
>
pageDataVO
=
PageDataVO
.
pageInfo
(
query
,
()
->
mapper
.
getBookRecordInfo
(
query
.
getSuper
()));
PageDataVO
<
VehicleBookRecordVo
>
pageDataVO
=
PageDataVO
.
pageInfo
(
query
,
()
->
mapper
.
getBookRecordInfo
(
query
.
getSuper
()));
getupKeeps
(
pageDataVO
.
getData
());
getupKeeps
(
pageDataVO
.
getData
()
,
userDTO
);
return
RestResponse
.
suc
(
pageDataVO
);
return
RestResponse
.
suc
(
pageDataVO
);
}
}
...
@@ -300,7 +300,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
...
@@ -300,7 +300,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
/**
/**
* 获取随身物品
* 获取随身物品
*/
*/
public
List
<
VehicleBookRecordVo
>
getupKeeps
(
List
<
VehicleBookRecordVo
>
vehicleBookRecordVos
)
{
public
List
<
VehicleBookRecordVo
>
getupKeeps
(
List
<
VehicleBookRecordVo
>
vehicleBookRecordVos
,
UserDTO
userDTO
)
{
for
(
VehicleBookRecordVo
vehicleBookRecordVo
:
vehicleBookRecordVos
)
{
for
(
VehicleBookRecordVo
vehicleBookRecordVo
:
vehicleBookRecordVos
)
{
if
(
vehicleBookRecordVo
.
getBookType
()
==
BookType
.
MAINTAIN
.
getCode
())
{
//获取 保养项目
if
(
vehicleBookRecordVo
.
getBookType
()
==
BookType
.
MAINTAIN
.
getCode
())
{
//获取 保养项目
if
(
StringUtils
.
isNotBlank
(
vehicleBookRecordVo
.
getUpkeepIds
()))
{
if
(
StringUtils
.
isNotBlank
(
vehicleBookRecordVo
.
getUpkeepIds
()))
{
...
@@ -311,10 +311,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
...
@@ -311,10 +311,21 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
}
}
}
}
}
}
if
(
userDTO
.
getCompanyId
()
!=
null
)
{
BranchCompany
branchCompany
=
branchCompanyBiz
.
getById
(
userDTO
.
getCompanyId
());
if
(
branchCompany
!=
null
)
{
vehicleBookRecordVo
.
setUserCompanyName
(
branchCompany
.
getName
());
}
}
}
}
return
vehicleBookRecordVos
;
return
vehicleBookRecordVos
;
}
}
public
ObjectRestResponse
<
List
<
VehicleBookRecordVo
>>
selectByIds
(
List
<
Long
>
ids
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"ids"
,
ids
);
return
ObjectRestResponse
.
succ
(
mapper
.
selectByIds
(
map
));
}
public
RestResponse
<
Integer
>
lift
(
Integer
operatorId
,
String
userName
,
LiftVehicleVo
liftVehicleVo
)
throws
Exception
{
public
RestResponse
<
Integer
>
lift
(
Integer
operatorId
,
String
userName
,
LiftVehicleVo
liftVehicleVo
)
throws
Exception
{
Map
<
String
,
Object
>
params
=
PropertyUtils
.
describe
(
liftVehicleVo
);
Map
<
String
,
Object
>
params
=
PropertyUtils
.
describe
(
liftVehicleVo
);
...
@@ -499,6 +510,13 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
...
@@ -499,6 +510,13 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
}
}
public
ObjectRestResponse
<
List
<
VehicleBookRecordVo
>>
selectAllBookRecord
(
Date
startTime
,
Date
endTime
,
Integer
status
)
{
Map
<
String
,
Object
>
map
=
new
HashMap
<>();
map
.
put
(
"startTime"
,
startTime
);
map
.
put
(
"endTime"
,
endTime
);
map
.
put
(
"status"
,
status
);
return
ObjectRestResponse
.
succ
(
mapper
.
selectAllBookRecord
(
map
));
}
/**
/**
* 获取上月数据,并复制到历史表
* 获取上月数据,并复制到历史表
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleCountRecordBiz.java
0 → 100644
View file @
be343ca5
This diff is collapsed.
Click to expand it.
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java
View file @
be343ca5
...
@@ -40,4 +40,7 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
...
@@ -40,4 +40,7 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
public
List
<
VehicleBookRecordVo
>
selectZeroHourRecord
(
Map
<
String
,
Object
>
param
);
public
List
<
VehicleBookRecordVo
>
selectZeroHourRecord
(
Map
<
String
,
Object
>
param
);
public
List
<
VehicleBookRecordVo
>
selectAllBookRecord
(
Map
<
String
,
Object
>
param
);
public
List
<
VehicleBookRecordVo
>
selectByIds
(
Map
<
String
,
Object
>
param
);
}
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleCountRecordMapper.java
0 → 100644
View file @
be343ca5
package
com
.
xxfc
.
platform
.
vehicle
.
mapper
;
import
com.xxfc.platform.vehicle.entity.VehicleCountRecord
;
import
tk.mybatis.mapper.common.Mapper
;
import
java.util.List
;
import
java.util.Map
;
public
interface
VehicleCountRecordMapper
extends
Mapper
<
VehicleCountRecord
>
{
List
<
VehicleCountRecord
>
countDepartureVehicle
(
VehicleCountRecord
vehicleCountRecord
);
List
<
VehicleCountRecord
>
selectByTypeAndTime
(
Map
<
String
,
Object
>
param
);
}
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleCountRecordController.java
0 → 100644
View file @
be343ca5
package
com
.
xxfc
.
platform
.
vehicle
.
rest
;
import
com.github.wxiaoqi.security.common.msg.ObjectRestResponse
;
import
com.xxfc.platform.vehicle.biz.VehicleCountRecordBiz
;
import
com.xxfc.platform.vehicle.entity.VehicleCountRecord
;
import
com.xxfc.platform.vehicle.pojo.ExcelParamDto
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.*
;
@RestController
@RequestMapping
(
value
=
"/vehicleCount"
)
public
class
VehicleCountRecordController
{
@Autowired
VehicleCountRecordBiz
vehicleCountRecordBiz
;
@GetMapping
(
"/app/unauth/test"
)
public
ObjectRestResponse
add
()
{
vehicleCountRecordBiz
.
add
();
return
ObjectRestResponse
.
succ
();
}
@GetMapping
(
"/app/unauth/get"
)
public
ObjectRestResponse
getByTypeAndDate
(
VehicleCountRecord
vehicleCountRecord
)
{
return
vehicleCountRecordBiz
.
countDepartureVehicle
(
vehicleCountRecord
);
}
@PostMapping
(
"/app/unauth/export"
)
public
ObjectRestResponse
export
(
@RequestBody
ExcelParamDto
excelParamDto
)
{
vehicleCountRecordBiz
.
export
(
excelParamDto
);
return
ObjectRestResponse
.
succ
();
}
}
xx-vehicle/xx-vehicle-server/src/main/resources/builder/generatorConfig.xml
View file @
be343ca5
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</plugin>
</plugin>
<jdbcConnection
driverClass=
"com.mysql.jdbc.Driver"
<jdbcConnection
driverClass=
"com.mysql.jdbc.Driver"
connectionURL=
"jdbc:mysql://10.5.52.3:3306/vehicle?useUnicode=true&characterEncoding=UTF8"
connectionURL=
"jdbc:mysql://10.5.52.3:3306/
xxfc_
vehicle?useUnicode=true&characterEncoding=UTF8"
userId=
"root"
userId=
"root"
password=
"sslcloud123*()"
>
password=
"sslcloud123*()"
>
</jdbcConnection>
</jdbcConnection>
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
<!-- </table>-->
<!-- </table>-->
<!-- <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
<!-- <table tableName="branch_company_stock_info" domainObjectName="BranchCompanyStockInfo"></table>-->
<!-- <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
<!-- <table tableName="branch_company_stock_apply_info" domainObjectName="BranchCompanyStockApplyInfo"></table>-->
<table
tableName=
"vehicle_
book_hour_info"
domainObjectName=
"VehicleBookHourInfo
"
></table>
<table
tableName=
"vehicle_
count_record"
domainObjectName=
"VehicleCountRecord
"
></table>
<!-- <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>-->
<!-- <table tableName="vehicle_upkeep_log" domainObjectName="VehicleUpkeepLog"></table>-->
</context>
</context>
</generatorConfiguration>
</generatorConfiguration>
\ No newline at end of file
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml
View file @
be343ca5
...
@@ -516,6 +516,26 @@
...
@@ -516,6 +516,26 @@
order by create_time DESC
order by create_time DESC
</select>
</select>
<select
id=
"selectAllBookRecord"
resultMap=
"searchBookRecord"
parameterType=
"Map"
>
select v1.* from vehicle_book_record v1
where v1.status not in (4,6,7,3)
<if
test=
"startTime != null and status == 1"
>
and v1.book_start_date between #{startTime} and #{endTime}
</if>
<if
test=
"startTime != null and status == 2"
>
and v1.book_end_date between #{startTime} and #{endTime}
</if>
</select>
<select
id=
"selectByIds"
resultMap=
"searchBookRecord"
parameterType=
"Map"
>
select v1.* from vehicle_book_record v1
where v1.status not in (4,6,7,3)
<if
test=
"ids != null and ids.size > 0"
>
and v1.id in
<foreach
collection=
"ids"
item=
"id"
open=
"("
separator=
","
close=
")"
>
#{id}
</foreach>
</if>
</select>
<insert
id=
"createTbIfNotExists"
parameterType=
"java.lang.String"
>
<insert
id=
"createTbIfNotExists"
parameterType=
"java.lang.String"
>
CREATE TABLE IF NOT EXISTS ${_parameter} (
CREATE TABLE IF NOT EXISTS ${_parameter} (
...
...
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleCountRecordMapper.xml
0 → 100644
View file @
be343ca5
<?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" >
<mapper
namespace=
"com.xxfc.platform.vehicle.mapper.VehicleCountRecordMapper"
>
<resultMap
id=
"BaseResultMap"
type=
"com.xxfc.platform.vehicle.entity.VehicleCountRecord"
>
<!--
WARNING - @mbg.generated
-->
<id
column=
"id"
property=
"id"
jdbcType=
"INTEGER"
/>
<result
column=
"type"
property=
"type"
jdbcType=
"INTEGER"
/>
<result
column=
"departure_num"
property=
"departureNum"
jdbcType=
"INTEGER"
/>
<result
column=
"actual_departure_num"
property=
"actualDepartureNum"
jdbcType=
"INTEGER"
/>
<result
column=
"after_departure_num"
property=
"afterDepartureNum"
jdbcType=
"INTEGER"
/>
<result
column=
"before_departure_num"
property=
"beforeDepartureNum"
jdbcType=
"INTEGER"
/>
<result
column=
"arrival_num"
property=
"arrivalNum"
jdbcType=
"INTEGER"
/>
<result
column=
"actual_arrival_num"
property=
"actualArrivalNum"
jdbcType=
"INTEGER"
/>
<result
column=
"after_arrival_num"
property=
"afterArrivalNum"
jdbcType=
"INTEGER"
/>
<result
column=
"before_arrival_num"
property=
"beforeArrivalNum"
jdbcType=
"INTEGER"
/>
<result
column=
"count_date"
property=
"countDate"
jdbcType=
"DATE"
/>
</resultMap>
<select
id =
"countDepartureVehicle"
parameterType =
"com.xxfc.platform.vehicle.entity.VehicleCountRecord"
resultMap =
"BaseResultMap"
>
select * from vehicle_count_record where count_date = #{time}
</select>
<select
id=
"selectByTypeAndTime"
parameterType =
"Map"
resultType=
"com.xxfc.platform.vehicle.entity.VehicleCountRecord"
>
select * from vehicle_count_record
<where>
<if
test=
"type != null"
>
and type = #{type}
</if>
<if
test=
"startTime != null"
>
and count_date
>
= #{startTime} and count_date
<
= #{endTime}
</if>
</where>
order by id DESC
</select>
</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