Merge branch 'develop_migration' into 'develop_master'

Develop migration

See merge request LiuChao/foton-slrs-system-rest!499

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/controller/EsRevisePlanController.java

@@ -66,6 +66,12 @@ public class EsRevisePlanController extends BaseController<EsRevisePlan> {
         return Result.success(iEsRevisePlanService.modPlan(esRevisePlan));
     }
 
+    @ApiOperation(value = "编辑企标计划-企标技术更新计划状态")
+    @PostMapping("modPlanByState")
+    public ResponseMessage<Object> modPlanByState(EsRevisePlan esRevisePlan){
+        return Result.success(iEsRevisePlanService.modPlanByState(esRevisePlan));
+    }
+
     @ApiOperation(value = "编辑企标计划")
     @PostMapping("/modPlanByWk")
     public ResponseMessage<Object> modPlanByWk(@RequestBody EsRevisePlan esRevisePlan){

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/IEsRevisePlanService.java

@@ -19,6 +19,7 @@ public interface IEsRevisePlanService extends IService<EsRevisePlan> {
     EsRevisePlan getOnePlan(String id);//查询详情
 
     String modPlan(EsRevisePlan esRevisePlan);//编辑
+    String modPlanByState(EsRevisePlan esRevisePlan);//编辑
     String addPlan(EsRevisePlan esRevisePlan);//插入
     int delPlan(String id);//删除
     int delPlans(String ids);//批量删除

adc-da-slrs/src/main/java/com/adc/da/slrs/esRevisePlan/service/impl/EsRevisePlanServiceImpl.java

@@ -75,6 +75,12 @@ public class EsRevisePlanServiceImpl extends ServiceImpl<EsRevisePlanDao, EsRevi
         }
     }
 
+    @Override
+    public String modPlanByState(EsRevisePlan esRevisePlan) {
+        esRevisePlanDao.updateById(esRevisePlan);
+        return "操作成功";
+    }
+
     @Override
     public String addPlan(EsRevisePlan esRevisePlan) {
         esRevisePlan.setId(UUIDUtils.randomUUID(32));