cr 1 сар өмнө
parent
commit
5d104c9722

+ 3 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ServicePlanController.java

@@ -343,7 +343,9 @@ public class ServicePlanController extends BladeController {
         Long contractId=Long.valueOf(dataInfo.getString("contractId"));
         Long groupId1 = null;
         if(dataInfo.containsKey("group_id")){
-            groupId1=Long.valueOf(dataInfo.getString("group_id"));
+            if(StringUtils.isNotEmpty(dataInfo.getString("group_id"))){
+                groupId1=Long.valueOf(dataInfo.getString("group_id"));
+            }
         }
         dataArray.add(dataInfo);
         List<TableInfo> tableInfoList=getServiceData(dataArray);

+ 129 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ServicePlanTaskController.java

@@ -0,0 +1,129 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package org.springblade.manager.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import lombok.AllArgsConstructor;
+import javax.validation.Valid;
+
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
+import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestParam;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springblade.manager.entity.ServicePlanTask;
+import org.springblade.manager.vo.ServicePlanTaskVO;
+import org.springblade.manager.wrapper.ServicePlanTaskWrapper;
+import org.springblade.manager.service.IServicePlanTaskService;
+import org.springblade.core.boot.ctrl.BladeController;
+
+/**
+ *  控制器
+ *
+ * @author BladeX
+ * @since 2025-06-27
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/serviceplantask")
+@Api(value = "", tags = "接口")
+public class ServicePlanTaskController extends BladeController {
+
+	private final IServicePlanTaskService servicePlanTaskService;
+
+	/**
+	 * 详情
+	 */
+	@GetMapping("/detail")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "详情", notes = "传入servicePlanTask")
+	public R<ServicePlanTaskVO> detail(ServicePlanTask servicePlanTask) {
+		ServicePlanTask detail = servicePlanTaskService.getOne(Condition.getQueryWrapper(servicePlanTask));
+		return R.data(ServicePlanTaskWrapper.build().entityVO(detail));
+	}
+
+	/**
+	 * 分页 
+	 */
+	@GetMapping("/list")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入servicePlanTask")
+	public R<IPage<ServicePlanTaskVO>> list(ServicePlanTask servicePlanTask, Query query) {
+		IPage<ServicePlanTask> pages = servicePlanTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(servicePlanTask));
+		return R.data(ServicePlanTaskWrapper.build().pageVO(pages));
+	}
+
+
+	/**
+	 * 自定义分页 
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入servicePlanTask")
+	public R<IPage<ServicePlanTaskVO>> page(ServicePlanTaskVO servicePlanTask, Query query) {
+		IPage<ServicePlanTaskVO> pages = servicePlanTaskService.selectServicePlanTaskPage(Condition.getPage(query), servicePlanTask);
+		return R.data(pages);
+	}
+
+	/**
+	 * 新增 
+	 */
+	@PostMapping("/save")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "新增", notes = "传入servicePlanTask")
+	public R save(@Valid @RequestBody ServicePlanTask servicePlanTask) {
+		return R.status(servicePlanTaskService.save(servicePlanTask));
+	}
+
+	/**
+	 * 修改 
+	 */
+	@PostMapping("/update")
+	@ApiOperationSupport(order = 5)
+	@ApiOperation(value = "修改", notes = "传入servicePlanTask")
+	public R update(@Valid @RequestBody ServicePlanTask servicePlanTask) {
+		return R.status(servicePlanTaskService.updateById(servicePlanTask));
+	}
+
+	/**
+	 * 新增或修改 
+	 */
+	@PostMapping("/submit")
+	@ApiOperationSupport(order = 6)
+	@ApiOperation(value = "新增或修改", notes = "传入servicePlanTask")
+	public R submit(@Valid @RequestBody ServicePlanTask servicePlanTask) {
+		return R.status(servicePlanTaskService.saveOrUpdate(servicePlanTask));
+	}
+
+	
+	/**
+	 * 删除 
+	 */
+	@PostMapping("/remove")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "逻辑删除", notes = "传入ids")
+	public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+		return R.status(servicePlanTaskService.deleteLogic(Func.toLongList(ids)));
+	}
+
+	
+}