Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
H
hzsomms
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
ZTGK
hzsomms
Commits
3747ab4e
Commit
3747ab4e
authored
Jan 17, 2024
by
hkl
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:1.分析批次修改
parent
63ab93f6
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
4 deletions
+34
-4
AnalysisBatchUnitDeviceVO.java
...s/dynamicStaticAnalysis/vo/AnalysisBatchUnitDeviceVO.java
+3
-3
DispatchDTO.java
...va/org/jeecg/modules/maintenanceWork/dto/DispatchDTO.java
+6
-0
WorkBatchDetail.java
...jeecg/modules/maintenanceWork/entity/WorkBatchDetail.java
+8
-0
WorkBatchDetailMapper.xml
...ules/maintenanceWork/mapper/xml/WorkBatchDetailMapper.xml
+2
-0
WorkBatchServiceImpl.java
...es/maintenanceWork/service/impl/WorkBatchServiceImpl.java
+7
-1
WorkBatchDetailVO.java
...g/jeecg/modules/maintenanceWork/vo/WorkBatchDetailVO.java
+8
-0
No files found.
jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/vo/AnalysisBatchUnitDeviceVO.java
View file @
3747ab4e
...
@@ -24,12 +24,12 @@ public class AnalysisBatchUnitDeviceVO {
...
@@ -24,12 +24,12 @@ public class AnalysisBatchUnitDeviceVO {
@ApiModelProperty
(
"主键"
)
@ApiModelProperty
(
"主键"
)
private
String
id
;
private
String
id
;
@ApiModelProperty
(
"分析批次号"
)
private
String
analysisBatchCode
;
@ApiModelProperty
(
"分析批id"
)
@ApiModelProperty
(
"分析批id"
)
private
String
analysisBatchId
;
private
String
analysisBatchId
;
@ApiModelProperty
(
"分析批次号"
)
private
String
analysisBatchCode
;
@ApiModelProperty
(
"单元设备id"
)
@ApiModelProperty
(
"单元设备id"
)
private
String
unitId
;
private
String
unitId
;
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/DispatchDTO.java
View file @
3747ab4e
...
@@ -21,6 +21,12 @@ public class DispatchDTO {
...
@@ -21,6 +21,12 @@ public class DispatchDTO {
@ApiModelProperty
(
"分析批次单元设备id"
)
@ApiModelProperty
(
"分析批次单元设备id"
)
private
String
id
;
private
String
id
;
@ApiModelProperty
(
"分析批次号"
)
private
String
analysisBatchCode
;
@ApiModelProperty
(
"分析批id"
)
private
String
analysisBatchId
;
@ApiModelProperty
(
"单元设备id"
)
@ApiModelProperty
(
"单元设备id"
)
private
String
unitId
;
private
String
unitId
;
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetail.java
View file @
3747ab4e
...
@@ -57,6 +57,14 @@ public class WorkBatchDetail implements Serializable {
...
@@ -57,6 +57,14 @@ public class WorkBatchDetail implements Serializable {
@TableField
(
"work_batch_id"
)
@TableField
(
"work_batch_id"
)
private
String
workBatchId
;
private
String
workBatchId
;
@TableField
(
"analysis_batch_id"
)
@ApiModelProperty
(
"分析批次id"
)
private
String
analysisBatchId
;
@TableField
(
"analysis_batch_code"
)
@ApiModelProperty
(
"分析批次code"
)
private
String
analysisBatchCode
;
@ApiModelProperty
(
"分析批次单元设备id"
)
@ApiModelProperty
(
"分析批次单元设备id"
)
@TableField
(
"analysis_batch_unit_device_id"
)
@TableField
(
"analysis_batch_unit_device_id"
)
private
String
analysisBatchUnitDeviceId
;
private
String
analysisBatchUnitDeviceId
;
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailMapper.xml
View file @
3747ab4e
...
@@ -26,6 +26,8 @@
...
@@ -26,6 +26,8 @@
SELECT t1.id,
SELECT t1.id,
t1.work_batch_id,
t1.work_batch_id,
t1.work_batch_code,
t1.work_batch_code,
t1.analysis_batch_id,
t1.analysis_batch_code,
t1.analysis_batch_unit_device_id,
t1.analysis_batch_unit_device_id,
t1.unit_id,
t1.unit_id,
t1.unit_code,
t1.unit_code,
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchServiceImpl.java
View file @
3747ab4e
...
@@ -165,6 +165,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
...
@@ -165,6 +165,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
workBatchDetail
.
setId
(
UUIDGenerator
.
generate
());
workBatchDetail
.
setId
(
UUIDGenerator
.
generate
());
workBatchDetail
.
setWorkBatchId
(
workBatch
.
getId
());
workBatchDetail
.
setWorkBatchId
(
workBatch
.
getId
());
workBatchDetail
.
setWorkBatchCode
(
workBatch
.
getWorkBatchCode
());
workBatchDetail
.
setWorkBatchCode
(
workBatch
.
getWorkBatchCode
());
workBatchDetail
.
setAnalysisBatchId
(
transfiniteDTO
.
getAnalysisBatchId
());
workBatchDetail
.
setAnalysisBatchCode
(
transfiniteDTO
.
getAnalysisBatchCode
());
workBatchDetail
.
setAnalysisBatchUnitDeviceId
(
transfiniteDTO
.
getId
());
workBatchDetail
.
setAnalysisBatchUnitDeviceId
(
transfiniteDTO
.
getId
());
workBatchDetail
.
setUnitId
(
transfiniteDTO
.
getUnitId
());
workBatchDetail
.
setUnitId
(
transfiniteDTO
.
getUnitId
());
workBatchDetail
.
setUnitCode
(
transfiniteDTO
.
getUnitCode
());
workBatchDetail
.
setUnitCode
(
transfiniteDTO
.
getUnitCode
());
...
@@ -175,9 +177,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
...
@@ -175,9 +177,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
workBatchDetail
.
setUnitEndMileage
(
transfiniteDTO
.
getUnitEndMileage
());
workBatchDetail
.
setUnitEndMileage
(
transfiniteDTO
.
getUnitEndMileage
());
workBatchDetail
.
setUnitCenterMileage
(
transfiniteDTO
.
getUnitCenterMileage
());
workBatchDetail
.
setUnitCenterMileage
(
transfiniteDTO
.
getUnitCenterMileage
());
workBatchDetail
.
setUnitScore
(
transfiniteDTO
.
getUnitScore
());
workBatchDetail
.
setUnitScore
(
transfiniteDTO
.
getUnitScore
());
workBatchDetail
.
setUnitScoreLevel
(
transfiniteDTO
.
getUnitScoreLevel
(
));
workBatchDetail
.
setUnitScoreLevel
(
Integer
.
valueOf
(
transfiniteDTO
.
getUnitScoreLevel
()
));
workBatchDetail
.
setUnitScoreLevelStr
(
transfiniteDTO
.
getUnitScoreLevelStr
());
workBatchDetail
.
setUnitScoreLevelStr
(
transfiniteDTO
.
getUnitScoreLevelStr
());
workBatchDetail
.
setWorkStatus
(
0
);
workBatchDetail
.
setWorkStatus
(
0
);
workBatchDetailList
.
add
(
workBatchDetail
);
workBatchDetailList
.
add
(
workBatchDetail
);
}
}
...
@@ -237,6 +241,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
...
@@ -237,6 +241,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
workBatchDetail
.
setWorkBatchId
(
workBatch
.
getId
());
workBatchDetail
.
setWorkBatchId
(
workBatch
.
getId
());
workBatchDetail
.
setWorkBatchCode
(
workBatch
.
getWorkBatchCode
());
workBatchDetail
.
setWorkBatchCode
(
workBatch
.
getWorkBatchCode
());
workBatchDetail
.
setAnalysisBatchUnitDeviceId
(
transfinite
.
getId
());
workBatchDetail
.
setAnalysisBatchUnitDeviceId
(
transfinite
.
getId
());
workBatchDetail
.
setAnalysisBatchId
(
transfinite
.
getAnalysisBatchId
());
workBatchDetail
.
setAnalysisBatchCode
(
transfinite
.
getAnalysisBatchCode
());
workBatchDetail
.
setUnitId
(
transfinite
.
getUnitId
());
workBatchDetail
.
setUnitId
(
transfinite
.
getUnitId
());
workBatchDetail
.
setUnitCode
(
transfinite
.
getUnitCode
());
workBatchDetail
.
setUnitCode
(
transfinite
.
getUnitCode
());
workBatchDetail
.
setUnitType
(
transfinite
.
getUnitType
());
workBatchDetail
.
setUnitType
(
transfinite
.
getUnitType
());
...
...
jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailVO.java
View file @
3747ab4e
...
@@ -33,6 +33,14 @@ public class WorkBatchDetailVO {
...
@@ -33,6 +33,14 @@ public class WorkBatchDetailVO {
@ApiModelProperty
(
"主键"
)
@ApiModelProperty
(
"主键"
)
private
String
id
;
private
String
id
;
@ApiModelProperty
(
"分析批次id"
)
@TableField
(
"analysis_batch_id"
)
private
String
analysisBatchId
;
@ApiModelProperty
(
"分析批次code"
)
@TableField
(
"analysis_batch_code"
)
private
String
analysisBatchCode
;
@ApiModelProperty
(
"工作批次code"
)
@ApiModelProperty
(
"工作批次code"
)
private
String
workBatchCode
;
private
String
workBatchCode
;
...
...
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