From bcfbba254d346d1d2a97703069bdaa3a4fb3a6df Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 13 六月 2025 10:19:56 +0800 Subject: [PATCH] 保洁巡检本周代码 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTemplateController.java | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTemplateController.java index 8d63715..cb48d4e 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTemplateController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTemplateController.java @@ -3,24 +3,19 @@ import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; -import com.google.gson.JsonArray; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.domain.entity.SysRole; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.bean.BeanUtils; -import com.ruoyi.system.dto.LocationDTO; import com.ruoyi.system.dto.TTemplateDTO; -import com.ruoyi.system.model.TLocation; import com.ruoyi.system.model.TLocationType; import com.ruoyi.system.model.TTemplate; import com.ruoyi.system.model.TTemplateDetail; -import com.ruoyi.system.query.LocationTypeListQuery; -import com.ruoyi.system.query.ProjectDeptListQuery; +import com.ruoyi.system.query.TemplateListQuery; import com.ruoyi.system.service.*; -import com.ruoyi.system.vo.system.LocationTypeListVO; -import com.ruoyi.system.vo.system.ProjectDeptListVO; import com.ruoyi.system.vo.system.TemplateDetailVO; import com.ruoyi.system.vo.system.TemplateListVO; import io.swagger.annotations.Api; @@ -58,7 +53,7 @@ @ApiOperation(value = "任务模板分页列表") @PostMapping(value = "/pageList") - public R<PageInfo<TemplateListVO>> pageList(@RequestBody ProjectDeptListQuery query) { + public R<PageInfo<TemplateListVO>> pageList(@RequestBody TemplateListQuery query) { return R.ok(templateService.pageList(query)); } @ApiOperation(value = "点位类型不分页列表") @@ -71,6 +66,11 @@ @PostMapping(value = "/add") public R<Boolean> add(@RequestBody TTemplateDTO dto) { templateService.save(dto); + List<TTemplateDetail> list = dto.getList(); + for (TTemplateDetail tTemplateDetail : list) { + tTemplateDetail.setTemplateId(dto.getId()); + } + templateDetailService.saveBatch(list); return R.ok(); } @Log(title = "编辑任务模板", businessType = BusinessType.UPDATE) @@ -78,6 +78,9 @@ @PostMapping(value = "/edit") public R<Boolean> edit(@RequestBody TTemplateDTO dto) { templateService.updateById(dto); + templateDetailService.remove(new LambdaQueryWrapper<TTemplateDetail>() + .eq(TTemplateDetail::getTemplateId, dto.getId())); + templateDetailService.saveBatch(dto.getList()); return R.ok(); } @Log(title = "批量删除任务模板", businessType = BusinessType.DELETE) -- Gitblit v1.7.1