From c6983deafdacebb0d5dbe5782fef4864d5a2170f Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 27 十二月 2023 09:44:13 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 30 +++++++++++++++++++++++------- 1 files changed, 23 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java index a9d8a31..5121488 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java @@ -4,32 +4,28 @@ import java.text.SimpleDateFormat; import java.util.*; +import com.ruoyi.common.annotation.NotRepeatCommit; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.enums.OrganEnum; +import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.project.domain.BaseOnlyvalue; -import com.ruoyi.project.domain.ServiceDonatecompletioninfo; import com.ruoyi.project.domain.ServiceDonateorgan; import com.ruoyi.project.domain.vo.DonationWitnessVO; import com.ruoyi.project.domain.vo.TimeVO; -import com.ruoyi.project.mapper.BaseOnlyvalueMapper; import com.ruoyi.project.service.IBaseOnlyvalueService; import com.ruoyi.project.service.IServiceDonatebaseinfoService; import com.ruoyi.project.service.IServiceDonateorganService; -import com.ruoyi.project.service.impl.BaseOnlyvalueServiceImpl; import com.ruoyi.web.controller.common.OnlyValueCommon; import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.springframework.security.access.prepost.PreAuthorize; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -50,6 +46,7 @@ * @author ruoyi * @date 2021-11-17 */ +@Slf4j @Api("鎹愮尞瑙佽瘉绠$悊") @RestController @RequestMapping("/project/donationwitness") @@ -525,5 +522,24 @@ return AjaxResult.success(serviceDonationwitnessService.getStats(timeVO)); } + @RepeatSubmit + @ApiOperation("鏂板鎴栦慨鏀规崘鐚璇佺鐞�") + @Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.UPDATE) + @PostMapping("/saveOrUpdateDonationwitness") + public AjaxResult saveOrUpdateDonationwitness(@RequestBody List<ServiceDonationwitness> serviceDonationwitnessList) { + if (CollectionUtils.isEmpty(serviceDonationwitnessList)) { + throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚璇佺鐞嗗弬鏁版槸鍚﹀畬鏁�"); + } + Boolean i = null; + for (ServiceDonationwitness serviceDonationwitness : serviceDonationwitnessList) { + log.info("鎹愮尞瑙佽瘉绠$悊id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid()); + if (serviceDonationwitness.getId() == null) { + i = serviceDonationwitnessService.save(serviceDonationwitness); + } else { + i = serviceDonationwitnessService.updateById(serviceDonationwitness); + } + } + return toAjax(i); + } } -- Gitblit v1.9.3