feat:1.分析批次修改

jeecg-module-system/src/main/java/org/jeecg/modules/dynamicStaticAnalysis/vo/AnalysisBatchUnitDeviceVO.java

@@ -24,12 +24,12 @@ public class AnalysisBatchUnitDeviceVO {
     @ApiModelProperty("主键")
     private String id;
 
-    @ApiModelProperty("分析批次号")
-    private String analysisBatchCode;
-
     @ApiModelProperty("分析批id")
     private String analysisBatchId;
 
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
     @ApiModelProperty("单元设备id")
     private String unitId;
 

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/dto/DispatchDTO.java

@@ -21,6 +21,12 @@ public class DispatchDTO {
     @ApiModelProperty("分析批次单元设备id")
     private String id;
 
+    @ApiModelProperty("分析批次号")
+    private String analysisBatchCode;
+
+    @ApiModelProperty("分析批id")
+    private String analysisBatchId;
+
     @ApiModelProperty("单元设备id")
     private String unitId;
 

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/entity/WorkBatchDetail.java

@@ -57,6 +57,14 @@ public class WorkBatchDetail implements Serializable {
     @TableField("work_batch_id")
     private String workBatchId;
 
+    @TableField("analysis_batch_id")
+    @ApiModelProperty("分析批次id")
+    private String analysisBatchId;
+
+    @TableField("analysis_batch_code")
+    @ApiModelProperty("分析批次code")
+    private String analysisBatchCode;
+
     @ApiModelProperty("分析批次单元设备id")
     @TableField("analysis_batch_unit_device_id")
     private String analysisBatchUnitDeviceId;

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/mapper/xml/WorkBatchDetailMapper.xml

@@ -26,6 +26,8 @@
         SELECT t1.id,
             t1.work_batch_id,
             t1.work_batch_code,
+            t1.analysis_batch_id,
+            t1.analysis_batch_code,
             t1.analysis_batch_unit_device_id,
             t1.unit_id,
             t1.unit_code,

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/service/impl/WorkBatchServiceImpl.java

@@ -165,6 +165,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
             workBatchDetail.setId(UUIDGenerator.generate());
             workBatchDetail.setWorkBatchId(workBatch.getId());
             workBatchDetail.setWorkBatchCode(workBatch.getWorkBatchCode());
+            workBatchDetail.setAnalysisBatchId(transfiniteDTO.getAnalysisBatchId());
+            workBatchDetail.setAnalysisBatchCode(transfiniteDTO.getAnalysisBatchCode());
             workBatchDetail.setAnalysisBatchUnitDeviceId(transfiniteDTO.getId());
             workBatchDetail.setUnitId(transfiniteDTO.getUnitId());
             workBatchDetail.setUnitCode(transfiniteDTO.getUnitCode());
@@ -175,9 +177,11 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
             workBatchDetail.setUnitEndMileage(transfiniteDTO.getUnitEndMileage());
             workBatchDetail.setUnitCenterMileage(transfiniteDTO.getUnitCenterMileage());
             workBatchDetail.setUnitScore(transfiniteDTO.getUnitScore());
-            workBatchDetail.setUnitScoreLevel(transfiniteDTO.getUnitScoreLevel());
+            workBatchDetail.setUnitScoreLevel(Integer.valueOf(transfiniteDTO.getUnitScoreLevel()));
             workBatchDetail.setUnitScoreLevelStr(transfiniteDTO.getUnitScoreLevelStr());
             workBatchDetail.setWorkStatus(0);
+
+
             workBatchDetailList.add(workBatchDetail);
 
         }
@@ -237,6 +241,8 @@ public class WorkBatchServiceImpl extends ServiceImpl<WorkBatchMapper, WorkBatch
             workBatchDetail.setWorkBatchId(workBatch.getId());
             workBatchDetail.setWorkBatchCode(workBatch.getWorkBatchCode());
             workBatchDetail.setAnalysisBatchUnitDeviceId(transfinite.getId());
+            workBatchDetail.setAnalysisBatchId(transfinite.getAnalysisBatchId());
+            workBatchDetail.setAnalysisBatchCode(transfinite.getAnalysisBatchCode());
             workBatchDetail.setUnitId(transfinite.getUnitId());
             workBatchDetail.setUnitCode(transfinite.getUnitCode());
             workBatchDetail.setUnitType(transfinite.getUnitType());

jeecg-module-system/src/main/java/org/jeecg/modules/maintenanceWork/vo/WorkBatchDetailVO.java

@@ -33,6 +33,14 @@ public class WorkBatchDetailVO {
     @ApiModelProperty("主键")
     private String id;
 
+    @ApiModelProperty("分析批次id")
+    @TableField("analysis_batch_id")
+    private String analysisBatchId;
+
+    @ApiModelProperty("分析批次code")
+    @TableField("analysis_batch_code")
+    private String analysisBatchCode;
+
     @ApiModelProperty("工作批次code")
     private String workBatchCode;