修改

src/main/java/com/steerinfo/meterwork/meterworkdatacount/controller/MeterWorkDataCountController.java

@@ -122,7 +122,19 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             //第8列创建并赋值
             row1.createCell(7).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionCombination()));
             //第9列创建并赋值
-            row1.createCell(8).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionType()));
+            String predictionType = "";
+            if(StringUtils.isEmpty(emps.get(i).getPredictionType())) {
+                predictionType = "";
+            }else if(emps.get(i).getPredictionType().equals("1")) {
+                predictionType = "单委托";
+            }else if(emps.get(i).getPredictionType().equals("5")) {
+                predictionType = "双委托i";
+            }else if(emps.get(i).getPredictionType().equals("6")) {
+                predictionType = "混卸";
+            }else if(emps.get(i).getPredictionType().equals("7")) {
+                predictionType = "混装";
+            }
+            row1.createCell(8).setCellValue(new HSSFRichTextString(predictionType));
             //第10列创建并赋值
             row1.createCell(9).setCellValue(new HSSFRichTextString(emps.get(i).getForwardingUnitName()));
             //第11列创建并赋值
@@ -234,7 +246,7 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             //第三列创建并赋值
             row1.createCell(2).setCellValue(new HSSFRichTextString(emps.get(i).getMatterName()));
             //第5列创建并赋值
-            row1.createCell(3).setCellValue(new HSSFRichTextString(emps.get(i).getValueFlag().equals("1")?"有效":"作废"));
+            row1.createCell(3).setCellValue(new HSSFRichTextString((emps.get(i).getValueFlag().equals("1") || emps.get(i).getValueFlag().equals("2"))?"有效":"作废"));
             //第6列创建并赋值
             row1.createCell(4).setCellValue(new HSSFRichTextString(emps.get(i).getIsPreSacale().equals("1")?"已匹配":"未匹配"));
             //第7列创建并赋值
@@ -244,7 +256,19 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
             //第8列创建并赋值
             row1.createCell(7).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionCombination()));
             //第9列创建并赋值
-            row1.createCell(8).setCellValue(new HSSFRichTextString(emps.get(i).getPredictionType()));
+            String predictionType = "";
+            if(StringUtils.isEmpty(emps.get(i).getPredictionType())) {
+                predictionType = "";
+            }else if(emps.get(i).getPredictionType().equals("1")) {
+                predictionType = "单委托";
+            }else if(emps.get(i).getPredictionType().equals("5")) {
+                predictionType = "双委托i";
+            }else if(emps.get(i).getPredictionType().equals("6")) {
+                predictionType = "混卸";
+            }else if(emps.get(i).getPredictionType().equals("7")) {
+                predictionType = "混装";
+            }
+            row1.createCell(8).setCellValue(new HSSFRichTextString(predictionType));
             //第10列创建并赋值
             row1.createCell(9).setCellValue(new HSSFRichTextString(emps.get(i).getForwardingUnitName()));
             //第11列创建并赋值

src/main/java/com/steerinfo/meterwork/meterworkmonitor/model/MeterWorkMonitor.java

@@ -1026,6 +1026,7 @@ public class MeterWorkMonitor implements IBasePO<String> {
         this.ledKeep = meterWorkMonitor.ledKeep;
         this.rfidCar = meterWorkMonitor.rfidCar;
         this.photoCar = meterWorkMonitor.photoCar;
+        this.photoCar2 = meterWorkMonitor.photoCar2;
         this.scanCar = meterWorkMonitor.scanCar;
         this.editCar = meterWorkMonitor.editCar;
         this.carErr = meterWorkMonitor.carErr;