后端修改

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

@@ -5475,10 +5475,19 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
         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(com.steerinfo.util.StringUtils.isNotEmpty(params.get("actualFirstNo").toString())){
                 MeterWorkCarActualFirst model = meterWorkCarActualFirstMapper.selectByPrimaryKey(params.get("actualFirstNo").toString());
                 if(model != null) {
-
                     if(model.getValueFlag().equals("1")) {
                         if(model.getValueFlag().equals("2")){
                             rm.setMessage("毛皮转换失败：数据已结净，请确认！！");
@@ -5487,8 +5496,24 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                         if(model.getWeightType() == null || StringUtils.isEmpty(model.getWeightType())) {
 //                            rm.setMessage("毛皮转换失败：重量类型为空，请确认！！");
 //                            return rm;
+                            model.setUpdateManNo(userId);
+                            model.setUpdateManName(userName);
+                            model.setUpdateTime(new Date());
+                            model.setNote("毛皮转换");
                             model.setWeightType("1");
                             meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model);
+
+                            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(model.getActualFirstNo());
+                            logModel.setOperationPredictionNo(model.getPredictionNo());
+                            logModel.setOperationCarnNo(model.getCarNo());
+                            meterBaseOperationLogMapper.insertSelective(logModel);
                             rm.setSucceed();
                             rm.setMessage("重量类型为空，毛皮转换成皮重!!");
                             rm.setData(model);
@@ -5503,7 +5528,24 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
                                 rm.setMessage("毛皮转换失败：毛皮转换只针对毛重和常规皮重，请确认！！");
                                 return rm;
                             }
+                            model.setUpdateManNo(userId);
+                            model.setUpdateManName(userName);
+                            model.setUpdateTime(new Date());
+                            model.setNote("毛皮转换");
                             meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(model);
+
+                            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(model.getActualFirstNo());
+                            logModel.setOperationPredictionNo(model.getPredictionNo());
+                            logModel.setOperationCarnNo(model.getCarNo());
+                            meterBaseOperationLogMapper.insertSelective(logModel);
+
                             rm.setSucceed();
                             rm.setMessage("毛皮转换成功!!");
                             rm.setData(model);

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

@@ -8795,6 +8795,17 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
         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(params.get("actualFirstNo") != null && com.steerinfo.util.StringUtils.isNotEmpty(params.get("actualFirstNo").toString())){
                 MeterWorkRailwayActFirst model = meterWorkRailwayActFirstMapper.selectByPrimaryKey(params.get("actualFirstNo").toString());
                 if(model != null) {
@@ -8806,8 +8817,23 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                         if(model.getWeightType() == null || StringUtils.isEmpty(model.getWeightType())) {
 //                            rm.setMessage("毛皮转换失败：重量类型为空，请确认！！");
 //                            return rm;
+                            model.setUpdateManNo(userId);
+                            model.setUpdateManName(userName);
+                            model.setUpdateTime(new Date());
+                            model.setNote("毛皮转换");
                             model.setWeightType("1");
                             meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
+
+                            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(model.getActualFirstNo());
+                            logModel.setOperationPredictionNo(model.getPredictionNo());
+                            logModel.setOperationCarnNo(model.getRailwayNo());
                             rm.setSucceed();
                             rm.setMessage("重量类型为空，毛皮转换成皮重!!");
                             rm.setData(model);
@@ -8822,7 +8848,22 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
                                 rm.setMessage("毛皮转换失败：毛皮转换只针对毛重和常规皮重，请确认！！");
                                 return rm;
                             }
+                            model.setUpdateManNo(userId);
+                            model.setUpdateManName(userName);
+                            model.setUpdateTime(new Date());
+                            model.setNote("毛皮转换");
                             meterWorkRailwayActFirstMapper.updateByPrimaryKeySelective(model);
+
+                            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(model.getActualFirstNo());
+                            logModel.setOperationPredictionNo(model.getPredictionNo());
+                            logModel.setOperationCarnNo(model.getRailwayNo());
                             rm.setSucceed();
                             rm.setMessage("毛皮转换成功!!");
                             rm.setData(model);