修改

src/main/java/com/steerinfo/baseinfo/combaseinfo/mapper/ComBaseInfoMapper.java

@@ -28,4 +28,5 @@ public interface ComBaseInfoMapper extends IBaseMapper<ComBaseInfo, String> {
     String getConfigIDByFive(@Param(value = "tablName") String tablName, @Param(value = "primaryKey") String primaryKey);
 
     List<String> matterNoByBaseCode(Map<String,Object> map);
+    List<String> matterNoByBaseName(Map<String,Object> map);
 }

src/main/java/com/steerinfo/baseinfo/combaseinfo/mapper/ComBaseInfoMapper.xml

@@ -565,4 +565,15 @@
       and valid_flag = #{validFlag}
     </if>
   </select>
+  <select id="matterNoByBaseName" parameterType="java.util.HashMap" resultType="java.lang.String">
+    select base_name
+    from com_base_info
+    where 1=1
+    <if test="pBaseCode != null and pBaseCode != ''">
+      and p_base_code = #{pBaseCode, jdbcType=VARCHAR}
+    </if>
+    <if test="validFlag != null and validFlag != ''">
+      and valid_flag = #{validFlag}
+    </if>
+  </select>
 </mapper>

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

@@ -340,6 +340,18 @@ public class MeterWorkDataCountController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "计量准确性分析", notes = "根据计量时间、车号查询")
+    @PostMapping(value = "/measurementAccuracyAnalysisFunction")
+    public RESTfulResult measurementAccuracyAnalysisFunction(@RequestBody(required = false) HashMap params) {
+        try {
+            List<String> list = meterWorkDataCountService.measurementAccuracyAnalysisFunction(params);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
+
     @ApiOperation(value = "计量准确性分析", notes = "根据计量时间、车号查询")
     @PostMapping(value = "/measurementAccuracyAnalysis")
     public RESTfulResult measurementAccuracyAnalysis(@RequestBody(required = false) HashMap params) {

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

@@ -17,6 +17,7 @@ public interface MeterWorkDataCountMapper {
     List<WorkLoadReportInfo> groupByDayCarReportInfo(HashMap<String, Object> param);
     List<WorkLoadReportInfo> groupByDayStaticReportInfo(HashMap<String, Object> param);
     List<TruckHisTareComparison> truckHisTareComparison(HashMap<String, Object> param);
+    List<String> measurementAccuracyAnalysisFunction(HashMap<String, Object> param);
     List<MeasurementAccuracyAnalysis> measurementAccuracyAnalysis(HashMap<String, Object> param);
     List<HookTareWeightAndTheoryAmount> hookTareWeightAndTheoryAmount(HashMap<String, Object> param);
     List<TwoMillionTareWeightComparison> twoMillionTareWeightComparison(HashMap<String, Object> param);

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

@@ -672,9 +672,26 @@
             <if test="carNo != null and carNo != ''">
                 and carNo like '%${carNo}%'
             </if>
+            <if test="operationFunction != null and operationFunction != ''">
+                and operationFunction in
+                <foreach collection="operationFunctionList" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         order by createTime desc
     </select>
 
+    <select id="measurementAccuracyAnalysisFunction" parameterType="java.util.HashMap"
+            resultType="String">
+        select distinct A.operation_function operationFunction
+        from meter_base_operation_log A
+        where 1 = 1
+        <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')
+        </if>
+    </select>
+
     <select id="hookTareWeightAndTheoryAmount" parameterType="java.util.HashMap"
             resultType="com.steerinfo.meterwork.meterworkdatacount.model.HookTareWeightAndTheoryAmount">
         select A.actual_no actualNo,

src/main/java/com/steerinfo/meterwork/meterworkdatacount/service/IMeterWorkDataCountService.java

@@ -14,6 +14,7 @@ public interface IMeterWorkDataCountService{
     RESTfulResult carRegularComparison(HashMap<String, Object> params);
     List<HashMap> countDayAllSpot(HashMap<String, Object> params);
     PageList<TruckHisTareComparison> truckHisTareComparison(HashMap<String, Object> params);
+    List<String> measurementAccuracyAnalysisFunction(HashMap<String, Object> params);
     PageList<MeasurementAccuracyAnalysis> measurementAccuracyAnalysis(HashMap<String, Object> params);
     PageList<HookTareWeightAndTheoryAmount> hookTareWeightAndTheoryAmount(HashMap<String, Object> params);
     PageList<TwoMillionTareWeightComparison> twoMillionTareWeightComparison(HashMap<String, Object> params);

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

@@ -698,9 +698,19 @@ public class MeterWorkDataCountServiceImpl implements IMeterWorkDataCountService
         return rows;
     }
 
+    @Override
+    public List<String> measurementAccuracyAnalysisFunction(HashMap<String, Object> params) {
+        List<String> models = meterWorkDataCountMapper.measurementAccuracyAnalysisFunction(params);
+        return models;
+    }
+
     @Override
     public PageList<MeasurementAccuracyAnalysis> measurementAccuracyAnalysis(HashMap<String, Object> params) {
         PageHelper.startPage(Integer.parseInt(params.get("pageNum").toString()), Integer.parseInt(params.get("pageSize").toString()));
+        if(params.get("operationFunction") != null) {
+            String[] operationFunctionList =  params.get("operationFunction").toString().split(",");
+            params.put("operationFunctionList", operationFunctionList);
+        }
         List<MeasurementAccuracyAnalysis> models = meterWorkDataCountMapper.measurementAccuracyAnalysis(params);
         if (models.size() >= 1) {
             for (MeasurementAccuracyAnalysis model : models) {

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

@@ -4388,6 +4388,10 @@
       <if test="railwayNo != null and railwayNo != ''">
         and railway_no like '%${railwayNo}%'
       </if>
+      and MATTER_NAME in
+      <foreach collection="matterNameList" item="id" separator="," open="(" close=")">
+        #{id}
+      </foreach>
       and forwarding_unit_no in
       <foreach collection="list" item="id" separator="," open="(" close=")">
         #{id}

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

@@ -3101,8 +3101,15 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             //查询配置表所有发货单位编号
             HashMap<String, Object> obj = new HashMap<>();
             obj.put("pBaseCode", "001038");
+            obj.put("validFlag", "1");
             List<String> matterModels = comBaseInfoMapper.matterNoByBaseCode(obj);
             params.put("list", matterModels);
+
+            HashMap<String, Object> mapObj = new HashMap<>();
+            mapObj.put("pBaseCode", "001044");
+            mapObj.put("validFlag", "1");
+            List<String> matterNameModels = comBaseInfoMapper.matterNoByBaseName(mapObj);
+            params.put("matterNameList", matterNameModels);
             List<MeterWorkRailwayActual> actualModels = meterWorkRailwayActualMapper.autoPrintRailway(params);
 
             rm.setSucceed();