后端提交

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

@@ -121,11 +121,10 @@ throw new MarkerMetException(500, "操作异常！！");
     }
 
     @ApiOperation(value = "远程-获取列表", notes = "分页模糊查询")
-    @GetMapping(value = "/likeByDesc/")
-    public RESTfulResult likeByDesc01(@RequestParam HashMap params,Integer pageNum, Integer pageSize) {
+    @PostMapping(value = "/likeByDesc/")
+    public RESTfulResult likeByDesc01(@RequestBody CommonPage<HashMap> oci) {
         try {
-            params.put("carNo",params.get("memo1")==null? "": params.get("memo1").toString());
-            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByDesc(params, pageNum, pageSize);
+            PageList<MeterWorkCarActual> list = meterWorkCarActualService.likeByDesc(oci.getParam(), oci.getPageNum(), oci.getPageSize());
             return success(list);
         } catch (Exception ex) {
             ex.printStackTrace();

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

@@ -646,21 +646,31 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                         // 删一次
-                        MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
-                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
+                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
                         if(firstGross.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkCarActualFirstMapper.deleteByPrimaryKey(model.getActualFirst1No());
+                            firstGross.setValueFlag(DbConstants.VALID);
+                            firstGross.setNote(model.getNote());
+                            firstGross.setUpdateManName("system");
+                            firstGross.setUpdateManName("双委托解除更新");
+                            firstGross.setUpdateTime(new Date());
+                            firstGross.setIsPreScale("0");
+                            meterWorkCarActualFirstMapper.updateByPrimaryKey(firstGross);
                         }
                         if(firstTare.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkCarActualFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
+                            firstTare.setValueFlag(DbConstants.VALID);
+                            firstTare.setNote(model.getNote());
+                            firstTare.setUpdateManName("system");
+                            firstTare.setUpdateManName("双委托解除更新");
+                            firstTare.setUpdateTime(new Date());
+                            firstTare.setIsPreScale("0");
+                            meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
                         }
 
                         // 删洁净
                         model.setUploadFlag("1");
                         model.setValueFlag("0");
                         meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
-
-                        //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                     else {
                         // 清空毛重数据中的委托信息
@@ -702,7 +712,6 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         model.setUploadFlag("1");
                         model.setValueFlag("0");
                         meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
-                        //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();
@@ -734,10 +743,16 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                         // 删一次毛重、清空一次皮重委托信息
-                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
                         MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
                         if(firstTare.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkCarActualFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
+                            firstTare.setValueFlag(DbConstants.VALID);
+                            firstTare.setUpdateManName("system");
+                            firstTare.setUpdateManName("混卸解除更新");
+                            firstTare.setNote(model.getNote());
+                            firstTare.setUpdateTime(new Date());
+                            firstTare.setIsPreScale("0");
+                            meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
                         }
                         if(firstGross != null){
                             firstGross.setValueFlag(DbConstants.VALID);
@@ -752,7 +767,6 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         model.setUploadFlag("1");
                         model.setValueFlag("0");
                         meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
-//                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                     else {
                         // 清空毛重数据中的委托信息
@@ -794,7 +808,6 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                         model.setUploadFlag("1");
                         model.setValueFlag("0");
                         meterWorkCarActualMapper.updateByPrimaryKeySelective(model);
-//                        meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();
@@ -826,12 +839,17 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                             preTrackScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                         // 删一次毛重、清空一次皮重委托信息
-//                        MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
-//                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
                         MeterWorkCarActualFirst firstGross = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst1No());
-                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        MeterWorkCarActualFirst firstTare = meterWorkCarActualFirstMapper.selectAndRemove(model.getActualFirst2No());
                         if(firstTare.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkCarActualFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
+                            //meterWorkCarActualFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
+                            firstTare.setValueFlag(DbConstants.VALID);
+                            firstTare.setUpdateManName("system");
+                            firstTare.setUpdateManName("混装解除更新");
+                            firstTare.setNote(model.getNote());
+                            firstTare.setUpdateTime(new Date());
+                            firstTare.setIsPreScale("0");
+                            meterWorkCarActualFirstMapper.updateByPrimaryKey(firstTare);
                         }
                         if(firstGross != null){
                             firstGross.setValueFlag(DbConstants.VALID);

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

@@ -1786,17 +1786,33 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                         // 删一次
-                        MeterWorkRailwayActFirst firstGross = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst1No());
-                        MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        MeterWorkRailwayActFirst firstGross = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst1No());
+                        MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
                         if(firstGross.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst1No());
+                            firstGross.setValueFlag(DbConstants.VALID);
+                            firstGross.setNote(model.getNote());
+                            firstGross.setUpdateManName("system");
+                            firstGross.setUpdateManName("双委托解除更新");
+                            firstGross.setUpdateTime(new Date());
+                            firstGross.setIsPreSacale("0");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstGross);
+                            //meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst1No());
                         }
                         if(firstTare.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
+                            firstTare.setValueFlag(DbConstants.VALID);
+                            firstTare.setNote(model.getNote());
+                            firstTare.setUpdateManName("system");
+                            firstTare.setUpdateManName("双委托解除更新");
+                            firstTare.setUpdateTime(new Date());
+                            firstTare.setIsPreSacale("0");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstTare);
+                            //meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
                         }
-
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
                         // 删洁净
-                        meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+                        //meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                     else {
                         // 清空毛重数据中的委托信息
@@ -1835,7 +1851,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             scale.setUpdateManName("双委托解除操作");
                             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                         }
-                        meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+                        //meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();
@@ -1868,10 +1887,17 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                         }
                         // 删一次毛重、清空一次皮重委托信息
-                        MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
                         MeterWorkRailwayActFirst firstGross = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst1No());
                         if(firstTare.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
+                            firstTare.setValueFlag(DbConstants.VALID);
+                            firstTare.setUpdateManName("system");
+                            firstTare.setUpdateManName("混卸解除更新");
+                            firstTare.setNote(model.getNote());
+                            firstTare.setUpdateTime(new Date());
+                            firstTare.setIsPreSacale("0");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstTare);
+                            //meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
                         }
                         if(firstGross != null){
                             firstGross.setValueFlag(DbConstants.VALID);
@@ -1883,7 +1909,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstGross);
                         }
                         // 删洁净
-                        meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+                        //meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                     else {
                         // 清空毛重数据中的委托信息
@@ -1922,7 +1951,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             scale.setUpdateManName("混卸解除操作");
                             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                         }
-                        meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+                        //meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();
@@ -1956,9 +1988,16 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                         }
                         // 删一次毛重、清空一次皮重委托信息
                         MeterWorkRailwayActFirst firstGross = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst1No());
-                        MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectByPrimaryKey(model.getActualFirst2No());
+                        MeterWorkRailwayActFirst firstTare = meterWorkRailwayActFirstMapper.selectAndRemove(model.getActualFirst2No());
                         if(firstTare.getPredictionNo().equals(model.getPredictionNo())){
-                            meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
+                            firstTare.setValueFlag(DbConstants.VALID);
+                            firstTare.setUpdateManName("system");
+                            firstTare.setUpdateManName("混装解除更新");
+                            firstTare.setNote(model.getNote());
+                            firstTare.setUpdateTime(new Date());
+                            firstTare.setIsPreSacale("0");
+                            meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstTare);
+                            //meterWorkRailwayActFirstMapper.deleteByPrimaryKey(model.getActualFirst2No());
                         }
                         if(firstGross != null){
                             firstGross.setValueFlag(DbConstants.VALID);
@@ -1970,7 +2009,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             meterWorkRailwayActFirstMapper.updateByPrimaryKey(firstGross);
                         }
                         // 删洁净
-                        meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+                        //meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                     else {
                         // 清空毛重数据中的委托信息
@@ -2009,7 +2051,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                             scale.setUpdateManName("混装解除操作");
                             preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                         }
-                        meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
+                        model.setUploadFlag("1");
+                        model.setValueFlag("0");
+                        meterWorkRailwayActualMapper.updateByPrimaryKeySelective(model);
+                        //meterWorkRailwayActualMapper.deleteByPrimaryKey(model.getActualNo());
                     }
                 }
                 rm.setSucceed();

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

@@ -3048,12 +3048,12 @@
 
   <select id="selectlist" parameterType="java.lang.String" resultMap="BaseResultMap">
     <include refid="select"/>
-    where CAR_NO=#{carNo,jdbcType=VARCHAR} and (value_flag='1' or value_flag='4' ) order by create_time desc
+    where CAR_NO=#{carNo,jdbcType=VARCHAR} and (value_flag='1' or value_flag='4' ) order by trust_date_time desc
   </select>
 
   <select id="selectuselist" parameterType="java.lang.String" resultMap="BaseResultMap">
     <include refid="select"/>
-    where CAR_NO=#{carNo,jdbcType=VARCHAR} and value_flag='1' and LINE_DESC = '1' order by create_time desc
+    where CAR_NO=#{carNo,jdbcType=VARCHAR} and value_flag='1' and LINE_DESC = '1' order by trust_date_time desc
   </select>
 
   <select id="selectView" parameterType="java.util.HashMap" resultMap="BaseResultMap">
@@ -3061,7 +3061,7 @@
     <include refid="columns"/>
     FROM PRE_TRACK_SCALE_VIEW
     <include refid="where"/>
-    order by CREATE_TIME desc
+    order by trust_date_time desc
   </select>
   <select id="getNewID" parameterType="java.lang.String" resultType="java.lang.String">
     SELECT LPAD(NVL(MAX(TO_NUMBER(SUBSTR(PREDICTION_NO, LENGTH(PREDICTION_NO) - 3))),0) + 1,4,'0') PREDICTION_NO
@@ -3245,7 +3245,7 @@
       </if>
 
     </where>
-    order by CREATE_TIME desc
+    order by trust_date_time desc
   </select>
 
   <!--查询预报的有效日期 sysdate - decode(t2.scale_valid_period, null, 5, t2.scale_valid_period) + 1-->
@@ -3284,7 +3284,7 @@
     <if test="valueFlag != null and valueFlag != ''">
       and value_flag = #{valueFlag}
     </if>
-    and TRUST_AVAILABILITY_TIME &gt; SYSDATE
+    and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
   </select>
 
   <select id="selectByCar" parameterType="java.lang.String" resultMap="BaseResultMap">
@@ -3305,7 +3305,7 @@
   <select id="selectByMap" parameterType="java.util.HashMap" resultMap="BaseResultMap">
     <include refid="select"/>
     <include refid="where"/>
-    and TRUST_AVAILABILITY_TIME &gt; SYSDATE
+    and TRUST_AVAILABILITY_TIME &gt;= SYSDATE
   </select>
 
   <select id="likeByDesc" parameterType="java.util.HashMap" resultMap="BaseResultMap">