Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety
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
耿迪迪
gassafety
Commits
519b3734
Commit
519b3734
authored
Jul 31, 2021
by
王晓倩
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
工单相关表字段及接口修改
parent
ea47958b
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
300 additions
and
186 deletions
+300
-186
TInspectionPlanController.java
...ontroller/deviceInspection/TInspectionPlanController.java
+6
-4
TDeviceAlarm.java
.../src/main/java/com/zehong/system/domain/TDeviceAlarm.java
+16
-16
TDeviceInfo.java
...m/src/main/java/com/zehong/system/domain/TDeviceInfo.java
+6
-6
TEnterpriseInfo.java
...c/main/java/com/zehong/system/domain/TEnterpriseInfo.java
+3
-3
THiddenTrouble.java
...rc/main/java/com/zehong/system/domain/THiddenTrouble.java
+12
-12
TInspectionData.java
...c/main/java/com/zehong/system/domain/TInspectionData.java
+17
-17
TInspectionPlan.java
...c/main/java/com/zehong/system/domain/TInspectionPlan.java
+21
-17
TOrderFeedback.java
...rc/main/java/com/zehong/system/domain/TOrderFeedback.java
+11
-11
TPipe.java
...-system/src/main/java/com/zehong/system/domain/TPipe.java
+6
-6
TWorkOrder.java
...em/src/main/java/com/zehong/system/domain/TWorkOrder.java
+3
-3
InspectionPlanForm.java
...ava/com/zehong/system/domain/form/InspectionPlanForm.java
+104
-0
OrderFeedbackVo.java
...ain/java/com/zehong/system/domain/vo/OrderFeedbackVo.java
+10
-11
WorkOrderVo.java
...rc/main/java/com/zehong/system/domain/vo/WorkOrderVo.java
+6
-7
TInspectionDataMapper.java
.../java/com/zehong/system/mapper/TInspectionDataMapper.java
+2
-2
TInspectionPlanMapper.java
.../java/com/zehong/system/mapper/TInspectionPlanMapper.java
+3
-2
ITInspectionPlanService.java
...va/com/zehong/system/service/ITInspectionPlanService.java
+3
-2
TInspectionPlanServiceImpl.java
...ehong/system/service/impl/TInspectionPlanServiceImpl.java
+4
-3
TOrderFeedbackServiceImpl.java
...zehong/system/service/impl/TOrderFeedbackServiceImpl.java
+6
-4
TWorkOrderServiceImpl.java
...com/zehong/system/service/impl/TWorkOrderServiceImpl.java
+12
-14
TDeviceAlarmMapper.xml
...m/src/main/resources/mapper/system/TDeviceAlarmMapper.xml
+11
-11
THiddenTroubleMapper.xml
...src/main/resources/mapper/system/THiddenTroubleMapper.xml
+7
-7
TInspectionDataMapper.xml
...rc/main/resources/mapper/system/TInspectionDataMapper.xml
+8
-8
TInspectionPlanMapper.xml
...rc/main/resources/mapper/system/TInspectionPlanMapper.xml
+14
-11
TOrderFeedbackMapper.xml
...src/main/resources/mapper/system/TOrderFeedbackMapper.xml
+6
-6
index.vue
gassafety-web/src/views/workOrder/feedback/index.vue
+3
-3
No files found.
gassafety-admin/src/main/java/com/zehong/web/controller/deviceInspection/TInspectionPlanController.java
View file @
519b3734
package
com
.
zehong
.
web
.
controller
.
deviceInspection
;
package
com
.
zehong
.
web
.
controller
.
deviceInspection
;
import
java.util.List
;
import
java.util.List
;
import
com.zehong.system.domain.form.InspectionPlanForm
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.security.access.prepost.PreAuthorize
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.GetMapping
;
...
@@ -38,10 +40,10 @@ public class TInspectionPlanController extends BaseController
...
@@ -38,10 +40,10 @@ public class TInspectionPlanController extends BaseController
*/
*/
@PreAuthorize
(
"@ss.hasPermi('deviceInspection:inspectionPlan:list')"
)
@PreAuthorize
(
"@ss.hasPermi('deviceInspection:inspectionPlan:list')"
)
@GetMapping
(
"/list"
)
@GetMapping
(
"/list"
)
public
TableDataInfo
list
(
TInspectionPlan
tInspectionPlan
)
public
TableDataInfo
list
(
InspectionPlanForm
inspectionPlanForm
)
{
{
startPage
();
startPage
();
List
<
TInspectionPlan
>
list
=
tInspectionPlanService
.
selectTInspectionPlanList
(
tInspectionPlan
);
List
<
TInspectionPlan
>
list
=
tInspectionPlanService
.
selectTInspectionPlanList
(
inspectionPlanForm
);
return
getDataTable
(
list
);
return
getDataTable
(
list
);
}
}
...
@@ -51,9 +53,9 @@ public class TInspectionPlanController extends BaseController
...
@@ -51,9 +53,9 @@ public class TInspectionPlanController extends BaseController
@PreAuthorize
(
"@ss.hasPermi('deviceInspection:inspectionPlan:export')"
)
@PreAuthorize
(
"@ss.hasPermi('deviceInspection:inspectionPlan:export')"
)
@Log
(
title
=
"巡检计划"
,
businessType
=
BusinessType
.
EXPORT
)
@Log
(
title
=
"巡检计划"
,
businessType
=
BusinessType
.
EXPORT
)
@GetMapping
(
"/export"
)
@GetMapping
(
"/export"
)
public
AjaxResult
export
(
TInspectionPlan
tInspectionPlan
)
public
AjaxResult
export
(
InspectionPlanForm
inspectionPlanForm
)
{
{
List
<
TInspectionPlan
>
list
=
tInspectionPlanService
.
selectTInspectionPlanList
(
tInspectionPlan
);
List
<
TInspectionPlan
>
list
=
tInspectionPlanService
.
selectTInspectionPlanList
(
inspectionPlanForm
);
ExcelUtil
<
TInspectionPlan
>
util
=
new
ExcelUtil
<
TInspectionPlan
>(
TInspectionPlan
.
class
);
ExcelUtil
<
TInspectionPlan
>
util
=
new
ExcelUtil
<
TInspectionPlan
>(
TInspectionPlan
.
class
);
return
util
.
exportExcel
(
list
,
"巡检计划数据"
);
return
util
.
exportExcel
(
list
,
"巡检计划数据"
);
}
}
...
...
gassafety-system/src/main/java/com/zehong/system/domain/TDeviceAlarm.java
View file @
519b3734
...
@@ -18,14 +18,14 @@ public class TDeviceAlarm extends BaseEntity
...
@@ -18,14 +18,14 @@ public class TDeviceAlarm extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
/** $column.columnComment */
private
int
alarmId
;
private
Integer
alarmId
;
/** 设备id */
/** 设备id */
@Excel
(
name
=
"设备id"
)
@Excel
(
name
=
"设备id"
)
private
String
deviceCode
;
private
Integer
deviceId
;
/**
是否是管道信息(0是,1否
) */
/**
设备类型(0管道,1调压阀,2阀门井,3流量计,4压力表
) */
private
String
isPi
pe
;
private
String
deviceTy
pe
;
/** 工单id */
/** 工单id */
@Excel
(
name
=
"工单id"
)
@Excel
(
name
=
"工单id"
)
...
@@ -57,31 +57,31 @@ public class TDeviceAlarm extends BaseEntity
...
@@ -57,31 +57,31 @@ public class TDeviceAlarm extends BaseEntity
@Excel
(
name
=
"备注"
)
@Excel
(
name
=
"备注"
)
private
String
remarks
;
private
String
remarks
;
public
void
setAlarmId
(
int
alarmId
)
public
void
setAlarmId
(
Integer
alarmId
)
{
{
this
.
alarmId
=
alarmId
;
this
.
alarmId
=
alarmId
;
}
}
public
int
getAlarmId
()
public
Integer
getAlarmId
()
{
{
return
alarmId
;
return
alarmId
;
}
}
public
void
setDevice
Code
(
String
deviceCode
)
public
void
setDevice
Id
(
Integer
deviceId
)
{
{
this
.
device
Code
=
deviceCode
;
this
.
device
Id
=
deviceId
;
}
}
public
String
getDeviceCode
()
public
Integer
getDeviceId
()
{
{
return
device
Code
;
return
device
Id
;
}
}
public
String
get
IsPi
pe
()
{
public
String
get
DeviceTy
pe
()
{
return
isPi
pe
;
return
deviceTy
pe
;
}
}
public
void
set
IsPipe
(
String
isPi
pe
)
{
public
void
set
DeviceType
(
String
deviceTy
pe
)
{
this
.
isPipe
=
isPi
pe
;
this
.
deviceType
=
deviceTy
pe
;
}
}
public
void
setOrderId
(
String
orderId
)
public
void
setOrderId
(
String
orderId
)
...
@@ -152,8 +152,8 @@ public class TDeviceAlarm extends BaseEntity
...
@@ -152,8 +152,8 @@ public class TDeviceAlarm extends BaseEntity
public
String
toString
()
{
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"alarmId"
,
getAlarmId
())
.
append
(
"alarmId"
,
getAlarmId
())
.
append
(
"device
Code"
,
getDeviceCode
())
.
append
(
"device
Id"
,
getDeviceId
())
.
append
(
"isPipe"
,
get
IsPi
pe
())
.
append
(
"isPipe"
,
get
DeviceTy
pe
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"alarmType"
,
getAlarmType
())
.
append
(
"alarmType"
,
getAlarmType
())
.
append
(
"alarmValue"
,
getAlarmValue
())
.
append
(
"alarmValue"
,
getAlarmValue
())
...
...
gassafety-system/src/main/java/com/zehong/system/domain/TDeviceInfo.java
View file @
519b3734
...
@@ -19,11 +19,11 @@ public class TDeviceInfo extends BaseEntity
...
@@ -19,11 +19,11 @@ public class TDeviceInfo extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 设备id */
/** 设备id */
private
int
deviceId
;
private
Integer
deviceId
;
/** 企业id */
/** 企业id */
@Excel
(
name
=
"企业id"
)
@Excel
(
name
=
"企业id"
)
private
int
enterpriseId
;
private
Integer
enterpriseId
;
/** 所属管道编号 */
/** 所属管道编号 */
@Excel
(
name
=
"所属管道编号"
)
@Excel
(
name
=
"所属管道编号"
)
...
@@ -87,21 +87,21 @@ public class TDeviceInfo extends BaseEntity
...
@@ -87,21 +87,21 @@ public class TDeviceInfo extends BaseEntity
@Excel
(
name
=
"备注"
)
@Excel
(
name
=
"备注"
)
private
String
remarks
;
private
String
remarks
;
public
void
setDeviceId
(
int
deviceId
)
public
void
setDeviceId
(
Integer
deviceId
)
{
{
this
.
deviceId
=
deviceId
;
this
.
deviceId
=
deviceId
;
}
}
public
int
getDeviceId
()
public
Integer
getDeviceId
()
{
{
return
deviceId
;
return
deviceId
;
}
}
public
void
setEnterpriseId
(
int
enterpriseId
)
public
void
setEnterpriseId
(
Integer
enterpriseId
)
{
{
this
.
enterpriseId
=
enterpriseId
;
this
.
enterpriseId
=
enterpriseId
;
}
}
public
int
getEnterpriseId
()
public
Integer
getEnterpriseId
()
{
{
return
enterpriseId
;
return
enterpriseId
;
}
}
...
...
gassafety-system/src/main/java/com/zehong/system/domain/TEnterpriseInfo.java
View file @
519b3734
...
@@ -17,7 +17,7 @@ public class TEnterpriseInfo extends BaseEntity
...
@@ -17,7 +17,7 @@ public class TEnterpriseInfo extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** $column.columnComment */
/** $column.columnComment */
private
int
infoId
;
private
Integer
infoId
;
/** 单位名称 */
/** 单位名称 */
@Excel
(
name
=
"企业名称"
)
@Excel
(
name
=
"企业名称"
)
...
@@ -75,12 +75,12 @@ public class TEnterpriseInfo extends BaseEntity
...
@@ -75,12 +75,12 @@ public class TEnterpriseInfo extends BaseEntity
@Excel
(
name
=
"备注"
)
@Excel
(
name
=
"备注"
)
private
String
remarks
;
private
String
remarks
;
public
void
setInfoId
(
int
infoId
)
public
void
setInfoId
(
Integer
infoId
)
{
{
this
.
infoId
=
infoId
;
this
.
infoId
=
infoId
;
}
}
public
int
getInfoId
()
public
Integer
getInfoId
()
{
{
return
infoId
;
return
infoId
;
}
}
...
...
gassafety-system/src/main/java/com/zehong/system/domain/THiddenTrouble.java
View file @
519b3734
...
@@ -17,11 +17,11 @@ public class THiddenTrouble extends BaseEntity
...
@@ -17,11 +17,11 @@ public class THiddenTrouble extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 隐患信息id */
/** 隐患信息id */
private
int
troubleId
;
private
Integer
troubleId
;
/** 设备
编号
*/
/** 设备
id
*/
@Excel
(
name
=
"设备
编号
"
)
@Excel
(
name
=
"设备
id
"
)
private
String
deviceCode
;
private
Integer
deviceId
;
/** 设备类型(0管道,1调压阀,2阀门井,3流量计,4压力表) */
/** 设备类型(0管道,1调压阀,2阀门井,3流量计,4压力表) */
private
String
deviceType
;
private
String
deviceType
;
...
@@ -47,30 +47,30 @@ public class THiddenTrouble extends BaseEntity
...
@@ -47,30 +47,30 @@ public class THiddenTrouble extends BaseEntity
private
String
coordinates
;
private
String
coordinates
;
/** 处理状态(1不需处理,2已处理完成,3未处理完成) */
/** 处理状态(1不需处理,2已处理完成,3未处理完成) */
@Excel
(
name
=
"处理状态"
,
readConverterExp
=
"1
=
不需处理,2已处理完成,3未处理完成"
)
@Excel
(
name
=
"处理状态"
,
readConverterExp
=
"1不需处理,2已处理完成,3未处理完成"
)
private
String
dealStatus
;
private
String
dealStatus
;
/** 备注 */
/** 备注 */
@Excel
(
name
=
"备注"
)
@Excel
(
name
=
"备注"
)
private
String
remarks
;
private
String
remarks
;
public
void
setTroubleId
(
int
troubleId
)
public
void
setTroubleId
(
Integer
troubleId
)
{
{
this
.
troubleId
=
troubleId
;
this
.
troubleId
=
troubleId
;
}
}
public
int
getTroubleId
()
public
Integer
getTroubleId
()
{
{
return
troubleId
;
return
troubleId
;
}
}
public
void
setDevice
Code
(
String
deviceCode
)
public
void
setDevice
Id
(
Integer
deviceId
)
{
{
this
.
device
Code
=
deviceCode
;
this
.
device
Id
=
deviceId
;
}
}
public
String
getDeviceCode
()
public
Integer
getDeviceId
()
{
{
return
device
Code
;
return
device
Id
;
}
}
public
String
getDeviceType
()
{
public
String
getDeviceType
()
{
...
@@ -149,7 +149,7 @@ public class THiddenTrouble extends BaseEntity
...
@@ -149,7 +149,7 @@ public class THiddenTrouble extends BaseEntity
public
String
toString
()
{
public
String
toString
()
{
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"troubleId"
,
getTroubleId
())
.
append
(
"troubleId"
,
getTroubleId
())
.
append
(
"device
Code"
,
getDeviceCode
())
.
append
(
"device
Id"
,
getDeviceId
())
.
append
(
"deviceType"
,
getDeviceType
())
.
append
(
"deviceType"
,
getDeviceType
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"address"
,
getAddress
())
.
append
(
"address"
,
getAddress
())
...
...
gassafety-system/src/main/java/com/zehong/system/domain/TInspectionData.java
View file @
519b3734
...
@@ -16,22 +16,22 @@ public class TInspectionData extends BaseEntity
...
@@ -16,22 +16,22 @@ public class TInspectionData extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 巡检记录id */
/** 巡检记录id */
private
int
dataId
;
private
Integer
dataId
;
/** 巡检计划id */
/** 巡检计划id */
@Excel
(
name
=
"巡检计划id"
)
@Excel
(
name
=
"巡检计划id"
)
private
int
planId
;
private
Integer
planId
;
/** 设备
编号
*/
/** 设备
id
*/
@Excel
(
name
=
"设备
编号
"
)
@Excel
(
name
=
"设备
id
"
)
private
String
deviceCode
;
private
Integer
deviceId
;
/** 设备类型 */
/** 设备类型
(0管道,1调压阀,2阀门井,3流量计,4压力表)
*/
@Excel
(
name
=
"设备类型"
)
@Excel
(
name
=
"设备类型
(0管道,1调压阀,2阀门井,3流量计,4压力表)
"
)
private
String
deviceType
;
private
String
deviceType
;
/** 处理状态(1不需处理,2已处理完成,3未处理完成) */
/** 处理状态(1不需处理,2已处理完成,3未处理完成) */
@Excel
(
name
=
"处理状态"
,
readConverterExp
=
"1
=
不需处理,2已处理完成,3未处理完成"
)
@Excel
(
name
=
"处理状态"
,
readConverterExp
=
"1不需处理,2已处理完成,3未处理完成"
)
private
String
dealStatus
;
private
String
dealStatus
;
/** 是否存在隐患 */
/** 是否存在隐患 */
...
@@ -42,34 +42,34 @@ public class TInspectionData extends BaseEntity
...
@@ -42,34 +42,34 @@ public class TInspectionData extends BaseEntity
@Excel
(
name
=
"备注"
)
@Excel
(
name
=
"备注"
)
private
String
remarks
;
private
String
remarks
;
public
void
setDataId
(
int
dataId
)
public
void
setDataId
(
Integer
dataId
)
{
{
this
.
dataId
=
dataId
;
this
.
dataId
=
dataId
;
}
}
public
int
getDataId
()
public
Integer
getDataId
()
{
{
return
dataId
;
return
dataId
;
}
}
public
void
setPlanId
(
int
planId
)
public
void
setPlanId
(
Integer
planId
)
{
{
this
.
planId
=
planId
;
this
.
planId
=
planId
;
}
}
public
int
getPlanId
()
public
Integer
getPlanId
()
{
{
return
planId
;
return
planId
;
}
}
public
void
setDevice
Code
(
String
deviceCode
)
public
void
setDevice
Id
(
Integer
deviceId
)
{
{
this
.
device
Code
=
deviceCode
;
this
.
device
Id
=
deviceId
;
}
}
public
String
getDeviceCode
()
public
Integer
getDeviceId
()
{
{
return
device
Code
;
return
device
Id
;
}
}
public
String
getDeviceType
()
{
public
String
getDeviceType
()
{
...
@@ -113,7 +113,7 @@ public class TInspectionData extends BaseEntity
...
@@ -113,7 +113,7 @@ public class TInspectionData extends BaseEntity
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"dataId"
,
getDataId
())
.
append
(
"dataId"
,
getDataId
())
.
append
(
"planId"
,
getPlanId
())
.
append
(
"planId"
,
getPlanId
())
.
append
(
"device
Code"
,
getDeviceCode
())
.
append
(
"device
Id"
,
getDeviceId
())
.
append
(
"deviceType"
,
getDeviceType
())
.
append
(
"deviceType"
,
getDeviceType
())
.
append
(
"dealStatus"
,
getDealStatus
())
.
append
(
"dealStatus"
,
getDealStatus
())
.
append
(
"isHiddenDanger"
,
getIsHiddenDanger
())
.
append
(
"isHiddenDanger"
,
getIsHiddenDanger
())
...
...
gassafety-system/src/main/java/com/zehong/system/domain/TInspectionPlan.java
View file @
519b3734
...
@@ -18,7 +18,7 @@ public class TInspectionPlan extends BaseEntity
...
@@ -18,7 +18,7 @@ public class TInspectionPlan extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 巡检计划id */
/** 巡检计划id */
private
int
planId
;
private
Integer
planId
;
/** 巡检计划名称 */
/** 巡检计划名称 */
@Excel
(
name
=
"巡检计划名称"
)
@Excel
(
name
=
"巡检计划名称"
)
...
@@ -28,10 +28,6 @@ public class TInspectionPlan extends BaseEntity
...
@@ -28,10 +28,6 @@ public class TInspectionPlan extends BaseEntity
@Excel
(
name
=
"工单id"
)
@Excel
(
name
=
"工单id"
)
private
String
orderId
;
private
String
orderId
;
/** 设备编号(多个编号用逗号分隔) */
@Excel
(
name
=
"设备号"
)
private
String
deviceCodes
;
/** 开始时间 */
/** 开始时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
@Excel
(
name
=
"开始时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd HH:mm:ss"
)
@Excel
(
name
=
"开始时间"
,
width
=
30
,
dateFormat
=
"yyyy-MM-dd HH:mm:ss"
)
...
@@ -46,19 +42,24 @@ public class TInspectionPlan extends BaseEntity
...
@@ -46,19 +42,24 @@ public class TInspectionPlan extends BaseEntity
@Excel
(
name
=
"计划状态(0未下发,1已下发,2进行中,3已完成)"
)
@Excel
(
name
=
"计划状态(0未下发,1已下发,2进行中,3已完成)"
)
private
String
planStatus
;
private
String
planStatus
;
/** 是否作废(0正常,1作废) */
@Excel
(
name
=
"是否作废(0正常,1作废)"
)
private
String
isDel
;
/** 计划描述 */
/** 计划描述 */
@Excel
(
name
=
"计划描述"
)
@Excel
(
name
=
"计划描述"
)
private
String
remarks
;
private
String
remarks
;
public
void
setPlanId
(
int
planId
)
public
void
setPlanId
(
Integer
planId
)
{
{
this
.
planId
=
planId
;
this
.
planId
=
planId
;
}
}
public
int
getPlanId
()
public
Integer
getPlanId
()
{
{
return
planId
;
return
planId
;
}
}
public
void
setPlanName
(
String
planName
)
public
void
setPlanName
(
String
planName
)
{
{
this
.
planName
=
planName
;
this
.
planName
=
planName
;
...
@@ -69,14 +70,6 @@ public class TInspectionPlan extends BaseEntity
...
@@ -69,14 +70,6 @@ public class TInspectionPlan extends BaseEntity
return
planName
;
return
planName
;
}
}
public
String
getDeviceCodes
()
{
return
deviceCodes
;
}
public
void
setDeviceCodes
(
String
deviceCodes
)
{
this
.
deviceCodes
=
deviceCodes
;
}
public
void
setOrderId
(
String
orderId
)
public
void
setOrderId
(
String
orderId
)
{
{
this
.
orderId
=
orderId
;
this
.
orderId
=
orderId
;
...
@@ -86,6 +79,7 @@ public class TInspectionPlan extends BaseEntity
...
@@ -86,6 +79,7 @@ public class TInspectionPlan extends BaseEntity
{
{
return
orderId
;
return
orderId
;
}
}
public
void
setStartTime
(
Date
startTime
)
public
void
setStartTime
(
Date
startTime
)
{
{
this
.
startTime
=
startTime
;
this
.
startTime
=
startTime
;
...
@@ -95,6 +89,7 @@ public class TInspectionPlan extends BaseEntity
...
@@ -95,6 +89,7 @@ public class TInspectionPlan extends BaseEntity
{
{
return
startTime
;
return
startTime
;
}
}
public
void
setEndTime
(
Date
endTime
)
public
void
setEndTime
(
Date
endTime
)
{
{
this
.
endTime
=
endTime
;
this
.
endTime
=
endTime
;
...
@@ -104,6 +99,7 @@ public class TInspectionPlan extends BaseEntity
...
@@ -104,6 +99,7 @@ public class TInspectionPlan extends BaseEntity
{
{
return
endTime
;
return
endTime
;
}
}
public
void
setPlanStatus
(
String
planStatus
)
public
void
setPlanStatus
(
String
planStatus
)
{
{
this
.
planStatus
=
planStatus
;
this
.
planStatus
=
planStatus
;
...
@@ -113,6 +109,15 @@ public class TInspectionPlan extends BaseEntity
...
@@ -113,6 +109,15 @@ public class TInspectionPlan extends BaseEntity
{
{
return
planStatus
;
return
planStatus
;
}
}
public
String
getIsDel
()
{
return
isDel
;
}
public
void
setIsDel
(
String
isDel
)
{
this
.
isDel
=
isDel
;
}
public
void
setRemarks
(
String
remarks
)
public
void
setRemarks
(
String
remarks
)
{
{
this
.
remarks
=
remarks
;
this
.
remarks
=
remarks
;
...
@@ -128,7 +133,6 @@ public class TInspectionPlan extends BaseEntity
...
@@ -128,7 +133,6 @@ public class TInspectionPlan extends BaseEntity
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"planId"
,
getPlanId
())
.
append
(
"planId"
,
getPlanId
())
.
append
(
"planName"
,
getPlanName
())
.
append
(
"planName"
,
getPlanName
())
.
append
(
"deviceCodes"
,
getDeviceCodes
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"startTime"
,
getStartTime
())
.
append
(
"startTime"
,
getStartTime
())
.
append
(
"endTime"
,
getEndTime
())
.
append
(
"endTime"
,
getEndTime
())
...
...
gassafety-system/src/main/java/com/zehong/system/domain/TOrderFeedback.java
View file @
519b3734
...
@@ -18,15 +18,15 @@ public class TOrderFeedback extends BaseEntity
...
@@ -18,15 +18,15 @@ public class TOrderFeedback extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 工单反馈id */
/** 工单反馈id */
private
int
feedbackId
;
private
Integer
feedbackId
;
/** 工单id */
/** 工单id */
@Excel
(
name
=
"工单id"
)
@Excel
(
name
=
"工单id"
)
private
String
orderId
;
private
String
orderId
;
/** 设备
编号
*/
/** 设备
id
*/
@Excel
(
name
=
"设备
编号
"
)
@Excel
(
name
=
"设备
id
"
)
private
String
deviceCode
;
private
Integer
deviceId
;
/** 反馈内容 */
/** 反馈内容 */
@Excel
(
name
=
"反馈内容"
)
@Excel
(
name
=
"反馈内容"
)
...
@@ -57,12 +57,12 @@ public class TOrderFeedback extends BaseEntity
...
@@ -57,12 +57,12 @@ public class TOrderFeedback extends BaseEntity
@Excel
(
name
=
"图片地址3"
)
@Excel
(
name
=
"图片地址3"
)
private
String
pictureUrl3
;
private
String
pictureUrl3
;
public
void
setFeedbackId
(
int
feedbackId
)
public
void
setFeedbackId
(
Integer
feedbackId
)
{
{
this
.
feedbackId
=
feedbackId
;
this
.
feedbackId
=
feedbackId
;
}
}
public
int
getFeedbackId
()
public
Integer
getFeedbackId
()
{
{
return
feedbackId
;
return
feedbackId
;
}
}
...
@@ -75,14 +75,14 @@ public class TOrderFeedback extends BaseEntity
...
@@ -75,14 +75,14 @@ public class TOrderFeedback extends BaseEntity
{
{
return
orderId
;
return
orderId
;
}
}
public
void
setDevice
Code
(
String
deviceCode
)
public
void
setDevice
Id
(
Integer
deviceId
)
{
{
this
.
device
Code
=
deviceCode
;
this
.
device
Id
=
deviceId
;
}
}
public
String
getDeviceCode
()
public
Integer
getDeviceId
()
{
{
return
device
Code
;
return
device
Id
;
}
}
public
void
setContents
(
String
contents
)
public
void
setContents
(
String
contents
)
{
{
...
@@ -153,7 +153,7 @@ public class TOrderFeedback extends BaseEntity
...
@@ -153,7 +153,7 @@ public class TOrderFeedback extends BaseEntity
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"feedbackId"
,
getFeedbackId
())
.
append
(
"feedbackId"
,
getFeedbackId
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"deviceId"
,
getDevice
Code
())
.
append
(
"deviceId"
,
getDevice
Id
())
.
append
(
"contents"
,
getContents
())
.
append
(
"contents"
,
getContents
())
.
append
(
"feedbackTime"
,
getFeedbackTime
())
.
append
(
"feedbackTime"
,
getFeedbackTime
())
.
append
(
"isHiddenDanger"
,
getIsHiddenDanger
())
.
append
(
"isHiddenDanger"
,
getIsHiddenDanger
())
...
...
gassafety-system/src/main/java/com/zehong/system/domain/TPipe.java
View file @
519b3734
...
@@ -18,11 +18,11 @@ public class TPipe extends BaseEntity
...
@@ -18,11 +18,11 @@ public class TPipe extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 管道id */
/** 管道id */
private
int
pipeId
;
private
Integer
pipeId
;
/** 企业id */
/** 企业id */
@Excel
(
name
=
"企业id"
)
@Excel
(
name
=
"企业id"
)
private
int
enterpriseId
;
private
Integer
enterpriseId
;
/** 管道名称 */
/** 管道名称 */
@Excel
(
name
=
"管道名称"
)
@Excel
(
name
=
"管道名称"
)
...
@@ -70,21 +70,21 @@ public class TPipe extends BaseEntity
...
@@ -70,21 +70,21 @@ public class TPipe extends BaseEntity
@Excel
(
name
=
"备注"
)
@Excel
(
name
=
"备注"
)
private
String
remarks
;
private
String
remarks
;
public
void
setPipeId
(
int
pipeId
)
public
void
setPipeId
(
Integer
pipeId
)
{
{
this
.
pipeId
=
pipeId
;
this
.
pipeId
=
pipeId
;
}
}
public
int
getPipeId
()
public
Integer
getPipeId
()
{
{
return
pipeId
;
return
pipeId
;
}
}
public
void
setEnterpriseId
(
int
enterpriseId
)
public
void
setEnterpriseId
(
Integer
enterpriseId
)
{
{
this
.
enterpriseId
=
enterpriseId
;
this
.
enterpriseId
=
enterpriseId
;
}
}
public
int
getEnterpriseId
()
public
Integer
getEnterpriseId
()
{
{
return
enterpriseId
;
return
enterpriseId
;
}
}
...
...
gassafety-system/src/main/java/com/zehong/system/domain/TWorkOrder.java
View file @
519b3734
...
@@ -26,7 +26,7 @@ public class TWorkOrder extends BaseEntity
...
@@ -26,7 +26,7 @@ public class TWorkOrder extends BaseEntity
/** 源id */
/** 源id */
@Excel
(
name
=
"源id"
)
@Excel
(
name
=
"源id"
)
private
int
resourceId
;
private
Integer
resourceId
;
/** 工单名称 */
/** 工单名称 */
@Excel
(
name
=
"工单名称"
)
@Excel
(
name
=
"工单名称"
)
...
@@ -77,11 +77,11 @@ public class TWorkOrder extends BaseEntity
...
@@ -77,11 +77,11 @@ public class TWorkOrder extends BaseEntity
return
orderType
;
return
orderType
;
}
}
public
int
getResourceId
()
{
public
Integer
getResourceId
()
{
return
resourceId
;
return
resourceId
;
}
}
public
void
setResourceId
(
int
resourceId
)
{
public
void
setResourceId
(
Integer
resourceId
)
{
this
.
resourceId
=
resourceId
;
this
.
resourceId
=
resourceId
;
}
}
...
...
gassafety-system/src/main/java/com/zehong/system/domain/form/InspectionPlanForm.java
0 → 100644
View file @
519b3734
package
com
.
zehong
.
system
.
domain
.
form
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.zehong.common.core.domain.BaseEntity
;
import
java.util.Date
;
/**
* 巡检计划对象 t_inspection_plan
*
* @author zehong
* @date 2021-07-21
*/
public
class
InspectionPlanForm
extends
BaseEntity
{
/** 巡检计划名称 */
private
String
planName
;
/** 工单id */
private
String
orderId
;
/** 起始开始时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
startTime1
;
/** 起始结束时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
endTime1
;
/** 截止开始时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
startTime2
;
/** 截止结束时间 */
@JsonFormat
(
pattern
=
"yyyy-MM-dd HH:mm:ss"
)
private
Date
endTime2
;
/** 计划状态(0未下发,1已下发,2进行中,3已完成) */
private
String
planStatus
;
/** 计划描述 */
private
String
remarks
;
public
void
setPlanName
(
String
planName
)
{
this
.
planName
=
planName
;
}
public
String
getPlanName
()
{
return
planName
;
}
public
void
setOrderId
(
String
orderId
)
{
this
.
orderId
=
orderId
;
}
public
String
getOrderId
()
{
return
orderId
;
}
public
void
setStartTime1
(
Date
startTime1
)
{
this
.
startTime1
=
startTime1
;
}
public
Date
getStartTime1
()
{
return
startTime1
;
}
public
void
setEndTime1
(
Date
endTime1
)
{
this
.
endTime1
=
endTime1
;
}
public
Date
getEndTime1
()
{
return
endTime1
;
}
public
void
setPlanStatus
(
String
planStatus
)
{
this
.
planStatus
=
planStatus
;
}
public
String
getPlanStatus
()
{
return
planStatus
;
}
public
void
setRemarks
(
String
remarks
)
{
this
.
remarks
=
remarks
;
}
public
String
getRemarks
()
{
return
remarks
;
}
}
gassafety-system/src/main/java/com/zehong/system/domain/vo/OrderFeedbackVo.java
View file @
519b3734
package
com
.
zehong
.
system
.
domain
.
vo
;
package
com
.
zehong
.
system
.
domain
.
vo
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.fasterxml.jackson.annotation.JsonFormat
;
import
com.zehong.common.annotation.Excel
;
import
com.zehong.common.core.domain.BaseEntity
;
import
com.zehong.common.core.domain.BaseEntity
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringBuilder
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
import
org.apache.commons.lang3.builder.ToStringStyle
;
...
@@ -19,13 +18,13 @@ public class OrderFeedbackVo extends BaseEntity
...
@@ -19,13 +18,13 @@ public class OrderFeedbackVo extends BaseEntity
private
static
final
long
serialVersionUID
=
1L
;
private
static
final
long
serialVersionUID
=
1L
;
/** 工单反馈id */
/** 工单反馈id */
private
int
feedbackId
;
private
Integer
feedbackId
;
/** 工单id */
/** 工单id */
private
String
orderId
;
private
String
orderId
;
/** 设备
编号
*/
/** 设备
id
*/
private
String
deviceCode
;
private
Integer
deviceId
;
/** 设备名称 */
/** 设备名称 */
private
String
deviceName
;
private
String
deviceName
;
...
@@ -55,12 +54,12 @@ public class OrderFeedbackVo extends BaseEntity
...
@@ -55,12 +54,12 @@ public class OrderFeedbackVo extends BaseEntity
/** 图片地址3 */
/** 图片地址3 */
private
String
pictureUrl3
;
private
String
pictureUrl3
;
public
void
setFeedbackId
(
int
feedbackId
)
public
void
setFeedbackId
(
Integer
feedbackId
)
{
{
this
.
feedbackId
=
feedbackId
;
this
.
feedbackId
=
feedbackId
;
}
}
public
int
getFeedbackId
()
public
Integer
getFeedbackId
()
{
{
return
feedbackId
;
return
feedbackId
;
}
}
...
@@ -75,14 +74,14 @@ public class OrderFeedbackVo extends BaseEntity
...
@@ -75,14 +74,14 @@ public class OrderFeedbackVo extends BaseEntity
return
orderId
;
return
orderId
;
}
}
public
void
setDevice
Code
(
String
deviceCode
)
public
void
setDevice
Id
(
Integer
deviceId
)
{
{
this
.
device
Code
=
deviceCode
;
this
.
device
Id
=
deviceId
;
}
}
public
String
getDeviceCode
()
public
Integer
getDeviceId
()
{
{
return
device
Code
;
return
device
Id
;
}
}
public
String
getDeviceName
()
{
public
String
getDeviceName
()
{
...
@@ -176,7 +175,7 @@ public class OrderFeedbackVo extends BaseEntity
...
@@ -176,7 +175,7 @@ public class OrderFeedbackVo extends BaseEntity
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
return
new
ToStringBuilder
(
this
,
ToStringStyle
.
MULTI_LINE_STYLE
)
.
append
(
"feedbackId"
,
getFeedbackId
())
.
append
(
"feedbackId"
,
getFeedbackId
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"orderId"
,
getOrderId
())
.
append
(
"deviceId"
,
getDevice
Code
())
.
append
(
"deviceId"
,
getDevice
Id
())
.
append
(
"contents"
,
getContents
())
.
append
(
"contents"
,
getContents
())
.
append
(
"feedbackTime"
,
getFeedbackTime
())
.
append
(
"feedbackTime"
,
getFeedbackTime
())
.
append
(
"isHiddenDanger"
,
getIsHiddenDanger
())
.
append
(
"isHiddenDanger"
,
getIsHiddenDanger
())
...
...
gassafety-system/src/main/java/com/zehong/system/domain/vo/WorkOrderVo.java
View file @
519b3734
...
@@ -33,8 +33,8 @@ public class WorkOrderVo extends BaseEntity
...
@@ -33,8 +33,8 @@ public class WorkOrderVo extends BaseEntity
/** 工单名称 */
/** 工单名称 */
private
String
orderName
;
private
String
orderName
;
/** 设备
编号
*/
/** 设备
id
*/
private
String
deviceCodes
;
private
Integer
deviceId
;
/** 设备名称 */
/** 设备名称 */
private
String
deviceName
;
private
String
deviceName
;
...
@@ -132,12 +132,12 @@ public class WorkOrderVo extends BaseEntity
...
@@ -132,12 +132,12 @@ public class WorkOrderVo extends BaseEntity
return
orderName
;
return
orderName
;
}
}
public
String
getDeviceCodes
()
{
public
Integer
getDeviceId
()
{
return
device
Codes
;
return
device
Id
;
}
}
public
void
setDevice
Codes
(
String
deviceCodes
)
{
public
void
setDevice
Id
(
Integer
deviceId
)
{
this
.
device
Codes
=
deviceCodes
;
this
.
device
Id
=
deviceId
;
}
}
public
String
getDeviceName
()
{
public
String
getDeviceName
()
{
...
@@ -311,7 +311,6 @@ public class WorkOrderVo extends BaseEntity
...
@@ -311,7 +311,6 @@ public class WorkOrderVo extends BaseEntity
.
append
(
"orderType"
,
getOrderType
())
.
append
(
"orderType"
,
getOrderType
())
.
append
(
"resourceId"
,
getResourceId
())
.
append
(
"resourceId"
,
getResourceId
())
.
append
(
"orderName"
,
getOrderName
())
.
append
(
"orderName"
,
getOrderName
())
.
append
(
"deviceCodes"
,
getDeviceCodes
())
.
append
(
"deviceNum"
,
getDeviceNum
())
.
append
(
"deviceNum"
,
getDeviceNum
())
.
append
(
"finishNum"
,
getFinishNum
())
.
append
(
"finishNum"
,
getFinishNum
())
.
append
(
"deviceType"
,
getDeviceType
())
.
append
(
"deviceType"
,
getDeviceType
())
...
...
gassafety-system/src/main/java/com/zehong/system/mapper/TInspectionDataMapper.java
View file @
519b3734
...
@@ -22,10 +22,10 @@ public interface TInspectionDataMapper
...
@@ -22,10 +22,10 @@ public interface TInspectionDataMapper
/**
/**
* 查询巡检记录
* 查询巡检记录
*
*
* @param device
Code 设备编号
* @param device
Id 设备id
* @return 巡检记录
* @return 巡检记录
*/
*/
public
TInspectionData
selectTInspectionDataBy
Code
(
String
deviceCode
);
public
TInspectionData
selectTInspectionDataBy
DeviceId
(
int
deviceId
);
/**
/**
* 查询巡检记录
* 查询巡检记录
...
...
gassafety-system/src/main/java/com/zehong/system/mapper/TInspectionPlanMapper.java
View file @
519b3734
...
@@ -2,6 +2,7 @@ package com.zehong.system.mapper;
...
@@ -2,6 +2,7 @@ package com.zehong.system.mapper;
import
java.util.List
;
import
java.util.List
;
import
com.zehong.system.domain.TInspectionPlan
;
import
com.zehong.system.domain.TInspectionPlan
;
import
com.zehong.system.domain.form.InspectionPlanForm
;
/**
/**
* 巡检计划Mapper接口
* 巡检计划Mapper接口
...
@@ -22,10 +23,10 @@ public interface TInspectionPlanMapper
...
@@ -22,10 +23,10 @@ public interface TInspectionPlanMapper
/**
/**
* 查询巡检计划列表
* 查询巡检计划列表
*
*
* @param
tInspectionPlan
巡检计划
* @param
inspectionPlanForm
巡检计划
* @return 巡检计划集合
* @return 巡检计划集合
*/
*/
public
List
<
TInspectionPlan
>
selectTInspectionPlanList
(
TInspectionPlan
tInspectionPlan
);
public
List
<
TInspectionPlan
>
selectTInspectionPlanList
(
InspectionPlanForm
inspectionPlanForm
);
/**
/**
* 新增巡检计划
* 新增巡检计划
...
...
gassafety-system/src/main/java/com/zehong/system/service/ITInspectionPlanService.java
View file @
519b3734
...
@@ -2,6 +2,7 @@ package com.zehong.system.service;
...
@@ -2,6 +2,7 @@ package com.zehong.system.service;
import
java.util.List
;
import
java.util.List
;
import
com.zehong.system.domain.TInspectionPlan
;
import
com.zehong.system.domain.TInspectionPlan
;
import
com.zehong.system.domain.form.InspectionPlanForm
;
/**
/**
* 巡检计划Service接口
* 巡检计划Service接口
...
@@ -22,10 +23,10 @@ public interface ITInspectionPlanService
...
@@ -22,10 +23,10 @@ public interface ITInspectionPlanService
/**
/**
* 查询巡检计划列表
* 查询巡检计划列表
*
*
* @param
tInspectionPlan
巡检计划
* @param
inspectionPlanForm
巡检计划
* @return 巡检计划集合
* @return 巡检计划集合
*/
*/
public
List
<
TInspectionPlan
>
selectTInspectionPlanList
(
TInspectionPlan
tInspectionPlan
);
public
List
<
TInspectionPlan
>
selectTInspectionPlanList
(
InspectionPlanForm
inspectionPlanForm
);
/**
/**
* 新增巡检计划
* 新增巡检计划
...
...
gassafety-system/src/main/java/com/zehong/system/service/impl/TInspectionPlanServiceImpl.java
View file @
519b3734
...
@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
...
@@ -2,6 +2,7 @@ package com.zehong.system.service.impl;
import
java.util.List
;
import
java.util.List
;
import
com.zehong.common.utils.DateUtils
;
import
com.zehong.common.utils.DateUtils
;
import
com.zehong.system.domain.form.InspectionPlanForm
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
com.zehong.system.mapper.TInspectionPlanMapper
;
import
com.zehong.system.mapper.TInspectionPlanMapper
;
...
@@ -35,13 +36,13 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
...
@@ -35,13 +36,13 @@ public class TInspectionPlanServiceImpl implements ITInspectionPlanService
/**
/**
* 查询巡检计划列表
* 查询巡检计划列表
*
*
* @param
tInspectionPlan
巡检计划
* @param
inspectionPlanForm
巡检计划
* @return 巡检计划
* @return 巡检计划
*/
*/
@Override
@Override
public
List
<
TInspectionPlan
>
selectTInspectionPlanList
(
TInspectionPlan
tInspectionPlan
)
public
List
<
TInspectionPlan
>
selectTInspectionPlanList
(
InspectionPlanForm
inspectionPlanForm
)
{
{
return
tInspectionPlanMapper
.
selectTInspectionPlanList
(
tInspectionPlan
);
return
tInspectionPlanMapper
.
selectTInspectionPlanList
(
inspectionPlanForm
);
}
}
/**
/**
...
...
gassafety-system/src/main/java/com/zehong/system/service/impl/TOrderFeedbackServiceImpl.java
View file @
519b3734
...
@@ -25,6 +25,8 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
...
@@ -25,6 +25,8 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
@Autowired
@Autowired
private
TInspectionDataMapper
tInspectionDataMapper
;
private
TInspectionDataMapper
tInspectionDataMapper
;
@Autowired
@Autowired
private
TInspectionPlanMapper
tInspectionPlanMapper
;
@Autowired
private
THiddenTroubleMapper
tHiddenTroubleMapper
;
private
THiddenTroubleMapper
tHiddenTroubleMapper
;
@Autowired
@Autowired
private
TDeviceAlarmMapper
tDeviceAlarmMapper
;
private
TDeviceAlarmMapper
tDeviceAlarmMapper
;
...
@@ -71,7 +73,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
...
@@ -71,7 +73,7 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
}
}
tOrderFeedback
.
setFeedbackTime
(
DateUtils
.
getNowDate
());
tOrderFeedback
.
setFeedbackTime
(
DateUtils
.
getNowDate
());
String
deviceCode
=
tOrderFeedback
.
getDeviceCode
();
Integer
deviceId
=
tOrderFeedback
.
getDeviceId
();
String
dealStatus
=
tOrderFeedback
.
getDealStatus
();
String
dealStatus
=
tOrderFeedback
.
getDealStatus
();
String
isHiddenDanger
=
tOrderFeedback
.
getIsHiddenDanger
();
String
isHiddenDanger
=
tOrderFeedback
.
getIsHiddenDanger
();
...
@@ -80,18 +82,18 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
...
@@ -80,18 +82,18 @@ public class TOrderFeedbackServiceImpl implements ITOrderFeedbackService
String
orderType
=
order
.
getOrderType
();
String
orderType
=
order
.
getOrderType
();
if
(
"1"
.
equals
(
orderType
)){
if
(
"1"
.
equals
(
orderType
)){
TInspectionData
data
=
tInspectionDataMapper
.
selectTInspectionDataBy
Code
(
deviceCode
);
TInspectionData
data
=
tInspectionDataMapper
.
selectTInspectionDataBy
DeviceId
(
deviceId
);
data
.
setDealStatus
(
dealStatus
);
data
.
setDealStatus
(
dealStatus
);
data
.
setIsHiddenDanger
(
isHiddenDanger
);
data
.
setIsHiddenDanger
(
isHiddenDanger
);
data
.
setUpdateTime
(
DateUtils
.
getNowDate
());
data
.
setUpdateTime
(
DateUtils
.
getNowDate
());
tInspectionDataMapper
.
updateTInspectionData
(
data
);
tInspectionDataMapper
.
updateTInspectionData
(
data
);
if
(
"0"
.
equals
(
data
.
getDeviceType
())){
if
(
"0"
.
equals
(
data
.
getDeviceType
())){
TPipe
pipe
=
tPipeMapper
.
selectTPipeBy
Code
(
deviceCode
);
TPipe
pipe
=
tPipeMapper
.
selectTPipeBy
Id
(
deviceId
);
pipe
.
setInspectionTime
(
DateUtils
.
getNowDate
());
pipe
.
setInspectionTime
(
DateUtils
.
getNowDate
());
tPipeMapper
.
updateTPipe
(
pipe
);
tPipeMapper
.
updateTPipe
(
pipe
);
}
else
{
}
else
{
TDeviceInfo
device
=
tDeviceInfoMapper
.
selectTDeviceInfoBy
Code
(
deviceCode
);
TDeviceInfo
device
=
tDeviceInfoMapper
.
selectTDeviceInfoBy
Id
(
deviceId
);
device
.
setInspectionTime
(
DateUtils
.
getNowDate
());
device
.
setInspectionTime
(
DateUtils
.
getNowDate
());
tDeviceInfoMapper
.
updateTDeviceInfo
(
device
);
tDeviceInfoMapper
.
updateTDeviceInfo
(
device
);
}
}
...
...
gassafety-system/src/main/java/com/zehong/system/service/impl/TWorkOrderServiceImpl.java
View file @
519b3734
...
@@ -76,9 +76,6 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
...
@@ -76,9 +76,6 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
if
(
"1"
.
equals
(
orderType
)){
if
(
"1"
.
equals
(
orderType
)){
TInspectionPlan
plan
=
tInspectionPlanMapper
.
selectTInspectionPlanById
(
resourceId
);
workOrderVo
.
setDeviceCodes
(
plan
.
getDeviceCodes
());
TInspectionData
data
=
new
TInspectionData
();
TInspectionData
data
=
new
TInspectionData
();
data
.
setPlanId
(
resourceId
);
data
.
setPlanId
(
resourceId
);
...
@@ -87,7 +84,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
...
@@ -87,7 +84,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
TDeviceInfo
deviceInfo
=
null
;
TDeviceInfo
deviceInfo
=
null
;
for
(
TInspectionData
temp
:
totalList
){
for
(
TInspectionData
temp
:
totalList
){
deviceInfo
=
tDeviceInfoMapper
.
selectTDeviceInfoBy
Code
(
temp
.
getDeviceCode
());
deviceInfo
=
tDeviceInfoMapper
.
selectTDeviceInfoBy
Id
(
temp
.
getDeviceId
());
if
(
deviceInfo
!=
null
){
if
(
deviceInfo
!=
null
){
deviceInfoList
.
add
(
deviceInfo
);
deviceInfoList
.
add
(
deviceInfo
);
}
}
...
@@ -99,15 +96,16 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
...
@@ -99,15 +96,16 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
}
else
if
(
"2"
.
equals
(
orderType
))
{
}
else
if
(
"2"
.
equals
(
orderType
))
{
THiddenTrouble
trouble
=
tHiddenTroubleMapper
.
selectTHiddenTroubleById
(
resourceId
);
THiddenTrouble
trouble
=
tHiddenTroubleMapper
.
selectTHiddenTroubleById
(
resourceId
);
workOrderVo
.
setDeviceCodes
((
trouble
.
getDeviceCode
()
!=
null
?
trouble
.
getDeviceCode
()
:
null
).
toString
());
Integer
deviceId
=
trouble
.
getDeviceId
();
workOrderVo
.
setDeviceId
(
deviceId
);
workOrderVo
.
setLongitude
(
trouble
.
getLongitude
()
!=
null
?
trouble
.
getLongitude
()
:
null
);
workOrderVo
.
setLongitude
(
trouble
.
getLongitude
()
!=
null
?
trouble
.
getLongitude
()
:
null
);
workOrderVo
.
setLatitude
(
trouble
.
getLatitude
()
!=
null
?
trouble
.
getLatitude
()
:
null
);
workOrderVo
.
setLatitude
(
trouble
.
getLatitude
()
!=
null
?
trouble
.
getLatitude
()
:
null
);
workOrderVo
.
setCoordinates
(
trouble
.
getCoordinates
()
!=
null
?
trouble
.
getCoordinates
()
:
null
);
workOrderVo
.
setCoordinates
(
trouble
.
getCoordinates
()
!=
null
?
trouble
.
getCoordinates
()
:
null
);
workOrderVo
.
setDeviceType
(
trouble
.
getDeviceType
());
workOrderVo
.
setDeviceType
(
trouble
.
getDeviceType
());
workOrderVo
.
setAddress
(
trouble
.
getAddress
());
workOrderVo
.
setAddress
(
trouble
.
getAddress
());
String
deviceCode
=
trouble
.
getDeviceCode
();
TDeviceInfo
device
=
tDeviceInfoMapper
.
selectTDeviceInfoById
(
deviceId
);
TDeviceInfo
device
=
tDeviceInfoMapper
.
selectTDeviceInfoByCode
(
deviceCode
);
if
(
device
!=
null
){
if
(
device
!=
null
){
workOrderVo
.
setDeviceName
(
device
.
getDeviceName
());
workOrderVo
.
setDeviceName
(
device
.
getDeviceName
());
deviceInfoList
.
add
(
device
);
deviceInfoList
.
add
(
device
);
...
@@ -116,17 +114,17 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
...
@@ -116,17 +114,17 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
}
else
if
(
"3"
.
equals
(
orderType
))
{
}
else
if
(
"3"
.
equals
(
orderType
))
{
TDeviceAlarm
alarm
=
tDeviceAlarmMapper
.
selectTDeviceAlarmById
(
resourceId
);
TDeviceAlarm
alarm
=
tDeviceAlarmMapper
.
selectTDeviceAlarmById
(
resourceId
);
String
deviceCode
=
alarm
.
getDeviceCode
();
Integer
deviceId
=
alarm
.
getDeviceId
();
workOrderVo
.
setDevice
Codes
(
String
.
valueOf
(
deviceCode
)
);
workOrderVo
.
setDevice
Id
(
deviceId
);
String
isPipe
=
alarm
.
getIsPi
pe
();
String
deviceType
=
alarm
.
getDeviceTy
pe
();
if
(
"0"
.
equals
(
isPi
pe
)){
if
(
"0"
.
equals
(
deviceTy
pe
)){
TPipe
pipe
=
tPipeMapper
.
selectTPipeBy
Code
(
deviceCode
);
TPipe
pipe
=
tPipeMapper
.
selectTPipeBy
Id
(
deviceId
);
workOrderVo
.
setCoordinates
(
pipe
.
getCoordinates
());
workOrderVo
.
setCoordinates
(
pipe
.
getCoordinates
());
workOrderVo
.
setDeviceType
(
"0"
);
workOrderVo
.
setDeviceType
(
"0"
);
workOrderVo
.
setAddress
(
pipe
.
getPipeAddr
());
workOrderVo
.
setAddress
(
pipe
.
getPipeAddr
());
}
else
{
}
else
{
TDeviceInfo
device
=
tDeviceInfoMapper
.
selectTDeviceInfoBy
Code
(
deviceCode
);
TDeviceInfo
device
=
tDeviceInfoMapper
.
selectTDeviceInfoBy
Id
(
deviceId
);
if
(
device
!=
null
){
if
(
device
!=
null
){
workOrderVo
.
setLongitude
(
device
.
getLongitude
());
workOrderVo
.
setLongitude
(
device
.
getLongitude
());
workOrderVo
.
setLatitude
(
device
.
getLatitude
());
workOrderVo
.
setLatitude
(
device
.
getLatitude
());
...
@@ -151,7 +149,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
...
@@ -151,7 +149,7 @@ public class TWorkOrderServiceImpl implements ITWorkOrderService
BeanUtils
.
copyProperties
(
feedback
,
feedbackVo
);
BeanUtils
.
copyProperties
(
feedback
,
feedbackVo
);
}
}
device
=
tDeviceInfoMapper
.
selectTDeviceInfoBy
Code
(
feedback
.
getDeviceCode
());
device
=
tDeviceInfoMapper
.
selectTDeviceInfoBy
Id
(
feedback
.
getDeviceId
());
if
(
device
!=
null
)
{
if
(
device
!=
null
)
{
feedbackVo
.
setDeviceName
(
device
.
getDeviceName
());
feedbackVo
.
setDeviceName
(
device
.
getDeviceName
());
feedbackVo
.
setDeviceType
(
device
.
getDeviceType
());
feedbackVo
.
setDeviceType
(
device
.
getDeviceType
());
...
...
gassafety-system/src/main/resources/mapper/system/TDeviceAlarmMapper.xml
View file @
519b3734
...
@@ -6,8 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -6,8 +6,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap
type=
"TDeviceAlarm"
id=
"TDeviceAlarmResult"
>
<resultMap
type=
"TDeviceAlarm"
id=
"TDeviceAlarmResult"
>
<result
property=
"alarmId"
column=
"alarm_id"
/>
<result
property=
"alarmId"
column=
"alarm_id"
/>
<result
property=
"device
Code"
column=
"device_code
"
/>
<result
property=
"device
Id"
column=
"device_id
"
/>
<result
property=
"
isPipe"
column=
"is_pi
pe"
/>
<result
property=
"
deviceType"
column=
"device_ty
pe"
/>
<result
property=
"orderId"
column=
"order_id"
/>
<result
property=
"orderId"
column=
"order_id"
/>
<result
property=
"alarmType"
column=
"alarm_type"
/>
<result
property=
"alarmType"
column=
"alarm_type"
/>
<result
property=
"alarmValue"
column=
"alarm_value"
/>
<result
property=
"alarmValue"
column=
"alarm_value"
/>
...
@@ -20,14 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -20,14 +20,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
</resultMap>
<sql
id=
"selectTDeviceAlarmVo"
>
<sql
id=
"selectTDeviceAlarmVo"
>
select alarm_id, device_
code, is_pi
pe, order_id, alarm_type, alarm_value, start_time, end_time, deal_status, update_time, create_time, remarks from t_device_alarm
select alarm_id, device_
id, device_ty
pe, order_id, alarm_type, alarm_value, start_time, end_time, deal_status, update_time, create_time, remarks from t_device_alarm
</sql>
</sql>
<select
id=
"selectTDeviceAlarmList"
parameterType=
"TDeviceAlarm"
resultMap=
"TDeviceAlarmResult"
>
<select
id=
"selectTDeviceAlarmList"
parameterType=
"TDeviceAlarm"
resultMap=
"TDeviceAlarmResult"
>
<include
refid=
"selectTDeviceAlarmVo"
/>
<include
refid=
"selectTDeviceAlarmVo"
/>
<where>
<where>
<if
test=
"device
Code != null "
>
and device_code = #{deviceCode
}
</if>
<if
test=
"device
Id != null "
>
and device_id = #{deviceId
}
</if>
<if
test=
"
isPipe != null "
>
and is_pipe = #{isPi
pe}
</if>
<if
test=
"
deviceType != null "
>
and device_type = #{deviceTy
pe}
</if>
<if
test=
"orderId != null and orderId != ''"
>
and order_id = #{orderId}
</if>
<if
test=
"orderId != null and orderId != ''"
>
and order_id = #{orderId}
</if>
<if
test=
"alarmType != null and alarmType != ''"
>
and alarm_type = #{alarmType}
</if>
<if
test=
"alarmType != null and alarmType != ''"
>
and alarm_type = #{alarmType}
</if>
<if
test=
"alarmValue != null and alarmValue != ''"
>
and alarm_value = #{alarmValue}
</if>
<if
test=
"alarmValue != null and alarmValue != ''"
>
and alarm_value = #{alarmValue}
</if>
...
@@ -46,8 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -46,8 +46,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert
id=
"insertTDeviceAlarm"
parameterType=
"TDeviceAlarm"
useGeneratedKeys=
"true"
keyProperty=
"alarmId"
>
<insert
id=
"insertTDeviceAlarm"
parameterType=
"TDeviceAlarm"
useGeneratedKeys=
"true"
keyProperty=
"alarmId"
>
insert into t_device_alarm
insert into t_device_alarm
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"device
Code != null"
>
device_code
,
</if>
<if
test=
"device
Id != null"
>
device_id
,
</if>
<if
test=
"
isPipe != null"
>
is_pi
pe,
</if>
<if
test=
"
deviceType != null"
>
device_ty
pe,
</if>
<if
test=
"orderId != null"
>
order_id,
</if>
<if
test=
"orderId != null"
>
order_id,
</if>
<if
test=
"alarmType != null"
>
alarm_type,
</if>
<if
test=
"alarmType != null"
>
alarm_type,
</if>
<if
test=
"alarmValue != null"
>
alarm_value,
</if>
<if
test=
"alarmValue != null"
>
alarm_value,
</if>
...
@@ -59,8 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -59,8 +59,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"remarks != null"
>
remarks,
</if>
<if
test=
"remarks != null"
>
remarks,
</if>
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"device
Code != null"
>
#{deviceCode
},
</if>
<if
test=
"device
Id != null"
>
#{deviceId
},
</if>
<if
test=
"
isPipe != null"
>
#{isPi
pe},
</if>
<if
test=
"
deviceType != null"
>
#{deviceTy
pe},
</if>
<if
test=
"orderId != null"
>
#{orderId},
</if>
<if
test=
"orderId != null"
>
#{orderId},
</if>
<if
test=
"alarmType != null"
>
#{alarmType},
</if>
<if
test=
"alarmType != null"
>
#{alarmType},
</if>
<if
test=
"alarmValue != null"
>
#{alarmValue},
</if>
<if
test=
"alarmValue != null"
>
#{alarmValue},
</if>
...
@@ -76,8 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -76,8 +76,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update
id=
"updateTDeviceAlarm"
parameterType=
"TDeviceAlarm"
>
<update
id=
"updateTDeviceAlarm"
parameterType=
"TDeviceAlarm"
>
update t_device_alarm
update t_device_alarm
<trim
prefix=
"SET"
suffixOverrides=
","
>
<trim
prefix=
"SET"
suffixOverrides=
","
>
<if
test=
"device
Code != null"
>
device_code = #{deviceCode
},
</if>
<if
test=
"device
Id != null"
>
device_id = #{deviceId
},
</if>
<if
test=
"
isPipe != null"
>
is_pipe = #{isPi
pe},
</if>
<if
test=
"
deviceType != null"
>
device_type = #{deviceTy
pe},
</if>
<if
test=
"orderId != null"
>
order_id = #{orderId},
</if>
<if
test=
"orderId != null"
>
order_id = #{orderId},
</if>
<if
test=
"alarmType != null"
>
alarm_type = #{alarmType},
</if>
<if
test=
"alarmType != null"
>
alarm_type = #{alarmType},
</if>
<if
test=
"alarmValue != null"
>
alarm_value = #{alarmValue},
</if>
<if
test=
"alarmValue != null"
>
alarm_value = #{alarmValue},
</if>
...
...
gassafety-system/src/main/resources/mapper/system/THiddenTroubleMapper.xml
View file @
519b3734
...
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -6,7 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap
type=
"THiddenTrouble"
id=
"THiddenTroubleResult"
>
<resultMap
type=
"THiddenTrouble"
id=
"THiddenTroubleResult"
>
<result
property=
"troubleId"
column=
"trouble_id"
/>
<result
property=
"troubleId"
column=
"trouble_id"
/>
<result
property=
"device
Code"
column=
"device_code
"
/>
<result
property=
"device
Id"
column=
"device_id
"
/>
<result
property=
"deviceType"
column=
"device_type"
/>
<result
property=
"deviceType"
column=
"device_type"
/>
<result
property=
"orderId"
column=
"order_id"
/>
<result
property=
"orderId"
column=
"order_id"
/>
<result
property=
"address"
column=
"address"
/>
<result
property=
"address"
column=
"address"
/>
...
@@ -20,13 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -20,13 +20,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
</resultMap>
<sql
id=
"selectTHiddenTroubleVo"
>
<sql
id=
"selectTHiddenTroubleVo"
>
select trouble_id, device_
code
, device_type, order_id, address, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
select trouble_id, device_
id
, device_type, order_id, address, longitude, latitude, coordinates, deal_status, update_time, create_time, remarks from t_hidden_trouble
</sql>
</sql>
<select
id=
"selectTHiddenTroubleList"
parameterType=
"THiddenTrouble"
resultMap=
"THiddenTroubleResult"
>
<select
id=
"selectTHiddenTroubleList"
parameterType=
"THiddenTrouble"
resultMap=
"THiddenTroubleResult"
>
<include
refid=
"selectTHiddenTroubleVo"
/>
<include
refid=
"selectTHiddenTroubleVo"
/>
<where>
<where>
<if
test=
"device
Code != null "
>
and device_code = #{deviceCode
}
</if>
<if
test=
"device
Id != null "
>
and device_id = #{deviceId
}
</if>
<if
test=
"deviceType != null "
>
and device_type = #{deviceType}
</if>
<if
test=
"deviceType != null "
>
and device_type = #{deviceType}
</if>
<if
test=
"orderId != null and orderId != ''"
>
and order_id = #{orderId}
</if>
<if
test=
"orderId != null and orderId != ''"
>
and order_id = #{orderId}
</if>
<if
test=
"longitude != null "
>
and longitude = #{longitude}
</if>
<if
test=
"longitude != null "
>
and longitude = #{longitude}
</if>
...
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -45,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<insert
id=
"insertTHiddenTrouble"
parameterType=
"THiddenTrouble"
useGeneratedKeys=
"true"
keyProperty=
"troubleId"
>
<insert
id=
"insertTHiddenTrouble"
parameterType=
"THiddenTrouble"
useGeneratedKeys=
"true"
keyProperty=
"troubleId"
>
insert into t_hidden_trouble
insert into t_hidden_trouble
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"device
Code != null"
>
device_code
,
</if>
<if
test=
"device
Id != null"
>
device_id
,
</if>
<if
test=
"deviceType != null"
>
device_type,
</if>
<if
test=
"deviceType != null"
>
device_type,
</if>
<if
test=
"orderId != null"
>
order_id,
</if>
<if
test=
"orderId != null"
>
order_id,
</if>
<if
test=
"address != null"
>
address,
</if>
<if
test=
"address != null"
>
address,
</if>
...
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if
test=
"remarks != null"
>
remarks,
</if>
<if
test=
"remarks != null"
>
remarks,
</if>
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"device
Code != null"
>
#{deviceCode
},
</if>
<if
test=
"device
Id != null"
>
#{deviceId
},
</if>
<if
test=
"deviceType != null"
>
#{deviceType},
</if>
<if
test=
"deviceType != null"
>
#{deviceType},
</if>
<if
test=
"orderId != null"
>
#{orderId},
</if>
<if
test=
"orderId != null"
>
#{orderId},
</if>
<if
test=
"address != null"
>
#{address},
</if>
<if
test=
"address != null"
>
#{address},
</if>
...
@@ -75,8 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -75,8 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update
id=
"updateTHiddenTrouble"
parameterType=
"THiddenTrouble"
>
<update
id=
"updateTHiddenTrouble"
parameterType=
"THiddenTrouble"
>
update t_hidden_trouble
update t_hidden_trouble
<trim
prefix=
"SET"
suffixOverrides=
","
>
<trim
prefix=
"SET"
suffixOverrides=
","
>
<if
test=
"device
Code != null"
>
device_code = #{deviceCode
},
</if>
<if
test=
"device
Id != null"
>
device_id = #{deviceId
},
</if>
<if
test=
"deviceType != null"
>
device_
code
= #{deviceType},
</if>
<if
test=
"deviceType != null"
>
device_
id
= #{deviceType},
</if>
<if
test=
"orderId != null"
>
order_id = #{orderId},
</if>
<if
test=
"orderId != null"
>
order_id = #{orderId},
</if>
<if
test=
"address != null"
>
address = #{address},
</if>
<if
test=
"address != null"
>
address = #{address},
</if>
<if
test=
"longitude != null"
>
longitude = #{longitude},
</if>
<if
test=
"longitude != null"
>
longitude = #{longitude},
</if>
...
...
gassafety-system/src/main/resources/mapper/system/TInspectionDataMapper.xml
View file @
519b3734
...
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap
type=
"TInspectionData"
id=
"TInspectionDataResult"
>
<resultMap
type=
"TInspectionData"
id=
"TInspectionDataResult"
>
<result
property=
"dataId"
column=
"data_id"
/>
<result
property=
"dataId"
column=
"data_id"
/>
<result
property=
"planId"
column=
"plan_id"
/>
<result
property=
"planId"
column=
"plan_id"
/>
<result
property=
"device
Code"
column=
"device_code
"
/>
<result
property=
"device
Id"
column=
"device_id
"
/>
<result
property=
"deviceType"
column=
"device_type"
/>
<result
property=
"deviceType"
column=
"device_type"
/>
<result
property=
"isHiddenDanger"
column=
"is_hidden_danger"
/>
<result
property=
"isHiddenDanger"
column=
"is_hidden_danger"
/>
<result
property=
"dealStatus"
column=
"deal_status"
/>
<result
property=
"dealStatus"
column=
"deal_status"
/>
...
@@ -17,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -17,14 +17,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
</resultMap>
<sql
id=
"selectTInspectionDataVo"
>
<sql
id=
"selectTInspectionDataVo"
>
select data_id, plan_id, device_
code
, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
select data_id, plan_id, device_
id
, device_type, is_hidden_danger, deal_status, update_time, create_time, remarks from t_inspection_data
</sql>
</sql>
<select
id=
"selectTInspectionDataList"
parameterType=
"TInspectionData"
resultMap=
"TInspectionDataResult"
>
<select
id=
"selectTInspectionDataList"
parameterType=
"TInspectionData"
resultMap=
"TInspectionDataResult"
>
<include
refid=
"selectTInspectionDataVo"
/>
<include
refid=
"selectTInspectionDataVo"
/>
<where>
<where>
<if
test=
"planId != null "
>
and plan_id = #{planId}
</if>
<if
test=
"planId != null "
>
and plan_id = #{planId}
</if>
<if
test=
"device
Code != null "
>
and device_code = #{deviceCode
}
</if>
<if
test=
"device
Id != null "
>
and device_id = #{deviceId
}
</if>
<if
test=
"deviceType != null "
>
and device_type = #{deviceType}
</if>
<if
test=
"deviceType != null "
>
and device_type = #{deviceType}
</if>
<if
test=
"dealStatus != null and dealStatus != ''"
>
and deal_status = #{dealStatus}
</if>
<if
test=
"dealStatus != null and dealStatus != ''"
>
and deal_status = #{dealStatus}
</if>
<if
test=
"isHiddenDanger != null and isHiddenDanger != ''"
>
and is_hidden_danger = #{isHiddenDanger}
</if>
<if
test=
"isHiddenDanger != null and isHiddenDanger != ''"
>
and is_hidden_danger = #{isHiddenDanger}
</if>
...
@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -43,9 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where data_id = #{dataId}
where data_id = #{dataId}
</select>
</select>
<select
id=
"selectTInspectionDataBy
Code"
parameterType=
"String
"
resultMap=
"TInspectionDataResult"
>
<select
id=
"selectTInspectionDataBy
DeviceId"
parameterType=
"int
"
resultMap=
"TInspectionDataResult"
>
<include
refid=
"selectTInspectionDataVo"
/>
<include
refid=
"selectTInspectionDataVo"
/>
where device_
code = #{deviceCode
}
where device_
id = #{deviceId
}
</select>
</select>
<insert
id=
"insertTInspectionData"
parameterType=
"TInspectionData"
>
<insert
id=
"insertTInspectionData"
parameterType=
"TInspectionData"
>
...
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -53,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"dataId != null"
>
data_id,
</if>
<if
test=
"dataId != null"
>
data_id,
</if>
<if
test=
"planId != null"
>
plan_id,
</if>
<if
test=
"planId != null"
>
plan_id,
</if>
<if
test=
"device
Code != null"
>
device_code
,
</if>
<if
test=
"device
Id != null"
>
device_id
,
</if>
<if
test=
"deviceType != null"
>
device_type,
</if>
<if
test=
"deviceType != null"
>
device_type,
</if>
<if
test=
"isHiddenDanger != null"
>
is_hidden_danger,
</if>
<if
test=
"isHiddenDanger != null"
>
is_hidden_danger,
</if>
<if
test=
"dealStatus != null"
>
deal_status,
</if>
<if
test=
"dealStatus != null"
>
deal_status,
</if>
...
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -64,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"dataId != null"
>
#{dataId},
</if>
<if
test=
"dataId != null"
>
#{dataId},
</if>
<if
test=
"planId != null"
>
#{planId},
</if>
<if
test=
"planId != null"
>
#{planId},
</if>
<if
test=
"device
Code != null"
>
#{deviceCode
},
</if>
<if
test=
"device
Id != null"
>
#{deviceId
},
</if>
<if
test=
"deviceType != null"
>
#{deviceType},
</if>
<if
test=
"deviceType != null"
>
#{deviceType},
</if>
<if
test=
"isHiddenDanger != null"
>
#{isHiddenDanger},
</if>
<if
test=
"isHiddenDanger != null"
>
#{isHiddenDanger},
</if>
<if
test=
"dealStatus != null"
>
#{dealStatus},
</if>
<if
test=
"dealStatus != null"
>
#{dealStatus},
</if>
...
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_inspection_data
update t_inspection_data
<trim
prefix=
"SET"
suffixOverrides=
","
>
<trim
prefix=
"SET"
suffixOverrides=
","
>
<if
test=
"planId != null"
>
plan_id = #{planId},
</if>
<if
test=
"planId != null"
>
plan_id = #{planId},
</if>
<if
test=
"device
Code != null"
>
device_code = #{deviceCode
},
</if>
<if
test=
"device
Id != null"
>
device_id = #{deviceId
},
</if>
<if
test=
"deviceType != null"
>
device_type = #{deviceType},
</if>
<if
test=
"deviceType != null"
>
device_type = #{deviceType},
</if>
<if
test=
"isHiddenDanger != null"
>
is_hidden_danger = #{isHiddenDanger},
</if>
<if
test=
"isHiddenDanger != null"
>
is_hidden_danger = #{isHiddenDanger},
</if>
<if
test=
"dealStatus != null"
>
deal_status = #{dealStatus},
</if>
<if
test=
"dealStatus != null"
>
deal_status = #{dealStatus},
</if>
...
...
gassafety-system/src/main/resources/mapper/system/TInspectionPlanMapper.xml
View file @
519b3734
...
@@ -7,29 +7,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -7,29 +7,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap
type=
"TInspectionPlan"
id=
"TInspectionPlanResult"
>
<resultMap
type=
"TInspectionPlan"
id=
"TInspectionPlanResult"
>
<result
property=
"planId"
column=
"plan_id"
/>
<result
property=
"planId"
column=
"plan_id"
/>
<result
property=
"planName"
column=
"plan_name"
/>
<result
property=
"planName"
column=
"plan_name"
/>
<result
property=
"deviceCodes"
column=
"device_codes"
/>
<result
property=
"orderId"
column=
"order_id"
/>
<result
property=
"orderId"
column=
"order_id"
/>
<result
property=
"startTime"
column=
"start_time"
/>
<result
property=
"startTime"
column=
"start_time"
/>
<result
property=
"endTime"
column=
"end_time"
/>
<result
property=
"endTime"
column=
"end_time"
/>
<result
property=
"planStatus"
column=
"plan_status"
/>
<result
property=
"planStatus"
column=
"plan_status"
/>
<result
property=
"isDel"
column=
"is_del"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"updateTime"
column=
"update_time"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"createTime"
column=
"create_time"
/>
<result
property=
"remarks"
column=
"remarks"
/>
<result
property=
"remarks"
column=
"remarks"
/>
</resultMap>
</resultMap>
<sql
id=
"selectTInspectionPlanVo"
>
<sql
id=
"selectTInspectionPlanVo"
>
select plan_id, plan_name,
device_codes, order_id, start_time, end_time, plan_status
, update_time, create_time, remarks from t_inspection_plan
select plan_id, plan_name,
order_id, start_time, end_time, plan_status, is_del
, update_time, create_time, remarks from t_inspection_plan
</sql>
</sql>
<select
id=
"selectTInspectionPlanList"
parameterType=
"
TInspectionPlan
"
resultMap=
"TInspectionPlanResult"
>
<select
id=
"selectTInspectionPlanList"
parameterType=
"
InspectionPlanForm
"
resultMap=
"TInspectionPlanResult"
>
<include
refid=
"selectTInspectionPlanVo"
/>
<include
refid=
"selectTInspectionPlanVo"
/>
<where>
<where>
is_del = '0'
<if
test=
"planName != null and planName != ''"
>
and plan_name like concat('%', #{planName}, '%')
</if>
<if
test=
"planName != null and planName != ''"
>
and plan_name like concat('%', #{planName}, '%')
</if>
<if
test=
"orderId != null and orderId != ''"
>
and order_id = #{orderId}
</if>
<if
test=
"orderId != null and orderId != ''"
>
and order_id like concat('%', #{orderId}, '%')
</if>
<if
test=
"startTime != null "
>
and start_time = #{startTime}
</if>
<if
test=
"startTime1 != null "
>
and start_time
>
= #{startTime1}
</if>
<if
test=
"endTime != null "
>
and end_time = #{endTime}
</if>
<if
test=
"endTime1 != null "
>
and start_time
<
= #{endTime1}
</if>
<if
test=
"startTime2 != null "
>
and end_time
>
= #{startTime2}
</if>
<if
test=
"endTime2 != null "
>
and end_time
<
= #{endTime2}
</if>
<if
test=
"planStatus != null and planStatus != ''"
>
and plan_status = #{planStatus}
</if>
<if
test=
"planStatus != null and planStatus != ''"
>
and plan_status = #{planStatus}
</if>
<if
test=
"remarks != null
and remarks != ''"
>
and remarks
= #{remarks}
</if>
<if
test=
"remarks != null
"
>
and remarks
<
= #{remarks}
</if>
</where>
</where>
</select>
</select>
...
@@ -42,22 +45,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -42,22 +45,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_inspection_plan
insert into t_inspection_plan
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"planName != null"
>
plan_name,
</if>
<if
test=
"planName != null"
>
plan_name,
</if>
<if
test=
"deviceCodes != null"
>
device_codes,
</if>
<if
test=
"orderId != null"
>
order_id,
</if>
<if
test=
"orderId != null"
>
order_id,
</if>
<if
test=
"startTime != null"
>
start_time,
</if>
<if
test=
"startTime != null"
>
start_time,
</if>
<if
test=
"endTime != null"
>
end_time,
</if>
<if
test=
"endTime != null"
>
end_time,
</if>
<if
test=
"planStatus != null"
>
plan_status,
</if>
<if
test=
"planStatus != null"
>
plan_status,
</if>
<if
test=
"isDel != null"
>
is_del,
</if>
<if
test=
"updateTime != null"
>
update_time,
</if>
<if
test=
"updateTime != null"
>
update_time,
</if>
<if
test=
"createTime != null"
>
create_time,
</if>
<if
test=
"createTime != null"
>
create_time,
</if>
<if
test=
"remarks != null"
>
remarks,
</if>
<if
test=
"remarks != null"
>
remarks,
</if>
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"planName != null"
>
#{planName},
</if>
<if
test=
"planName != null"
>
#{planName},
</if>
<if
test=
"deviceCodes != null"
>
#{deviceCodes},
</if>
<if
test=
"orderId != null"
>
#{orderId},
</if>
<if
test=
"orderId != null"
>
#{orderId},
</if>
<if
test=
"startTime != null"
>
#{startTime},
</if>
<if
test=
"startTime != null"
>
#{startTime},
</if>
<if
test=
"endTime != null"
>
#{endTime},
</if>
<if
test=
"endTime != null"
>
#{endTime},
</if>
<if
test=
"planStatus != null"
>
#{planStatus},
</if>
<if
test=
"planStatus != null"
>
#{planStatus},
</if>
<if
test=
"isDel != null"
>
#{isDel},
</if>
<if
test=
"updateTime != null"
>
#{updateTime},
</if>
<if
test=
"updateTime != null"
>
#{updateTime},
</if>
<if
test=
"createTime != null"
>
#{createTime},
</if>
<if
test=
"createTime != null"
>
#{createTime},
</if>
<if
test=
"remarks != null"
>
#{remarks},
</if>
<if
test=
"remarks != null"
>
#{remarks},
</if>
...
@@ -68,11 +71,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -68,11 +71,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_inspection_plan
update t_inspection_plan
<trim
prefix=
"SET"
suffixOverrides=
","
>
<trim
prefix=
"SET"
suffixOverrides=
","
>
<if
test=
"planName != null"
>
plan_name = #{planName},
</if>
<if
test=
"planName != null"
>
plan_name = #{planName},
</if>
<if
test=
"deviceCodes != null"
>
device_codes = #{deviceCodes},
</if>
<if
test=
"orderId != null"
>
order_id = #{orderId},
</if>
<if
test=
"orderId != null"
>
order_id = #{orderId},
</if>
<if
test=
"startTime != null"
>
start_time = #{startTime},
</if>
<if
test=
"startTime != null"
>
start_time = #{startTime},
</if>
<if
test=
"endTime != null"
>
end_time = #{endTime},
</if>
<if
test=
"endTime != null"
>
end_time = #{endTime},
</if>
<if
test=
"planStatus != null"
>
plan_status = #{planStatus},
</if>
<if
test=
"planStatus != null"
>
plan_status = #{planStatus},
</if>
<if
test=
"isDel != null"
>
is_del = #{isDel},
</if>
<if
test=
"updateTime != null"
>
update_time = #{updateTime},
</if>
<if
test=
"updateTime != null"
>
update_time = #{updateTime},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime},
</if>
<if
test=
"createTime != null"
>
create_time = #{createTime},
</if>
<if
test=
"remarks != null"
>
remarks = #{remarks},
</if>
<if
test=
"remarks != null"
>
remarks = #{remarks},
</if>
...
...
gassafety-system/src/main/resources/mapper/system/TOrderFeedbackMapper.xml
View file @
519b3734
...
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<resultMap
type=
"TOrderFeedback"
id=
"TOrderFeedbackResult"
>
<resultMap
type=
"TOrderFeedback"
id=
"TOrderFeedbackResult"
>
<result
property=
"feedbackId"
column=
"feedback_id"
/>
<result
property=
"feedbackId"
column=
"feedback_id"
/>
<result
property=
"orderId"
column=
"order_id"
/>
<result
property=
"orderId"
column=
"order_id"
/>
<result
property=
"device
Code"
column=
"device_code
"
/>
<result
property=
"device
Id"
column=
"device_id
"
/>
<result
property=
"contents"
column=
"contents"
/>
<result
property=
"contents"
column=
"contents"
/>
<result
property=
"feedbackTime"
column=
"feedback_time"
/>
<result
property=
"feedbackTime"
column=
"feedback_time"
/>
<result
property=
"isHiddenDanger"
column=
"is_hidden_danger"
/>
<result
property=
"isHiddenDanger"
column=
"is_hidden_danger"
/>
...
@@ -18,14 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -18,14 +18,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
</resultMap>
<sql
id=
"selectTOrderFeedbackVo"
>
<sql
id=
"selectTOrderFeedbackVo"
>
select feedback_id, order_id, device_
code
, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
select feedback_id, order_id, device_
id
, contents, feedback_time, is_hidden_danger, deal_status, picture_url_1, picture_url_2, picture_url_3 from t_order_feedback
</sql>
</sql>
<select
id=
"selectTOrderFeedbackList"
parameterType=
"TOrderFeedback"
resultMap=
"TOrderFeedbackResult"
>
<select
id=
"selectTOrderFeedbackList"
parameterType=
"TOrderFeedback"
resultMap=
"TOrderFeedbackResult"
>
<include
refid=
"selectTOrderFeedbackVo"
/>
<include
refid=
"selectTOrderFeedbackVo"
/>
<where>
<where>
<if
test=
"orderId != null and orderId != ''"
>
and order_id = #{orderId}
</if>
<if
test=
"orderId != null and orderId != ''"
>
and order_id = #{orderId}
</if>
<if
test=
"device
Code != null "
>
and device_code = #{deviceCode
}
</if>
<if
test=
"device
Id != null "
>
and device_id = #{deviceId
}
</if>
<if
test=
"contents != null and contents != ''"
>
and contents = #{contents}
</if>
<if
test=
"contents != null and contents != ''"
>
and contents = #{contents}
</if>
<if
test=
"feedbackTime != null "
>
and feedback_time = #{feedbackTime}
</if>
<if
test=
"feedbackTime != null "
>
and feedback_time = #{feedbackTime}
</if>
<if
test=
"isHiddenDanger != null and isHiddenDanger != ''"
>
and is_hidden_danger = #{isHiddenDanger}
</if>
<if
test=
"isHiddenDanger != null and isHiddenDanger != ''"
>
and is_hidden_danger = #{isHiddenDanger}
</if>
...
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -51,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
insert into t_order_feedback
insert into t_order_feedback
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"orderId != null"
>
order_id,
</if>
<if
test=
"orderId != null"
>
order_id,
</if>
<if
test=
"device
Code != null"
>
device_code
,
</if>
<if
test=
"device
Id != null"
>
device_id
,
</if>
<if
test=
"contents != null"
>
contents,
</if>
<if
test=
"contents != null"
>
contents,
</if>
<if
test=
"feedbackTime != null"
>
feedback_time,
</if>
<if
test=
"feedbackTime != null"
>
feedback_time,
</if>
<if
test=
"isHiddenDanger != null"
>
is_hidden_danger,
</if>
<if
test=
"isHiddenDanger != null"
>
is_hidden_danger,
</if>
...
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -62,7 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</trim>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<trim
prefix=
"values ("
suffix=
")"
suffixOverrides=
","
>
<if
test=
"orderId != null"
>
#{orderId},
</if>
<if
test=
"orderId != null"
>
#{orderId},
</if>
<if
test=
"device
Code != null"
>
#{deviceCode
},
</if>
<if
test=
"device
Id != null"
>
#{deviceId
},
</if>
<if
test=
"contents != null"
>
#{contents},
</if>
<if
test=
"contents != null"
>
#{contents},
</if>
<if
test=
"feedbackTime != null"
>
#{feedbackTime},
</if>
<if
test=
"feedbackTime != null"
>
#{feedbackTime},
</if>
<if
test=
"isHiddenDanger != null"
>
#{isHiddenDanger},
</if>
<if
test=
"isHiddenDanger != null"
>
#{isHiddenDanger},
</if>
...
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
...
@@ -77,7 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update t_order_feedback
update t_order_feedback
<trim
prefix=
"SET"
suffixOverrides=
","
>
<trim
prefix=
"SET"
suffixOverrides=
","
>
<if
test=
"orderId != null"
>
order_id = #{orderId},
</if>
<if
test=
"orderId != null"
>
order_id = #{orderId},
</if>
<if
test=
"device
Code != null"
>
device_code = #{deviceCode
},
</if>
<if
test=
"device
Id != null"
>
device_id = #{deviceId
},
</if>
<if
test=
"contents != null"
>
contents = #{contents},
</if>
<if
test=
"contents != null"
>
contents = #{contents},
</if>
<if
test=
"feedbackTime != null"
>
feedback_time = #{feedbackTime},
</if>
<if
test=
"feedbackTime != null"
>
feedback_time = #{feedbackTime},
</if>
<if
test=
"isHiddenDanger != null"
>
is_hidden_danger = #{isHiddenDanger},
</if>
<if
test=
"isHiddenDanger != null"
>
is_hidden_danger = #{isHiddenDanger},
</if>
...
...
gassafety-web/src/views/workOrder/feedback/index.vue
View file @
519b3734
...
@@ -136,12 +136,12 @@
...
@@ -136,12 +136,12 @@
<font>
{{form.orderId}}
</font>
<font>
{{form.orderId}}
</font>
</el-form-item>
</el-form-item>
<el-form-item
label=
"设备列表"
prop=
"deviceCode"
v-if=
"form.orderType == '1'"
>
<el-form-item
label=
"设备列表"
prop=
"deviceCode"
v-if=
"form.orderType == '1'"
>
<el-select
v-model=
"form.device
Code
"
placeholder=
"请选择设备"
clearable
size=
"small"
filterable
>
<el-select
v-model=
"form.device
Id
"
placeholder=
"请选择设备"
clearable
size=
"small"
filterable
>
<el-option
<el-option
v-for=
"device in form.deviceInfoList"
v-for=
"device in form.deviceInfoList"
:key=
"device.device
Code
"
:key=
"device.device
Id
"
:label=
"device.deviceName"
:label=
"device.deviceName"
:value=
"device.device
Code
"
:value=
"device.device
Id
"
></el-option>
></el-option>
</el-select>
</el-select>
</el-form-item>
</el-form-item>
...
...
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