From 6f344e6360751574f7e03b21c00cfa3f4b2bc099 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 10 十一月 2023 15:41:41 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java | 123 ++++++++
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateannex.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BasePrcaddressDictController.java | 37 +-
ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseAnnextypeMapper.java | 26 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseAnnextypeServiceImpl.java | 52 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java | 70 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java | 8
ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseAnnextypeService.java | 24 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java | 40 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java | 8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java | 31 +
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java | 18
ruoyi-project/src/main/resources/mapper/project/BaseAnnextypeMapper.xml | 37 ++
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java | 3
ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java | 7
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java | 8
ruoyi-project/src/main/resources/mapper/project/ServiceDonateannexMapper.xml | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java | 16
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java | 8
ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java | 34 +-
ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseAnnextype.java | 55 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java | 39 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java | 41 +-
ruoyi-common/src/main/java/com/ruoyi/common/utils/ChineseUtils.java | 15 +
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java | 3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java | 12
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 15 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java | 34 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java | 40 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java | 10
35 files changed, 655 insertions(+), 189 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java
new file mode 100644
index 0000000..3443496
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java
@@ -0,0 +1,123 @@
+package com.ruoyi.web.controller.project;
+
+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.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.BaseAnnextype;
+import com.ruoyi.project.service.IBaseAnnextypeService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * 鎹愮尞闄勪欢Controller
+ *
+ * @author ruoyi
+ * @date 2023-11-10
+ */
+@Slf4j
+@Api("鎹愮尞闄勪欢")
+@RestController
+@RequestMapping("/project/annextype")
+public class BaseAnnextypeController extends BaseController {
+ @Autowired
+ private IBaseAnnextypeService baseAnnextypeService;
+
+ /**
+ * 鏌ヨ鎹愮尞闄勪欢鍒楄〃
+ */
+ @ApiOperation("鏌ヨ鎹愮尞闄勪欢鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('system:annextype:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(BaseAnnextype baseAnnextype) {
+ startPage();
+ List<BaseAnnextype> list = baseAnnextypeService.queryList(baseAnnextype);
+ return getDataTable(list);
+ }
+
+ /**
+ * 瀵煎嚭鎹愮尞闄勪欢鍒楄〃
+ */
+ @ApiOperation("瀵煎嚭鎹愮尞闄勪欢鍒楄〃")
+ @PreAuthorize("@ss.hasPermi('system:annextype:export')")
+ @Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.EXPORT)
+ @GetMapping("/export")
+ public AjaxResult export(BaseAnnextype baseAnnextype) {
+ log.info("瀵煎嚭鎹愮尞闄勪欢鍒楄〃{}锛�", baseAnnextype);
+ List<BaseAnnextype> list = baseAnnextypeService.queryList(baseAnnextype);
+ ExcelUtil<BaseAnnextype> util = new ExcelUtil<BaseAnnextype>(BaseAnnextype.class);
+ return util.exportExcel(list, "鎹愮尞闄勪欢鏁版嵁");
+ }
+
+ /**
+ * 鑾峰彇鎹愮尞闄勪欢璇︾粏淇℃伅
+ */
+ @ApiOperation("鑾峰彇鎹愮尞闄勪欢璇︾粏淇℃伅")
+ @PreAuthorize("@ss.hasPermi('system:annextype:query')")
+ @GetMapping(value = "/getInfo/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鎹愮尞闄勪欢璇︾粏淇℃伅{}锛�", id);
+
+ return AjaxResult.success(baseAnnextypeService.getById(id));
+ }
+
+ /**
+ * 鏂板鎹愮尞闄勪欢
+ */
+ @ApiOperation("鏂板鎹愮尞闄勪欢")
+ @PreAuthorize("@ss.hasPermi('system:annextype:add')")
+ @Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.INSERT)
+ @PostMapping("/add")
+ @RepeatSubmit
+ public AjaxResult add(@RequestBody BaseAnnextype baseAnnextype) {
+ log.info("鏂板鎹愮尞闄勪欢{}锛�", baseAnnextype);
+
+ if (ObjectUtils.isEmpty(baseAnnextype) || StringUtils.isEmpty(baseAnnextype.getDonationcategory()) || StringUtils.isEmpty(baseAnnextype.getAnnextype())) {
+ throw new BaseException("璇锋鏌ユ崘鐚被鍒拰闄勪欢绫诲瀷锛屼负绌轰簡");
+ }
+ return toAjax(baseAnnextypeService.save(baseAnnextype));
+ }
+
+ /**
+ * 淇敼鎹愮尞闄勪欢
+ */
+ @ApiOperation("淇敼鎹愮尞闄勪欢")
+ @PreAuthorize("@ss.hasPermi('system:annextype:edit')")
+ @Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BaseAnnextype baseAnnextype) {
+ log.info("淇敼鎹愮尞闄勪欢鐨勫叆鍙倇}锛�", baseAnnextype);
+
+ if (ObjectUtils.isEmpty(baseAnnextype) || baseAnnextype.getId() == null) {
+ throw new BaseException("淇敼鐨勬潯浠朵负绌�");
+ }
+ return toAjax(baseAnnextypeService.updateById(baseAnnextype));
+ }
+
+ /**
+ * 鍒犻櫎鎹愮尞闄勪欢
+ */
+ @ApiOperation("鍒犻櫎鎹愮尞闄勪欢")
+ @PreAuthorize("@ss.hasPermi('system:annextype:remove')")
+ @Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.DELETE)
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鎹愮尞闄勪欢{}锛�", ids);
+
+ return toAjax(baseAnnextypeService.removeByIds(Arrays.asList(ids)));
+ }
+}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
index c666fc6..a3541df 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +32,7 @@
* @author ruoyi
* @date 2022-04-19
*/
+@Slf4j
@Api("涓撳璐圭敤")
@RestController
@RequestMapping("/project/expertfeetype")
@@ -44,6 +46,7 @@
@ApiOperation("鏌ヨ涓撳璐圭敤鍒楄〃")
@GetMapping("/list")
public TableDataInfo list(BaseExpertfeetype baseExpertfeetype) {
+ log.info("鏌ヨ涓撳璐圭敤鍒楄〃{}锛�", baseExpertfeetype);
startPage();
List<BaseExpertfeetype> list = baseExpertfeetypeService.queryList(baseExpertfeetype);
return getDataTable(list);
@@ -56,6 +59,7 @@
@Log(title = "涓撳璐圭敤", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(BaseExpertfeetype baseExpertfeetype) {
+ log.info("瀵煎嚭涓撳璐圭敤鍒楄〃{}锛�", baseExpertfeetype);
List<BaseExpertfeetype> list = baseExpertfeetypeService.queryList(baseExpertfeetype);
ExcelUtil<BaseExpertfeetype> util = new ExcelUtil<BaseExpertfeetype>(BaseExpertfeetype.class);
return util.exportExcel(list, "涓撳璐圭敤鏁版嵁");
@@ -67,6 +71,7 @@
@ApiOperation("鑾峰彇涓撳璐圭敤璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇涓撳璐圭敤璇︾粏淇℃伅{}锛�", id);
return AjaxResult.success(baseExpertfeetypeService.getById(id));
}
@@ -78,6 +83,7 @@
@PostMapping
@RepeatSubmit
public AjaxResult add(@RequestBody BaseExpertfeetype baseExpertfeetype) {
+ log.info("鏂板涓撳璐圭敤{}锛�", baseExpertfeetype);
return toAjax(baseExpertfeetypeService.save(baseExpertfeetype));
}
@@ -89,6 +95,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseExpertfeetype baseExpertfeetype) {
+ log.info("淇敼涓撳璐圭敤{}锛�", baseExpertfeetype);
return toAjax(baseExpertfeetypeService.updateById(baseExpertfeetype));
}
@@ -99,6 +106,7 @@
@Log(title = "涓撳璐圭敤", businessType = BusinessType.DELETE)
@DeleteMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎涓撳璐圭敤{}锛�", ids);
return toAjax(baseExpertfeetypeService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
index 21f906c..00af4ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
@@ -11,6 +11,7 @@
import com.ruoyi.project.service.IBaseFinancesubjectService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +24,7 @@
* @author ruoyi
* @date 2022-01-11
*/
+@Slf4j
@Api("鏀跺叆璐圭敤绉戠洰")
@RestController
@RequestMapping("/project/financesubject")
@@ -39,6 +41,7 @@
@GetMapping("/list")
public TableDataInfo list(BaseFinancesubject baseFinancesubject)
{
+ log.info("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�" , baseFinancesubject);
startPage();
//List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);銆�
List<BaseFinancesubject> list = baseFinancesubjectService.selectBaseFinancesubjectList(baseFinancesubject);
@@ -54,6 +57,7 @@
@GetMapping("/export")
public AjaxResult export(BaseFinancesubject baseFinancesubject)
{
+ log.info("瀵煎嚭鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�" , baseFinancesubject);
List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
ExcelUtil<BaseFinancesubject> util = new ExcelUtil<BaseFinancesubject>(BaseFinancesubject.class);
return util.exportExcel(list, "鏀跺叆璐圭敤绉戠洰鏁版嵁");
@@ -67,6 +71,7 @@
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
+ log.info("鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅{}锛�" , id);
return AjaxResult.success(baseFinancesubjectService.getById(id));
}
@@ -80,6 +85,7 @@
@RepeatSubmit
public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject)
{
+ log.info("鏂板鏀跺叆璐圭敤绉戠洰{}锛�" , baseFinancesubject);
return toAjax(baseFinancesubjectService.save(baseFinancesubject));
}
@@ -93,6 +99,7 @@
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject)
{
+ log.info("淇敼鏀跺叆璐圭敤绉戠洰{}锛�" , baseFinancesubject);
return toAjax(baseFinancesubjectService.updateById(baseFinancesubject));
}
@@ -105,11 +112,13 @@
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ log.info("鍒犻櫎鏀跺叆璐圭敤绉戠洰{}锛�" , ids);
return toAjax(baseFinancesubjectService.removeByIds(Arrays.asList(ids)));
}
@GetMapping(value = "/getItemName/{ItemType}")
public AjaxResult getItemName(@PathVariable("ItemType") String ItemType){
+ log.info("/getItemName鐨勫叆鍙� {}锛�" , ItemType);
return AjaxResult.success(baseFinancesubjectService.getItemName(ItemType));
}
@@ -117,6 +126,7 @@
@Log(title = "鑾峰彇鎹愮尞鎴愭湰", businessType = BusinessType.OTHER)
@GetMapping(value = "/getDonationCost/{DonorNo}")
public AjaxResult getDonationCost(@PathVariable("DonorNo") String DonorNo){
+ log.info("鑾峰彇鎹愮尞鎴愭湰{}锛�" , DonorNo);
return AjaxResult.success(baseFinancesubjectService.getDonationCost(DonorNo));
}
@@ -129,6 +139,7 @@
@GetMapping("/getbyexpensetype/{ExpenseType}")
public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType)
{
+ log.info("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰绫诲瀷{}锛�" , ExpenseType);
/*BaseFinancesubject baseFinancesubject=new BaseFinancesubject();
baseFinancesubject.setExpensetype(ExpenseType);
List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
@@ -146,6 +157,7 @@
@GetMapping("/getDetails/{ExpenseType}")
public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType)
{
+ log.info("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰鏄庣粏{}锛�" , ExpenseType);
return AjaxResult.success(baseFinancesubjectService.getDetails(ExpenseType));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java
index 62d9289..1b33ba9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java
@@ -2,8 +2,10 @@
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,15 @@
/**
* 鏀跺叆璐圭敤绉戠洰Controller
- *
+ *
* @author ruoyi
* @date 2022-05-11
*/
+@Slf4j
@Api("鏀跺叆璐圭敤绉戠洰")
@RestController
@RequestMapping("/project/itemexpense")
-public class BaseItemexpenseController extends BaseController
-{
+public class BaseItemexpenseController extends BaseController {
@Autowired
private IBaseItemexpenseService baseItemexpenseService;
@@ -43,8 +45,8 @@
*/
@ApiOperation("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃")
@GetMapping("/list")
- public TableDataInfo list(BaseItemexpense baseItemexpense)
- {
+ public TableDataInfo list(BaseItemexpense baseItemexpense) {
+ log.info("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�" , baseItemexpense);
startPage();
List<BaseItemexpense> list = baseItemexpenseService.queryList(baseItemexpense);
return getDataTable(list);
@@ -56,8 +58,8 @@
@ApiOperation("瀵煎嚭鏀跺叆璐圭敤绉戠洰鍒楄〃")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(BaseItemexpense baseItemexpense)
- {
+ public AjaxResult export(BaseItemexpense baseItemexpense) {
+ log.info("瀵煎嚭鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�" , baseItemexpense);
List<BaseItemexpense> list = baseItemexpenseService.queryList(baseItemexpense);
ExcelUtil<BaseItemexpense> util = new ExcelUtil<BaseItemexpense>(BaseItemexpense.class);
return util.exportExcel(list, "鏀跺叆璐圭敤绉戠洰鏁版嵁");
@@ -68,8 +70,8 @@
*/
@ApiOperation("鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅{}锛�" , id);
return AjaxResult.success(baseItemexpenseService.getById(id));
}
@@ -80,8 +82,8 @@
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody BaseItemexpense baseItemexpense)
- {
+ public AjaxResult add(@RequestBody BaseItemexpense baseItemexpense) {
+ log.info("鏂板鏀跺叆璐圭敤绉戠洰{}锛�" , baseItemexpense);
return toAjax(baseItemexpenseService.save(baseItemexpense));
}
@@ -91,9 +93,9 @@
@ApiOperation("淇敼鏀跺叆璐圭敤绉戠洰")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody BaseItemexpense baseItemexpense)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BaseItemexpense baseItemexpense) {
+ log.info("淇敼鏀跺叆璐圭敤绉戠洰{}锛�" , baseItemexpense);
return toAjax(baseItemexpenseService.updateById(baseItemexpense));
}
@@ -103,8 +105,8 @@
@ApiOperation("鍒犻櫎鏀跺叆璐圭敤绉戠洰")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鏀跺叆璐圭敤绉戠洰{}锛�" , ids);
return toAjax(baseItemexpenseService.removeByIds(Arrays.asList(ids)));
}
@@ -113,11 +115,10 @@
*/
@ApiOperation("閫氳繃椤圭洰id鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅")
@GetMapping(value = "/getDetailsByItemId/{itemid}")
- public AjaxResult getDetailsByItemId(@PathVariable("itemid") Long itemid)
- {
+ public AjaxResult getDetailsByItemId(@PathVariable("itemid") Long itemid) {
+ log.info("閫氳繃椤圭洰id鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅{}锛�" , itemid);
return AjaxResult.success(baseItemexpenseService.getDetailsByItemId(itemid));
}
-
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
index cff3e12..09c5115 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
@@ -11,6 +11,7 @@
import com.ruoyi.project.service.IBaseOrganchargeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -24,6 +25,7 @@
* @author ruoyi
* @date 2023-10-08
*/
+@Slf4j
@Api("浜轰綋鍣ㄥ畼鑾峰彇璐圭敤")
@RestController
@RequestMapping("/organcharge")
@@ -38,6 +40,7 @@
@PreAuthorize("@ss.hasPermi('system:organcharge:list')")
@GetMapping("/list")
public TableDataInfo list(BaseOrgancharge baseOrgancharge) {
+ log.info("鏌ヨ浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃{}锛�" , baseOrgancharge);
startPage();
List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
return getDataTable(list);
@@ -51,6 +54,7 @@
@Log(title = "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(BaseOrgancharge baseOrgancharge) {
+ log.info("瀵煎嚭浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鍒楄〃{}锛�" , baseOrgancharge);
List<BaseOrgancharge> list = baseOrganchargeService.queryList(baseOrgancharge);
ExcelUtil<BaseOrgancharge> util = new ExcelUtil<BaseOrgancharge>(BaseOrgancharge.class);
return util.exportExcel(list, "浜轰綋鍣ㄥ畼鑾峰彇璐圭敤鏁版嵁");
@@ -63,6 +67,7 @@
@PreAuthorize("@ss.hasPermi('system:organcharge:query')")
@GetMapping(value = "/getInfo/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇浜轰綋鍣ㄥ畼鑾峰彇璐圭敤璇︾粏淇℃伅{}锛�" , id);
return AjaxResult.success(baseOrganchargeService.getById(id));
}
@@ -75,6 +80,7 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody BaseOrgancharge baseOrgancharge) {
+ log.info("鏂板浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�" , baseOrgancharge);
return toAjax(baseOrganchargeService.save(baseOrgancharge));
}
@@ -87,6 +93,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseOrgancharge baseOrgancharge) {
+ log.info("淇敼浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�" , baseOrgancharge);
return toAjax(baseOrganchargeService.updateById(baseOrgancharge));
}
@@ -97,6 +104,7 @@
@PreAuthorize("@ss.hasPermi('system:organcharge:remove')")
@GetMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎浜轰綋鍣ㄥ畼鑾峰彇璐圭敤{}锛�" , ids);
return toAjax(baseOrganchargeService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
index 94f1f26..a7cdde5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -12,6 +12,7 @@
import com.ruoyi.web.controller.common.OnlyValueCommon;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +26,7 @@
* @author ruoyi
* @date 2021-11-05
*/
+@Slf4j
@Api("鏈烘瀯淇℃伅绠＄悊")
@RestController
@RequestMapping("/project/organization")
@@ -42,6 +44,7 @@
//@PreAuthorize("@ss.hasPermi('project:organization:list')")
@GetMapping("/list")
public TableDataInfo list(BaseOrganization baseOrganization) {
+ log.info("鑾峰彇鏈烘瀯鍒楄〃{}锛�" , baseOrganization);
startPage();
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
return getDataTable(list);
@@ -55,6 +58,7 @@
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(BaseOrganization baseOrganization) {
+ log.info("瀵煎嚭鏈烘瀯淇℃伅{}锛�" , baseOrganization);
List<BaseOrganization> list = baseOrganizationService.queryList(baseOrganization);
ExcelUtil<BaseOrganization> util = new ExcelUtil<BaseOrganization>(BaseOrganization.class);
return util.exportExcel(list, "鏈烘瀯绠＄悊鏁版嵁");
@@ -67,6 +71,7 @@
//@PreAuthorize("@ss.hasPermi('project:organization:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鏈烘瀯绠＄悊璇︾粏淇℃伅{}锛�" , id);
return AjaxResult.success(baseOrganizationService.getById(id));
}
@@ -79,6 +84,7 @@
@PostMapping
@RepeatSubmit
public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
+ log.info("鏂板鏈烘瀯淇℃伅{}锛�" , baseOrganization);
String organization = onlyValueCommon.addOnlyValue("organization");
//"0"+鍦板競缂栫爜+鍖婚櫌绫诲瀷+搴忓彿
baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
@@ -94,6 +100,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseOrganization baseOrganization) {
+ log.info("淇敼鏈烘瀯淇℃伅{}锛�" , baseOrganization);
return toAjax(baseOrganizationService.updateById(baseOrganization));
}
@@ -105,6 +112,7 @@
@Log(title = "鏈烘瀯绠＄悊", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鏈烘瀯淇℃伅{}锛�" , ids);
return toAjax(baseOrganizationService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BasePrcaddressDictController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BasePrcaddressDictController.java
index 836c4ac..07db4ea 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BasePrcaddressDictController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BasePrcaddressDictController.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,15 +28,15 @@
/**
* 鐪佸競鍖虹鐞咰ontroller
- *
+ *
* @author ruoyi
* @date 2021-11-15
*/
+@Slf4j
@Api("鐪佸競鍖虹鐞�")
@RestController
@RequestMapping("/project/dict")
-public class BasePrcaddressDictController extends BaseController
-{
+public class BasePrcaddressDictController extends BaseController {
@Autowired
private IBasePrcaddressDictService basePrcaddressDictService;
@@ -45,8 +46,8 @@
@ApiOperation("鑾峰彇鐪佸競鍖哄垪琛�")
//@PreAuthorize("@ss.hasPermi('project:dict:list')")
@GetMapping("/list")
- public TableDataInfo list(BasePrcaddressDict basePrcaddressDict)
- {
+ public TableDataInfo list(BasePrcaddressDict basePrcaddressDict) {
+ log.info("鏌ヨ鐪佸競鍖虹鐞嗗垪琛▄}锛�", basePrcaddressDict);
startPage();
List<BasePrcaddressDict> list = basePrcaddressDictService.queryList(basePrcaddressDict);
return getDataTable(list);
@@ -57,8 +58,8 @@
*/
@ApiOperation("鑾峰彇鐪佸競鍖轰笅鎷夋爲鍒楄〃")
@GetMapping("/treeselect")
- public AjaxResult treeselect(BasePrcaddressDict basePrcaddressDict)
- {
+ public AjaxResult treeselect(BasePrcaddressDict basePrcaddressDict) {
+ log.info("鑾峰彇鐪佸競鍖轰笅鎷夋爲鍒楄〃{}锛�", basePrcaddressDict);
List<BasePrcaddressDict> basePrcaddressDicts = basePrcaddressDictService.queryList(basePrcaddressDict);
return AjaxResult.success(basePrcaddressDictService.buildAddressTreeSelect(basePrcaddressDicts));
}
@@ -71,8 +72,8 @@
//@PreAuthorize("@ss.hasPermi('project:dict:export')")
@Log(title = "鐪佸競鍖虹鐞�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(BasePrcaddressDict basePrcaddressDict)
- {
+ public AjaxResult export(BasePrcaddressDict basePrcaddressDict) {
+ log.info("瀵煎嚭鐪佸競鍖哄垪琛▄}锛�", basePrcaddressDict);
List<BasePrcaddressDict> list = basePrcaddressDictService.queryList(basePrcaddressDict);
ExcelUtil<BasePrcaddressDict> util = new ExcelUtil<BasePrcaddressDict>(BasePrcaddressDict.class);
return util.exportExcel(list, "鐪佸競鍖虹鐞嗘暟鎹�");
@@ -84,8 +85,8 @@
@ApiOperation("閫氳繃id鑾峰緱鐪佸競鍖�")
//@PreAuthorize("@ss.hasPermi('project:dict:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鐪佸競鍖虹鐞嗚缁嗕俊鎭瘂}锛�", id);
return AjaxResult.success(basePrcaddressDictService.getById(id));
}
@@ -97,8 +98,8 @@
@Log(title = "鐪佸競鍖虹鐞�", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody BasePrcaddressDict basePrcaddressDict)
- {
+ public AjaxResult add(@RequestBody BasePrcaddressDict basePrcaddressDict) {
+ log.info("鏂板鐪佸競鍖簕}锛�", basePrcaddressDict);
return toAjax(basePrcaddressDictService.save(basePrcaddressDict));
}
@@ -109,9 +110,9 @@
//@PreAuthorize("@ss.hasPermi('project:dict:edit')")
@Log(title = "鐪佸競鍖虹鐞�", businessType = BusinessType.UPDATE)
@PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody BasePrcaddressDict basePrcaddressDict)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BasePrcaddressDict basePrcaddressDict) {
+ log.info("淇敼鐪佸競鍖虹鐞唟}锛�", basePrcaddressDict);
return toAjax(basePrcaddressDictService.updateById(basePrcaddressDict));
}
@@ -122,8 +123,8 @@
//@PreAuthorize("@ss.hasPermi('project:dict:remove')")
@Log(title = "鐪佸競鍖虹鐞�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鐪佸競鍖虹鐞唟}锛�", ids);
return toAjax(basePrcaddressDictService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
index c81e15b..9151cfb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
@@ -11,6 +11,7 @@
import com.ruoyi.project.service.IBaseTravelcityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -20,15 +21,15 @@
/**
* 宸梾鍩庡競鍜岃ˉ璐存爣鍑咰ontroller
- *
+ *
* @author ruoyi
* @date 2023-04-23
*/
+@Slf4j
@Api("宸梾鍩庡競鍜岃ˉ璐存爣鍑�")
@RestController
@RequestMapping("/project/travelcity")
-public class BaseTravelcityController extends BaseController
-{
+public class BaseTravelcityController extends BaseController {
@Autowired
private IBaseTravelcityService baseTravelcityService;
@@ -38,8 +39,8 @@
@ApiOperation("鏌ヨ宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛�")
@PreAuthorize("@ss.hasPermi('project:travelcity:list')")
@GetMapping("/list")
- public TableDataInfo list(BaseTravelcity baseTravelcity)
- {
+ public TableDataInfo list(BaseTravelcity baseTravelcity) {
+ log.info("鏌ヨ宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛▄}锛�", baseTravelcity);
startPage();
List<BaseTravelcity> list = baseTravelcityService.queryList(baseTravelcity);
return getDataTable(list);
@@ -52,8 +53,8 @@
@PreAuthorize("@ss.hasPermi('project:travelcity:export')")
@Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(BaseTravelcity baseTravelcity)
- {
+ public AjaxResult export(BaseTravelcity baseTravelcity) {
+ log.info("瀵煎嚭宸梾鍩庡競鍜岃ˉ璐存爣鍑嗗垪琛▄}锛�", baseTravelcity);
List<BaseTravelcity> list = baseTravelcityService.queryList(baseTravelcity);
ExcelUtil<BaseTravelcity> util = new ExcelUtil<BaseTravelcity>(BaseTravelcity.class);
return util.exportExcel(list, "宸梾鍩庡競鍜岃ˉ璐存爣鍑嗘暟鎹�");
@@ -65,8 +66,8 @@
@ApiOperation("鑾峰彇宸梾鍩庡競鍜岃ˉ璐存爣鍑嗚缁嗕俊鎭�")
@PreAuthorize("@ss.hasPermi('project:travelcity:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇宸梾鍩庡競鍜岃ˉ璐存爣鍑嗚缁嗕俊鎭瘂}锛�", id);
return AjaxResult.success(baseTravelcityService.getById(id));
}
@@ -78,8 +79,8 @@
@Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity)
- {
+ public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity) {
+ log.info("鏂板宸梾鍩庡競鍜岃ˉ璐存爣鍑唟}锛�", baseTravelcity);
return toAjax(baseTravelcityService.save(baseTravelcity));
}
@@ -90,9 +91,9 @@
@PreAuthorize("@ss.hasPermi('project:travelcity:edit')")
@Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.UPDATE)
@PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody BaseTravelcity baseTravelcity)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody BaseTravelcity baseTravelcity) {
+ log.info("淇敼宸梾鍩庡競鍜岃ˉ璐存爣鍑唟}锛�", baseTravelcity);
return toAjax(baseTravelcityService.updateById(baseTravelcity));
}
@@ -103,8 +104,8 @@
@PreAuthorize("@ss.hasPermi('project:travelcity:remove')")
@Log(title = "宸梾鍩庡競鍜岃ˉ璐存爣鍑�", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎宸梾鍩庡競鍜岃ˉ璐存爣鍑唟}锛�", ids);
return toAjax(baseTravelcityService.removeByIds(Arrays.asList(ids)));
}
@@ -113,11 +114,11 @@
* 鏍规嵁鍖哄煙鑾峰彇浼欓琛ュ姪銆佸叕鏉傝琛ュ姪
*/
@ApiOperation("鏍规嵁鍖哄煙鑾峰彇琛ュ姪")
- // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
+ // @PreAuthorize("@ss.hasPermi('project:travelcity:list')")
@GetMapping("/getSubsidy/{cityCode}")
- public AjaxResult getSubsidy(@PathVariable String cityCode)
- {
- BaseTravelcity baseTravelcity=baseTravelcityService.getSubsidy(cityCode);
+ public AjaxResult getSubsidy(@PathVariable String cityCode) {
+ log.info("鏍规嵁鍖哄煙鑾峰彇浼欓琛ュ姪銆佸叕鏉傝琛ュ姪{}锛�", cityCode);
+ BaseTravelcity baseTravelcity = baseTravelcityService.getSubsidy(cityCode);
return AjaxResult.success(baseTravelcity);
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java
index a9d40b8..9bebbd1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java
@@ -7,6 +7,7 @@
import com.taobao.api.ApiException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.PropertySource;
@@ -21,6 +22,7 @@
* @author liusheng
* @date 2023-05-15
*/
+@Slf4j
@Api(description = "閽夐拤鎺ュ彛")
@RestController
@RequestMapping("/smartor/dingtalk")
@@ -45,6 +47,7 @@
@ApiOperation("鍙戦�侀拤閽夋秷鎭�")
@PostMapping("/sendNotification")
public AjaxResult sendNotification(@RequestBody DingTalkReqVo dingTalkReqVo) {
+ log.info("鍙戦�侀拤閽夋秷鎭細{}", dingTalkReqVo);
Boolean aBoolean = dingTalkService.sendNotification(dingTalkReqVo);
if (aBoolean) {
return success();
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java
index cc1a3cd..800cf68 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java
@@ -2,8 +2,10 @@
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,15 @@
/**
* 涓撳璐圭敤鍒嗗彂姹囨�绘槑缁咰ontroller
- *
+ *
* @author ruoyi
* @date 2022-03-01
*/
+@Slf4j
@Api("涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�")
@RestController
@RequestMapping("/project/distributedetail")
-public class ServiceDistributedetailController extends BaseController
-{
+public class ServiceDistributedetailController extends BaseController {
@Autowired
private IServiceDistributedetailService serviceDistributedetailService;
@@ -43,8 +45,8 @@
*/
@ApiOperation("鏌ヨ涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗗垪琛�")
@GetMapping("/list")
- public TableDataInfo list(ServiceDistributedetail serviceDistributedetail)
- {
+ public TableDataInfo list(ServiceDistributedetail serviceDistributedetail) {
+ log.info("鏌ヨ涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗗垪琛細{}", serviceDistributedetail);
startPage();
List<ServiceDistributedetail> list = serviceDistributedetailService.queryList(serviceDistributedetail);
return getDataTable(list);
@@ -56,8 +58,8 @@
@ApiOperation("瀵煎嚭涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗗垪琛�")
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDistributedetail serviceDistributedetail)
- {
+ public AjaxResult export(ServiceDistributedetail serviceDistributedetail) {
+ log.info("瀵煎嚭涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗗垪琛細{}", serviceDistributedetail);
List<ServiceDistributedetail> list = serviceDistributedetailService.queryList(serviceDistributedetail);
ExcelUtil<ServiceDistributedetail> util = new ExcelUtil<ServiceDistributedetail>(ServiceDistributedetail.class);
return util.exportExcel(list, "涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗘暟鎹�");
@@ -68,8 +70,8 @@
*/
@ApiOperation("鑾峰彇涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗚缁嗕俊鎭�")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗚缁嗕俊鎭細{}", id);
return AjaxResult.success(serviceDistributedetailService.getById(id));
}
@@ -80,8 +82,8 @@
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDistributedetail serviceDistributedetail)
- {
+ public AjaxResult add(@RequestBody ServiceDistributedetail serviceDistributedetail) {
+ log.info("鏂板涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗭細{}", serviceDistributedetail);
return toAjax(serviceDistributedetailService.save(serviceDistributedetail));
}
@@ -91,9 +93,9 @@
@ApiOperation("淇敼涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�")
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDistributedetail serviceDistributedetail)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDistributedetail serviceDistributedetail) {
+ log.info("淇敼涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗭細{}", serviceDistributedetail);
return toAjax(serviceDistributedetailService.updateById(serviceDistributedetail));
}
@@ -103,8 +105,8 @@
@ApiOperation("鍒犻櫎涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�")
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�绘槑缁�", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎涓撳璐圭敤鍒嗗彂姹囨�绘槑缁嗭細{}", ids);
return toAjax(serviceDistributedetailService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java
index 0147ac0..050e656 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java
@@ -2,8 +2,10 @@
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,15 @@
/**
* 涓撳璐圭敤鍒嗗彂姹囨�讳富Controller
- *
+ *
* @author ruoyi
* @date 2022-03-01
*/
+@Slf4j
@Api("涓撳璐圭敤鍒嗗彂姹囨�讳富")
@RestController
@RequestMapping("/project/distributesummary")
-public class ServiceDistributesummaryController extends BaseController
-{
+public class ServiceDistributesummaryController extends BaseController {
@Autowired
private IServiceDistributesummaryService serviceDistributesummaryService;
@@ -43,8 +45,8 @@
*/
@ApiOperation("鏌ヨ涓撳璐圭敤鍒嗗彂姹囨�讳富鍒楄〃")
@GetMapping("/list")
- public TableDataInfo list(ServiceDistributesummary serviceDistributesummary)
- {
+ public TableDataInfo list(ServiceDistributesummary serviceDistributesummary) {
+ log.info("鏌ヨ涓撳璐圭敤鍒嗗彂姹囨�讳富鍒楄〃锛歿}", serviceDistributesummary);
startPage();
List<ServiceDistributesummary> list = serviceDistributesummaryService.queryList(serviceDistributesummary);
return getDataTable(list);
@@ -56,8 +58,8 @@
@ApiOperation("瀵煎嚭涓撳璐圭敤鍒嗗彂姹囨�讳富鍒楄〃")
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�讳富", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDistributesummary serviceDistributesummary)
- {
+ public AjaxResult export(ServiceDistributesummary serviceDistributesummary) {
+ log.info("瀵煎嚭涓撳璐圭敤鍒嗗彂姹囨�讳富鍒楄〃锛歿}", serviceDistributesummary);
List<ServiceDistributesummary> list = serviceDistributesummaryService.queryList(serviceDistributesummary);
ExcelUtil<ServiceDistributesummary> util = new ExcelUtil<ServiceDistributesummary>(ServiceDistributesummary.class);
return util.exportExcel(list, "涓撳璐圭敤鍒嗗彂姹囨�讳富鏁版嵁");
@@ -68,8 +70,8 @@
*/
@ApiOperation("鑾峰彇涓撳璐圭敤鍒嗗彂姹囨�讳富璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇涓撳璐圭敤鍒嗗彂姹囨�讳富璇︾粏淇℃伅锛歿}", id);
return AjaxResult.success(serviceDistributesummaryService.getById(id));
}
@@ -80,8 +82,8 @@
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�讳富", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDistributesummary serviceDistributesummary)
- {
+ public AjaxResult add(@RequestBody ServiceDistributesummary serviceDistributesummary) {
+ log.info("鏂板涓撳璐圭敤鍒嗗彂姹囨�讳富锛歿}", serviceDistributesummary);
return toAjax(serviceDistributesummaryService.save(serviceDistributesummary));
}
@@ -91,9 +93,9 @@
@ApiOperation("淇敼涓撳璐圭敤鍒嗗彂姹囨�讳富")
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�讳富", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDistributesummary serviceDistributesummary)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDistributesummary serviceDistributesummary) {
+ log.info("淇敼涓撳璐圭敤鍒嗗彂姹囨�讳富锛歿}", serviceDistributesummary);
return toAjax(serviceDistributesummaryService.updateById(serviceDistributesummary));
}
@@ -103,16 +105,16 @@
@ApiOperation("鍒犻櫎涓撳璐圭敤鍒嗗彂姹囨�讳富")
@Log(title = "涓撳璐圭敤鍒嗗彂姹囨�讳富", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎涓撳璐圭敤鍒嗗彂姹囨�讳富锛歿}", ids);
return toAjax(serviceDistributesummaryService.removeByIds(Arrays.asList(ids)));
}
- @GetMapping(value ="/getSummaryByInfoId/{infoid}")
- public AjaxResult getSummaryByInfoId(@PathVariable("infoid") Long infoid){
+ @GetMapping(value = "/getSummaryByInfoId/{infoid}")
+ public AjaxResult getSummaryByInfoId(@PathVariable("infoid") Long infoid) {
+ log.info("getSummaryByInfoId鐨勫叆鍙傦細{}", infoid);
return AjaxResult.success(serviceDistributesummaryService.getSummaryByInfoId(infoid));
}
-
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
index 2197372..4cb2e5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
@@ -2,8 +2,10 @@
import java.util.Arrays;
import java.util.List;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,15 +28,15 @@
/**
* 鎹愮尞闄勪欢Controller
- *
+ *
* @author ruoyi
* @date 2022-04-08
*/
+@Slf4j
@Api("鎹愮尞闄勪欢")
@RestController
@RequestMapping("/project/documentfiles")
-public class ServiceDocumentfilesController extends BaseController
-{
+public class ServiceDocumentfilesController extends BaseController {
@Autowired
private IServiceDocumentfilesService serviceDocumentfilesService;
@@ -43,8 +45,8 @@
*/
@ApiOperation("鏌ヨ鎹愮尞闄勪欢鍒楄〃")
@GetMapping("/list")
- public TableDataInfo list(ServiceDocumentfiles serviceDocumentfiles)
- {
+ public TableDataInfo list(ServiceDocumentfiles serviceDocumentfiles) {
+ log.info("鏌ヨ鎹愮尞闄勪欢鍒楄〃锛歿}", serviceDocumentfiles);
startPage();
//List<ServiceDocumentfiles> list = serviceDocumentfilesService.queryList(serviceDocumentfiles);
List<ServiceDocumentfiles> list = serviceDocumentfilesService.selectList(serviceDocumentfiles);
@@ -57,8 +59,8 @@
@ApiOperation("瀵煎嚭鎹愮尞闄勪欢鍒楄〃")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDocumentfiles serviceDocumentfiles)
- {
+ public AjaxResult export(ServiceDocumentfiles serviceDocumentfiles) {
+ log.info("瀵煎嚭鎹愮尞闄勪欢鍒楄〃锛歿}", serviceDocumentfiles);
List<ServiceDocumentfiles> list = serviceDocumentfilesService.queryList(serviceDocumentfiles);
ExcelUtil<ServiceDocumentfiles> util = new ExcelUtil<ServiceDocumentfiles>(ServiceDocumentfiles.class);
return util.exportExcel(list, "鎹愮尞闄勪欢鏁版嵁");
@@ -69,8 +71,8 @@
*/
@ApiOperation("鑾峰彇鎹愮尞闄勪欢璇︾粏淇℃伅")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鎹愮尞闄勪欢璇︾粏淇℃伅锛歿}", id);
return AjaxResult.success(serviceDocumentfilesService.getById(id));
}
@@ -81,8 +83,8 @@
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.INSERT)
@PostMapping
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDocumentfiles serviceDocumentfiles)
- {
+ public AjaxResult add(@RequestBody ServiceDocumentfiles serviceDocumentfiles) {
+ log.info("鏂板鎹愮尞闄勪欢锛歿}", serviceDocumentfiles);
return toAjax(serviceDocumentfilesService.save(serviceDocumentfiles));
}
@@ -92,9 +94,9 @@
@ApiOperation("淇敼鎹愮尞闄勪欢")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.UPDATE)
@PostMapping("/edit")
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDocumentfiles serviceDocumentfiles)
- {
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDocumentfiles serviceDocumentfiles) {
+ log.info("淇敼鎹愮尞闄勪欢锛歿}", serviceDocumentfiles);
return toAjax(serviceDocumentfilesService.updateById(serviceDocumentfiles));
}
@@ -104,8 +106,8 @@
@ApiOperation("鍒犻櫎鎹愮尞闄勪欢")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鎹愮尞闄勪欢锛歿}", ids);
return toAjax(serviceDocumentfilesService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
index 3e3ea5d..8657d9f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
@@ -7,6 +7,7 @@
import com.ruoyi.project.domain.vo.DonateAnnexVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -34,6 +35,7 @@
* @author ruoyi
* @date 2021-11-11
*/
+@Slf4j
@Api("闄勪欢绠＄悊")
@RestController
@RequestMapping("/project/donateannex")
@@ -48,6 +50,7 @@
//@PreAuthorize("@ss.hasPermi('project:donateannex:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonateannex serviceDonateannex) {
+ log.info("闄勪欢绠＄悊鍒楄〃锛歿}", serviceDonateannex);
startPage();
List<ServiceDonateannex> list = serviceDonateannexService.queryList(serviceDonateannex);
return getDataTable(list);
@@ -55,6 +58,7 @@
@GetMapping("/listnew")
public TableDataInfo listnew(DonateAnnexVO donateAnnexVO) {
+ log.info("listnew鐨勫叆鍙傦細{}", donateAnnexVO);
startPage();
List<DonateAnnexVO> list = serviceDonateannexService.selectVOList(donateAnnexVO);
return getDataTable(list);
@@ -69,6 +73,7 @@
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonateannex serviceDonateannex) {
+ log.info("瀵煎嚭鎹愮尞闄勪欢鍒楄〃锛歿}", serviceDonateannex);
List<ServiceDonateannex> list = serviceDonateannexService.queryList(serviceDonateannex);
ExcelUtil<ServiceDonateannex> util = new ExcelUtil<ServiceDonateannex>(ServiceDonateannex.class);
return util.exportExcel(list, "鎹愮尞闄勪欢鏁版嵁");
@@ -81,6 +86,7 @@
//@PreAuthorize("@ss.hasPermi('project:donateannex:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("閫氳繃id鑾峰緱鎹愮尞闄勪欢淇℃伅锛歿}", id);
return AjaxResult.success(serviceDonateannexService.getById(id));
}
@@ -93,6 +99,7 @@
@PostMapping("/add")
@RepeatSubmit
public AjaxResult add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
+ log.info("鏂板鎹愮尞闄勪欢淇℃伅锛歿}", serviceDonateannexs.size());
return toAjax(serviceDonateannexService.saveData(serviceDonateannexs));
}
@@ -105,6 +112,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonateannex serviceDonateannex) {
+ log.info("淇敼鎹愮尞闄勪欢淇℃伅锛歿}", serviceDonateannex);
return toAjax(serviceDonateannexService.updateById(serviceDonateannex));
}
@@ -118,6 +126,7 @@
@PostMapping("/editannexfiles")
@RepeatSubmit
public AjaxResult editannexfiles(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
+ log.info("淇敼娼滃湪鎹愮尞銆佷鸡鐞嗗鏌ャ�佸畬鎴愮櫥璁般�佸尰瀛﹁瘎浼伴檮浠朵俊鎭細{}", serviceDonateannexs.size());
return toAjax(serviceDonateannexService.updateOrSave(serviceDonateannexs));
}
@@ -129,6 +138,7 @@
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鎹愮尞鏂囦欢淇℃伅锛歿}", ids);
return toAjax(serviceDonateannexService.removeByIds(Arrays.asList(ids)));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java
index f00661e..bc5f1e9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -31,6 +32,7 @@
* @author ruoyi
* @date 2021-11-10
*/
+@Slf4j
@Api("鎹愮尞瑕佹眰闄勪欢绠＄悊")
@RestController
@RequestMapping("/project/donateannexrequirement")
@@ -45,6 +47,7 @@
//@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonateannexrequirement serviceDonateannexrequirement) {
+ log.info("鎹愮尞瑕佹眰闄勪欢绠＄悊鍒楄〃锛歿}", serviceDonateannexrequirement);
startPage();
List<ServiceDonateannexrequirement> list = serviceDonateannexrequirementService.queryList(serviceDonateannexrequirement);
return getDataTable(list);
@@ -58,6 +61,7 @@
@Log(title = "鎹愮尞闄勪欢瑕佹眰", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonateannexrequirement serviceDonateannexrequirement) {
+ log.info("瀵煎嚭鎹愮尞瑕佹眰闄勪欢绠＄悊鍒楄〃锛歿}", serviceDonateannexrequirement);
List<ServiceDonateannexrequirement> list = serviceDonateannexrequirementService.queryList(serviceDonateannexrequirement);
ExcelUtil<ServiceDonateannexrequirement> util = new ExcelUtil<ServiceDonateannexrequirement>(ServiceDonateannexrequirement.class);
return util.exportExcel(list, "鎹愮尞闄勪欢瑕佹眰鏁版嵁");
@@ -70,6 +74,7 @@
//@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("閫氳繃id鑾峰彇鎹愮尞瑕佹眰闄勪欢锛歿}", id);
return AjaxResult.success(serviceDonateannexrequirementService.getById(id));
}
@@ -82,6 +87,7 @@
@PostMapping
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement) {
+ log.info("鏂板鎹愮尞瑕佹眰闄勪欢淇℃伅锛歿}", serviceDonateannexrequirement);
return toAjax(serviceDonateannexrequirementService.save(serviceDonateannexrequirement));
}
@@ -94,6 +100,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement) {
+ log.info("淇敼鎹愮尞瑕佹眰闄勪欢淇℃伅锛歿}", serviceDonateannexrequirement);
return toAjax(serviceDonateannexrequirementService.updateById(serviceDonateannexrequirement));
}
@@ -105,6 +112,7 @@
@Log(title = "鎹愮尞闄勪欢瑕佹眰", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鎹愮尞瑕佹眰闄勪欢淇℃伅锛歿}", ids);
return toAjax(serviceDonateannexrequirementService.removeByIds(Arrays.asList(ids)));
}
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
index b7880b6..3ec5767 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -23,6 +23,7 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +40,7 @@
* @author ruoyi
* @date 2021-11-10
*/
+@Slf4j
@Api("娼滃湪鎹愮尞淇℃伅绠＄悊")
@RestController
@RequestMapping("/project/donatebaseinfo")
@@ -70,6 +72,7 @@
//@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
//List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
@@ -79,6 +82,7 @@
@ApiOperation("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃")
@GetMapping("/listForSearch")
public TableDataInfo listForSearch(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("灏忕▼搴忕娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
startPage();
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.listForSearch(serviceDonatebaseinfo);
return getDataTable(list);
@@ -93,6 +97,7 @@
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("瀵煎嚭娼滃湪鎹愮尞淇℃伅鍒楄〃锛歿}", serviceDonatebaseinfo);
List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
ExcelUtil<ServiceDonatebaseinfo> util = new ExcelUtil<ServiceDonatebaseinfo>(ServiceDonatebaseinfo.class);
return util.exportExcel(list, "鎹愮尞鍩虹鏁版嵁");
@@ -105,6 +110,7 @@
//@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("閫氳繃id鑾峰緱娼滃湪鎹愮尞淇℃伅锛歿}", id);
return AjaxResult.success(serviceDonatebaseinfoService.getById(id));
}
@@ -117,6 +123,7 @@
@PostMapping
@RepeatSubmit
public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("鏂板娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
SysUser user = SecurityUtils.getLoginUser().getUser();
String bh = "";
@@ -158,6 +165,7 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("淇敼娼滃湪鎹愮尞淇℃伅锛歿}", serviceDonatebaseinfo);
return toAjax(serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo));
}
@@ -169,12 +177,14 @@
@Log(title = "鎹愮尞鍩虹", businessType = BusinessType.DELETE)
@GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎娼滃湪鎹愮尞淇℃伅锛歿}", ids);
return toAjax(serviceDonatebaseinfoService.removeByIds(Arrays.asList(ids)));
}
@ApiOperation("鑾峰彇鎹愮尞缂栧彿")
@GetMapping("/donatenumber")
public AjaxResult getDonateNumber(ServiceDonatebaseinfo serviceDonatebaseinfo) {
+ log.info("鑾峰彇鎹愮尞缂栧彿锛歿}", serviceDonatebaseinfo);
return AjaxResult.success(serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo));
}
@@ -182,11 +192,13 @@
@ApiOperation("鑾峰彇鎹愮尞鎶ュ憡浜�")
@GetMapping("/reportName/{usertype}")
public AjaxResult getReportName(@PathVariable("usertype") String usertype) {
+ log.info("鑾峰彇鎹愮尞鎶ュ憡浜猴細{}", usertype);
return AjaxResult.success(serviceExternalpersonService.getReportName(usertype));
}
@GetMapping(value = "/updateS1S2S3S4/{id}")
public AjaxResult updateS1S2S3S4(@PathVariable Long id) {
+ log.info("updateS1S2S3S4鐨勫叆鍙傦細{}", id);
return AjaxResult.success(serviceDonatebaseinfoService.updateS1S2S3S4(id));
}
@@ -196,6 +208,7 @@
@ApiOperation("閫氳繃id涓嬭浇浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃")
@GetMapping(value = "/download/{id}")
public Map downloadInfo(@PathVariable("id") Long id) throws IOException {
+ log.info("閫氳繃id涓嬭浇浜轰綋鍣ㄥ畼娼滃湪鎹愮尞鑰呯櫥璁拌〃锛歿}", id);
Map dataMap = new HashMap();
getData(dataMap, id);
String filePath = getClass().getResource("/template/").getPath();
@@ -925,6 +938,7 @@
@ApiOperation("鑾峰彇鐘舵�佽幏鍙栬鏁�")
@GetMapping("/countByRecordState")
public AjaxResult countByRecordState(TimeVO timeVO) {
+ log.info("鑾峰彇鐘舵�佽幏鍙栬鏁帮細{}", timeVO);
return AjaxResult.success(serviceDonatebaseinfoService.countByRecordState(timeVO));
}
@@ -934,6 +948,7 @@
@ApiOperation("鑾峰彇鎹愮尞宸ヤ綔娴�")
@GetMapping(value = "/getWorkFlow/{id}")
public AjaxResult getWorkFlow(@PathVariable("id") Long id) {
+ log.info("鑾峰彇鎹愮尞宸ヤ綔娴侊細{}", id);
return AjaxResult.success(serviceDonatebaseinfoService.getWorkFlow(id));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
index 3895d03..05667b9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -19,6 +19,7 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -33,6 +34,7 @@
* @author ruoyi
* @date 2021-11-19
*/
+@Slf4j
@Api("鎹愮尞瀹屾垚鐧昏绠＄悊")
@RestController
@RequestMapping("/project/donatecompletioninfo")
@@ -57,6 +59,7 @@
//@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
@GetMapping("/list")
public TableDataInfo list(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+ log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛歿}", serviceDonatecompletioninfo);
startPage();
List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
return getDataTable(list);
@@ -66,6 +69,7 @@
@GetMapping("/listnew")
@Log(title = "鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛�", businessType = BusinessType.OTHER)
public TableDataInfo listnew(DonationCompletionVO donationCompletionVO) {
+ log.info("鏌ヨ鎹愮尞瀹屾垚鍒楄〃锛堟柊锛夛細{}", donationCompletionVO);
startPage();
List<DonationCompletionVO> list = serviceDonatecompletioninfoService.selectVOList(donationCompletionVO);
return getDataTable(list);
@@ -80,6 +84,7 @@
@Log(title = "鎹愮尞瀹屾垚", businessType = BusinessType.EXPORT)
@GetMapping("/export")
public AjaxResult export(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+ log.info("瀵煎嚭鎹愮尞瀹屾垚鍒楄〃锛堟柊锛夛細{}", serviceDonatecompletioninfo);
List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
ExcelUtil<ServiceDonatecompletioninfo> util = new ExcelUtil<ServiceDonatecompletioninfo>(ServiceDonatecompletioninfo.class);
return util.exportExcel(list, "鎹愮尞瀹屾垚鏁版嵁");
@@ -92,6 +97,7 @@
//@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("閫氳繃id鑾峰彇鏌愪竴鏉℃崘鐚畬鎴愪俊鎭細{}", id);
return AjaxResult.success(serviceDonatecompletioninfoService.getById(id));
}
@@ -104,6 +110,7 @@
@PostMapping
@RepeatSubmit(interval = 5000)
public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
+ log.info("鏂板鎹愮尞瀹屾垚锛歿}", serviceDonatecompletioninfo);
serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
index 599750a..99a3912 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -1,37 +1,28 @@
package com.ruoyi.web.controller.project;
-import java.util.Arrays;
-import java.util.List;
-
-import com.ruoyi.common.utils.bean.DtoConversionUtils;
-import com.ruoyi.project.domain.*;
-import com.ruoyi.project.domain.vo.DonateOrganVO;
-import com.ruoyi.project.domain.vo.NumberOfOrgans;
-import com.ruoyi.project.domain.vo.TimeVO;
-import com.ruoyi.project.mapper.BaseOrganizationMapper;
-import com.ruoyi.project.service.IServiceDonatebaseinfoService;
-import com.ruoyi.project.service.IServiceOrganallocationService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-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;
-import org.springframework.web.bind.annotation.RestController;
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.enums.BusinessType;
-import com.ruoyi.project.service.IServiceDonateorganService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.bean.DtoConversionUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.ServiceDonateorganVO;
+import com.ruoyi.project.domain.ServiceOrganallocation;
+import com.ruoyi.project.domain.vo.DonateOrganVO;
+import com.ruoyi.project.domain.vo.TimeVO;
+import com.ruoyi.project.service.IServiceDonateorganService;
+import com.ruoyi.project.service.IServiceOrganallocationService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鎹愮尞鍣ㄥ畼绠＄悊Controller
@@ -61,12 +52,12 @@
List<ServiceDonateorgan> list = serviceDonateorganService.queryList(serviceDonateorgan);
if (!CollectionUtils.isEmpty(list)) {
List<ServiceDonateorganVO> serviceDonateorganVOS = DtoConversionUtils.sourceToTarget(list, ServiceDonateorganVO.class);
- for (ServiceDonateorganVO serviceDonateorganVO : serviceDonateorganVOS) {
- ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
- serviceOrganallocation.setOrganid(serviceDonateorganVO.getId());
- List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
- serviceDonateorganVO.setServiceOrganallocations(serviceOrganallocations);
- }
+// for (ServiceDonateorganVO serviceDonateorganVO : serviceDonateorganVOS) {
+// ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
+// serviceOrganallocation.setOrganid(serviceDonateorganVO.getId());
+// List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
+// serviceDonateorganVO.setServiceOrganallocations(serviceOrganallocations);
+// }
return getDataTable(serviceDonateorganVOS);
}
@@ -142,6 +133,19 @@
return saveDataTable(serviceDonateorgans1);
}
+
+ /**
+ * 淇敼鍣ㄥ畼鍒嗛厤
+ */
+ @ApiOperation("淇敼鍣ㄥ畼鍒嗛厤淇℃伅")
+ //@PreAuthorize("@ss.hasPermi('project:organallocation:edit')")
+ @Log(title = "鍣ㄥ畼鍒嗛厤", businessType = BusinessType.UPDATE)
+ @PostMapping("/editarraydata")
+ @RepeatSubmit
+ public AjaxResult editArrayData(@RequestBody List<ServiceDonateorgan> serviceDonateorgans) {
+ return AjaxResult.success(serviceDonateorganService.editArrayData(serviceDonateorgans));
+ }
+
/**
* 淇敼鎹愮尞鍣ㄥ畼绠＄悊
*/
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..c28d50e 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
@@ -7,29 +7,21 @@
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
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 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;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
index c457492..39789a9 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -705,6 +705,7 @@
return toAjax(false);
}
+
/**
* 鍒犻櫎璐圭敤鐢宠涓�
*/
@@ -2126,7 +2127,7 @@
@RepeatSubmit
public AjaxResult totaltax(@RequestBody TotalTaxVO totalTaxVO) {
Boolean totaltax = serviceFundService.totaltax(totalTaxVO);
- if(totaltax){
+ if (totaltax) {
return AjaxResult.success("鍚堣涓◣鎴愬姛,璇峰幓E:\\OPO\\WEB\\Upload\\download 涓煡鎵炬枃浠�");
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
index 1091173..ed7065f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -9,6 +9,7 @@
import com.ruoyi.common.enums.Education;
import com.ruoyi.common.enums.NationalityEnum;
import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
import com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper;
@@ -130,13 +131,16 @@
@PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {
- ServiceRelativesconfirmation serviceRelativesconfirmation1 = new ServiceRelativesconfirmation();
- serviceRelativesconfirmation1.setInfoid(serviceRelativesconfirmation.getInfoid());
- List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation1);
- if (CollectionUtils.isEmpty(list)) {
- return error("鎹愮尞浜插睘纭鏁版嵁涓嶅瓨鍦�,璇锋鏌ュ悗鍐嶆淇敼");
+ if (serviceRelativesconfirmation.getInfoid() == null || serviceRelativesconfirmation.getId() == null) {
+ throw new BaseException("璇疯仈绯诲伐绋嬪笀妫�鏌D鏄惁涓虹┖");
}
- serviceRelativesconfirmation.setId(list.get(0).getId());
+// ServiceRelativesconfirmation serviceRelativesconfirmation1 = new ServiceRelativesconfirmation();
+// serviceRelativesconfirmation1.setInfoid(serviceRelativesconfirmation.getInfoid());
+// List<ServiceRelativesconfirmation> list = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation1);
+// if (CollectionUtils.isEmpty(list)) {
+// return error("鎹愮尞浜插睘纭鏁版嵁涓嶅瓨鍦�,璇锋鏌ュ悗鍐嶆淇敼");
+// }
+// serviceRelativesconfirmation.setId(list.get(0).getId());
return toAjax(serviceRelativesconfirmationService.updateById(serviceRelativesconfirmation));
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/ChineseUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ChineseUtils.java
new file mode 100644
index 0000000..e978d6c
--- /dev/null
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/ChineseUtils.java
@@ -0,0 +1,15 @@
+package com.ruoyi.common.utils;
+
+public class ChineseUtils {
+
+ /**
+ * 鏍￠獙鏄惁鏄腑鏂�
+ *
+ * @param str
+ * @return
+ */
+ public static boolean isChinese(String str) {
+ String regex = "[\\u4e00-\\u9fa5]+";
+ return str.matches(regex);
+ }
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseAnnextype.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseAnnextype.java
new file mode 100644
index 0000000..b30a970
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/BaseAnnextype.java
@@ -0,0 +1,55 @@
+package com.ruoyi.project.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 鎹愮尞闄勪欢瀵硅薄 base_annextype
+ *
+ * @author ruoyi
+ * @date 2023-11-10
+ */
+@Data
+@ApiModel("鎹愮尞闄勪欢")
+public class BaseAnnextype extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** $column.columnComment */
+ @ApiModelProperty("$column.columnComment")
+ //鏁版嵁搴撹嚜澧炴敼鎴怈TableId(type = IdType.AUTO)
+ @TableId(type = IdType.AUTO)
+ private Long id;
+
+ /** 鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory锛圖BD銆丏CD銆丏BCD锛� */
+ @ApiModelProperty("鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory锛圖BD銆丏CD銆丏BCD锛�")
+ @Excel(name = "鎹愮尞绫诲埆 鏍规嵁瀛楀吀sys_DonationCategory", readConverterExp = "D=BD銆丏CD銆丏BCD")
+ private String donationcategory;
+
+ /** 闄勪欢绫诲瀷锛�0 娼滃湪鎹愮尞锛�1 鍖诲璇勪及锛�2 鎹愮尞纭锛�3浼︾悊瀹℃煡锛�6 瀹屾垚鐧昏锛夐『搴忔槸鍜岄〉闈笂鐨勯『搴忎繚鎸佷竴鑷达紝娌℃湁搴忓彿鐨勮鏄庝笉闇�瑕侀檮浠� */
+ @ApiModelProperty("闄勪欢绫诲瀷锛�0 娼滃湪鎹愮尞锛�1 鍖诲璇勪及锛�2 鎹愮尞纭锛�3浼︾悊瀹℃煡锛�6 瀹屾垚鐧昏锛夐『搴忔槸鍜岄〉闈笂鐨勯『搴忎繚鎸佷竴鑷达紝娌℃湁搴忓彿鐨勮鏄庝笉闇�瑕侀檮浠�")
+ @Excel(name = "闄勪欢绫诲瀷", readConverterExp = "0=,娼�=鍦ㄦ崘鐚紝1,鍖�=瀛﹁瘎浼帮紝2,鎹�=鐚‘璁わ紝3浼︾悊瀹℃煡锛�6,瀹�=鎴愮櫥璁�")
+ private String annextype;
+
+ /** 闄勪欢鍚嶇О */
+ @ApiModelProperty("闄勪欢鍚嶇О")
+ @Excel(name = "闄勪欢鍚嶇О")
+ private String annexname;
+
+ /** 蹇呴』闄勪欢鐨勬爣璇� */
+ @ApiModelProperty("蹇呴』闄勪欢鐨勬爣璇�")
+ @Excel(name = "蹇呴』闄勪欢鐨勬爣璇�")
+ private Long need;
+
+ /** 搴忓彿 */
+ @ApiModelProperty("搴忓彿")
+ @Excel(name = "搴忓彿")
+ private Long seqno;
+
+}
+
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateannex.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateannex.java
index 858d6f2..896d92b 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateannex.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateannex.java
@@ -33,6 +33,10 @@
@ApiModelProperty("鍏宠仈service_donatebaseinfo琛ㄧ殑ID")
private Long infoid;
+
+ @ApiModelProperty("鍏宠仈base_annextype琛ㄧ殑ID")
+ private Long annextypeid;
+
/**
* 鎹愮尞鑰呯紪鍙�
*/
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
index 41b15b6..83d4bf5 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonateorgan.java
@@ -301,5 +301,12 @@
private Integer transplantstate;
+
+ /** 绯荤粺缂栧彿 */
+ @ApiModelProperty("绯荤粺缂栧彿")
+ @Excel(name = "绯荤粺缂栧彿")
+ private String caseno;
+
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseAnnextypeMapper.java b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseAnnextypeMapper.java
new file mode 100644
index 0000000..3a52879
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/mapper/BaseAnnextypeMapper.java
@@ -0,0 +1,26 @@
+package com.ruoyi.project.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.project.domain.BaseAnnextype;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞闄勪欢Mapper鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-11-10
+ */
+@Mapper
+public interface BaseAnnextypeMapper extends BaseMapper<BaseAnnextype>
+{
+ /**
+ * 鏌ヨ鎹愮尞闄勪欢鍒楄〃
+ *
+ * @param baseAnnextype 鎹愮尞闄勪欢
+ * @return 鎹愮尞闄勪欢闆嗗悎
+ */
+ public List<BaseAnnextype> selectBaseAnnextypeList(BaseAnnextype baseAnnextype);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseAnnextypeService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseAnnextypeService.java
new file mode 100644
index 0000000..0af3331
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IBaseAnnextypeService.java
@@ -0,0 +1,24 @@
+package com.ruoyi.project.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.project.domain.BaseAnnextype;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞闄勪欢Service鎺ュ彛
+ *
+ * @author ruoyi
+ * @date 2023-11-10
+ */
+public interface IBaseAnnextypeService extends IService<BaseAnnextype>
+{
+
+ /**
+ * 鏌ヨ鎹愮尞闄勪欢鍒楄〃
+ *
+ * @param baseAnnextype 鎹愮尞闄勪欢
+ * @return 鎹愮尞闄勪欢闆嗗悎
+ */
+ public List<BaseAnnextype> queryList(BaseAnnextype baseAnnextype);
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
index 64e550f..d6ea92e 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.project.domain.ServiceDonateorgan;
+import com.ruoyi.project.domain.ServiceOrganallocation;
import com.ruoyi.project.domain.vo.*;
import org.springframework.web.bind.annotation.PathVariable;
@@ -73,5 +74,7 @@
List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans);
+ Boolean editArrayData(List<ServiceDonateorgan> serviceDonateorgans);
+
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseAnnextypeServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseAnnextypeServiceImpl.java
new file mode 100644
index 0000000..d3eb0ec
--- /dev/null
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/BaseAnnextypeServiceImpl.java
@@ -0,0 +1,52 @@
+package com.ruoyi.project.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.project.domain.BaseAnnextype;
+import com.ruoyi.project.mapper.BaseAnnextypeMapper;
+import com.ruoyi.project.service.IBaseAnnextypeService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鎹愮尞闄勪欢Service涓氬姟灞傚鐞�
+ *
+ * @author ruoyi
+ * @date 2023-11-10
+ */
+@Service
+public class BaseAnnextypeServiceImpl extends ServiceImpl<BaseAnnextypeMapper, BaseAnnextype> implements IBaseAnnextypeService
+{
+
+
+ /**
+ * 鏌ヨ鎹愮尞闄勪欢鍒楄〃
+ *
+ * @param baseAnnextype 鎹愮尞闄勪欢
+ * @return 鎹愮尞闄勪欢
+ */
+ @Override
+ public List<BaseAnnextype> queryList(BaseAnnextype baseAnnextype) {
+ LambdaQueryWrapper<BaseAnnextype> wrappers = Wrappers.lambdaQuery();
+ if (StringUtils.isNotBlank(baseAnnextype.getDonationcategory())){
+ wrappers.eq(BaseAnnextype::getDonationcategory ,baseAnnextype.getDonationcategory());
+ }
+ if (StringUtils.isNotBlank(baseAnnextype.getAnnextype())){
+ wrappers.eq(BaseAnnextype::getAnnextype ,baseAnnextype.getAnnextype());
+ }
+ if (StringUtils.isNotBlank(baseAnnextype.getAnnexname())){
+ wrappers.like(BaseAnnextype::getAnnexname ,baseAnnextype.getAnnexname());
+ }
+ if (baseAnnextype.getNeed() != null){
+ wrappers.eq(BaseAnnextype::getNeed ,baseAnnextype.getNeed());
+ }
+ if (baseAnnextype.getSeqno() != null){
+ wrappers.eq(BaseAnnextype::getSeqno ,baseAnnextype.getSeqno());
+ }
+ return this.list(wrappers);
+ }
+
+}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
index dffb8ea..c475520 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.domain.vo.DonateAnnexVO;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -29,6 +30,7 @@
* @author ruoyi
* @date 2021-11-11
*/
+@Slf4j
@Service
public class ServiceDonateannexServiceImpl extends ServiceImpl<ServiceDonateannexMapper, ServiceDonateannex> implements IServiceDonateannexService {
@@ -99,6 +101,7 @@
@Transactional(rollbackFor = Exception.class)
public Boolean saveData(List<ServiceDonateannex> serviceDonateannexs) {
for (ServiceDonateannex serviceDonateannex : serviceDonateannexs) {
+ log.info("serviceDonateannex鐨勪俊鎭細{}", serviceDonateannex);
if (serviceDonateannex.getInfoid() == null || serviceDonateannex.getAnnexfilestype() == null) {
throw new BaseException("涓昏〃id鎴栭檮浠剁被鍨婭D涓虹┖锛岃妫�鏌ュ悗鍐嶄繚瀛�");
}
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
index ccc033f..d53a421 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoServiceImpl.java
@@ -61,6 +61,9 @@
private IServiceOrganallocationService serviceOrganallocationService;
@Autowired
+ private IServiceDonateorganService serviceDonateorganService;
+
+ @Autowired
private IServiceDonationwitnessService serviceDonationwitnessService;
@Autowired
@@ -272,12 +275,12 @@
return null;
}
//灏佽serviceDonateorgan娼滃湪鎹愮尞鏁版嵁
- Map<String, String> donateorgan = new HashMap<>();
- donateorgan.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
- donateorgan.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
- donateorgan.put("process", "");
+ Map<String, String> donatebaseinfo = new HashMap<>();
+ donatebaseinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
+ donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
+ donatebaseinfo.put("process", "");
//灏佽serviceDonateorgan娼滃湪鎹愮尞杩斿洖鏁版嵁
- map.put("donateorgan", donateorgan);
+ map.put("donatebaseinfo", donatebaseinfo);
//灏佽鍖诲璇勪及
Map<String, String> medicalevaluation = new HashMap<>();
@@ -326,19 +329,19 @@
map.put("ethicalreviewopinions", ethicalreviewopinions);
//灏佽鍣ㄥ畼鍒嗛厤
- Map<String, String> organallocationService = new HashMap<>();
+ Map<String, String> donateorgansService = new HashMap<>();
if (serviceDonatebaseinfo.getWorkflow() >= 4) {
- ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
- serviceOrganallocation.setOrganid(id);
- List<ServiceOrganallocation> serviceOrganallocations = serviceOrganallocationService.selectServiceOrganallocationList(serviceOrganallocation);
- if (!CollectionUtils.isEmpty(serviceOrganallocations)) {
- organallocationService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceOrganallocations.get(0).getCreateTime()));
- organallocationService.put("updatetime", serviceOrganallocations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceOrganallocations.get(0).getUpdateTime()) : "");
- organallocationService.put("process", "");
+ ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
+ serviceDonateorgan.setInfoid(id);
+ List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
+ if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
+ donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
+ donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");
+ donateorgansService.put("process", "");
}
}
//灏佽鍣ㄥ畼鍒嗛厤杩斿洖鏁版嵁
- map.put("organallocationService", organallocationService);
+ map.put("donateorgansService", donateorgansService);
//灏佽鑾峰彇瑙佽瘉
Map<String, String> donationwitness = new HashMap<>();
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
index ec0acea..8e32765 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateorganServiceImpl.java
@@ -448,7 +448,8 @@
donateNumber.setNumberOfDonate(serviceDonatebaseinfoMapper.countNumber(timeVO));
donateNumber.setNumberOfMedicalEvaluation(serviceMedicalevaluationMapper.countNumber(timeVO));
donateNumber.setNumberOfRelativeConfirmation(serviceRelativesconfirmationMapper.countNumber(timeVO));
- donateNumber.setNumberOfDonatePeople(serviceOrganallocationMapper.countNumber(timeVO));
+// donateNumber.setNumberOfDonatePeople(serviceOrganallocationMapper.countNumber(timeVO));
+ donateNumber.setNumberOfDonatePeople(serviceDonateorganMapper.countNumber(timeVO));
donateNumber.setNumberOfOrgans(serviceDonateorganMapper.countNumber(timeVO));
donateNumber.setNumberOfWitness(serviceDonationwitnessMapper.countNumber(timeVO));
donateNumber.setNumberOfEthicalReview(serviceEthicalreviewopinionsMapper.countNumber(timeVO));
@@ -748,6 +749,10 @@
@Transactional(rollbackFor = Exception.class)
public List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans) {
for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
+ if (serviceDonateorgan.getInfoid() == null) {
+ throw new BaseException("鏈叧鑱旀崘鐚熀纭�淇℃伅锛宨nfoid涓虹┖浜�" + serviceDonateorgan);
+ }
+
String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
if (StringUtils.isEmpty(serviceDonateorgan.getDonorno()) || StringUtils.isEmpty(serviceDonateorgan.getOrganno())) {
throw new BaseException("鏂板鏃剁敓鎴愮殑缂栧彿涓虹┖,鍒涘缓澶辫触(璇锋鏌ユ崘鐚�呯紪鍙峰拰鍣ㄥ畼绫诲埆)! 锛�" + serviceDonateorgan.toString());
@@ -764,20 +769,33 @@
boolean save = this.save(serviceDonateorgan);
- //淇濆瓨service_organallocation
- ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
- serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
- serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
- serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
- serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
- serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
- serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
- log.info("serviceOrganallocation鐨勬暟鎹负: {}", serviceOrganallocation);
- serviceOrganallocationService.save(serviceOrganallocation);
+// //淇濆瓨service_organallocation
+// ServiceOrganallocation serviceOrganallocation = new ServiceOrganallocation();
+// serviceOrganallocation.setAgeunit(serviceDonateorgan.getAgeunit());
+// serviceOrganallocation.setApplicanttime(serviceDonateorgan.getApplicanttime());
+// serviceOrganallocation.setIdcardno(serviceDonateorgan.getIdcardno());
+// serviceOrganallocation.setIdcardtype(Long.valueOf(serviceDonateorgan.getIdcardtype()));
+// serviceOrganallocation.setOrganid(serviceDonateorgan.getId());
+// serviceOrganallocation.setOrgannumber(serviceDonateorgan.getOrgannumber());
+// log.info("serviceOrganallocation鐨勬暟鎹负: {}", serviceOrganallocation);
+// serviceOrganallocationService.save(serviceOrganallocation);
}
return serviceDonateorgans;
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Boolean editArrayData(List<ServiceDonateorgan> serviceDonateorgans) {
+ for (ServiceDonateorgan serviceDonateorgan : serviceDonateorgans) {
+ if (serviceDonateorgan.getId() == null) {
+ throw new BaseException("id涓虹┖浜� 锛�" + serviceDonateorgan);
+ }
+ this.updateById(serviceDonateorgan);
+ }
+ //灏嗗甫ID鐨勬暟鎹繑鍥�
+ return true;
+ }
+
// @Override
// public List<DonateByRegionVO> OrgansOfHospitalByMonth() {
diff --git a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
index aaf94e9..2e2f0b6 100644
--- a/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
+++ b/ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFundServiceImpl.java
@@ -1,13 +1,10 @@
package com.ruoyi.project.service.impl;
import java.io.File;
-import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.LockSupport;
import java.util.stream.Collectors;
import com.alibaba.fastjson.JSON;
@@ -15,7 +12,7 @@
import com.alibaba.fastjson.JSONObject;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.exception.base.BaseException;
-import com.ruoyi.common.tax.TaxtUtils;
+import com.ruoyi.common.utils.ChineseUtils;
import com.ruoyi.common.utils.HttpClientKit;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -28,7 +25,6 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -692,11 +688,19 @@
List<ServiceFunddetailVO> serviceFunddetails = serviceFundVO.getServiceFunddetails();
if (CollectionUtils.isEmpty(serviceFunddetails)) {
- System.out.println("serviceFunddetails涓虹┖鍠�");
- return null;
+ throw new BaseException("serviceFunddetails涓虹┖鍠�");
}
// 淇濆瓨璇︽儏鏁版嵁
for (ServiceFunddetailVO serviceFunddetailVO : serviceFunddetails) {
+ if (StringUtils.isEmpty(serviceFunddetailVO.getIdcardno())) {
+ throw new BaseException("璇锋鏌ヨ韩浠借瘉鍙�,韬唤璇佸彿涓虹┖浜�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname());
+ }
+ if (StringUtils.isEmpty(serviceFunddetailVO.getTitle()) || ChineseUtils.isChinese(serviceFunddetailVO.getTitle())) {
+ throw new BaseException("璇锋鏌ヨ亴绉版槸鍚︿负绌猴紙鎴栦笉鏄腑鏂囷級,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname() + " 鑱岀О:" + serviceFunddetailVO.getTitle());
+ }
+ if (StringUtils.isEmpty(serviceFunddetailVO.getBankcardno())) {
+ throw new BaseException("璇锋鏌ラ摱琛屽崱鍙锋槸鍚︿负绌�,濮撳悕锛�" + serviceFunddetailVO.getBeneficiaryname());
+ }
serviceFunddetailVO.setFundid(id);
//灏囬檮浠惰浆鎴恓son
if (!CollectionUtils.isEmpty(serviceFunddetailVO.getAnnexfilesList())) {
diff --git a/ruoyi-project/src/main/resources/mapper/project/BaseAnnextypeMapper.xml b/ruoyi-project/src/main/resources/mapper/project/BaseAnnextypeMapper.xml
new file mode 100644
index 0000000..12c63d1
--- /dev/null
+++ b/ruoyi-project/src/main/resources/mapper/project/BaseAnnextypeMapper.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.project.mapper.BaseAnnextypeMapper">
+
+ <resultMap type="com.ruoyi.project.domain.BaseAnnextype" id="BaseAnnextypeResult">
+ <result property="id" column="ID" />
+ <result property="donationcategory" column="donationcategory" />
+ <result property="annextype" column="annextype" />
+ <result property="annexname" column="annexname" />
+ <result property="need" column="need" />
+ <result property="seqno" column="seqno" />
+ <result property="remark" column="remark" />
+ <result property="del_flag" column="del_flag" />
+ <result property="createBy" column="create_by" />
+ <result property="createTime" column="create_time" />
+ <result property="updateBy" column="update_by" />
+ <result property="updateTime" column="update_time" />
+ </resultMap>
+
+ <sql id="selectBaseAnnextypeVo">
+ select ID, donationcategory, annextype, annexname, need, seqno, remark, del_flag, create_by, create_time, update_by, update_time from base_annextype
+ </sql>
+
+ <select id="selectBaseAnnextypeList" parameterType="com.ruoyi.project.domain.BaseAnnextype" resultMap="BaseAnnextypeResult">
+ <include refid="selectBaseAnnextypeVo"/>
+ <where>
+ <if test="donationcategory != null and donationcategory != ''"> and donationcategory = #{donationcategory}</if>
+ <if test="annextype != null and annextype != ''"> and annextype = #{annextype}</if>
+ <if test="annexname != null and annexname != ''"> and annexname like concat('%', #{annexname}, '%')</if>
+ <if test="need != null "> and need = #{need}</if>
+ <if test="seqno != null "> and seqno = #{seqno}</if>
+ </where>
+ </select>
+
+</mapper>
\ No newline at end of file
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateannexMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateannexMapper.xml
index c82246a..698674e 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateannexMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateannexMapper.xml
@@ -17,10 +17,11 @@
<result property="annexno" column="AnnexNo" />
<result property="annexurl" column="AnnexUrl" />
<result property="annexfilestype" column="AnnexfilesType" />
+ <result property="annextypeid" column="annextypeid" />
</resultMap>
<sql id="selectServiceDonateannexVo">
- select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, AnnexName, AnnexNo, AnnexUrl,AnnexfilesType from service_donateannex
+ select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, AnnexName, AnnexNo, AnnexUrl,AnnexfilesType,annextypeid from service_donateannex
</sql>
<select id="selectServiceDonateannexList" parameterType="com.ruoyi.project.domain.ServiceDonateannex" resultMap="ServiceDonateannexResult">
diff --git a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
index cefad7b..1ac7204 100644
--- a/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
+++ b/ruoyi-project/src/main/resources/mapper/project/ServiceDonateorganMapper.xml
@@ -37,6 +37,7 @@
<result property="applicantusername" column="ApplicantUserName"/>
<result property="applicanttime" column="ApplicantTime"/>
<result property="checkuserid" column="CheckUserID"/>
+ <result property="caseno" column="CaseNo" />
<result property="checkusername" column="CheckUserName"/>
<result property="checktime" column="CheckTime"/>
<result property="checksuggestion" column="CheckSuggestion"/>
@@ -79,6 +80,7 @@
OrganState,
OrganNumber,
OrganGetTime,
+ CaseNo,
OrganGetDoct,
GainHospitalNo,
GainHospitalName,
--
Gitblit v1.9.3