修改

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

@@ -659,6 +659,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="createManNoStr != null and createManNoStr != ''">
+        and B.create_man_no in
+        <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and  B.base_spot_no like '%${baseSpotNo}%'
       </if>
@@ -698,6 +704,12 @@
           #{item}
         </foreach>
       </if>
+    <if test="createManNoStr != null and createManNoStr != ''">
+      and B.create_man_no in
+      <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and  B.base_spot_no like '%${baseSpotNo}%'
       </if>

src/main/java/com/steerinfo/baseinfo/meterbasespotinfo/mapper/MeterBaseSpotInfoMapper.xml

@@ -1159,6 +1159,12 @@
             #{item}
           </foreach>
         </if>
+        <if test="createManNoStr != null and createManNoStr != ''">
+          and A.create_man_no in
+          <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+            #{item}
+          </foreach>
+        </if>
        group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name)
       union
       (select A.net_spot3_no base_spot_no,
@@ -1179,6 +1185,12 @@
             #{item}
           </foreach>
         </if>
+        <if test="createManNoStr != null and createManNoStr != ''">
+          and A.net_man_no in
+          <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+            #{item}
+          </foreach>
+        </if>
        group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name)
     union
       (
@@ -1201,6 +1213,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="createManNoStr != null and createManNoStr != ''">
+        and B.create_man_no in
+        <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name)
     )
     where 1 = 1
@@ -1210,6 +1228,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="createManNoStr != null and createManNoStr != ''">
+        and create_man_no in
+        <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and base_spot_no = #{baseSpotNo}
       </if>
@@ -1248,6 +1272,12 @@
           #{item}
         </foreach>
       </if>
+    <if test="createManNoStr != null and createManNoStr != ''">
+      and A.create_man_no in
+      <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
       group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name)
     union
       (select A.net_spot3_no base_spot_no,
@@ -1272,6 +1302,12 @@
           #{item}
         </foreach>
       </if>
+    <if test="createManNoStr != null and createManNoStr != ''">
+      and A.net_man_no in
+      <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
       group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name)
     union
       (select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name
@@ -1291,6 +1327,12 @@
           #{item}
         </foreach>
       </if>
+    <if test="createManNoStr != null and createManNoStr != ''">
+      and B.create_man_no in
+      <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
       and t.operation_page like '%web端-轨道衡一次数据维护%'
       and t.operation_function like '%车号%'
       <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
@@ -1306,6 +1348,12 @@
         #{item}
       </foreach>
     </if>
+    <if test="createManNoStr != null and createManNoStr != ''">
+      and create_man_no in
+      <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
     <if test="baseSpotNo != null and baseSpotNo != ''">
       and base_spot_no = #{baseSpotNo}
     </if>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/mapper/MeterWorkCarActualMapper.xml

@@ -4348,6 +4348,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="createManNoStr != null and createManNoStr != ''">
+        and A.net_man_no in
+        <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and  A.net_spot3_no like '%${baseSpotNo}%'
       </if>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -28,6 +28,8 @@ import com.steerinfo.meterwork.meterworkcaractual.service.IMeterWorkCarActualSer
 import com.steerinfo.meterwork.meterworkcaractualfirst.mapper.MeterWorkCarActualFirstMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import com.steerinfo.meterwork.meterworkcaractualfirst.service.IMeterWorkCarActualFirstService;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.mapper.MeterWorkCheckFirstActualMapper;
+import com.steerinfo.meterwork.meterworkcheckfirstactual.model.FirstActualImgData;
 import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkprelink.mapper.MeterWorkPreLinkMapper;
@@ -127,6 +129,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     @Resource
     private MeterBaseTermTareDataMapper meterBaseTermTareDataMapper;
 
+    @Resource
+    private MeterWorkCheckFirstActualMapper meterWorkCheckFirstActualMapper;
+
     @Resource
     private MeterWorkCarActualMapper meterWorkCarActualMapper;
 
@@ -3067,7 +3072,11 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
         //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、已作废数据
         List<MeterWorkCarActual> carActual = meterWorkCarActualMapper.countAllState(params);
+        //净重数据与核查表左连接
+        List<FirstActualImgData> ActualImgDatamodels = meterWorkCheckFirstActualMapper.carActualImgDataList(params);
         List<MeterWorkCarActualFirst> carFirst = meterWorkCarActualFirstMapper.countAllState(params);
+        //一次数据与核查表左连接
+        List<FirstActualImgData> firstImgDatamodels = meterWorkCheckFirstActualMapper.carFirstImgDataList(params);
         List<MeterWorkScheduledHelp> carHelp = meterWorkScheduledHelpMapper.countAllState(params);
         List<HashMap> carFirstLog = meterBaseOperationLogMapper.countAllFirstState(params);
         List<HashMap> carActualLog = meterBaseOperationLogMapper.countAllActualState(params);
@@ -3082,27 +3091,34 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getBaseSpotNo() + ";" + o.getBaseSpotName()))), ArrayList::new)
         );
         for(MeterBaseSpotInfo spot: spotList) {
+            long countActual = 0L;
             long countIsPrescale = 0L;
             long countIsNotPrescale = 0L;
             long countUpload = 0L;
             long countUnUpload = 0L;
             long countActualValid = 0L;
+            long countActualCheck = 0L;
             if(carActual != null && carActual.size() >= 1) {
+                //结净总数
+                countActual = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
+                        && model.getNetSpot3Name().equals(spot.getBaseSpotName())
+                        && !model.getValueFlag().equals("0")).count();
                 //结净已匹配
                 countIsPrescale = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
-                        && model.getValueFlag().equals("1")
+                        && !model.getValueFlag().equals("0")
                         && model.getIsPreScale().equals("1")).count();
                 //结净未匹配
                 countIsNotPrescale = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
-                        && model.getValueFlag().equals("1")
-                        && model.getIsPreScale().equals("0")).count();
+                        && !model.getValueFlag().equals("0")
+                        && ( StringUtils.isEmpty(model.getIsPreScale()) || model.getIsPreScale().equals("0") )).count();
                 //结净已上传
                 countUpload = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
-                        && model.getValueFlag().equals("1")
+                        && !model.getValueFlag().equals("0")
                         && model.getIsPreScale().equals("1")
+                        && model.getValueFlag().equals("1")
                         && model.getUploadFlag().equals("2")).count();
                 //结净未上传
                 countUnUpload = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
@@ -3113,6 +3129,9 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 countActualValid = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
                         && model.getNetSpot3Name().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("0")).count();
+                //结净数据已核查
+                countActualCheck = ActualImgDatamodels.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())).count();
             }
 
             long countGross = 0L;
@@ -3123,7 +3142,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             long countNullWeightType = 0L;
             long countFirst = 0L;
             long countFirstValid = 0L;
+            long countFirstCheck = 0L;
             if(carFirst != null && carFirst.size() >= 1) {
+                //一次总数
+                countFirst = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && !model.getValueFlag().equals("0")).count();
                 //一次毛重
                 countGross = carFirst.stream().filter(model -> StringUtils.isNotEmpty(model.getWeightType()) && model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
@@ -3154,14 +3178,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && !model.getValueFlag().equals("0")
                         && StringUtil.isEmpty(model.getWeightType())).count();
-                //仅一次有效
-                countFirst = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
-                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
-                        && !model.getValueFlag().equals("0")).count();
                 //仅一次作废
                 countFirstValid = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
                         && model.getBaseSpotName().equals(spot.getBaseSpotName())
                         && model.getValueFlag().equals("0")).count();
+                //一次数据已核查
+                countFirstCheck = ActualImgDatamodels.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())).count();
             }
 
             long countCarHelp = 0L;
@@ -3388,11 +3411,13 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             //根据时间查询所有秤点的结净已匹配、结净未匹配、结净已上传、结净未上传、结净已作废
             obj.put("spotNo", spot.getBaseSpotNo());
             obj.put("spotName", spot.getBaseSpotName());
+            obj.put("countActual", countActual);
             obj.put("countIsPrescale", countIsPrescale);
             obj.put("countIsNotPrescale", countIsNotPrescale);
             obj.put("countUpload", countUpload);
             obj.put("countUnUpload", countUnUpload);
             obj.put("countActualValid", countActualValid);
+            obj.put("countActualCheck", countActualCheck);
             //根据时间查询所有秤点的一次毛重、未洁净毛重、一次皮重、未结净皮重、一次期限皮、一次有效、一次作废
             obj.put("countGross", countGross);
             obj.put("countGrossNoClean", countGrossNoClean);
@@ -3402,6 +3427,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             obj.put("countNullWeightType", countNullWeightType);
             obj.put("countFirst", countFirst);
             obj.put("countFirstValid", countFirstValid);
+            obj.put("countFirstCheck", countFirstCheck);
             //根据时间查询所有秤点的报警总数、报警未处理、报警已处理
             obj.put("countCarHelp", countCarHelp);
             obj.put("countCarHelpIsNotValue", countCarHelpIsNotValue);

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/mapper/MeterWorkCarActualFirstMapper.xml

@@ -2998,6 +2998,12 @@
           #{item}
         </foreach>
       </if>
+      <if test="createManNoStr != null and createManNoStr != ''">
+        and A.create_man_no in
+        <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and  A.base_spot_no like '%${baseSpotNo}%'
       </if>

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/controller/MeterWorkCarMeterTimeController.java

@@ -90,6 +90,14 @@ public class MeterWorkCarMeterTimeController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value="通过站点获取一次数据和计量时间效率分析列表", notes="分页查询")
+    //@RequiresPermissions("meterworkcarmetertime:view")
+    @PostMapping(value = "/carMeterTimeAndCarFirstBySpot")
+    public RESTfulResult carMeterTimeAndCarFirstBySpot(@RequestBody HashMap parmas){
+        PageList<MeterWorkCarMeterTime> list = meterWorkCarMeterTimeService.carMeterTimeAndCarFirstBySpot(parmas, Integer.parseInt(parmas.get("pageNum").toString()), Integer.parseInt(parmas.get("pageSize").toString()));
+        return success(list);
+    }
+
     @ApiOperation(value="新增汽车衡计量时间")
     @ApiImplicitParam(name = "meterWorkCarMeterTime", value = "详细实体meterWorkCarMeterTime", required = true, dataType = "MeterWorkCarMeterTime")
     @PostMapping(value = "/insert")

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.java

@@ -2,14 +2,12 @@ package com.steerinfo.meterwork.meterworkcarmetertime.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.*;
+
 import java.math.*;
 import java.util.HashMap;
 import java.util.List;
 
-import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.shiro.crypto.hash.Hash;
 
@@ -18,4 +16,5 @@ public interface MeterWorkCarMeterTimeMapper extends IBaseMapper<MeterWorkCarMet
     List<GroupTimeVo> selectGroupByTime(HashMap meterWorkCarMeterTime);
 
     List<PointDetailsVo> selectPointDetails(PointDetailsBo pointDetailsBo);
+    List<CarMeterTimeAndCarFirst> carMeterTimeAndCarFirstBySpot(HashMap<String, Object> obj);
 }

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/mapper/MeterWorkCarMeterTimeMapper.xml

@@ -481,4 +481,64 @@
     </where>
     order by t.CREATE_TIME desc
   </select>
+
+  <select id="carMeterTimeAndCarFirstBySpot" parameterType="hashmap" resultType="com.steerinfo.meterwork.meterworkcarmetertime.model.CarMeterTimeAndCarFirst">
+    select t1.BASE_SPOT_NO    baseSpotNo,
+          t1.BASE_SPOT_NAME  baseSpotName,
+          t1.actual_first_no actualFirstNo,
+          t1.car_no carNo，
+          t1.create_time createTime,
+          t.START_TIME startTime,
+          t.METER_START_TIME meterStartTime,
+          t.METER_END_TIME meterEndTime,
+          t.END_TIME endTime,
+          t.TOTAL_NUM totalNum,
+          t.UP_NUM upNum,
+          t.METER_NUM meterNum,
+          t.DOWN_NUM downNum,
+          t1.create_man_no createManNo,
+          t1.create_man_name createManName,
+          t1.prediction_no predictionNo,
+          t1.matter_no matterNo,
+          t1.matter_name matterName,
+          t1.forwarding_unit_no forwardingUnitNo,
+          t1.forwarding_unit_name forwardingUnitName,
+          t1.receiving_uint_no receivingUintNo,
+          t1.receiving_uint_name receivingUintName,
+          case when t1.is_pre_scale = '0' then '未匹配'
+              when t1.is_pre_scale = '1' then '已匹配'
+              else t1.is_pre_scale end isPreScale,
+          case when t1.value_flag = '0' then '作废'
+              when t1.value_flag = '1' then '有效'
+              when t1.value_flag = '2' then '结净'
+              else t1.value_flag end valueFlag
+    from METER_WORK_CAR_METER_TIME t
+        left join meter_work_car_actual_first t1
+            on t.actual_first_no = t1.actual_first_no
+    <where>
+      and t1.base_spot_no is not null
+      <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+        and t.create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and t.create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+      </if>
+      <if test="baseSpotName != null and baseSpotName != ''">
+        and t1.BASE_SPOT_NAME = #{baseSpotName}
+      </if>
+      <if test="baseSpotNo != null and baseSpotNo != ''">
+        and t1.BASE_SPOT_NO = #{baseSpotNo}
+      </if>
+      <if test="baseSpotNoStr != null and baseSpotNoStr != ''">
+        and t1.base_spot_no in
+        <foreach collection="spotNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+      <if test="createManNoStr != null and createManNoStr != ''">
+        and t1.create_man_no in
+        <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
+    </where>
+    order by t1.CREATE_TIME desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/model/CarMeterTimeAndCarFirst.java

@@ -0,0 +1,222 @@
+package com.steerinfo.meterwork.meterworkcarmetertime.model;
+
+import java.util.Date;
+
+public class CarMeterTimeAndCarFirst {
+    private String baseSpotNo;
+    private String baseSpotName;
+    private String actualFirstNo;
+    private String carNo;
+    private Date createTime;
+    private Date startTime;
+    private Date meterStartTime;
+    private Date meterEndTime;
+    private Date endTime;
+    private String totalNum;
+    private String upNum;
+    private String meterNum;
+    private String downNum;
+    private String createManNo;
+    private String createManName;
+    private String predictionNo;
+    private String matterNo;
+    private String matterName;
+    private String forwardingUnitNo;
+    private String forwardingUnitName;
+    private String receivingUintNo;
+    private String receivingUintName;
+    private String isPreScale;
+    private String valueFlag;
+
+    public String getBaseSpotNo() {
+        return baseSpotNo;
+    }
+
+    public void setBaseSpotNo(String baseSpotNo) {
+        this.baseSpotNo = baseSpotNo;
+    }
+
+    public String getBaseSpotName() {
+        return baseSpotName;
+    }
+
+    public void setBaseSpotName(String baseSpotName) {
+        this.baseSpotName = baseSpotName;
+    }
+
+    public String getActualFirstNo() {
+        return actualFirstNo;
+    }
+
+    public void setActualFirstNo(String actualFirstNo) {
+        this.actualFirstNo = actualFirstNo;
+    }
+
+    public String getCarNo() {
+        return carNo;
+    }
+
+    public void setCarNo(String carNo) {
+        this.carNo = carNo;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(Date startTime) {
+        this.startTime = startTime;
+    }
+
+    public Date getMeterStartTime() {
+        return meterStartTime;
+    }
+
+    public void setMeterStartTime(Date meterStartTime) {
+        this.meterStartTime = meterStartTime;
+    }
+
+    public Date getMeterEndTime() {
+        return meterEndTime;
+    }
+
+    public void setMeterEndTime(Date meterEndTime) {
+        this.meterEndTime = meterEndTime;
+    }
+
+    public Date getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(Date endTime) {
+        this.endTime = endTime;
+    }
+
+    public String getTotalNum() {
+        return totalNum;
+    }
+
+    public void setTotalNum(String totalNum) {
+        this.totalNum = totalNum;
+    }
+
+    public String getUpNum() {
+        return upNum;
+    }
+
+    public void setUpNum(String upNum) {
+        this.upNum = upNum;
+    }
+
+    public String getMeterNum() {
+        return meterNum;
+    }
+
+    public void setMeterNum(String meterNum) {
+        this.meterNum = meterNum;
+    }
+
+    public String getDownNum() {
+        return downNum;
+    }
+
+    public void setDownNum(String downNum) {
+        this.downNum = downNum;
+    }
+
+    public String getCreateManNo() {
+        return createManNo;
+    }
+
+    public void setCreateManNo(String createManNo) {
+        this.createManNo = createManNo;
+    }
+
+    public String getCreateManName() {
+        return createManName;
+    }
+
+    public void setCreateManName(String createManName) {
+        this.createManName = createManName;
+    }
+
+    public String getPredictionNo() {
+        return predictionNo;
+    }
+
+    public void setPredictionNo(String predictionNo) {
+        this.predictionNo = predictionNo;
+    }
+
+    public String getMatterNo() {
+        return matterNo;
+    }
+
+    public void setMatterNo(String matterNo) {
+        this.matterNo = matterNo;
+    }
+
+    public String getMatterName() {
+        return matterName;
+    }
+
+    public void setMatterName(String matterName) {
+        this.matterName = matterName;
+    }
+
+    public String getForwardingUnitNo() {
+        return forwardingUnitNo;
+    }
+
+    public void setForwardingUnitNo(String forwardingUnitNo) {
+        this.forwardingUnitNo = forwardingUnitNo;
+    }
+
+    public String getForwardingUnitName() {
+        return forwardingUnitName;
+    }
+
+    public void setForwardingUnitName(String forwardingUnitName) {
+        this.forwardingUnitName = forwardingUnitName;
+    }
+
+    public String getReceivingUintNo() {
+        return receivingUintNo;
+    }
+
+    public void setReceivingUintNo(String receivingUintNo) {
+        this.receivingUintNo = receivingUintNo;
+    }
+
+    public String getReceivingUintName() {
+        return receivingUintName;
+    }
+
+    public void setReceivingUintName(String receivingUintName) {
+        this.receivingUintName = receivingUintName;
+    }
+
+    public String getIsPreScale() {
+        return isPreScale;
+    }
+
+    public void setIsPreScale(String isPreScale) {
+        this.isPreScale = isPreScale;
+    }
+
+    public String getValueFlag() {
+        return valueFlag;
+    }
+
+    public void setValueFlag(String valueFlag) {
+        this.valueFlag = valueFlag;
+    }
+}

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/service/IMeterWorkCarMeterTimeService.java

@@ -1,11 +1,9 @@
 package com.steerinfo.meterwork.meterworkcarmetertime.service;
 
 import com.steerinfo.framework.service.IBaseService;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.*;
 
 import java.util.Date;
 import java.math.BigDecimal;
@@ -31,4 +29,6 @@ public interface IMeterWorkCarMeterTimeService extends IBaseService<MeterWorkCar
 
 
     List<PointDetailsVo> getPointDetails(PointDetailsBo pointDetailsBo);
+
+    PageList<CarMeterTimeAndCarFirst> carMeterTimeAndCarFirstBySpot(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
 }

src/main/java/com/steerinfo/meterwork/meterworkcarmetertime/service/impl/MeterWorkCarMeterTimeServiceImpl.java

@@ -2,12 +2,11 @@ package com.steerinfo.meterwork.meterworkcarmetertime.service.impl;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import com.steerinfo.framework.service.pagehelper.PageHelper;
+import com.steerinfo.framework.service.pagehelper.PageList;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.GroupTimeVo;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.MeterWorkCarMeterTime;
+import com.steerinfo.meterwork.meterworkcarmetertime.model.*;
 import com.steerinfo.meterwork.meterworkcarmetertime.mapper.MeterWorkCarMeterTimeMapper;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsBo;
-import com.steerinfo.meterwork.meterworkcarmetertime.model.PointDetailsVo;
 import com.steerinfo.meterwork.meterworkcarmetertime.service.IMeterWorkCarMeterTimeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -51,4 +50,20 @@ public class MeterWorkCarMeterTimeServiceImpl extends BaseServiceImpl<MeterWorkC
         return meterWorkCarMeterTimeMapper.selectPointDetails(pointDetailsBo);
     }
 
+    @Override
+    public PageList<CarMeterTimeAndCarFirst> carMeterTimeAndCarFirstBySpot(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
+        if (params.get("baseSpotNoStr") != null) {
+            String[] spotNoStr = params.get("baseSpotNoStr").toString().split(",");
+            params.put("spotNoStr", spotNoStr);
+        }
+        if (params.get("createManNoStr") != null) {
+            String[] spotNoStr = params.get("createManNoStr").toString().split(",");
+            params.put("manNoStr", spotNoStr);
+        }
+        List<CarMeterTimeAndCarFirst> rows = meterWorkCarMeterTimeMapper.carMeterTimeAndCarFirstBySpot(params);
+        PageList pageInfo = new PageList(rows);
+        return pageInfo;
+    }
+
 }

src/main/java/com/steerinfo/meterwork/meterworkcarnoidentify/controller/MeterWorkCarnoIdentifyController.java

@@ -101,7 +101,6 @@ public class MeterWorkCarnoIdentifyController extends BaseRESTfulController {
             e.printStackTrace();
             return failed("操作失败");
         }
-
     }
 
     @ApiOperation(value="获取列表", notes="分页查询")

src/main/java/com/steerinfo/meterwork/meterworkdatacount/mapper/MeterWorkDataCountMapper.xml

@@ -230,6 +230,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="createManNoStr != null and createManNoStr != ''">
+                and A.create_man_no in
+                <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name)
             union
             (select A.net_spot3_no base_spot_no,
@@ -250,6 +256,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="createManNoStr != null and createManNoStr != ''">
+                and A.net_man_no in
+                <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name)
         union
         (
@@ -272,6 +284,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="createManNoStr != null and createManNoStr != ''">
+            and B.create_man_no in
+            <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name)
         )
         where 1 = 1
@@ -281,6 +299,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="createManNoStr != null and createManNoStr != ''">
+                and create_man_no in
+                <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
             <if test="baseSpotNo != null and baseSpotNo != ''">
                 and BASE_SPOT_NO = #{baseSpotNo}
             </if>
@@ -322,6 +346,12 @@
                     #{item}
                 </foreach>
             </if>
+        <if test="createManNoStr != null and createManNoStr != ''">
+            and A.create_man_no in
+            <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
             group by A.base_spot_no, A.base_spot_name, A.create_man_no, A.create_man_name)
         union
             (select A.net_spot3_no base_spot_no,
@@ -346,6 +376,12 @@
                     #{item}
                 </foreach>
             </if>
+        <if test="createManNoStr != null and createManNoStr != ''">
+            and A.net_man_no in
+            <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
             group by A.net_spot3_no, A.net_spot3_name, A.net_man_no, A.net_man_name)
         union
             (select B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name
@@ -371,6 +407,12 @@
                     #{item}
                 </foreach>
             </if>
+        <if test="createManNoStr != null and createManNoStr != ''">
+            and B.create_man_no in
+            <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
             group by B.base_spot_no, B.base_spot_name,t.create_man_no,t.create_man_name)
         )
         where 1 = 1
@@ -380,6 +422,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="createManNoStr != null and createManNoStr != ''">
+            and create_man_no in
+            <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         <if test="baseSpotNo != null and baseSpotNo != ''">
             and BASE_SPOT_NO = #{baseSpotNo}
         </if>

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/impl/MeterWorkDataCountServiceImpl.java

@@ -177,6 +177,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
             String[] spotNoStr = params.get("netSpot3NoStr").toString().split(",");
             params.put("spotNoStr", spotNoStr);
         }
+        if (params.get("createManNoStr") != null) {
+            String[] manNoStr = params.get("createManNoStr").toString().split(",");
+            params.put("manNoStr", manNoStr);
+        }
         List<HashMap> paramsList = new ArrayList<>();
         //总结净
         long countActualTemp = 0L;
@@ -199,6 +203,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 actualMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                 actualMap.put("spotNoStr", params.get("spotNoStr"));
             }
+            if (params.get("createManNoStr") != null) {
+                actualMap.put("createManNoStr", params.get("createManNoStr"));
+                actualMap.put("manNoStr", params.get("manNoStr"));
+            }
             actualMap.put("validFlag", "1");
             List<HashMap> carActualTotal = meterWorkCarActualMapper.countDayAllState(actualMap);
             if (carActualTotal.size() >= 1) {
@@ -214,6 +222,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 actualVoidMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                 actualVoidMap.put("spotNoStr", params.get("spotNoStr"));
             }
+            if (params.get("createManNoStr") != null) {
+                actualVoidMap.put("createManNoStr", params.get("createManNoStr"));
+                actualVoidMap.put("manNoStr", params.get("manNoStr"));
+            }
             actualVoidMap.put("valueFlag", "0");
             List<HashMap> carActualVoidTotal = meterWorkCarActualMapper.countDayAllState(actualVoidMap);
             //结净未匹配委托总数
@@ -224,6 +236,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 actualNotMatchScaleMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                 actualNotMatchScaleMap.put("spotNoStr", params.get("spotNoStr"));
             }
+            if (params.get("createManNoStr") != null) {
+                actualNotMatchScaleMap.put("createManNoStr", params.get("createManNoStr"));
+                actualNotMatchScaleMap.put("manNoStr", params.get("manNoStr"));
+            }
             actualNotMatchScaleMap.put("isPreScale", "0");
             actualNotMatchScaleMap.put("validFlag", "1");
             List<HashMap> carActualNotMatchTotal = meterWorkCarActualMapper.countDayAllState(actualNotMatchScaleMap);
@@ -240,6 +256,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 firstMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                 firstMap.put("spotNoStr", params.get("spotNoStr"));
             }
+            if (params.get("createManNoStr") != null) {
+                firstMap.put("createManNoStr", params.get("createManNoStr"));
+                firstMap.put("manNoStr", params.get("manNoStr"));
+            }
             firstMap.put("validFlag", "1");
             List<HashMap> carFirstTotal = meterWorkCarActualFirstMaper.countDayAllState(firstMap);
             if (carFirstTotal.size() >= 1) {
@@ -255,6 +275,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 firstNotNetMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                 firstNotNetMap.put("spotNoStr", params.get("spotNoStr"));
             }
+            if (params.get("createManNoStr") != null) {
+                firstNotNetMap.put("createManNoStr", params.get("createManNoStr"));
+                firstNotNetMap.put("manNoStr", params.get("manNoStr"));
+            }
             firstNotNetMap.put("valueFlag", "1");
             List<HashMap> carFirst = meterWorkCarActualFirstMaper.countDayAllState(firstNotNetMap);
             if (carFirst.size() >= 1) {
@@ -269,6 +293,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 firstResetMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                 firstResetMap.put("spotNoStr", params.get("spotNoStr"));
             }
+            if (params.get("createManNoStr") != null) {
+                firstResetMap.put("createManNoStr", params.get("createManNoStr"));
+                firstResetMap.put("manNoStr", params.get("manNoStr"));
+            }
             List<HashMap> carFirstLog = meterBaseOperationLogMapper.countAllFirstState02(firstResetMap);
 
             HashMap<String, Object> obj = new HashMap<>();
@@ -278,6 +306,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                 obj.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                 obj.put("spotNoStr", params.get("spotNoStr"));
             }
+            if (params.get("createManNoStr") != null) {
+                obj.put("createManNoStr", params.get("createManNoStr"));
+                obj.put("manNoStr", params.get("manNoStr"));
+            }
             List<WorkLoadReportInfo> models = meterWorkDataCountMapper.groupByDayCarReportInfo(obj);
             if (spotModelList.size() >= 1) {
                 for (MeterBaseSpotInfo spotModel : spotModelList) {
@@ -417,6 +449,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     spotModelMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                     spotModelMap.put("spotNoStr", params.get("spotNoStr"));
                 }
+                if (params.get("createManNoStr") != null) {
+                    String[] manNoStr = params.get("createManNoStr").toString().split(",");
+                    params.put("manNoStr", manNoStr);
+                }
                 List<MeterBaseSpotInfo> spotModelList = meterBaseSpotInfoMapper.staticSpotGroupByActualAndFirst(spotModelMap);
 
                 //总结净数
@@ -428,6 +464,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     actualMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                     actualMap.put("spotNoStr", params.get("spotNoStr"));
                 }
+                if (params.get("createManNoStr") != null) {
+                    actualMap.put("createManNoStr", params.get("createManNoStr"));
+                    actualMap.put("manNoStr", params.get("manNoStr"));
+                }
                 actualMap.put("validFlag", "1");
                 List<HashMap> carActualTotal = meterWorkRailwayActualMapper.countDayAllState(actualMap);
                 if (carActualTotal.size() >= 1) {
@@ -444,6 +484,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     actualVoidMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                     actualVoidMap.put("spotNoStr", params.get("spotNoStr"));
                 }
+                if (params.get("createManNoStr") != null) {
+                    actualVoidMap.put("createManNoStr", params.get("createManNoStr"));
+                    actualVoidMap.put("manNoStr", params.get("manNoStr"));
+                }
                 actualVoidMap.put("valueFlag", "0");
                 List<HashMap> carActualVoidTotal = meterWorkRailwayActualMapper.countDayAllState(actualVoidMap);
                 //结净未匹配委托总数
@@ -455,6 +499,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     actualNotMatchScaleMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                     actualNotMatchScaleMap.put("spotNoStr", params.get("spotNoStr"));
                 }
+                if (params.get("createManNoStr") != null) {
+                    actualNotMatchScaleMap.put("createManNoStr", params.get("createManNoStr"));
+                    actualNotMatchScaleMap.put("manNoStr", params.get("manNoStr"));
+                }
                 actualNotMatchScaleMap.put("isPreSacale", "0");
                 actualNotMatchScaleMap.put("validFlag", "1");
                 List<HashMap> carActualNotMatchTotal = meterWorkRailwayActualMapper.countDayAllState(actualNotMatchScaleMap);
@@ -471,6 +519,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     firstMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                     firstMap.put("spotNoStr", params.get("spotNoStr"));
                 }
+                if (params.get("createManNoStr") != null) {
+                    firstMap.put("createManNoStr", params.get("createManNoStr"));
+                    firstMap.put("manNoStr", params.get("manNoStr"));
+                }
                 firstMap.put("railwayTypeNo", railwayTypeNo);
                 firstMap.put("validFlag", "1");
                 List<HashMap> carFirstTotal = meterWorkRailwayActFirstMapper.countDayAllState(firstMap);
@@ -488,6 +540,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     firstNotNetMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                     firstNotNetMap.put("spotNoStr", params.get("spotNoStr"));
                 }
+                if (params.get("createManNoStr") != null) {
+                    firstNotNetMap.put("createManNoStr", params.get("createManNoStr"));
+                    firstNotNetMap.put("manNoStr", params.get("manNoStr"));
+                }
                 firstNotNetMap.put("valueFlag", "1");
                 List<HashMap> carFirst = meterWorkRailwayActFirstMapper.countDayAllState(firstNotNetMap);
                 if (carFirst.size() >= 1) {
@@ -503,6 +559,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     firstResetMap.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                     firstResetMap.put("spotNoStr", params.get("spotNoStr"));
                 }
+                if (params.get("createManNoStr") != null) {
+                    firstResetMap.put("createManNoStr", params.get("createManNoStr"));
+                    firstResetMap.put("manNoStr", params.get("manNoStr"));
+                }
                 List<HashMap> carFirstLog = meterBaseOperationLogMapper.countAllFirstState03(firstResetMap);
 
                 HashMap<String, Object> obj = new HashMap<>();
@@ -513,6 +573,10 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
                     obj.put("netSpot3NoStr", params.get("netSpot3NoStr"));
                     obj.put("spotNoStr", params.get("spotNoStr"));
                 }
+                if (params.get("createManNoStr") != null) {
+                    obj.put("createManNoStr", params.get("createManNoStr"));
+                    obj.put("manNoStr", params.get("manNoStr"));
+                }
                 List<WorkLoadReportInfo> models = meterWorkDataCountMapper.groupByDayStaticReportInfo(obj);
                 if (spotModelList.size() >= 1) {
                     for (MeterBaseSpotInfo spotModel : spotModelList) {

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/mapper/MeterWorkRailwayActFirstMapper.xml

@@ -3949,6 +3949,12 @@
           #{item}
         </foreach>
       </if>
+    <if test="createManNoStr != null and createManNoStr != ''">
+      and A.create_man_no in
+      <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
       <if test="valueFlag != null and valueFlag != ''">
         and A.value_flag like '%${valueFlag}%'
       </if>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/mapper/MeterWorkRailwayActualMapper.xml

@@ -4740,6 +4740,12 @@
           #{item}
         </foreach>
       </if>
+    <if test="createManNoStr != null and createManNoStr != ''">
+      and A.net_man_no in
+      <foreach collection="manNoStr" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
       <if test="baseSpotNo != null and baseSpotNo != ''">
         and  A.net_spot3_no like '%${baseSpotNo}%'
       </if>