修改

src/main/java/com/steerinfo/baseinfo/meterbaseoperationlog/mapper/MeterBaseOperationLogMapper.xml

@@ -858,8 +858,8 @@
      where A.operation_page = 'web端-汽车衡一次数据维护'
        and A.operation_function = '车号修改'
     <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
-      and  A.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
-      and A.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      and  B.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss')
+      and B.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
     </if>
   </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/mapper/MeterWorkCarnoIdentifyMapper.xml

@@ -455,7 +455,8 @@
        A.video_car_no2,
        case when (select C.video_car_no2 from Meter_Work_Carno_Identify C where C.Actual_First_No = A.Actual_First_No and C.video_car_no2 = A.car_no) is not null then '是' else '否' end vedio_car_no2_flag,
        A.Rfid_Car_No,
-       (select D.car_No from meter_base_rfid_info D where D.RFID_code in (select C.rfid_car_no from Meter_Work_Carno_Identify C where C.Actual_First_No = A.Actual_First_No and A.Car_No_type = '2')) rfid_carNo
+       (select D.car_No from meter_base_rfid_info D where D.RFID_code in (select C.rfid_car_no from Meter_Work_Carno_Identify C where C.Actual_First_No = A.Actual_First_No and A.Car_No_type = '2')) rfid_carNo,
+       A.scan_car_no
     from Meter_Work_Carno_Identify A
     left join meter_work_car_actual_first B
       on A.actual_first_no = B.actual_first_no

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/service/impl/MeterWorkCarnoIdentifyServiceImpl.java

@@ -77,6 +77,12 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
             for(MeterBaseSpotInfo spot: spotModels) {
                 //一次计量车数
                 long countCarFirst = 0L;
+                //枪机车号使用数
+                long countGunUsedIdentify = 0L;
+                //球机车号使用数
+                long countBallUsedIdentify = 0L;
+                //扫码车号使用数
+                long countScanCarIdentify = 0L;
                 //球机车号识别数
                 long countBallIdentify = 0L;
                 //球机车号未识别数
@@ -122,6 +128,30 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
                             && model.getCarNoType().equals("2")
                             && StringUtils.isNotEmpty(model.getRfidCarNo())).count();
+                    //枪机车号使用数
+                    countGunUsedIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                            && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                            && model.getCarNoType().equals("1")
+                            && StringUtils.isNotEmpty(model.getVideoCarNo1())
+                            && model.getVideoCarNo1().equals(model.getCarNo())).count();
+                    //球机车号使用数 - 枪机和球机同时等于一次车号识别数
+                    countBallUsedIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                            && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                            && model.getCarNoType().equals("1")
+                            && StringUtils.isNotEmpty(model.getVideoCarNo2())
+                            && model.getVideoCarNo2().equals(model.getCarNo())).count()
+                            - models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                                && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                                && model.getCarNoType().equals("1")
+                                && StringUtils.isNotEmpty(model.getVideoCarNo1())
+                                && StringUtils.isNotEmpty(model.getVideoCarNo2())
+                                && model.getVideoCarNo1().equals(model.getCarNo())
+                                && model.getVideoCarNo2().equals(model.getCarNo())).count();
+                    //扫码车号识别数
+                    countScanCarIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                            && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                            && StringUtils.isNotEmpty(model.getScanCarNo())
+                            && model.getScanCarNo().equals(model.getCarNo())).count();
                     //球机车号识别数
                     countBallIdentify = models.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                             && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -223,6 +253,9 @@ public class MeterWorkCarnoIdentifyServiceImpl extends BaseServiceImpl<MeterWork
                     obj.put("spotNo", spot.getBaseSpotNo());
                     obj.put("spotName", spot.getBaseSpotName());
                     obj.put("countCarFirst", countCarFirst);
+                    obj.put("countGunUsedIdentify", countGunUsedIdentify);
+                    obj.put("countBallUsedIdentify", countBallUsedIdentify);
+                    obj.put("countScanCarIdentify", countScanCarIdentify);
                     obj.put("countBallIdentify", countBallIdentify);
                     obj.put("countGunIdentify", countGunIdentify);
                     obj.put("countVisualIdentify", countVisualIdentify);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/controller/MeterWorkRailwayActualController.java

@@ -8,6 +8,7 @@ import com.steerinfo.meterwork.except.MarkerMetException;
 import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
+import com.steerinfo.meterwork.meterworkrailwayactual.model.AuditRailwayActualTemp;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.meterwork.meterworkrailwayactual.service.IMeterWorkRailwayActualService;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
@@ -1253,9 +1254,9 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
 
     @ApiOperation(value = "轨道衡审核功能", notes = "轨道衡审核功能")
     @PostMapping(value = "/auditRailwayActual")
-    public RESTfulResult auditRailwayActual(@RequestBody List<MeterWorkRailwayActual> params) {
+    public RESTfulResult auditRailwayActual(@RequestBody AuditRailwayActualTemp models) {
         try {
-            RESTfulResult rm = meterWorkRailwayActualService.auditRailwayActual(params);
+            RESTfulResult rm = meterWorkRailwayActualService.auditRailwayActual(models.getModels(), models.getMemo());
             return rm;
         } catch (Exception ex) {
             ex.printStackTrace();

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/model/AuditRailwayActualTemp.java

@@ -0,0 +1,24 @@
+package com.steerinfo.meterwork.meterworkrailwayactual.model;
+
+import java.util.List;
+
+public class AuditRailwayActualTemp {
+    List<MeterWorkRailwayActual> models;
+    String memo;
+
+    public List<MeterWorkRailwayActual> getModels() {
+        return models;
+    }
+
+    public void setModels(List<MeterWorkRailwayActual> models) {
+        this.models = models;
+    }
+
+    public String getMemo() {
+        return memo;
+    }
+
+    public void setMemo(String memo) {
+        this.memo = memo;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/IMeterWorkRailwayActualService.java

@@ -129,5 +129,5 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     int updateCar(MeterWorkRailwayActual model);
 
     PageList<HashMap> dynamicAndStaticCompare(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
-    RESTfulResult auditRailwayActual(List<MeterWorkRailwayActual> models);
+    RESTfulResult auditRailwayActual(List<MeterWorkRailwayActual> models, String memo);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -4375,7 +4375,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
     @Override
     @Transactional(rollbackFor=Exception.class)
-    public RESTfulResult auditRailwayActual(List<MeterWorkRailwayActual> models) {
+    public RESTfulResult auditRailwayActual(List<MeterWorkRailwayActual> models, String memo) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try{
@@ -4390,7 +4390,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                         model.setCheckManNo(userId);
                         model.setCheckManName(userName);
                         model.setCheckTime(new Date());
-                        model.setMemo(model.getMemo());
+                        model.setMemo(memo);
                         meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
                         count ++;
                     }