feature 修改代码

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsCraftStepServiceImpl.java

@@ -51,7 +51,7 @@ public class ApsCraftStepServiceImpl extends ServiceImpl<ApsCraftStepDao, ApsCra
         }
         // 获取需要删除工艺步骤ID 数据更新先删除在更新
         List<String> deletedIds = updateApsRouteAboutVos.stream()
-                .filter(info -> DELTED_ROW_STATUS.equals(info.getRowStatus()) || EDIT_ROW_STATUS.equals(info.getRowStatus()))
+                .filter(info -> DELTED_ROW_STATUS.equals(info.getRowstatus()) || EDIT_ROW_STATUS.equals(info.getRowstatus()))
                 .map(ApsCraftRouteStepDo::getId).collect(Collectors.toList());
         if (!deletedIds.isEmpty()) {
             apsCraftRouteStepEquDao.removeByIdList(deletedIds, routeId);
@@ -59,12 +59,12 @@ public class ApsCraftStepServiceImpl extends ServiceImpl<ApsCraftStepDao, ApsCra
         }
         // 如下工艺步骤需要新增对应的  步骤设备和步骤输出规则
         List<UpdateApsRouteAboutVo> addStepAboutData = updateApsRouteAboutVos.stream()
-                .filter(info -> ADD_ROW_STATUS.equals(info.getRowStatus()) || EDIT_ROW_STATUS.equals(info.getRowStatus()))
+                .filter(info -> ADD_ROW_STATUS.equals(info.getRowstatus()) || EDIT_ROW_STATUS.equals(info.getRowstatus()))
                 .collect(Collectors.toList());
 
-        if(addStepAboutData.isEmpty()){
-            apsCraftRouteStepEquDao.copyDataById(addStepAboutData,routeId);
-            apsCraftRouteOutMaterRequestDao.copyDataById(addStepAboutData,routeId);
+        if (!addStepAboutData.isEmpty()) {
+            apsCraftRouteStepEquDao.copyDataById(addStepAboutData, routeId);
+            apsCraftRouteOutMaterRequestDao.copyDataById(addStepAboutData, routeId);
         }
 
         return R.ok();

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/vo/UpdateApsRouteAboutVo.java

@@ -11,5 +11,5 @@ import lombok.Data;
  */
 @Data
 public class UpdateApsRouteAboutVo extends ApsCraftRouteStepDo {
-    private String rowStatus;
+    private String rowstatus;
 }