Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
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
项目统一框架
amos-boot-biz
Commits
1e00898c
Commit
1e00898c
authored
Aug 22, 2022
by
chenzhao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改代码
parent
ff8ccb14
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
+5
-5
EquipmentExportVO.java
...ejoin/equipmanage/common/entity/vo/EquipmentExportVO.java
+1
-1
EquipmentDetailDownloadTemplateDto.java
...n/equipmanage/dto/EquipmentDetailDownloadTemplateDto.java
+1
-1
EquipmentDetailExcelSingleTemplateDto.java
...quipmanage/dto/EquipmentDetailExcelSingleTemplateDto.java
+1
-1
EquipmentManageMapper.xml
...equip/src/main/resources/mapper/EquipmentManageMapper.xml
+2
-2
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/entity/vo/EquipmentExportVO.java
View file @
1e00898c
...
@@ -24,7 +24,7 @@ public class EquipmentExportVO {
...
@@ -24,7 +24,7 @@ public class EquipmentExportVO {
private
String
validityPeriod
=
""
;
private
String
validityPeriod
=
""
;
@ExcelProperty
(
value
=
"维保周期"
,
index
=
5
)
@ExcelProperty
(
value
=
"维保周期"
,
index
=
5
)
private
String
maintenanceCycle
=
""
;
private
String
maintenanceCycle
=
""
;
@ExcelProperty
(
value
=
"投运
时间
"
,
index
=
6
)
@ExcelProperty
(
value
=
"投运
日期
"
,
index
=
6
)
private
String
operationTime
=
""
;
private
String
operationTime
=
""
;
@ExcelProperty
(
value
=
"生产厂商"
,
index
=
7
)
@ExcelProperty
(
value
=
"生产厂商"
,
index
=
7
)
private
String
manufacturer
=
""
;
private
String
manufacturer
=
""
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailDownloadTemplateDto.java
View file @
1e00898c
...
@@ -67,7 +67,7 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable {
...
@@ -67,7 +67,7 @@ public class EquipmentDetailDownloadTemplateDto implements Serializable {
//@Excel(name = "品牌", width = 30, orderNum = "4")
//@Excel(name = "品牌", width = 30, orderNum = "4")
private
BigDecimal
maintenanceCycle
;
private
BigDecimal
maintenanceCycle
;
@Excel
(
name
=
"投运
时间
"
,
width
=
30
,
orderNum
=
"16"
)
@Excel
(
name
=
"投运
日期
"
,
width
=
30
,
orderNum
=
"16"
)
//@Excel(name = "品牌", width = 30, orderNum = "4")
//@Excel(name = "品牌", width = 30, orderNum = "4")
private
Date
deliveryDate
;
private
Date
deliveryDate
;
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/dto/EquipmentDetailExcelSingleTemplateDto.java
View file @
1e00898c
...
@@ -76,7 +76,7 @@ public class EquipmentDetailExcelSingleTemplateDto {
...
@@ -76,7 +76,7 @@ public class EquipmentDetailExcelSingleTemplateDto {
//@Excel(name = "品牌", width = 30, orderNum = "4")
//@Excel(name = "品牌", width = 30, orderNum = "4")
private
BigDecimal
maintenanceCycle
;
private
BigDecimal
maintenanceCycle
;
@ExcelProperty
(
value
=
"投运
时间
"
,
index
=
15
)
@ExcelProperty
(
value
=
"投运
日期
"
,
index
=
15
)
//@Excel(name = "品牌", width = 30, orderNum = "4")
//@Excel(name = "品牌", width = 30, orderNum = "4")
private
Date
deliveryDate
;
private
Date
deliveryDate
;
...
...
amos-boot-system-equip/src/main/resources/mapper/EquipmentManageMapper.xml
View file @
1e00898c
...
@@ -47,7 +47,7 @@
...
@@ -47,7 +47,7 @@
AND biz_org_code like CONCAT(#{bizOrgCode},'%')
AND biz_org_code like CONCAT(#{bizOrgCode},'%')
</if>
</if>
<if
test=
"companyCode != null and companyCode != ''"
>
<if
test=
"companyCode != null and companyCode != ''"
>
AND biz_org_code ={companyCode}
AND biz_org_code =
#
{companyCode}
</if>
</if>
<if
test=
"formGroupId != null and formGroupId != '' and formGroupId != '-1'"
>
<if
test=
"formGroupId != null and formGroupId != '' and formGroupId != '-1'"
>
AND form_group_id = #{formGroupId}
AND form_group_id = #{formGroupId}
...
@@ -80,7 +80,7 @@
...
@@ -80,7 +80,7 @@
AND biz_org_code like CONCAT(#{bizOrgCode},'%')
AND biz_org_code like CONCAT(#{bizOrgCode},'%')
</if>
</if>
<if
test=
"companyCode != null and companyCode != ''"
>
<if
test=
"companyCode != null and companyCode != ''"
>
AND biz_org_code ={companyCode}
AND biz_org_code =
#
{companyCode}
</if>
</if>
<if
test=
"formGroupId != null and formGroupId != '' and formGroupId != '-1'"
>
<if
test=
"formGroupId != null and formGroupId != '' and formGroupId != '-1'"
>
AND form_group_id = #{formGroupId}
AND form_group_id = #{formGroupId}
...
...
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