后端修改

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/controller/MeterBaseRailwayAiweightController.java

@@ -59,6 +59,18 @@ public class MeterBaseRailwayAiweightController extends BaseRESTfulController {
         PageList<MeterBaseRailwayAiweight> list = meterBaseRailwayAiweightService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
+
+    @ApiOperation(value="获取列表", notes="分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterbaserailwayaiweight:view")
+    @PostMapping(value = "/noPage")
+    public RESTfulResult noPage(@RequestBody HashMap parmas){
+        List<MeterBaseRailwayAiweight> list = meterBaseRailwayAiweightService.noPage(parmas);
+        return success(list);
+    }
     
     @ApiOperation(value="创建", notes="根据MeterBaseRailwayAiweight对象创建")
     @ApiImplicitParam(name = "meterBaseRailwayAiweight", value = "详细实体meterBaseRailwayAiweight", required = true, dataType = "MeterBaseRailwayAiweight")

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/mapper/MeterBaseRailwayAiweightMapper.java

@@ -5,7 +5,11 @@ import com.steerinfo.framework.mapper.IBaseMapper;
 import feign.Param;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.HashMap;
+import java.util.List;
+
 @Mapper
 public interface MeterBaseRailwayAiweightMapper extends IBaseMapper<MeterBaseRailwayAiweight, String> {
     String getNewID(@Param(value="actualFirstNo") String actualFirstNo);
+    List<MeterBaseRailwayAiweight> noPage(HashMap<String, Object> parmas);
 }

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/mapper/MeterBaseRailwayAiweightMapper.xml

@@ -521,4 +521,59 @@
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(actual_first_no, LENGTH(actual_first_no) - 3))),0) + 1,4,'0') actual_first_no
     FROM meter_base_railway_aiweight where instr(actual_first_no,#{actualFirstNo, jdbcType=VARCHAR})>0
   </select>
+
+  <select id="noPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    <where>
+      <if test="actualFirstNo != null and actualFirstNo != ''">
+        and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+      </if>
+      <if test="railwayNo != null and railwayNo != ''">
+        and RAILWAY_NO LIKE '%${railwayNo}%'
+      </if>
+      <if test="meterWeight != null">
+        and METER_WEIGHT = #{meterWeight}
+      </if>
+      <if test="railwayType != null and railwayType != ''">
+        and RAILWAY_TYPE LIKE '%${railwayType}%'
+      </if>
+      <if test="railwayTypeNo != null and railwayTypeNo != ''">
+        and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+      </if>
+      <if test="railwayTypeName != null and railwayTypeName != ''">
+        and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+      </if>
+      <if test="valueFlag != null and valueFlag != ''">
+        and VALUE_FLAG LIKE '%${valueFlag}%'
+      </if>
+      <if test="createManNo != null and createManNo != ''">
+        and CREATE_MAN_NO LIKE '%${createManNo}%'
+      </if>
+      <if test="createManName != null and createManName != ''">
+        and CREATE_MAN_NAME LIKE '%${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 LIKE '%${updateManNo}%'
+      </if>
+      <if test="updateManName != null and updateManName != ''">
+        and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+      </if>
+      <if test="updateTime != null">
+        and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+      </if>
+      <if test="termValidity != null">
+        and TERM_VALIDITY = #{termValidity}
+      </if>
+      <if test="railwaySpeed != null">
+        and RAILWAY_SPEED = #{railwaySpeed}
+      </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>
+    </where>
+    order by CREATE_TIME desc
+</select>
 </mapper>

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/IMeterBaseRailwayAiweightService.java

@@ -4,6 +4,7 @@ import com.steerinfo.baseinfo.meterbaserailwayaiweight.model.MeterBaseRailwayAiw
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.service.IBaseService;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -22,4 +23,5 @@ import java.util.List;
 public interface IMeterBaseRailwayAiweightService extends IBaseService<MeterBaseRailwayAiweight, String>{
 
     RESTfulResult checkAdd(List<MeterBaseRailwayAiweight> models);
+    List<MeterBaseRailwayAiweight> noPage(HashMap<String, Object> parmas);
 }

src/main/java/com/steerinfo/baseinfo/meterbaserailwayaiweight/service/impl/MeterBaseRailwayAiweightServiceImpl.java

@@ -6,6 +6,7 @@ import com.steerinfo.baseinfo.meterbaserailwayaiweight.service.IMeterBaseRailway
 import com.steerinfo.framework.controller.RESTfulResult;
 import com.steerinfo.framework.mapper.IBaseMapper;
 import com.steerinfo.framework.service.impl.BaseServiceImpl;
+import io.micrometer.core.instrument.Meter;
 import org.apache.shiro.crypto.hash.Hash;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -84,4 +85,10 @@ public class MeterBaseRailwayAiweightServiceImpl extends BaseServiceImpl<MeterBa
         }
         return rm;
     }
+
+    @Override
+    public List<MeterBaseRailwayAiweight> noPage(HashMap<String, Object> parmas) {
+        List<MeterBaseRailwayAiweight> rows = meterBaseRailwayAiweightMapper.noPage(parmas);
+        return rows;
+    }
 }

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

@@ -3135,7 +3135,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model03.setPredictionNo(scale02.getPredictionNo());
             model03.setPredictionType("5");
             model03.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
-            model03.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(model03);
             //添加第二次皮重数据库
 //            String actualSecondNo = sdf.format(new Date()) + meterWorkCarActualFirstMapper.getNewID(afl);
@@ -3152,7 +3151,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             model04.setPredictionNo(scale02.getPredictionNo());
             model04.setPredictionType("5");
             model04.setPredictionCombination(scale01.getPredictionNo() + "," + scale02.getPredictionNo());
-            model04.setCreateTime(new Date());
             meterWorkCarActualFirstMapper.insertSelective(model04);
 
             //将委托中的编号和收发货单位和一次数据等数据拷贝进结净数据中
@@ -3179,7 +3177,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow1.setNetSpot3No(two.getNetSpot3No());
             actualRow1.setNetSpot3Name(two.getNetSpot3Name());
             actualRow1.setCreateManName(two.getCreateManName());
-            actualRow1.setCreateTime(two.getCreateTime());
             actualRow1.setUpdateManNo(two.getUpdateManNo());
             actualRow1.setUpdateManName(two.getUpdateManName());
             actualRow1.setUpdateTime(two.getUpdateTime());
@@ -3206,7 +3203,6 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             actualRow2.setNetSpot3No(two.getNetSpot3No());
             actualRow2.setNetSpot3Name(two.getNetSpot3Name());
             actualRow2.setCreateManName(two.getCreateManName());
-            actualRow2.setCreateTime(two.getCreateTime());
             actualRow2.setUpdateManNo(two.getUpdateManNo());
             actualRow2.setUpdateManName(two.getUpdateManName());
             actualRow2.setUpdateTime(two.getUpdateTime());

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/controller/MeterWorkRailwayReceivedController.java

@@ -80,6 +80,18 @@ public class MeterWorkRailwayReceivedController extends BaseRESTfulController {
         PageList<MeterWorkRailwayReceived> list = meterWorkRailwayReceivedService.queryLikeForPage(parmas, pageNum, pageSize);
         return success(list);
     }
+
+    @ApiOperation(value="获取列表", notes="不分页模糊查询")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "pageNum", value = "查询页数", required = false, dataType = "Integer"),
+            @ApiImplicitParam(name = "pageSize", value = "每页记录数", required = false, dataType = "Integer")
+    })
+    //@RequiresPermissions("meterworkrailwayreceived:view")
+    @PostMapping(value = "/noPage")
+    public RESTfulResult noPage(@RequestBody HashMap parmas){
+        List<MeterWorkRailwayReceived> list = meterWorkRailwayReceivedService.noPage(parmas);
+        return success(list);
+    }
     
     @ApiOperation(value="创建", notes="根据MeterWorkRailwayReceived对象创建")
     @ApiImplicitParam(name = "meterWorkRailwayReceived", value = "详细实体meterWorkRailwayReceived", required = true, dataType = "MeterWorkRailwayReceived")

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.java

@@ -15,4 +15,5 @@ public interface MeterWorkRailwayReceivedMapper extends IBaseMapper<MeterWorkRai
     String getNewID(@Param(value="afl")String afl);
     void updateMeterWorkRailwayReceived(@feign.Param( value = "actualFirstNo") String actualFirstNo);
     void updateMeterWorkRailwayReceiveds(String s);
+    List<MeterWorkRailwayReceived> noPage(HashMap<String, Object> map);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/mapper/MeterWorkRailwayReceivedMapper.xml

@@ -1775,4 +1775,208 @@
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(ACTUAL_FIRST_NO, LENGTH(ACTUAL_FIRST_NO) - 3))),0) + 1,4,'0') ACTUAL_FIRST_NO
     FROM METER_WORK_RAILWAY_RECEIVED where instr(ACTUAL_FIRST_NO,#{afl,jdbcType=VARCHAR})>0
   </select>
+
+  <select id="noPage" parameterType="java.util.HashMap" resultMap="BaseResultMap">
+    <include refid="select" />
+    where 1=1
+    <if test="actualFirstNo != null and actualFirstNo != ''">
+      and ACTUAL_FIRST_NO LIKE '%${actualFirstNo}%'
+    </if>
+    <if test="predictionNo != null and predictionNo != ''">
+      and PREDICTION_NO LIKE '%${predictionNo}%'
+    </if>
+    <if test="noticeNo != null and noticeNo != ''">
+      and NOTICE_NO LIKE '%${noticeNo}%'
+    </if>
+    <if test="railwayNo != null and railwayNo != ''">
+      and RAILWAY_NO LIKE '%${railwayNo}%'
+    </if>
+    <if test="railwayCarriageNo != null and railwayCarriageNo != ''">
+      and RAILWAY_CARRIAGE_NO LIKE '%${railwayCarriageNo}%'
+    </if>
+    <if test="railwayWorkNo != null and railwayWorkNo != ''">
+      and RAILWAY_WORK_NO LIKE '%${railwayWorkNo}%'
+    </if>
+    <if test="railwaySpeed != null">
+      and RAILWAY_SPEED = #{railwaySpeed}
+    </if>
+    <if test="railwayModel != null and railwayModel != ''">
+      and RAILWAY_MODEL LIKE '%${railwayModel}%'
+    </if>
+    <if test="matterNo != null and matterNo != ''">
+      and MATTER_NO LIKE '%${matterNo}%'
+    </if>
+    <if test="matterName != null and matterName != ''">
+      and MATTER_NAME LIKE '%${matterName}%'
+    </if>
+    <if test="contractNo != null and contractNo != ''">
+      and CONTRACT_NO LIKE '%${contractNo}%'
+    </if>
+    <if test="batchNo != null and batchNo != ''">
+      and BATCH_NO LIKE '%${batchNo}%'
+    </if>
+    <if test="customerSupplierNo != null and customerSupplierNo != ''">
+      and CUSTOMER_SUPPLIER_NO LIKE '%${customerSupplierNo}%'
+    </if>
+    <if test="customerSupplierName != null and customerSupplierName != ''">
+      and CUSTOMER_SUPPLIER_NAME LIKE '%${customerSupplierName}%'
+    </if>
+    <if test="forwardingUnitNo != null and forwardingUnitNo != ''">
+      and FORWARDING_UNIT_NO LIKE '%${forwardingUnitNo}%'
+    </if>
+    <if test="forwardingUnitName != null and forwardingUnitName != ''">
+      and FORWARDING_UNIT_NAME LIKE '%${forwardingUnitName}%'
+    </if>
+    <if test="receivingUintNo != null and receivingUintNo != ''">
+      and RECEIVING_UINT_NO LIKE '%${receivingUintNo}%'
+    </if>
+    <if test="receivingUintName != null and receivingUintName != ''">
+      and RECEIVING_UINT_NAME LIKE '%${receivingUintName}%'
+    </if>
+    <if test="materialNo != null and materialNo != ''">
+      and MATERIAL_NO LIKE '%${materialNo}%'
+    </if>
+    <if test="materialName != null and materialName != ''">
+      and MATERIAL_NAME LIKE '%${materialName}%'
+    </if>
+    <if test="specNo != null and specNo != ''">
+      and SPEC_NO LIKE '%${specNo}%'
+    </if>
+    <if test="specName != null and specName != ''">
+      and SPEC_NAME LIKE '%${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="bindCardNo != null and bindCardNo != ''">
+      and BIND_CARD_NO LIKE '%${bindCardNo}%'
+    </if>
+    <if test="loadPointNo != null and loadPointNo != ''">
+      and LOAD_POINT_NO LIKE '%${loadPointNo}%'
+    </if>
+    <if test="loadPointName != null and loadPointName != ''">
+      and LOAD_POINT_NAME LIKE '%${loadPointName}%'
+    </if>
+    <if test="sampleNo != null and sampleNo != ''">
+      and SAMPLE_NO LIKE '%${sampleNo}%'
+    </if>
+    <if test="sampleVoucher != null and sampleVoucher != ''">
+      and SAMPLE_VOUCHER LIKE '%${sampleVoucher}%'
+    </if>
+    <if test="carrierUnitNo != null and carrierUnitNo != ''">
+      and CARRIER_UNIT_NO LIKE '%${carrierUnitNo}%'
+    </if>
+    <if test="carrierUnitName != null and carrierUnitName != ''">
+      and CARRIER_UNIT_NAME LIKE '%${carrierUnitName}%'
+    </if>
+    <if test="predictionType != null and predictionType != ''">
+      and PREDICTION_TYPE LIKE '%${predictionType}%'
+    </if>
+    <if test="predictionCombination != null and predictionCombination != ''">
+      and PREDICTION_COMBINATION LIKE '%${predictionCombination}%'
+    </if>
+    <if test="meterTypeNo != null and meterTypeNo != ''">
+      and METER_TYPE_NO LIKE '%${meterTypeNo}%'
+    </if>
+    <if test="meterTypeName != null and meterTypeName != ''">
+      and METER_TYPE_NAME LIKE '%${meterTypeName}%'
+    </if>
+    <if test="meterProcessNo != null and meterProcessNo != ''">
+      and METER_PROCESS_NO LIKE '%${meterProcessNo}%'
+    </if>
+    <if test="meterProcessEditionNo != null and meterProcessEditionNo != ''">
+      and METER_PROCESS_EDITION_NO LIKE '%${meterProcessEditionNo}%'
+    </if>
+    <if test="meterWeight != null">
+      and METER_WEIGHT = #{meterWeight}
+    </if>
+    <if test="weightType != null and weightType != ''">
+      and WEIGHT_TYPE LIKE '%${weightType}%'
+    </if>
+    <if test="meterSortWeight != null">
+      and METER_SORT_WEIGHT = #{meterSortWeight}
+    </if>
+    <if test="meterBalanceWeight != null">
+      and METER_BALANCE_WEIGHT = #{meterBalanceWeight}
+    </if>
+    <if test="createManNo != null and createManNo != ''">
+      and CREATE_MAN_NO LIKE '%${createManNo}%'
+    </if>
+    <if test="createManName != null and createManName != ''">
+      and CREATE_MAN_NAME LIKE '%${createManName}%'
+    </if>
+    <if test="createTime != null">
+      and TO_CHAR(CREATE_TIME,'yyyy-MM-dd') = #{createTime}
+    </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>
+    <if test="meterClass != null and meterClass != ''">
+      and METER_CLASS LIKE '%${meterClass}%'
+    </if>
+    <if test="meterGroup != null and meterGroup != ''">
+      and METER_GROUP LIKE '%${meterGroup}%'
+    </if>
+    <if test="memo != null and memo != ''">
+      and MEMO LIKE '%${memo}%'
+    </if>
+    <if test="valueFlag != null and valueFlag != ''">
+      and VALUE_FLAG LIKE '%${valueFlag}%'
+    </if>
+    <if test="updateManNo != null and updateManNo != ''">
+      and UPDATE_MAN_NO LIKE '%${updateManNo}%'
+    </if>
+    <if test="updateManName != null and updateManName != ''">
+      and UPDATE_MAN_NAME LIKE '%${updateManName}%'
+    </if>
+    <if test="updateTime != null">
+      and TO_CHAR(UPDATE_TIME,'yyyy-MM-dd') = #{updateTime}
+    </if>
+    <if test="checkFlag != null and checkFlag != ''">
+      and CHECK_FLAG LIKE '%${checkFlag}%'
+    </if>
+    <if test="checkManNo != null and checkManNo != ''">
+      and CHECK_MAN_NO LIKE '%${checkManNo}%'
+    </if>
+    <if test="checkManName != null and checkManName != ''">
+      and CHECK_MAN_NAME LIKE '%${checkManName}%'
+    </if>
+    <if test="checkTime != null">
+      and TO_CHAR(CHECK_TIME,'yyyy-MM-dd') = #{checkTime}
+    </if>
+    <if test="meterMode != null and meterMode != ''">
+      and METER_MODE LIKE '%${meterMode}%'
+    </if>
+    <if test="railwayTypeNo != null and railwayTypeNo != ''">
+      and RAILWAY_TYPE_NO LIKE '%${railwayTypeNo}%'
+    </if>
+    <if test="railwayTypeName != null and railwayTypeName != ''">
+      and RAILWAY_TYPE_NAME LIKE '%${railwayTypeName}%'
+    </if>
+    <if test="isChemical != null and isChemical != ''">
+      and IS_CHEMICAL LIKE '%${isChemical}%'
+    </if>
+    <if test="limitWeight != null">
+      and LIMIT_WEIGHT = #{limitWeight}
+    </if>
+    <if test="railwayModelNo != null and railwayModelNo != ''">
+      and RAILWAY_MODEL_NO LIKE '%${railwayModelNo}%'
+    </if>
+    <if test="railwayModelName != null and railwayModelName != ''">
+      and RAILWAY_MODEL_NAME LIKE '%${railwayModelName}%'
+    </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/meterworkrailwayreceived/service/IMeterWorkRailwayReceivedService.java

@@ -7,6 +7,8 @@ import com.steerinfo.meterwork.meterworkcaractualfirst.model.MeterWorkCarActualF
 import com.steerinfo.meterwork.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkRailwayReceived服务接口：
@@ -23,4 +25,5 @@ import java.math.BigDecimal;
  */
 public interface IMeterWorkRailwayReceivedService extends IBaseService<MeterWorkRailwayReceived, String>{
     RESTfulResult checkandadd(MeterWorkRailwayReceived model)  throws Exception;
+    List<MeterWorkRailwayReceived> noPage(HashMap<String, Object> parmas);
 }

src/main/java/com/steerinfo/meterwork/meterworkrailwayreceived/service/impl/MeterWorkRailwayReceivedServiceImpl.java

@@ -3,6 +3,8 @@ package com.steerinfo.meterwork.meterworkrailwayreceived.service.impl;
 import com.steerinfo.framework.controller.RESTfulResult;
 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.meterworkrailwayreceived.model.MeterWorkRailwayReceived;
 import com.steerinfo.meterwork.meterworkrailwayreceived.mapper.MeterWorkRailwayReceivedMapper;
 import com.steerinfo.meterwork.meterworkrailwayreceived.service.IMeterWorkRailwayReceivedService;
@@ -12,6 +14,8 @@ import org.springframework.stereotype.Service;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
 
 /**
  * MeterWorkRailwayReceived服务实现：
@@ -55,4 +59,10 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
             throw e;
         }
     }
+
+    @Override
+    public List<MeterWorkRailwayReceived> noPage(HashMap<String, Object> parmas) {
+        List<MeterWorkRailwayReceived> rows = meterWorkRailwayReceivedMapper.noPage(parmas);
+        return rows;
+    }
 }