Browse Source

更新字段

master
gejunhao 4 weeks ago
parent
commit
6c2978843b
  1. 9
      ruoyi-modules/guoyan-platform/pom.xml
  2. 18
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java
  3. 6
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java
  4. 2
      ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

9
ruoyi-modules/guoyan-platform/pom.xml

@ -103,12 +103,11 @@
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-demo</artifactId> <artifactId>ruoyi-demo</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
</dependencies> </dependencies>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
</properties>
</project> </project>

18
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/controller/WorkOrderInfoController.java

@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
@Validated @Validated
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/platform/workorder") @RequestMapping("/platform/workOrder")
public class WorkOrderInfoController extends BaseController { public class WorkOrderInfoController extends BaseController {
private final IWorkOrderInfoService workOrderInfoService; private final IWorkOrderInfoService workOrderInfoService;
@ -39,7 +39,7 @@ public class WorkOrderInfoController extends BaseController {
/** /**
* 查询工单信息列表 * 查询工单信息列表
*/ */
@SaCheckPermission("platform:workorder:list") @SaCheckPermission("platform:workOrder:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo<WorkOrderInfoVo> list(WorkOrderInfoBo bo, PageQuery pageQuery) { public TableDataInfo<WorkOrderInfoVo> list(WorkOrderInfoBo bo, PageQuery pageQuery) {
return workOrderInfoService.queryPageList(bo, pageQuery); return workOrderInfoService.queryPageList(bo, pageQuery);
@ -48,7 +48,7 @@ public class WorkOrderInfoController extends BaseController {
/** /**
* 导出工单信息列表 * 导出工单信息列表
*/ */
@SaCheckPermission("platform:workorder:export") @SaCheckPermission("platform:workOrder:export")
@Log(title = "工单信息", businessType = BusinessType.EXPORT) @Log(title = "工单信息", businessType = BusinessType.EXPORT)
@PostMapping("/export") @PostMapping("/export")
public void export(WorkOrderInfoBo bo, HttpServletResponse response) { public void export(WorkOrderInfoBo bo, HttpServletResponse response) {
@ -61,7 +61,7 @@ public class WorkOrderInfoController extends BaseController {
* *
* @param id 主键 * @param id 主键
*/ */
@SaCheckPermission("platform:workorder:query") @SaCheckPermission("platform:workOrder:query")
@GetMapping("/{id}") @GetMapping("/{id}")
public R<WorkOrderInfoVo> getInfo(@NotNull(message = "主键不能为空") public R<WorkOrderInfoVo> getInfo(@NotNull(message = "主键不能为空")
@PathVariable String id) { @PathVariable String id) {
@ -71,7 +71,7 @@ public class WorkOrderInfoController extends BaseController {
/** /**
* 新增工单信息 * 新增工单信息
*/ */
@SaCheckPermission("platform:workorder:add") @SaCheckPermission("platform:workOrder:add")
@Log(title = "工单信息", businessType = BusinessType.INSERT) @Log(title = "工单信息", businessType = BusinessType.INSERT)
@RepeatSubmit() @RepeatSubmit()
@PostMapping("/add") @PostMapping("/add")
@ -82,11 +82,11 @@ public class WorkOrderInfoController extends BaseController {
/** /**
* 修改工单信息 * 修改工单信息
*/ */
@SaCheckPermission("platform:workorder:edit") @SaCheckPermission("platform:workOrder:edit")
@Log(title = "工单信息", businessType = BusinessType.UPDATE) @Log(title = "工单信息", businessType = BusinessType.UPDATE)
@RepeatSubmit() @RepeatSubmit()
@PutMapping() @PutMapping("/update")
public R<Void> edit(@Validated(EditGroup.class) @RequestBody WorkOrderInfoBo bo) { public R<Void> edit(@RequestBody WorkOrderInfoBo bo) {
return toAjax(workOrderInfoService.updateByBo(bo)); return toAjax(workOrderInfoService.updateByBo(bo));
} }
@ -95,7 +95,7 @@ public class WorkOrderInfoController extends BaseController {
* *
* @param ids 主键串 * @param ids 主键串
*/ */
@SaCheckPermission("platform:workorder:remove") @SaCheckPermission("platform:workOrder:remove")
@Log(title = "工单信息", businessType = BusinessType.DELETE) @Log(title = "工单信息", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}") @DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "主键不能为空") public R<Void> remove(@NotEmpty(message = "主键不能为空")

6
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/domain/WorkOrderInfo.java

@ -114,5 +114,11 @@ public class WorkOrderInfo extends TenantEntity {
*/ */
private String longitude; private String longitude;
/**
* 删除标志0代表存在 2代表删除
*/
@TableLogic
private String delFlag;
} }

2
ruoyi-modules/guoyan-platform/src/main/java/org/dromara/platform/service/impl/WorkOrderInfoServiceImpl.java

@ -117,7 +117,7 @@ public class WorkOrderInfoServiceImpl implements IWorkOrderInfoService {
@Override @Override
public Boolean updateByBo(WorkOrderInfoBo bo) { public Boolean updateByBo(WorkOrderInfoBo bo) {
WorkOrderInfo update = MapstructUtils.convert(bo, WorkOrderInfo.class); WorkOrderInfo update = MapstructUtils.convert(bo, WorkOrderInfo.class);
validEntityBeforeSave(update); //validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0; return baseMapper.updateById(update) > 0;
} }

Loading…
Cancel
Save