后端修改

src/main/java/com/steerinfo/baseinfo/meterbasemattermap/service/impl/MeterBaseMatterMapServiceImpl.java

@@ -120,7 +120,7 @@ public class MeterBaseMatterMapServiceImpl extends BaseServiceImpl<MeterBaseMatt
                 preNoSel.put("carNo",carNo);
                 preNoSel.put("valueFlag","1");
                 preNoSel.put("lineDesc","0");
-                List<PreTrackScale> pts = preTrackScaleMapper.selectByParameters(preNoSel);
+                List<PreTrackScale> pts = preTrackScaleMapper.selectByParameterDoubles(preNoSel);
                 if(pts.size() > 0) {
                     //循环判断是否有满足的双委托，有则计数
                     for (PreTrackScale model : pts){
@@ -143,7 +143,7 @@ public class MeterBaseMatterMapServiceImpl extends BaseServiceImpl<MeterBaseMatt
                         preNoSelMbmm.put("valueFlag","1");
                         preNoSelMbmm.put("lineDesc","0");
                         preNoSelMbmm.put("matterNo",map.getMaaterNo2());
-                        List<PreTrackScale> ptsMbmm = preTrackScaleMapper.selectByParameters(preNoSelMbmm);
+                        List<PreTrackScale> ptsMbmm = preTrackScaleMapper.selectByParameterDoubles(preNoSelMbmm);
                         if(ptsMbmm.size() > 0){
                             for (PreTrackScale model : ptsMbmm){
                                 if((model.getForwardingUnitNo().equals(receivingUintNo) && model.getMatterNo().equals(map.getMaaterNo2())) ||

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

@@ -3,13 +3,18 @@ package com.steerinfo.baseinfo.meterbaseoperationlog.mapper;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
 import com.steerinfo.meterwork.meterworkbeltscaleactual.model.MeterWorkBeltScaleActual;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface MeterBaseOperationLogMapper extends IBaseMapper<MeterBaseOperationLog, String> {
 
     List<MeterBaseOperationLog> doQueryAndMultiple(HashMap<String, Object> obj);
+
+    //根据时间查询所有秤点的洁净匹配委托、撤销委托、洁净已上传、洁净未上传
+    List<HashMap> countAllState(Map<String, Object> params);
 }

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

@@ -608,5 +608,25 @@
     </if>
     order by CREATE_TIME desc
   </select>
-  
+
+  <select id="countAllState" parameterType="java.util.HashMap" resultType="hashmap">
+    select t.ID, t.CREATE_MAN_NO, t.CREATE_MAN_NAME, t.CREATE_TIME, t.UPDATE_MAN_NO, t.UPDATE_MAN_NAME,
+    t.UPDATE_TIME, t.DELETE_MAN_NO, t.DELETE_MAN_NAME, t.DELETE_TIME, t.OPERATION_PAGE,
+    t.OPERATION_FUNCTION, t.OPERATION_ID, t.OPERATION_PREDICTION_NO, t.OPERATION_CARN_NO,
+    t.OPERATION_BEFORE_FIX, t.OPERATION_AFTER_FIX, t.LOG_TYPE, t.LOG_TYPE_CODE, B.base_spot_no, B.base_spot_name
+    from meter_base_operation_log t
+    left join meter_work_car_actual_first B
+    on t.operation_id = B.Actual_First_No
+    where 1=1
+    and t.operation_page like '%web端-汽车衡一次数据维护%'
+    <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="baseSpotNo != null and baseSpotNo != ''">
+      and  B.base_spot_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  B.base_spot_name like '%${baseSpotName}%'
+    </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbasetermtaredata/mapper/MeterBaseTermTareDataMapper.xml

@@ -637,6 +637,12 @@
   <select id="selectByCarNo" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     select * from METER_BASE_TERM_TARE_DATA
     where CAR_NO = '${carNo}'
+    <if test="spotAreaNo != null and spotAreaNo != ''">
+      and SPOT_AREA_NO = #{spotAreaNo}
+    </if>
+    <if test="spotAreaName != null and spotAreaName != ''">
+      and SPOT_AREA_NAME = #{spotAreaName}
+    </if>
     and END_TIME >= to_date('${endTime}', 'yyyy/MM/dd HH24:mi:ss')
     and rownum = 1 ORDER BY CREATE_TIME desc
   </select>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/controller/MeterWorkCarActualController.java

@@ -967,4 +967,16 @@ throw new MarkerMetException(500, "操作异常！！");
         }
         return rm;
     }
+
+    @ApiOperation(value = "根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传", notes = "实绩编号的两个一次计量编号")
+    @PostMapping(value = "/countAllSpotSate")
+    public RESTfulResult countAllSpotSate(@RequestBody HashMap params) {
+        try {
+            List<HashMap> list = meterWorkCarActualService.countAllSpotSate(params);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -61,4 +61,7 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     List<HashMap> selectOldAndNew(Map<String, Object> params);
     List<HashMap> doQueryFirstOldAndNew(Map<String, Object> params);
     List<HashMap> countOldAndNew(Map<String, Object> params);
+    
+    //根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传
+    List<MeterWorkCarActual> countAllState(Map<String, Object> params);
 }

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

@@ -4199,4 +4199,20 @@
       and matter_name LIKE '%${matterName}%'
     </if>
   </select>
+
+  <!--根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传、洁净已作废-->
+  <select id="countAllState" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  net_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and net_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  net_spot3_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  net_spot3_name like '%${baseSpotName}%'
+    </if>
+  </select>
+
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/IMeterWorkCarActualService.java

@@ -99,4 +99,7 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
 
     RESTfulResult selectByMap(HashMap<String, Object> params);
     RESTfulResult findPictureByActualNo(String actualNo);
+
+    //根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传、洁净已作废
+    List<HashMap> countAllSpotSate(HashMap params);
 }

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

@@ -4,6 +4,8 @@ import com.steerinfo.baseinfo.meterbasematterinfomatch.mapper.MeterBaseMatterInf
 import com.steerinfo.baseinfo.meterbasematterinfomatch.model.MeterBaseMatterInfoMatch;
 import com.steerinfo.baseinfo.meterbaseoperationlog.mapper.MeterBaseOperationLogMapper;
 import com.steerinfo.baseinfo.meterbaseoperationlog.model.MeterBaseOperationLog;
+import com.steerinfo.baseinfo.meterbasespotinfo.mapper.MeterBaseSpotInfoMapper;
+import com.steerinfo.baseinfo.meterbasespotinfo.model.MeterBaseSpotInfo;
 import com.steerinfo.baseinfo.meterbasetermtaredata.mapper.MeterBaseTermTareDataMapper;
 import com.steerinfo.baseinfo.meterbasetermtaredata.model.MeterBaseTermTareData;
 import com.steerinfo.framework.controller.RESTfulResult;
@@ -28,6 +30,8 @@ import com.steerinfo.meterwork.meterworkprelink.mapper.MeterWorkPreLinkMapper;
 import com.steerinfo.meterwork.meterworkprelink.service.IMeterWorkPreLinkService;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
+import com.steerinfo.meterwork.meterworkscheduledhelp.mapper.MeterWorkScheduledHelpMapper;
+import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
 import com.steerinfo.pretrack.prerailwayscale.model.PreRailwayScale;
 import com.steerinfo.pretrack.pretracknotice.mapper.PreTrackNoticeMapper;
 import com.steerinfo.pretrack.pretracknotice.model.PreTrackNotice;
@@ -77,6 +81,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
     @Resource
     private MeterToLimsOldMapper meterToLimsOldMapper;
 
+    @Resource
+    private MeterBaseSpotInfoMapper meterBaseSpotInfoMapper;
+
+    @Resource
+    private MeterWorkScheduledHelpMapper meterWorkScheduledHelpMapper;
+
     //物资匹配表
     @Resource
     private MeterBaseMatterInfoMatchMapper meterBaseMatterInfoMatchMapper;
@@ -2510,4 +2520,157 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         }
         return rm;
     }
+
+    @Override
+    public List<HashMap> countAllSpotSate(HashMap params) {
+        List<HashMap> map = new ArrayList<>();
+
+        //根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传、已作废数据
+        List<MeterWorkCarActual> carActual = meterWorkCarActualMapper.countAllState(params);
+        List<MeterWorkCarActualFirst> carFirst = meterWorkCarActualFirstMapper.countAllState(params);
+        List<MeterWorkScheduledHelp> carHelp = meterWorkScheduledHelpMapper.countAllState(params);
+        List<HashMap> carLog = meterBaseOperationLogMapper.countAllState(params);
+        //.map(MeterWorkCarActual::getCarNo).distinct().collect(Collectors.toList());
+//        List<String> spotList = carActual.stream().map(MeterWorkCarActual::getNetSpot3Name).distinct().collect(Collectors.toList());
+
+        List<MeterBaseSpotInfo> spotModel = meterBaseSpotInfoMapper.selectByParameters(params);
+        List<MeterBaseSpotInfo> spotList = spotModel.stream().collect(
+                Collectors. collectingAndThen(
+                        Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getBaseSpotNo() + ";" + o.getBaseSpotName()))), ArrayList::new)
+        );
+        for(MeterBaseSpotInfo spot: spotList) {
+            long countIsPrescale = 0L;
+            long countIsNotPrescale = 0L;
+            long countUpload = 0L;
+            long countUnUpload = 0L;
+            long countActualValid = 0L;
+            if(carActual != null) {
+                //洁净已匹配
+                countIsPrescale = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
+                        && model.getNetSpot3Name().equals(spot.getBaseSpotName())
+                        && model.getValueFlag().equals("1")
+                        && 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();
+                //洁净已上传
+                countUpload = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
+                        && model.getNetSpot3Name().equals(spot.getBaseSpotName())
+                        && model.getValueFlag().equals("1")
+                        && model.getIsPreScale().equals("1")
+                        && model.getUploadFlag().equals("2")).count();
+                //洁净未上传
+                countUnUpload = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
+                        && model.getNetSpot3Name().equals(spot.getBaseSpotName())
+                        && !model.getUploadFlag().equals("2")
+                        && !model.getIsPreScale().equals("0")).count();
+                //洁净数据已作废
+                countActualValid = carActual.stream().filter(model -> model.getNetSpot3No().equals(spot.getBaseSpotNo())
+                        && model.getNetSpot3Name().equals(spot.getBaseSpotName())
+                        && model.getValueFlag().equals("0")).count();
+            }
+
+            long countGross = 0L;
+            long countTare = 0L;
+            long countTermTare = 0L;
+            long countFirst = 0L;
+            long countFirstValid = 0L;
+            if(carFirst != null) {
+                //一次毛重
+                countGross = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && !model.getValueFlag().equals("0")
+                        && model.getWeightType().equals("0")).count();
+                //一次皮重
+                countTare = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && !model.getValueFlag().equals("0")
+                        && model.getValueFlag().equals("1")).count();
+                //一次期限皮重
+                countTermTare = carFirst.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && !model.getValueFlag().equals("0")
+                        && model.getWeightType().equals("2")).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();
+            }
+
+            long countCarHelp = 0L;
+            long countCarHelpIsNotValue = 0L;
+            long countCarHelpIsValue = 0L;
+            if(carHelp != null) {
+                //报警总数
+                countCarHelp = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())).count();
+                //报警未处理
+                countCarHelpIsNotValue = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getValueFlag().equals("0")).count();
+                //报警已处理
+                countCarHelpIsValue = carHelp.stream().filter(model -> model.getBaseSpotNo().equals(spot.getBaseSpotNo())
+                        && model.getBaseSpotName().equals(spot.getBaseSpotName())
+                        && model.getValueFlag().equals("1")).count();
+            }
+
+            long countLogIsPreScale = 0L;
+            long countLogIsNotPreScale = 0L;
+            long countLogUpdateCar = 0L;
+            long countLogValid = 0L;
+            long countLogRecover = 0L;
+            if(carLog != null) {
+                //日志一次处理匹配委托
+                countLogIsPreScale = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
+                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
+                        && model.get("operationFunction").equals("汽车衡匹配委托")).count();
+                countLogIsNotPreScale = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
+                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
+                        && model.get("operationFunction").equals("汽车衡撤销委托")).count();
+                countLogUpdateCar = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
+                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
+                        && model.get("operationFunction").equals("车号修改")).count();
+                countLogValid = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
+                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
+                        && model.get("operationFunction").equals("作废")).count();
+                countLogRecover = carLog.stream().filter(model -> model.get("baseSpotNo").equals(spot.getBaseSpotNo())
+                        && model.get("baseSpotName").equals(spot.getBaseSpotName())
+                        && model.get("operationFunction").equals("启用")).count();
+            }
+
+            HashMap<String, Object> obj = new HashMap<>();
+            //根据时间查询所有秤点的洁净已匹配、洁净未匹配、洁净已上传、洁净未上传、洁净已作废
+            obj.put("spotNo", spot.getBaseSpotNo());
+            obj.put("spotName", spot.getBaseSpotName());
+            obj.put("countIsPrescale", countIsPrescale);
+            obj.put("countIsNotPrescale", countIsNotPrescale);
+            obj.put("countUpload", countUpload);
+            obj.put("countUnUpload", countUnUpload);
+            obj.put("countActualValid", countActualValid);
+            //根据时间查询所有秤点的一次毛重、一次皮重、一次期限皮、一次有效、一次作废
+            obj.put("countGross", countGross);
+            obj.put("countTare", countTare);
+            obj.put("countTermTare", countTermTare);
+            obj.put("countFirst", countFirst);
+            obj.put("countFirstValid", countFirstValid);
+            //根据时间查询所有秤点的报警总数、报警未处理、报警已处理
+            obj.put("countCarHelp", countCarHelp);
+            obj.put("countCarHelpIsNotValue", countCarHelpIsNotValue);
+            obj.put("countCarHelpIsValue", countCarHelpIsValue);
+            //根据时间查询所有秤点的匹配委托、
+            obj.put("countLogIsPreScale", countLogIsPreScale);
+            obj.put("countLogIsNotPreScale", countLogIsNotPreScale);
+            obj.put("countLogUpdateCar", countLogUpdateCar);
+            obj.put("countLogValid", countLogValid);
+            obj.put("countLogRecover", countLogRecover);
+            map.add(obj);
+        }
+        return map;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.steerinfo.meterwork.meterworkcaractualfirst.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.meterwork.dto.*;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualFirst;
 import feign.Param;
 import io.micrometer.core.instrument.Meter;
@@ -82,4 +83,7 @@ public interface MeterWorkCarActualFirstMapper extends IBaseMapper<MeterWorkCarA
     List<MeterWorkCarActualFirst> selectById(List<String> actualNoList);
 
     int countFirstByCar(HashMap params);
+
+    //根据时间查询所有秤点的一次毛重、一次皮重、一次期限皮、一次有效、一次作废
+    List<MeterWorkCarActual> countAllState(Map<String, Object> params);
 }

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

@@ -2905,4 +2905,19 @@
           and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  <=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
         </if>
   </select>
+
+  <!--根据时间查询所有秤点的一次毛重、一次皮重、一次期限皮、一次有效、一次作废-->
+  <select id="countAllState" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  base_spot_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  base_spot_name like '%${baseSpotName}%'
+    </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -4691,7 +4691,10 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 mbttd = meterBaseTermTareDataMapper.selectByDataNo(mbMap);
             }
             else{
+                MeterBaseSpotInfo spotInfo = meterBaseSpotInfoMapper.selectByPrimaryKey(secondDb.getBaseSpotNo());
                 mbMap.put("carNo",netDb.getCarNo());
+                mbMap.put("spotAreaNo", spotInfo.getSpotAreaNo());
+                mbMap.put("spotAreaName", spotInfo.getSpotAreaName());
                 mbttd = meterBaseTermTareDataMapper.selectByCarNo(mbMap);
             }
             MeterWorkCarActualFirst imTare = new MeterWorkCarActualFirst();
@@ -5964,10 +5967,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                 rm.setMessage(pre02.getPredictionNo() + "委托信息不存在");
                 return rm;
             }
-
+            MeterBaseSpotInfo spotInfo = meterBaseSpotInfoMapper.selectByPrimaryKey(model.getBaseSpotNo());
             HashMap<String, Object> obj = new HashMap<>();
             obj.put("carNo", model.getCarNo());
             obj.put("valueFlag", "0");
+            obj.put("spotAreaNo", spotInfo.getSpotAreaNo());
+            obj.put("spotAreaName", spotInfo.getSpotAreaName());
             List<MeterBaseTermTareData> tareDataList = meterBaseTermTareDataMapper.selectByParameters(obj);
             if(tareDataList.size() < 1) {
                 rm.setMessage(model.getCarNo() + "车号期限皮重已过期或者未查找到期限皮中信息，不允许双委托计量");

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.java

@@ -1,6 +1,7 @@
 package com.steerinfo.meterwork.meterworkscheduledhelp.mapper;
 
 import com.steerinfo.framework.mapper.IBaseMapper;
+import com.steerinfo.meterwork.meterworkcaractual.model.MeterWorkCarActual;
 import com.steerinfo.meterwork.meterworkscheduledhelp.model.MeterWorkScheduledHelp;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
@@ -14,4 +15,7 @@ public interface MeterWorkScheduledHelpMapper extends IBaseMapper<MeterWorkSched
 
     List<MeterWorkScheduledHelp> likeByDesc(Map<String, Object> var1);
     List<MeterWorkScheduledHelp> HelpMsgByDesc(Map<String, Object> var1);
+
+    //根据时间查询所有秤点的报警总数、报警未处理、报警已处理
+    List<MeterWorkScheduledHelp> countAllState(Map<String, Object> params);
 }

src/main/java/com/steerinfo/meterwork/meterworkscheduledhelp/mapper/MeterWorkScheduledHelpMapper.xml

@@ -517,4 +517,20 @@
     </where>
     order by create_time desc
   </select>
+
+  <!--根据时间查询所有秤点的报警总数、报警未处理、报警已处理-->
+  <select id="countAllState" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    and warm_type in ('1', '2', '3')
+    <if test="startTime != null and endTime != null and startTime != '' and endTime != ''">
+      and  create_time  >= TO_DATE(#{startTime}, 'yyyy-MM-dd HH24:mi:ss') and create_time  &lt;=  TO_DATE(#{endTime}, 'yyyy-MM-dd HH24:mi:ss')
+    </if>
+    <if test="baseSpotNo != null and baseSpotNo != ''">
+      and  base_spot_no like '%${baseSpotNo}%'
+    </if>
+    <if test="baseSpotName != null and baseSpotName != ''">
+      and  base_spot_name like '%${baseSpotName}%'
+    </if>
+  </select>
 </mapper>

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.java

@@ -35,6 +35,8 @@ public interface PreTrackScaleMapper extends IBaseMapper<PreTrackScale, String>
     //查询预报的有效天数，写在 SHIPMENT_NUM字段中
     List<PreTrackScale> selectScaleValidPeriod();
 
+    List<PreTrackScale> selectByParameterDoubles(Map<String, Object> param);
+
     List<PreTrackScale> selectValueFlag(Map<String, Object> parameters);
 
     List<PreTrackScale> selectByCarNo(@Param( value = "carNo") String carNo, @Param( value = "valueFlag") String valueFlag);

src/main/java/com/steerinfo/pretrack/pretrackscale/mapper/PreTrackScaleMapper.xml

@@ -3575,5 +3575,305 @@
     </if>
     order By TRUST_DATE_TIME desc
   </select>
-
+  <select id="selectByParameterDoubles" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where TRUST_AVAILABILITY_TIME &gt;= SYSDATE
+    <if test="predictionNo != null and predictionNo != ''">
+      and PREDICTION_NO = #{predictionNo}
+    </if>
+    <if test="noticeNo != null and noticeNo != ''">
+      and NOTICE_NO = #{noticeNo}
+    </if>
+    <if test="carNo != null and carNo != ''">
+      and CAR_NO = #{carNo}
+    </if>
+    <if test="trailerNo != null and trailerNo != ''">
+      and TRAILER_NO = #{trailerNo}
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and MATTER_NO = #{matterNo}
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and MATTER_NAME = #{matterName}
+    </if>
+    <if test="contractNo != null and contractNo != ''">
+      and CONTRACT_NO = #{contractNo}
+    </if>
+    <if test="batchNo != null and batchNo != ''">
+      and BATCH_NO = #{batchNo}
+    </if>
+    <if test="customerSupplierNo != null and customerSupplierNo != ''">
+      and CUSTOMER_SUPPLIER_NO = #{customerSupplierNo}
+    </if>
+    <if test="customerSupplierName != null and customerSupplierName != ''">
+      and CUSTOMER_SUPPLIER_NAME = #{customerSupplierName}
+    </if>
+    <if test="sourceArea != null and sourceArea != ''">
+      and SOURCE_AREA = #{sourceArea}
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO = #{forwardingUnitNo}
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME = #{forwardingUnitName}
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO = #{receivingUintNo}
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME = #{receivingUintName}
+    </if>
+    <if test="materialNo != null and materialNo != ''">
+      and MATERIAL_NO = #{materialNo}
+    </if>
+    <if test="materialName != null and materialName != ''">
+      and MATERIAL_NAME = #{materialName}
+    </if>
+    <if test="specNo != null and specNo != ''">
+      and SPEC_NO = #{specNo}
+    </if>
+    <if test="specName != null and specName != ''">
+      and SPEC_NAME = #{specName}
+    </if>
+    <if test="shipmentGrossWeight != null">
+      and SHIPMENT_GROSS_WEIGHT = #{shipmentGrossWeight}
+    </if>
+    <if test="shipmentNetWeight != null">
+      and SHIPMENT_NET_WEIGHT = #{shipmentNetWeight}
+    </if>
+    <if test="shipmentNum != null">
+      and SHIPMENT_NUM = #{shipmentNum}
+    </if>
+    <if test="addWeightSum != null">
+      and ADD_WEIGHT_SUM = #{addWeightSum}
+    </if>
+    <if test="bindCardNo != null and bindCardNo != ''">
+      and BIND_CARD_NO = #{bindCardNo}
+    </if>
+    <if test="loadPointNo != null and loadPointNo != ''">
+      and LOAD_POINT_NO = #{loadPointNo}
+    </if>
+    <if test="loadPointName != null and loadPointName != ''">
+      and LOAD_POINT_NAME = #{loadPointName}
+    </if>
+    <if test="sampleNo != null and sampleNo != ''">
+      and SAMPLE_NO = #{sampleNo}
+    </if>
+    <if test="sampleVoucher != null and sampleVoucher != ''">
+      and SAMPLE_VOUCHER = #{sampleVoucher}
+    </if>
+    <if test="carrierUnitNo != null and carrierUnitNo != ''">
+      and CARRIER_UNIT_NO = #{carrierUnitNo}
+    </if>
+    <if test="carrierUnitName != null and carrierUnitName != ''">
+      and CARRIER_UNIT_NAME = #{carrierUnitName}
+    </if>
+    <if test="predictionType != null and predictionType != ''">
+      and PREDICTION_TYPE = #{predictionType}
+    </if>
+    <if test="predictionCombination != null and predictionCombination != ''">
+      and PREDICTION_COMBINATION = #{predictionCombination}
+    </if>
+    <if test="meterTypeNo != null and meterTypeNo != ''">
+      and METER_TYPE_NO = #{meterTypeNo}
+    </if>
+    <if test="meterTypeName != null and meterTypeName != ''">
+      and METER_TYPE_NAME = #{meterTypeName}
+    </if>
+    <if test="usedType != null and usedType != ''">
+      and USED_TYPE = #{usedType}
+    </if>
+    <if test="effectiveStartTime != null">
+      and TO_CHAR(EFFECTIVE_START_TIME,'yyyy-MM-dd') = #{effectiveStartTime}
+    </if>
+    <if test="effectiveEndTime != null">
+      and TO_CHAR(EFFECTIVE_END_TIME,'yyyy-MM-dd') = #{effectiveEndTime}
+    </if>
+    <if test="effectiveWeight != null">
+      and EFFECTIVE_WEIGHT = #{effectiveWeight}
+    </if>
+    <if test="effectiveNum != null">
+      and EFFECTIVE_NUM = #{effectiveNum}
+    </if>
+    <if test="meterWeight != null">
+      and METER_WEIGHT = #{meterWeight}
+    </if>
+    <if test="meterNum != null">
+      and METER_NUM = #{meterNum}
+    </if>
+    <if test="railwayNo != null and railwayNo != ''">
+      and RAILWAY_NO = #{railwayNo}
+    </if>
+    <if test="meterProcessNo != null and meterProcessNo != ''">
+      and METER_PROCESS_NO = #{meterProcessNo}
+    </if>
+    <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
+      and METER_PROCESS_EDITION_NO = #{meterProcessEditionNo}
+    </if>
+    <if test="memo != null and memo != ''">
+      and MEMO = #{memo}
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and VALUE_FLAG = #{valueFlag}
+    </if>
+    <if test="usedTime != null">
+      and TO_CHAR(USED_TIME,'yyyy-MM-dd') = #{usedTime}
+    </if>
+    <if test="createManNo != null and createManNo != ''">
+      and CREATE_MAN_NO = #{createManNo}
+    </if>
+    <if test="createManName != null and createManName != ''">
+      and CREATE_MAN_NAME = #{createManName}
+    </if>
+    <if test="createTime != null">
+      and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+    </if>
+    <if test="updateManNo != null and updateManNo != ''">
+      and UPDATE_MAN_NO = #{updateManNo}
+    </if>
+    <if test="updateManName != null and updateManName != ''">
+      and UPDATE_MAN_NAME = #{updateManName}
+    </if>
+    <if test="updateTime != null">
+      and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+    </if>
+    <if test="deleteManNo != null and deleteManNo != ''">
+      and DELETE_MAN_NO = #{deleteManNo}
+    </if>
+    <if test="deleteManName != null and deleteManName != ''">
+      and DELETE_MAN_NAME = #{deleteManName}
+    </if>
+    <if test="deleteTime != null">
+      and TO_CHAR(DELETE_TIME,'yyyy-MM-dd') = #{deleteTime}
+    </if>
+    <if test="pValueFlag != null and pValueFlag != ''">
+      and P_VALUE_FLAG = #{pValueFlag}
+    </if>
+    <if test="carAllocationTime != null">
+      and TO_CHAR(CAR_ALLOCATION_TIME,'yyyy-MM-dd') = #{carAllocationTime}
+    </if>
+    <if test="isCompleted != null and isCompleted != ''">
+      and IS_COMPLETED = #{isCompleted}
+    </if>
+    <if test="limsSamplingFlag != null and limsSamplingFlag != ''">
+      and LIMS_SAMPLING_FLAG = #{limsSamplingFlag}
+    </if>
+    <if test="heatNo != null and heatNo != ''">
+      and HEAT_NO = #{heatNo}
+    </if>
+    <if test="idNum != null and idNum != ''">
+      and ID_NUM = #{idNum}
+    </if>
+    <if test="predictionSource != null and predictionSource != ''">
+      and PREDICTION_SOURCE = #{predictionSource}
+    </if>
+    <if test="createDepname != null and createDepname != ''">
+      and CREATE_DEPNAME = #{createDepname}
+    </if>
+    <if test="createDepid != null and createDepid != ''">
+      and CREATE_DEPID = #{createDepid}
+    </if>
+    <if test="lineDesc != null and lineDesc != ''">
+      and LINE_DESC = #{lineDesc}
+    </if>
+    <if test="voucherIdentity != null and voucherIdentity != ''">
+      and VOUCHER_IDENTITY = #{voucherIdentity}
+    </if>
+    <if test="voucherItem != null and voucherItem != ''">
+      and VOUCHER_ITEM = #{voucherItem}
+    </if>
+    <if test="businessGroup != null and businessGroup != ''">
+      and BUSINESS_GROUP = #{businessGroup}
+    </if>
+    <if test="tempConveyance != null and tempConveyance != ''">
+      and TEMP_CONVEYANCE = #{tempConveyance}
+    </if>
+    <if test="conveyanceType != null and conveyanceType != ''">
+      and CONVEYANCE_TYPE = #{conveyanceType}
+    </if>
+    <if test="resourceSystem != null and resourceSystem != ''">
+      and RESOURCE_SYSTEM = #{resourceSystem}
+    </if>
+    <if test="groupPackageAmount != null">
+      and GROUP_PACKAGE_AMOUNT = #{groupPackageAmount}
+    </if>
+    <if test="groupPackageUnit != null and groupPackageUnit != ''">
+      and GROUP_PACKAGE_UNIT = #{groupPackageUnit}
+    </if>
+    <if test="packageAmount != null">
+      and PACKAGE_AMOUNT = #{packageAmount}
+    </if>
+    <if test="packageUnit != null and packageUnit != ''">
+      and PACKAGE_UNIT = #{packageUnit}
+    </if>
+    <if test="theoryAmount != null">
+      and THEORY_AMOUNT = #{theoryAmount}
+    </if>
+    <if test="measureBatch != null and measureBatch != ''">
+      and MEASURE_BATCH = #{measureBatch}
+    </if>
+    <if test="measureBatchCount != null">
+      and MEASURE_BATCH_COUNT = #{measureBatchCount}
+    </if>
+    <if test="senderType != null and senderType != ''">
+      and SENDER_TYPE = #{senderType}
+    </if>
+    <if test="senderRemark != null and senderRemark != ''">
+      and SENDER_REMARK = #{senderRemark}
+    </if>
+    <if test="receiverType != null and receiverType != ''">
+      and RECEIVER_TYPE = #{receiverType}
+    </if>
+    <if test="receiverRemark != null and receiverRemark != ''">
+      and RECEIVER_REMARK = #{receiverRemark}
+    </if>
+    <if test="trustDepartmentName != null and trustDepartmentName != ''">
+      and TRUST_DEPARTMENT_NAME = #{trustDepartmentName}
+    </if>
+    <if test="trustDepartment != null and trustDepartment != ''">
+      and TRUST_DEPARTMENT = #{trustDepartment}
+    </if>
+    <if test="trustor != null and trustor != ''">
+      and TRUSTOR = #{trustor}
+    </if>
+    <if test="trustDateTime != null">
+      and TO_CHAR(TRUST_DATE_TIME,'yyyy-MM-dd') = #{trustDateTime}
+    </if>
+    <if test="trustAvailabilityTime != null">
+      and TO_CHAR(TRUST_AVAILABILITY_TIME,'yyyy-MM-dd') = #{trustAvailabilityTime}
+    </if>
+    <if test="trustIp != null and trustIp != ''">
+      and TRUST_IP = #{trustIp}
+    </if>
+    <if test="stationType != null and stationType != ''">
+      and STATION_TYPE = #{stationType}
+    </if>
+    <if test="measureStation != null and measureStation != ''">
+      and MEASURE_STATION = #{measureStation}
+    </if>
+    <if test="measureStationName != null and measureStationName != ''">
+      and MEASURE_STATION_NAME = #{measureStationName}
+    </if>
+    <if test="amountUnit != null and amountUnit != ''">
+      and AMOUNT_UNIT = #{amountUnit}
+    </if>
+    <if test="trustDay != null">
+      and TRUST_DAY = #{trustDay}
+    </if>
+    <if test="conveyanceGroup != null and conveyanceGroup != ''">
+      and CONVEYANCE_GROUP = #{conveyanceGroup}
+    </if>
+    <if test="revocartionStatus != null and revocartionStatus != ''">
+      and REVOCARTION_STATUS = #{revocartionStatus}
+    </if>
+    <if test="useSite != null and useSite != ''">
+      and USE_SITE = #{useSite}
+    </if>
+    <if test="uploadFlag != null and uploadFlag != ''">
+      and UPLOAD_FLAG = #{uploadFlag}
+    </if>
+    <if test="submitFlag != null and submitFlag != ''">
+      and SUBMIT_FLAG = #{submitFlag}
+    </if>
+  </select>
 </mapper>