后端修改

src/main/java/com/jisco/dynamicweight/dynamicworkupdata/controller/DynamicWorkUpdataController.java

@@ -162,7 +162,7 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
 
     @ApiOperation(value = "导出Excel", notes = "导出Excel")
     @PostMapping(value = "/exportExcel")//String
-    public void exportExcel(HttpServletResponse response, @RequestParam HashMap parmas) throws IOException {
+    public void exportExcel(HttpServletResponse response, @RequestBody HashMap parmas) throws IOException {
         List<DynamicWorkUpdata> list = dynamicWorkUpdataService.query(parmas);
         ExcelUtil.exportExcel(response, list, DynamicWorkUpdata.class, "动态秤称重数据");
     }
@@ -309,4 +309,4 @@ public class DynamicWorkUpdataController extends BaseRESTfulController {
         dynamicWorkUpdataService.reCollect(id);
         return success(null, "操作成功");
     }
-}
+}

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

@@ -976,4 +976,16 @@ throw new MarkerMetException(500, "操作异常！！");
         }
     }
 
+    @ApiOperation(value = "计量统计明细-获取列表", notes = "不分页模糊查询")
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/carActualDataDetail")
+    public RESTfulResult carActualDataDetail(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkCarActual> list = meterWorkCarActualService.carActualDataDetail(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -55,6 +55,7 @@ public interface MeterWorkCarActualMapper extends IBaseMapper<MeterWorkCarActual
     MeterWorkCarActual selectActual(String actualFirstNo);
 
     List<MeterWorkCarActual> likeByDesc(Map<String, Object> params);
+    List<MeterWorkCarActual> carActualDataDetail(Map<String, Object> params);
 
     List<MeterWorkCarActual> selectByMap(Map<String, Object> params);
 

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

@@ -4227,4 +4227,21 @@
     </if>
   </select>
 
+  <select id="carActualDataDetail" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="validFlag != null and validFlag != ''">
+      and  value_flag != '0'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag = #{valueFlag}
+    </if>
+    <if test="isPreScale != null and isPreScale != ''">
+      and IS_PRE_SCALE = #{isPreScale}
+    </if>
+    <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>
+    order by net_time desc
+  </select>
 </mapper>

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

@@ -95,6 +95,7 @@ public interface IMeterWorkCarActualService extends IBaseService<MeterWorkCarAct
 
     PageList<MeterWorkCarActual> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
     List<MeterWorkCarActual> likeByValueFlag(HashMap<String, Object> params);
+    List<MeterWorkCarActual> carActualDataDetail(HashMap<String, Object> params);
 
     RESTfulResult abolish(List<MeterWorkCarActual> models);
 

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

@@ -1271,6 +1271,12 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
         return rows;
     }
 
+    @Override
+    public List<MeterWorkCarActual> carActualDataDetail(HashMap<String, Object> params) {
+        List<MeterWorkCarActual> rows = meterWorkCarActualMapper.carActualDataDetail(params);
+        return rows;
+    }
+
     @Override
     public RESTfulResult abolish(List<MeterWorkCarActual> models) {
         RESTfulResult rm = new RESTfulResult();

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/controller/MeterWorkCarActualFirstController.java

@@ -1419,4 +1419,16 @@ public class MeterWorkCarActualFirstController extends BaseRESTfulController {
         }
     }
 
+    @ApiOperation(value = "计量统计明细-获取列表", notes = "不分页模糊查询")
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/carFirstDataDetail")
+    public RESTfulResult carFirstDataDetail(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkCarActualFirst> list = meterWorkCarActualFirstService.carFirstDataDetail(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -76,6 +76,7 @@ public interface MeterWorkCarActualFirstMapper extends IBaseMapper<MeterWorkCarA
     void repairPre(Map<String, Object> map);
 
     List<MeterWorkCarActualFirst> likeByDesc(Map<String, Object> params);
+    List<MeterWorkCarActualFirst> carFirstDataDetail(Map<String, Object> params);
     List<MeterWorkCarActualFirst> ApplikeByDesc(Map<String, Object> params);
 
     List<MeterWorkCarActualFirst> queryForTimeInterval(Map<String, Object> params);

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

@@ -2963,4 +2963,19 @@
       and  base_spot_name like '%${baseSpotName}%'
     </if>
   </select>
+
+  <select id="carFirstDataDetail" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="validFlag != null and validFlag != ''">
+      and  value_flag != '0'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag = #{valueFlag}
+    </if>
+    <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>
+    order by create_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/IMeterWorkCarActualFirstService.java

@@ -136,6 +136,7 @@ public interface IMeterWorkCarActualFirstService extends IBaseService<MeterWorkC
 
     PageList<MeterWorkCarActualFirst> likeByDesc(Map<String, Object> var1, Integer pageNum, Integer pageSize);
     List<MeterWorkCarActualFirst> likeByValueFlag(Map<String, Object> var1);
+    List<MeterWorkCarActualFirst> carFirstDataDetail(Map<String, Object> var1);
     PageList<MeterWorkCarActualFirst> ApplikeByDesc(Map<String, Object> var1, Integer pageNum, Integer pageSize);
 
 

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

@@ -5033,6 +5033,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         return rows;
     }
 
+    @Override
+    public List<MeterWorkCarActualFirst> carFirstDataDetail(Map<String, Object> params) {
+        List<MeterWorkCarActualFirst> models = meterWorkCarActualFirstMapper.carFirstDataDetail(params);
+        return models;
+    }
+
     @Override
     public PageList<MeterWorkCarActualFirst> ApplikeByDesc(Map<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);

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

@@ -3,42 +3,102 @@
 <mapper namespace="com.steerinfo.meterwork.meterworkdatacount.mapper.MeterWorkDataCountMapper">
     <select id="countFirstAndActual" parameterType="java.util.HashMap" resultType="hashmap">
         select
-        (select count(*) from meter_work_car_actual_first t where t.value_flag !='0') as count_First_Valid,
-        (select count(*) from meter_work_car_actual_first t where t.value_flag ='1') as count_First_Effective_Unclean,
-        (select count(*) from meter_work_car_actual t where t.value_flag != '0') as count_Actual_Valid,
-        (select count(*) from meter_work_car_actual t where t.value_flag != '0' and is_pre_scale = '0') as count_Actual_Effective_Unclean,
+        (select count(*) from meter_work_car_actual_first t where t.value_flag !='0'
+        <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>) as count_First_Valid,
+        (select count(*) from meter_work_car_actual_first t where t.value_flag ='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>) as count_First_Effective_Unclean,
+        (select count(*) from meter_work_car_actual t where t.value_flag != '0'
+        <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>) as count_Actual_Valid,
+        (select count(*) from meter_work_car_actual t where t.value_flag != '0' and is_pre_scale = '0'
+        <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>) as count_Actual_Effective_Unclean,
         '汽车衡' as remark
          from dual
         union
         select
-        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019001') and t.value_flag !='0') as count_First_Valid,
-        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019001') and t.value_flag ='1') as count_First_Effective_Unclean,
-        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019001') and t.value_flag != '0') as count_Actual_Valid,
-        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019001') and t.value_flag != '0' and is_pre_sacale = '0') as count_Actual_Effective_Unclean,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019001') and t.value_flag !='0'
+        <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>) as count_First_Valid,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019001') and t.value_flag ='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>) as count_First_Effective_Unclean,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019001') and t.value_flag != '0'
+        <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>) as count_Actual_Valid,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019001') and t.value_flag != '0' and is_pre_sacale = '0'
+        <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>) as count_Actual_Effective_Unclean,
         '静态衡' as remark
          from dual
         union
         select
-        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019002') and t.value_flag !='0') as count_First_Valid,
-        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019002') and t.value_flag ='1') as count_First_Effective_Unclean,
-        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019002') and t.value_flag != '0') as count_Actual_Valid,
-        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019002') and t.value_flag != '0' and is_pre_sacale = '0') as count_Actual_Effective_Unclean,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019002') and t.value_flag !='0'
+        <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>) as count_First_Valid,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019002') and t.value_flag ='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>) as count_First_Effective_Unclean,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019002') and t.value_flag != '0'
+        <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>) as count_Actual_Valid,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019002') and t.value_flag != '0' and is_pre_sacale = '0'
+        <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>) as count_Actual_Effective_Unclean,
         '动态衡' as remark
          from dual
         union
          select
-        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019003', '001019004') and t.value_flag !='0') as count_First_Valid,
-        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019003', '001019004') and t.value_flag ='1') as count_First_Effective_Unclean,
-        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019003', '001019004') and t.value_flag != '0') as count_Actual_Valid,
-        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019003', '001019004') and t.value_flag != '0' and is_pre_sacale = '0') as count_Actual_Effective_Unclean,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019003', '001019004') and t.value_flag !='0'
+        <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>) as count_First_Valid,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019003', '001019004') and t.value_flag ='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>) as count_First_Effective_Unclean,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019003', '001019004') and t.value_flag != '0'
+        <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>) as count_Actual_Valid,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019003', '001019004') and t.value_flag != '0' and is_pre_sacale = '0'
+        <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>) as count_Actual_Effective_Unclean,
         '铁水衡' as remark
          from dual
         union
         select
-        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019005') and t.value_flag !='0') as count_First_Valid,
-        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019005') and t.value_flag ='1') as count_First_Effective_Unclean,
-        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019005') and t.value_flag != '0') as count_Actual_Valid,
-        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019005') and t.value_flag != '0' and is_pre_sacale = '0') as count_Actual_Effective_Unclean,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019005') and t.value_flag !='0'
+        <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>) as count_First_Valid,
+        (select count(*) from meter_work_railway_act_first t where t.railway_type_no in ('001019005') and t.value_flag ='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>) as count_First_Effective_Unclean,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019005') and t.value_flag != '0'
+        <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>) as count_Actual_Valid,
+        (select count(*) from meter_work_railway_actual t where t.railway_type_no in ('001019005') and t.value_flag != '0' and is_pre_sacale = '0'
+        <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>) as count_Actual_Effective_Unclean,
         '吊钩秤' as remark
          from dual
     </select>

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/controller/MeterWorkMeasuringInstrumentController.java

@@ -162,4 +162,19 @@ public class MeterWorkMeasuringInstrumentController extends BaseRESTfulControlle
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "批量作废", notes = "根据MeterWorkMeasuringInstrument对象批量作废")
+    @ApiImplicitParam(paramType = "path",  required = true, dataType = "List<MeterWorkMeasuringInstrument>")
+    @Transactional
+    @PostMapping(value = "/batchDeleteInfo")//String
+    public RESTfulResult batchDeleteInfo(@RequestBody List<MeterWorkMeasuringInstrument> models) {
+        try {
+            RESTfulResult rm = meterWorkMeasuringInstrumentService.batchDeleteInfo(models);
+            return rm;
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/service/IMeterWorkMeasuringInstrumentService.java

@@ -30,4 +30,5 @@ public interface IMeterWorkMeasuringInstrumentService extends IBaseService<Meter
     PageList<MeterWorkMeasuringInstrument> likeDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize);
     String checkandadd(MeterWorkMeasuringInstrument model);
     RESTfulResult batchAddInfo(List<MeterWorkMeasuringInstrument> models);
+    RESTfulResult batchDeleteInfo(List<MeterWorkMeasuringInstrument> models);
 }

src/main/java/com/steerinfo/meterwork/meterworkmeasuringinstrument/service/impl/MeterWorkMeasuringInstrumentServiceImpl.java

@@ -13,6 +13,7 @@ import com.steerinfo.meterwork.meterworkmeasuringinstrument.service.IMeterWorkMe
 import com.steerinfo.util.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.text.SimpleDateFormat;
@@ -187,4 +188,32 @@ public class MeterWorkMeasuringInstrumentServiceImpl extends BaseServiceImpl<Met
         rm.setMessage("操作成功，总共" + count + "条数据批量导入成功");
         return rm;
     }
+
+    @Override
+    public RESTfulResult batchDeleteInfo(List<MeterWorkMeasuringInstrument> models) {
+        RESTfulResult rm = new RESTfulResult();
+        try{
+            int count = 0;
+            UserPayload payload = UserPayload.getCurrUser();
+            String userId = payload.getUserCode();
+            String userName = payload.getUserName();
+            for(MeterWorkMeasuringInstrument model: models) {
+                model.setValueFlag("0");
+                model.setUpdateManNo(userId);
+                model.setUpdateManName(userName);
+                model.setUpdateTime(new Date());
+                model.setNote("数据作废");
+                meterWorkMeasuringInstrumentMapper.updateByPrimaryKeySelective(model);
+                count++;
+            }
+            rm.setSucceed(true);
+            rm.setMessage("操作成功，总共" + count + "条数据批量作废成功");
+        }catch (Exception e) {
+            e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            rm.setFailed();
+            rm.setMessage("操作失败：" + e.getMessage());
+        }
+        return rm;
+    }
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/controller/MeterWorkRailwayActFirstController.java

@@ -1595,4 +1595,17 @@ throw new MarkerMetException(500, "操作异常！！");
             throw new MarkerMetException(500, "操作异常！！");
         }
     }
+
+    @ApiOperation(value = "计量统计明细-获取列表", notes = "不分页模糊查询")
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/carFirstDataDetail")
+    public RESTfulResult carFirstDataDetail(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkRailwayActFirst> list = meterWorkRailwayActFirstService.carFirstDataDetail(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -44,6 +44,7 @@ public interface MeterWorkRailwayActFirstMapper extends IBaseMapper<MeterWorkRai
     List<MeterWorkRailwayActFirst> selectSta(HashMap parmas);
 
     List<MeterWorkRailwayActFirst> likeByDesc(HashMap parmas);
+    List<MeterWorkRailwayActFirst> carFirstDataDetail(Map<String, Object> params);
     List<MeterWorkRailwayActFirst> likeByDescTSDG(HashMap parmas);
 
     List<MeterWorkRailwayActFirst> distinctRailwayNo(HashMap<String, Object> obj);

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

@@ -3895,4 +3895,22 @@
     <include refid="whereLikeTSDG" />
     order by create_time desc
   </select>
+
+  <select id="carFirstDataDetail" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="validFlag != null and validFlag != ''">
+      and  value_flag != '0'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag = #{valueFlag}
+    </if>
+    <if test="railwayTypeNo != null and railwayTypeNo != ''">
+      and RAILWAY_TYPE_NO in (#{railwayTypeNo})
+    </if>
+    <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>
+    order by create_time desc
+  </select>
 </mapper>

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/IMeterWorkRailwayActFirstService.java

@@ -63,6 +63,7 @@ public interface IMeterWorkRailwayActFirstService extends IBaseService<MeterWork
     PageList<MeterWorkRailwayActFirst> selectTa(Map<String, Object> parmas, Integer pageNum, Integer pageSize);
 
     PageList<MeterWorkRailwayActFirst> likeByDesc(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize);
+    List<MeterWorkRailwayActFirst> carFirstDataDetail(Map<String, Object> var1);
     List<MeterWorkRailwayActFirst> likeByDescNoPage(HashMap<String, Object> parameters);
     List<MeterWorkRailwayActFirst> webByLikeDesc(HashMap<String, Object> parameters);
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -611,6 +611,12 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkRailwayActFirst> carFirstDataDetail(Map<String, Object> params) {
+        List<MeterWorkRailwayActFirst> models = meterWorkRailwayActFirstMapper.carFirstDataDetail(params);
+        return models;
+    }
+
     @Override
     public List<MeterWorkRailwayActFirst> likeByDescNoPage(HashMap<String, Object> parameters) {
         List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(parameters);

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

@@ -1225,4 +1225,17 @@ public class MeterWorkRailwayActualController extends BaseRESTfulController {
         }
         return rm;
     }
+
+    @ApiOperation(value = "计量统计明细-获取列表", notes = "不分页模糊查询")
+    //@RequiresPermissions("meterworkcaractualfirst:view")
+    @PostMapping(value = "/carActualDataDetail")
+    public RESTfulResult carActualDataDetail(@RequestBody HashMap parmas) {
+        try {
+            List<MeterWorkRailwayActual> list = meterWorkRailwayActualService.carActualDataDetail(parmas);
+            return success(list);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            throw new MarkerMetException(500, "操作异常！！");
+        }
+    }
 }

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

@@ -50,6 +50,7 @@ public interface MeterWorkRailwayActualMapper extends IBaseMapper<MeterWorkRailw
 
     List<MeterWorkRailwayActual> selectByParameter(Map<String, Object> params);
     List<MeterWorkRailwayActual> likeByDesc(Map<String, Object> params);
+    List<MeterWorkRailwayActual> carActualDataDetail(Map<String, Object> params);
     List<MeterWorkRailwayActual> likeByDescTemp(Map<String, Object> params);
 
     List<MeterWorkRailwayActual> selectByAcatualFristNo(Map<String, Object> params);

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

@@ -4446,6 +4446,7 @@
     create_time
     from meter_work_measuring_instrument
     where 1 = 1
+    and value_flag != '0'
     <if test="railwayNo != null and railwayNo != ''">
       and railway_no like '%railwayNo%'
     </if>
@@ -4639,4 +4640,25 @@
     and value_flag != '0'
     order by net_time desc
   </select>
+
+  <select id="carActualDataDetail" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select"/>
+    where 1 = 1
+    <if test="validFlag != null and validFlag != ''">
+      and  value_flag != '0'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and  value_flag = #{valueFlag}
+    </if>
+    <if test="isPreSacale != null and isPreSacale != ''">
+      and IS_PRE_SACALE = #{isPreSacale}
+    </if>
+    <if test="railwayTypeNo != null and railwayTypeNo != ''">
+      and RAILWAY_TYPE_NO in (#{railwayTypeNo})
+    </if>
+    <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>
+    order by net_time desc
+  </select>
 </mapper>

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

@@ -99,6 +99,7 @@ public interface IMeterWorkRailwayActualService extends IBaseService<MeterWorkRa
     RESTfulResult commonRemove(HashMap map);
 
     PageList<MeterWorkRailwayActual> likeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize);
+    List<MeterWorkRailwayActual> carActualDataDetail(HashMap<String, Object> params);
     List<MeterWorkRailwayActual> webByLikeDesc(HashMap<String, Object> parameters);
     List<MeterWorkRailwayActual> noPage(Map<String, Object> params);
 

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

@@ -2974,6 +2974,12 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         return pageInfo;
     }
 
+    @Override
+    public List<MeterWorkRailwayActual> carActualDataDetail(HashMap<String, Object> params) {
+        List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.carActualDataDetail(params);
+        return rows;
+    }
+
     @Override
     public List<MeterWorkRailwayActual> webByLikeDesc(HashMap<String, Object> parameters) {
 //        String[] lcNoTemp = parameters.get("lcNoTemp").toString().split(",");