From c20c99f256e2f47bd45f0b48fb6b1bcc83960f1e Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 21 三月 2024 14:22:13 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 63 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
index 6d868e7..540bd0b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -1,15 +1,21 @@
package com.ruoyi.web.controller.project;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.PageUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
-import com.ruoyi.project.domain.ServiceDonorchargeorgan;
+import com.ruoyi.project.domain.*;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -19,6 +25,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -31,7 +38,7 @@
@Slf4j
@Api("鎹愮尞鍣ㄥ畼")
@RestController
-@RequestMapping("/system/donorchargeorgan")
+@RequestMapping("/project/donorchargeorgan")
public class ServiceDonorchargeorganController extends BaseController {
@Autowired
private IServiceDonorchargeorganService serviceDonorchargeorganService;
@@ -40,19 +47,33 @@
* 鏌ヨ鎹愮尞鍣ㄥ畼鍒楄〃
*/
@ApiOperation("鏌ヨ鎹愮尞鍣ㄥ畼鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:list')")
+// @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonorchargeorgan serviceDonorchargeorgan) {
+ log.info("鏌ヨ鎹愮尞鍣ㄥ畼鍒楄〃鐨勫叆鍙傦細{}", serviceDonorchargeorgan);
startPage();
- List<ServiceDonorchargeorgan> list = serviceDonorchargeorganService.queryList(serviceDonorchargeorgan);
- return getDataTable(list);
+ List<ServiceDonorchargeorgan> list = null;
+ if (serviceDonorchargeorgan.getPaymentidIsNotNull()) {
+ list = serviceDonorchargeorganService.queryList(serviceDonorchargeorgan);
+ } else {
+ list = serviceDonorchargeorganService.queryListBypaymentidIsNull(serviceDonorchargeorgan);
+ }
+ List<ServiceDonorchargeorganVO> serviceDonorchargeorganVOList = DtoConversionUtils.sourceToTarget(list, ServiceDonorchargeorganVO.class);
+
+ for (ServiceDonorchargeorganVO serviceDonorchargeorganVO : serviceDonorchargeorganVOList) {
+ if (!StringUtils.isEmpty(serviceDonorchargeorganVO.getAnnexFiles())) {
+ List<RbDetailFile> rbDetailFiles = JSONArray.parseArray(serviceDonorchargeorganVO.getAnnexFiles(), RbDetailFile.class);
+ serviceDonorchargeorganVO.setAnnexFilesList(rbDetailFiles);
+ }
+ }
+ return getDataTable2(serviceDonorchargeorganVOList, list);
}
/**
* 瀵煎嚭鎹愮尞鍣ㄥ畼鍒楄〃
*/
@ApiOperation("瀵煎嚭鎹愮尞鍣ㄥ畼鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:export')")
+// @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:export')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonorchargeorgan serviceDonorchargeorgan) {
@@ -65,8 +86,8 @@
* 鑾峰彇鎹愮尞鍣ㄥ畼璇︾粏淇℃伅
*/
@ApiOperation("鑾峰彇鎹愮尞鍣ㄥ畼璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:query')")
- @GetMapping(value = "/{id}")
+// @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:query')")
+ @GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
return AjaxResult.success(serviceDonorchargeorganService.getById(id));
}
@@ -75,23 +96,32 @@
* 鏂板鎹愮尞鍣ㄥ畼
*/
@ApiOperation("鏂板鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:add')")
+// @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:add')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
- return toAjax(serviceDonorchargeorganService.save(serviceDonorchargeorgan));
+ public AjaxResult add(@RequestBody ServiceDonorchargeorganVO serviceDonorchargeorganvo) {
+ if (!CollectionUtils.isEmpty(serviceDonorchargeorganvo.getAnnexFilesList())) {
+ serviceDonorchargeorganvo.setAnnexFiles(JSON.toJSONString(serviceDonorchargeorganvo.getAnnexFilesList()));
+ }
+ ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonorchargeorganvo, ServiceDonorchargeorgan.class);
+ boolean save = serviceDonorchargeorganService.save(serviceDonorchargeorgan);
+ return AjaxResult.success(serviceDonorchargeorgan);
}
/**
* 淇敼鎹愮尞鍣ㄥ畼
*/
@ApiOperation("淇敼鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:edit')")
+// @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:edit')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
@RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
+ public AjaxResult edit(@RequestBody ServiceDonorchargeorganVO serviceDonorchargeorganVO) {
+ if (!CollectionUtils.isEmpty(serviceDonorchargeorganVO.getAnnexFilesList())) {
+ serviceDonorchargeorganVO.setAnnexFiles(JSON.toJSONString(serviceDonorchargeorganVO.getAnnexFilesList()));
+ }
+ ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonorchargeorganVO, ServiceDonorchargeorgan.class);
return toAjax(serviceDonorchargeorganService.updateById(serviceDonorchargeorgan));
}
@@ -99,9 +129,9 @@
* 鍒犻櫎鎹愮尞鍣ㄥ畼
*/
@ApiOperation("鍒犻櫎鎹愮尞鍣ㄥ畼")
- @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:remove')")
+// @PreAuthorize("@ss.hasPermi('project:donorchargeorgan:remove')")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
return toAjax(serviceDonorchargeorganService.removeByIds(Arrays.asList(ids)));
}
@@ -110,19 +140,30 @@
@ApiOperation("鏂板鎴栦慨鏀规崘鐚櫒瀹�")
@Log(title = "鎹愮尞鍣ㄥ畼", businessType = BusinessType.UPDATE)
@PostMapping("/saveOrUpdateDonorchargeorgan")
- public AjaxResult saveOrUpdateDonorchargeorgan(@RequestBody List<ServiceDonorchargeorgan> serviceDonorchargeorganList) {
+ public AjaxResult saveOrUpdateDonorchargeorgan(@RequestBody List<ServiceDonorchargeorganVO> serviceDonorchargeorganList) {
if (CollectionUtils.isEmpty(serviceDonorchargeorganList)) {
throw new BaseException("璇锋鏌ラ渶瑕佹柊澧炴垨淇敼鐨勬崘鐚櫒瀹樺弬鏁版槸鍚﹀畬鏁�");
}
Boolean i = null;
- for (ServiceDonorchargeorgan serviceDonorchargeorgan : serviceDonorchargeorganList) {
- log.info("鎹愮尞鍣ㄥ畼id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonorchargeorgan.getId(), serviceDonorchargeorgan.getInfoid());
+ for (ServiceDonorchargeorganVO serviceDonorchargeorganVO : serviceDonorchargeorganList) {
+ log.info("鎹愮尞鍣ㄥ畼id鏄惁涓虹┖ : {},鍩虹琛ㄧ殑id涓� : {}", serviceDonorchargeorganVO.getId(), serviceDonorchargeorganVO.getInfoid());
+ ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonorchargeorganVO, ServiceDonorchargeorgan.class);
+ serviceDonorchargeorgan.setAnnexFiles(JSON.toJSONString(serviceDonorchargeorganVO.getAnnexFilesList()));
+ if (serviceDonorchargeorgan.getDel_flag() == null) {
+ serviceDonorchargeorgan.setDel_flag(0);
+ }
if (serviceDonorchargeorgan.getId() == null) {
i = serviceDonorchargeorganService.save(serviceDonorchargeorgan);
} else {
- i = serviceDonorchargeorganService.updateById(serviceDonorchargeorgan);
+ i = serviceDonorchargeorganService.updateDonorchargeorgan(serviceDonorchargeorgan);
}
}
return toAjax(i);
}
+
+ @ApiOperation("鏀惰垂缁熻")
+ @PostMapping("/getListBySpStatChange")
+ public TableDataInfo getListBySpStatChange(@RequestBody SpStatChangeReq spStatChangeReq) {
+ return getDataTable(serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq));
+ }
}
--
Gitblit v1.9.3