修改

src/main/java/com/steerinfo/meterwork/meterworkcheckfirstactual/service/impl/MeterWorkCheckFirstActualServiceImpl.java

@@ -37,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * MeterWorkCheckFirstActual服务实现：
@@ -108,100 +109,94 @@ public class MeterWorkCheckFirstActualServiceImpl extends BaseServiceImpl<MeterW
             if(model.getTypeNo().equals("001002001")) { //001002001：汽车衡、valueFlag：0（一次数据）、1:（结净数据）
                 if(model.getValueFlag().equals("0")) {
                     if(meteringAdministratorModels.size() >= 1) {
-                        for (String str: meteringAdministratorModels) {
-                            if(str.equals(userId)) {
-                                MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
-                                if(firstModel != null) {
-                                    firstModel.setCheckMan2No(userId);
-                                    firstModel.setCheckMan2Name(userName);
-                                    firstModel.setCheckTime2(new Date());
-                                    firstModel.setCheckFlag2("2");
-                                    firstModel.setCheckMemo2(model.getCheckResult());
-                                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
-                                    flag = true;
-                                }
+                        Long count = meteringAdministratorModels.stream().filter(item -> item.equals(userId)).count();
+                        if(count >= 1) {
+                            MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
+                            if(firstModel != null) {
+                                firstModel.setCheckMan2No(userId);
+                                firstModel.setCheckMan2Name(userName);
+                                firstModel.setCheckTime2(new Date());
+                                firstModel.setCheckFlag2("2");
+                                firstModel.setCheckMemo2(model.getCheckResult());
+                                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
                             }
+                            flag = true;
                         }
                     }
                     if(flag == false && gaugerMonitorModels.size() >= 1){
-                        for (String str: gaugerMonitorModels) {
-                            if(str.equals(userId)) {
-                                MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
-                                if(firstModel != null) {
-                                    firstModel.setCheckMan1No(userId);
-                                    firstModel.setCheckMan1Name(userName);
-                                    firstModel.setCheckTime1(new Date());
-                                    firstModel.setCheckFlag1("2");
-                                    firstModel.setCheckMemo1(model.getCheckResult());
-                                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
-                                    flag = true;
-                                }
+                        Long count = gaugerMonitorModels.stream().filter(item -> item.equals(userId)).count();
+                        if(count >= 1) {
+                            MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
+                            if(firstModel != null) {
+                                firstModel.setCheckMan1No(userId);
+                                firstModel.setCheckMan1Name(userName);
+                                firstModel.setCheckTime1(new Date());
+                                firstModel.setCheckFlag1("2");
+                                firstModel.setCheckMemo1(model.getCheckResult());
+                                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
                             }
+                            flag = true;
                         }
                     }
                     if(flag == false &&gaugerModels.size() >= 1) {
-                        for (String str : gaugerModels) {
-                            if (str.equals(userId)) {
-                                MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
-                                if (firstModel != null) {
-                                    firstModel.setCheckManNo(userId);
-                                    firstModel.setCheckManName(userName);
-                                    firstModel.setCheckTime(new Date());
-                                    firstModel.setCheckFlag("2");
-                                    firstModel.setCheckMemo(model.getCheckResult());
-                                    meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
-                                    flag = true;
-                                }
+                        Long count = gaugerModels.stream().filter(item -> item.equals(userId)).count();
+                        if(count >= 1) {
+                            MeterWorkCarActualFirst firstModel = meterWorkCarActualFirstMapper.selectByPrimaryKey(model.getCheckId());
+                            if (firstModel != null) {
+                                firstModel.setCheckManNo(userId);
+                                firstModel.setCheckManName(userName);
+                                firstModel.setCheckTime(new Date());
+                                firstModel.setCheckFlag("2");
+                                firstModel.setCheckMemo(model.getCheckResult());
+                                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(firstModel);
                             }
+                            flag = true;
                         }
                     }
                 }else if(model.getValueFlag().equals("1")) {
                     if(meteringAdministratorModels.size() >= 1) {
-                        for (String str: meteringAdministratorModels) {
-                            if(str.equals(userId)) {
-                                MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
-                                if(actualModel != null) {
-                                    actualModel.setCheckMan2No(userId);
-                                    actualModel.setCheckMan2Name(userName);
-                                    actualModel.setCheckTime2(new Date());
-                                    actualModel.setCheckFlag2("2");
-                                    actualModel.setCheckMemo2(model.getCheckResult());
-                                    meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
-                                    flag = true;
-                                }
+                        Long count = meteringAdministratorModels.stream().filter(item -> item.equals(userId)).count();
+                        if(count >= 1) {
+                            MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
+                            if(actualModel != null) {
+                                actualModel.setCheckMan2No(userId);
+                                actualModel.setCheckMan2Name(userName);
+                                actualModel.setCheckTime2(new Date());
+                                actualModel.setCheckFlag2("2");
+                                actualModel.setCheckMemo2(model.getCheckResult());
+                                meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
                             }
+                            flag = true;
                         }
                     }
-                    if(gaugerMonitorModels.size() >= 1){
-                        for (String str: gaugerMonitorModels) {
-                            if(str.equals(userId)) {
-                                MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
-                                if(actualModel != null) {
-                                    actualModel.setCheckMan1No(userId);
-                                    actualModel.setCheckMan1Name(userName);
-                                    actualModel.setCheckTime1(new Date());
-                                    actualModel.setCheckFlag1("2");
-                                    actualModel.setCheckMemo1(model.getCheckResult());
-                                    meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
-                                    flag = true;
-                                }
+                    if(flag == false && gaugerMonitorModels.size() >= 1){
+                        Long count = gaugerMonitorModels.stream().filter(item -> item.equals(userId)).count();
+                        if(count >= 1) {
+                            MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
+                            if(actualModel != null) {
+                                actualModel.setCheckMan1No(userId);
+                                actualModel.setCheckMan1Name(userName);
+                                actualModel.setCheckTime1(new Date());
+                                actualModel.setCheckFlag1("2");
+                                actualModel.setCheckMemo1(model.getCheckResult());
+                                meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
                             }
+                            flag = true;
                         }
                     }
-                    if(gaugerModels.size() >= 1) {
-                        for (String str : gaugerModels) {
-                            if (str.equals(userId)) {
-                                MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
-                                if(actualModel != null) {
-                                    actualModel.setCheckManNo(userId);
-                                    actualModel.setCheckManName(userName);
-                                    actualModel.setCheckTime(new Date());
-                                    actualModel.setCheckFlag("2");
-                                    actualModel.setCheckMemo(model.getCheckResult());
-                                    meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
-                                    flag = true;
-                                }
+                    if(flag == false && gaugerModels.size() >= 1) {
+                        Long count = gaugerModels.stream().filter(item -> item.equals(userId)).count();
+                        if(count >= 1) {
+                            MeterWorkCarActual actualModel = meterWorkCarActualMapper.selectByPrimaryKey(model.getCheckId());
+                            if(actualModel != null) {
+                                actualModel.setCheckManNo(userId);
+                                actualModel.setCheckManName(userName);
+                                actualModel.setCheckTime(new Date());
+                                actualModel.setCheckFlag("2");
+                                actualModel.setCheckMemo(model.getCheckResult());
+                                meterWorkCarActualMapper.updateByPrimaryKeySelective(actualModel);
                             }
+                            flag = true;
                         }
                     }
                 }

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

@@ -2881,6 +2881,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         try{
 
             MeterWorkRailwayActual actualModel = meterWorkRailwayActualMapper.selectByPrimaryKey(params.get("actualNo").toString());
+            //操作原因
+            String note = params.get("note") != null? "": params.get("note").toString();
             if(actualModel == null){
                 rm.setMessage("未找到结净计量数据，请确认！！！");
                 return rm;
@@ -2922,7 +2924,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                     scale.setUploadFlag("1");
                     scale.setUpdateTime(new Date());
                     scale.setUpdateManNo(userId);
-                    scale.setUpdateManName(userName + ":结净废除操作");
+                    scale.setUpdateManName(userName);
                     preRailwayScaleMapper.updateByPrimaryKeySelective(scale);
                 }else {
                     if(StringUtils.isNotEmpty(model.getActualFirst1No())) {
@@ -2967,7 +2969,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 //                    firstGross.setUpdateManName("结净废除更新");
                     firstGross.setUpdateManNo(userId);
                     firstGross.setUpdateManName(userName);
-                    firstGross.setNote(model.getNote());
+                    firstGross.setNote(note);
                     firstGross.setUpdateTime(new Date());
                     firstGross.setIsPreSacale("0");
                     firstGross.setValueFlag("0");
@@ -2979,7 +2981,7 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
 //                    firstTare.setUpdateManName("结净废除更新");
                     firstTare.setUpdateManNo(userId);
                     firstTare.setUpdateManName(userName);
-                    firstTare.setNote(model.getNote());
+                    firstTare.setNote(note);
                     firstTare.setUpdateTime(new Date());
                     firstTare.setIsPreSacale("0");
                     firstTare.setValueFlag("0");
@@ -2990,6 +2992,10 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 cleanModel.setUploadFlag("1");
                 cleanModel.setValueFlag("0");
                 cleanModel.setIsPreSacale("0");
+                cleanModel.setUpdateManNo(userId);
+                cleanModel.setUpdateManName(userName);
+                cleanModel.setUpdateTime(new Date());
+                cleanModel.setNote(note);
                 meterWorkRailwayActualMapper.updateByPrimaryKey(cleanModel);
                 //删结净
                 //meterWorkCarActualMapper.deleteByPrimaryKey(model.getActualNo());