修改

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

@@ -3474,6 +3474,12 @@
       <if test="startTime != null and startTime != null and endTime != '' 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="railwayTypeNoStr != null and railwayTypeNoStr != ''">
+        and RAILWAY_TYPE_NO in
+        <foreach collection="typeNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="lcNoTemp != null and lcNoTemp != ''">
         and ( lc_no in
         <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">

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

@@ -594,9 +594,13 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
-    public PageList<MeterWorkRailwayActFirst> likeByDesc(HashMap<String, Object> parameters, Integer pageNum, Integer pageSize) {
+    public PageList<MeterWorkRailwayActFirst> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(parameters);
+        if(params.get("railwayTypeNoStr") != null) {
+            String[] typeNoStr = params.get("railwayTypeNoStr").toString().split(",");
+            params.put("typeNoStr", typeNoStr);
+        }
+        List<MeterWorkRailwayActFirst> rows = meterWorkRailwayActFirstMapper.likeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }
@@ -3012,6 +3016,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     public String mixedLoading(String actualNo1, String actualNo2, String actualNo3, String predictionNo1, String
             predictionNo2) {
         try {
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
             //查询所有的一次数据
             MeterWorkRailwayActFirst mwcaf1 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo1);
             MeterWorkRailwayActFirst mwcaf2 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo2);
@@ -3070,8 +3084,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //更新一次数据
             //更新第一次皮重数据
             mwcaf1.setValueFlag(DbConstants.NET);
-            mwcaf1.setUpdateManName("system");
-            mwcaf1.setUpdateManName("混装结净更新");
+            mwcaf1.setUpdateManNo(userId);
+            mwcaf1.setUpdateManName(userName);
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setIsPreSacale("1");
             mwcaf1.setWeightType("1");
@@ -3081,8 +3095,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf1);
             //更新第一次毛重数据
             mwcaf2.setValueFlag(DbConstants.NET);
-            mwcaf2.setUpdateManName("system");
-            mwcaf2.setUpdateManName("混装结净更新");
+            mwcaf2.setUpdateManNo(userId);
+            mwcaf2.setUpdateManName(userName);
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setIsPreSacale("1");
             mwcaf2.setWeightType("0");
@@ -3098,8 +3112,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String actualFirstNo = PublicMethod.IdCreate(3);
             mwcaf3.setActualFirstNo(actualFirstNo);
             mwcaf3.setValueFlag(DbConstants.NET);
-            mwcaf3.setUpdateManName("system");
-            mwcaf3.setUpdateManName("混装结净更新");
+            mwcaf3.setUpdateManNo(userId);
+            mwcaf3.setUpdateManName(userName);
             mwcaf3.setUpdateTime(new Date());
             mwcaf3.setIsPreSacale("1");
             mwcaf3.setWeightType("1");
@@ -3109,8 +3123,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf3);
             //更新第二次毛重数据
             mwcaf4.setValueFlag(DbConstants.NET);
-            mwcaf4.setUpdateManName("system");
-            mwcaf4.setUpdateManName("混装结净更新");
+            mwcaf4.setUpdateManNo(userId);
+            mwcaf4.setUpdateManName(userName);
             mwcaf4.setUpdateTime(new Date());
             mwcaf4.setIsPreSacale("1");
             mwcaf4.setWeightType("0");
@@ -3137,7 +3151,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow1.setIsPreSacale("1");
             actualRow1.setValueFlag("1");
             actualRow1.setCreateTime(new Date());
-            actualRow1.setCreateManName("混装匹配结净");
+            actualRow1.setCreateManName(userName);
             actualRow1.setPredictionType("7");
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow1.setPredictionNo(predictionNo1);
@@ -3175,7 +3189,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setIsPreSacale("1");
             actualRow2.setValueFlag("1");
             actualRow2.setCreateTime(new Date());
-            actualRow2.setCreateManName("混装匹配结净");
+            actualRow2.setCreateManName(userName);
             actualRow2.setPredictionType("7");
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             actualRow2.setPredictionNo(predictionNo2);
@@ -3206,8 +3220,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale.setPredictionNo(predictionNo1);
             scale.setValueFlag(DbConstants.NET);
             scale.setUpdateTime(new Date());
-            scale.setUpdateManNo("system");
-            scale.setUpdateManName("混装结净更新");
+            scale.setUpdateManNo(userId);
+            scale.setUpdateManName(userName);
             scale.setPredictionType("7");
             scale.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             scale.setUploadFlag("1");
@@ -3219,14 +3233,40 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale1.setPredictionNo(predictionNo2);
             scale1.setValueFlag(DbConstants.NET);
             scale1.setUpdateTime(new Date());
-            scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("混装结净更新");
+            scale1.setUpdateManNo(userId);
+            scale1.setUpdateManName(userName);
             scale1.setPredictionType("7");
             scale1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
             scale1.setUploadFlag("1");
             scale.setMeasureStation(actualRow2.getNetSpot3No());
             scale.setMeasureStationName(actualRow2.getNetSpot3Name());
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale1);
+
+            MeterBaseOperationLog logModel01 = new MeterBaseOperationLog();
+            logModel01.setId(PublicMethod.IdCreate(2));
+            logModel01.setCreateManNo(userId);
+            logModel01.setCreateManName(userName);
+            logModel01.setCreateTime(new Date());
+            logModel01.setOperationPage("web端-轨道衡一次数据维护");
+            logModel01.setOperationFunction("混装委托结净");
+            logModel01.setOperationId(actualRow1.getActualNo());
+            logModel01.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
+            logModel01.setOperationCarnNo(actualRow1.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel01);
+
+            MeterBaseOperationLog logModel02 = new MeterBaseOperationLog();
+            logModel02.setId(PublicMethod.IdCreate(2));
+            logModel02.setCreateManNo(userId);
+            logModel02.setCreateManName(userName);
+            logModel02.setCreateTime(new Date());
+            logModel02.setOperationPage("web端-轨道衡一次数据维护");
+            logModel02.setOperationFunction("混装委托结净");
+            logModel02.setOperationId(actualRow2.getActualNo());
+            logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel02.setOperationBeforeFix(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
+            logModel02.setOperationCarnNo(actualRow2.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel02);
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -3240,6 +3280,16 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     public String mixedDischarge(String actualNo1, String actualNo2, String actualNo3, String predictionNo1, String
             predictionNo2) {
         try {
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
             //查询所有的一次数据
             MeterWorkRailwayActFirst mwcaf1 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo1);
             MeterWorkRailwayActFirst mwcaf2 = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actualNo2);
@@ -3300,8 +3350,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             //更新一次数据
             //更新第一次毛重数据
             mwcaf1.setValueFlag(DbConstants.NET);
-            mwcaf1.setUpdateManNo("system");
-            mwcaf1.setUpdateManName("混卸结净更新");
+            mwcaf1.setUpdateManNo(userId);
+            mwcaf1.setUpdateManName(userName);
             mwcaf1.setUpdateTime(new Date());
             mwcaf1.setIsPreSacale("1");
             mwcaf1.setWeightType("0");
@@ -3311,8 +3361,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.updateByPrimaryKey(mwcaf1);
             //更新第一次皮重数据
             mwcaf2.setValueFlag(DbConstants.NET);
-            mwcaf2.setUpdateManNo("system");
-            mwcaf2.setUpdateManName("混卸结净更新");
+            mwcaf2.setUpdateManNo(userId);
+            mwcaf2.setUpdateManName(userName);
             mwcaf2.setUpdateTime(new Date());
             mwcaf2.setIsPreSacale("1");
             mwcaf2.setWeightType("1");
@@ -3328,7 +3378,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             String actualFirstNo = PublicMethod.IdCreate(3);
             mwcaf3.setActualFirstNo(actualFirstNo);
             mwcaf3.setValueFlag(DbConstants.NET);
-            mwcaf3.setUpdateManName("混卸结净更新");
+            mwcaf3.setUpdateManNo(userId);
+            mwcaf3.setUpdateManName(userName);
             mwcaf3.setUpdateTime(new Date());
             mwcaf3.setIsPreSacale("1");
             mwcaf3.setWeightType("0");
@@ -3338,8 +3389,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             meterWorkRailwayActFirstMapper.insertSelective(mwcaf3);
             //更新第二次皮重数据
             mwcaf4.setValueFlag(DbConstants.NET);
-            mwcaf4.setUpdateManNo("system");
-            mwcaf4.setUpdateManName("混卸结净更新");
+            mwcaf4.setUpdateManNo(userId);
+            mwcaf4.setUpdateManName(userName);
             mwcaf4.setUpdateTime(new Date());
             mwcaf4.setIsPreSacale("1");
             mwcaf4.setWeightType("1");
@@ -3366,7 +3417,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow1.setUploadFlag("1");
             actualRow1.setIsPreSacale("1");
             actualRow1.setValueFlag("1");
-            actualRow1.setCreateManName("混卸匹配结净");
+            actualRow1.setCreateManName(userName);
             actualRow1.setCreateTime(new Date());
             actualRow1.setPredictionType("6");
             actualRow1.setPredictionCombination(predictionNo1 + "," + predictionNo2);
@@ -3404,7 +3455,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             actualRow2.setUploadFlag("1");
             actualRow2.setIsPreSacale("1");
             actualRow2.setValueFlag("1");
-            actualRow2.setCreateManName("混卸匹配结净");
+            actualRow2.setCreateManName(userName);
             actualRow2.setCreateTime(new Date());
             actualRow2.setPredictionType("6");
             actualRow2.setPredictionCombination(predictionNo1 + "," + predictionNo2);
@@ -3436,8 +3487,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale.setPredictionNo(predictionNo1);
             scale.setValueFlag(DbConstants.NET);
             scale.setUpdateTime(new Date());
-            scale.setUpdateManNo("system");
-            scale.setUpdateManName("混卸结净更新");
+            scale.setUpdateManNo(userId);
+            scale.setUpdateManName(userName);
             scale.setUploadFlag("1");
             scale.setValueFlag("2");
             //预报类型：双委托（5）、预报组合：A预报，B预报
@@ -3451,8 +3502,8 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale1.setPredictionNo(predictionNo2);
             scale1.setValueFlag(DbConstants.NET);
             scale1.setUpdateTime(new Date());
-            scale1.setUpdateManNo("system");
-            scale1.setUpdateManName("混卸结净更新");
+            scale1.setUpdateManNo(userId);
+            scale1.setUpdateManName(userName);
             scale1.setUploadFlag("1");
             scale1.setValueFlag("2");
             scale1.setPredictionType("6");
@@ -3460,6 +3511,32 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
             scale1.setMeasureStation(actualRow2.getNetSpot3No());
             scale1.setMeasureStationName(actualRow2.getNetSpot3Name());
             preRailwayScaleMapper.updateByPrimaryKeySelective(scale1);
+
+            MeterBaseOperationLog logModel01 = new MeterBaseOperationLog();
+            logModel01.setId(PublicMethod.IdCreate(2));
+            logModel01.setCreateManNo(userId);
+            logModel01.setCreateManName(userName);
+            logModel01.setCreateTime(new Date());
+            logModel01.setOperationPage("web端-轨道衡一次数据维护");
+            logModel01.setOperationFunction("混卸委托结净");
+            logModel01.setOperationId(actualRow1.getActualNo());
+            logModel01.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel01.setOperationBeforeFix(actualNo1 + "," + actualNo2 + "," + actualNo3);
+            logModel01.setOperationCarnNo(actualRow1.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel01);
+
+            MeterBaseOperationLog logModel02 = new MeterBaseOperationLog();
+            logModel02.setId(PublicMethod.IdCreate(2));
+            logModel02.setCreateManNo(userId);
+            logModel02.setCreateManName(userName);
+            logModel02.setCreateTime(new Date());
+            logModel02.setOperationPage("web端-轨道衡一次数据维护");
+            logModel02.setOperationFunction("混卸委托结净");
+            logModel02.setOperationId(actualRow2.getActualNo());
+            logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
+            logModel02.setOperationBeforeFix(actualNo1 + "," + actualNo2 + "," + actualNo3);
+            logModel02.setOperationCarnNo(actualRow2.getRailwayNo());
+            meterBaseOperationLogMapper.insertSelective(logModel02);
         } catch (Exception e) {
             e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();

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

@@ -4203,6 +4203,12 @@
           and lc_no is not null)
         </if>
       </if>
+      <if test="railwayTypeNoStr != null and railwayTypeNoStr != ''">
+        and RAILWAY_TYPE_NO in
+        <foreach collection="typeNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="predictionType != null and predictionType != ''">
         and PREDICTION_TYPE LIKE '%${predictionType}%'
       </if>

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

@@ -488,6 +488,16 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     @Transactional(rollbackFor = Exception.class)
     public MeterWorkRailwayActual clean(String actualFirstNo, String dataNo, String predictionNo) throws MarkerMetException {
         try {
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
             if (actualFirstNo == null && actualFirstNo.equals("")) {
                 throw new MarkerMetException(500, "毛重数据编号为空");
             }
@@ -561,9 +571,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 scale.setPredictionNo(preNo);
                 scale.setValueFlag(DbConstants.NET);
                 scale.setUpdateTime(new Date());
-                scale.setUpdateManNo("system");
+                scale.setUpdateManNo(userId);
+                scale.setUpdateManName(userName);
                 scale.setUploadFlag("1");
-                scale.setUpdateManName("二次计量结净更新");
                 scale.setMeasureStation(mwcaf2.getBaseSpotNo());
                 scale.setMeasureStationName(mwcaf2.getBaseSpotName());
                 preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
@@ -642,14 +652,28 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 prs.setValueFlag(DbConstants.NET); //已结净
                 prs.setUploadFlag("1");
                 prs.setUpdateTime(new Date());
-                prs.setUpdateManNo("system");
-                prs.setUpdateManName("火车二次计量结净操作");
+                prs.setUpdateManNo(userId);
+                prs.setUpdateManName(userName);
                 prs.setMeasureStation(actualRow.getNetManName());
                 prs.setMeasureStationName(actualRow.getNetSpot3Name());
                 preRailwayScaleMapper.updateByPrimaryKeySelective(prs);
             }
+
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-轨道衡一次数据维护");
+            logModel.setOperationFunction("毛皮结净");
+            logModel.setOperationId(actualRow.getActualNo());
+            logModel.setOperationPredictionNo(actualRow.getPredictionNo());
+            logModel.setOperationCarnNo(actualRow.getRailwayNo());
+            logModel.setOperationBeforeFix(actualRow.getActualFirst1No() + "," + actualRow.getActualFirst2No());
+            meterBaseOperationLogMapper.insertSelective(logModel);
             return actualRow;
         } catch (MarkerMetException e) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw e;
         }
     }
@@ -660,6 +684,16 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         rm.setFailed();
         try{
 
+            String userId = "";
+            String userName = "";
+            try{
+                UserPayload userPayload = UserPayload.getCurrUser();
+                userId = userPayload.getUserCode();
+                userName = userPayload.getUserName();
+            }catch (Exception e) {
+                userId = "system";
+                userName = "system";
+            }
             //勾选的两个一次数据为空，报错
             if((actFirstNo01 == null || StringUtils.isEmpty(actFirstNo01)) || (actFirstNo02 == null || StringUtils.isEmpty(actFirstNo02))) {
                 rm.setMessage("未选择两个一次记录");
@@ -693,9 +727,6 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             //存储结净记录
             MeterWorkRailwayActual actualRow = new MeterWorkRailwayActual();
             SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMdd");
-            UserPayload payload = new UserPayload();
-            String userId = payload.getUserCode();
-            String userName = payload.getUserName();
 
             Assert.isTrue(actFirst01 != null || actFirst02 != null, "一次计量数据编号不存在于轨道衡一次计量表");
             Assert.isTrue(actFirst01.getRailwayNo().equals(actFirst02.getRailwayNo()), "请选择同一车号的一次计量数据进行结净");
@@ -718,8 +749,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 //更新第一次毛重数据库
                 actFirst01.setWeightType("0");
                 actFirst01.setValueFlag(DbConstants.NET);
-                actFirst01.setUpdateManName("system");
-                actFirst01.setUpdateManName("匹配结净更新");
+                actFirst01.setUpdateManNo(userId);
+                actFirst01.setUpdateManName(userName);
                 actFirst01.setUpdateTime(new Date());
                 actFirst01.setIsPreSacale("1");
                 actFirst01.setPredictionNo(scale.getPredictionNo());
@@ -729,8 +760,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 //更新第一次皮重数据库
                 actFirst02.setWeightType("1");
                 actFirst02.setValueFlag(DbConstants.NET);
-                actFirst02.setUpdateManName("system");
-                actFirst02.setUpdateManName("匹配结净更新");
+                actFirst02.setUpdateManNo(userId);
+                actFirst02.setUpdateManName(userName);
                 actFirst02.setUpdateTime(new Date());
                 actFirst02.setIsPreSacale("1");
                 actFirst02.setPredictionNo(scale.getPredictionNo());
@@ -778,8 +809,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 
                 scale.setValueFlag(DbConstants.NET);
                 scale.setUpdateTime(new Date());
-                scale.setUpdateManNo("system");
-                scale.setUpdateManName("匹配结净更新");
+                scale.setUpdateManNo(userId);
+                scale.setUpdateManName(userName);
                 scale.setUploadFlag("1");
                 scale.setPredictionType("1");
                 scale.setMeasureStation(actualRow.getNetSpot3No());
@@ -844,10 +875,23 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 }
                 meterWorkRailwayActualMapper.insertSelective(actualRow);
             }
+            MeterBaseOperationLog logModel = new MeterBaseOperationLog();
+            logModel.setId(PublicMethod.IdCreate(2));
+            logModel.setCreateManNo(userId);
+            logModel.setCreateManName(userName);
+            logModel.setCreateTime(new Date());
+            logModel.setOperationPage("web端-轨道衡一次数据维护");
+            logModel.setOperationFunction("毛皮结净");
+            logModel.setOperationId(actualRow.getActualNo());
+            logModel.setOperationPredictionNo(actualRow.getPredictionNo());
+            logModel.setOperationCarnNo(actualRow.getRailwayNo());
+            logModel.setOperationBeforeFix(actualRow.getActualFirst1No() + "," + actualRow.getActualFirst2No());
+            meterBaseOperationLogMapper.insertSelective(logModel);
             rm.setSucceed();
             rm.setData(actualRow);
         }catch(Exception e) {
             e.printStackTrace();
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             rm.setMessage(e.getMessage());
         }
         return rm;
@@ -3037,9 +3081,13 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
     }
 
     @Override
-    public PageList<MeterWorkRailwayActual> likeByDesc(Map<String, Object> parameters, Integer pageNum, Integer pageSize) {
+    public PageList<MeterWorkRailwayActual> likeByDesc(Map<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
-        List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.likeByDesc(parameters);
+        if(params.get("railwayTypeNoStr") != null) {
+            String[] typeNoStr = params.get("railwayTypeNoStr").toString().split(",");
+            params.put("typeNoStr", typeNoStr);
+        }
+        List<MeterWorkRailwayActual> rows = meterWorkRailwayActualMapper.likeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;
     }

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

@@ -2119,6 +2119,12 @@
       <if test="startTime != null and startTime != null and endTime != '' 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="railwayTypeNoStr != null and railwayTypeNoStr != ''">
+        and RAILWAY_TYPE_NO in
+        <foreach collection="typeNoStr" item="item" open="(" separator="," close=")">
+          #{item}
+        </foreach>
+      </if>
       <if test="lcNoTemp != null and lcNoTemp != ''">
         and ( lc_no in
         <foreach collection="lcNoTemp" item="item" open="(" separator="," close=")">
@@ -2132,5 +2138,6 @@
         </if>
       </if>
     </where>
+    order by CREATE_TIME desc
   </select>
 </mapper>

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

@@ -412,6 +412,10 @@ public class MeterWorkRailwayReceivedServiceImpl extends BaseServiceImpl<MeterWo
     @Override
     public PageList<MeterWorkRailwayReceived> likeByDesc(HashMap<String, Object> params, Integer pageNum, Integer pageSize) {
         PageHelper.startPage(pageNum, pageSize);
+        if(params.get("railwayTypeNoStr") != null) {
+            String[] typeNoStr = params.get("railwayTypeNoStr").toString().split(",");
+            params.put("typeNoStr", typeNoStr);
+        }
         List<MeterWorkRailwayReceived> rows = meterWorkRailwayReceivedMapper.likeByDesc(params);
         PageList pageInfo = new PageList(rows);
         return pageInfo;