liusheng
2024-02-05 22f2171b2f5a5cd594ea027860207bf3646f1f9d
代码提交
已修改45个文件
392 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java 26 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VServiceDonateorganRegisterController.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateannexService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java
@@ -89,7 +89,8 @@
        if (ObjectUtils.isEmpty(baseAnnextype) || StringUtils.isEmpty(baseAnnextype.getDonationcategory()) || StringUtils.isEmpty(baseAnnextype.getAnnextype())) {
            throw new BaseException("请检查捐献类别和附件类型,为空了");
        }
        return toAjax(baseAnnextypeService.save(baseAnnextype));
        boolean save = baseAnnextypeService.save(baseAnnextype);
        return AjaxResult.success(baseAnnextype);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java
@@ -80,11 +80,13 @@
     */
    @ApiOperation("新增专家费用")
    @Log(title = "专家费用", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseExpertfeetype baseExpertfeetype) {
        log.info("新增专家费用{}:", baseExpertfeetype);
        return toAjax(baseExpertfeetypeService.save(baseExpertfeetype));
        boolean save = baseExpertfeetypeService.save(baseExpertfeetype);
        log.info("返回的baseExpertfeetype的id:{}:", baseExpertfeetype.getId());
        return AjaxResult.success(baseExpertfeetype);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
@@ -28,8 +28,7 @@
@Api("收入费用科目")
@RestController
@RequestMapping("/project/financesubject")
public class BaseFinancesubjectController extends BaseController
{
public class BaseFinancesubjectController extends BaseController {
    @Autowired
    private IBaseFinancesubjectService baseFinancesubjectService;
@@ -39,8 +38,7 @@
    @ApiOperation("查询收入费用科目列表")
    //@PreAuthorize("@ss.hasPermi('project::list')")
    @GetMapping("/list")
    public TableDataInfo list(BaseFinancesubject baseFinancesubject)
    {
    public TableDataInfo list(BaseFinancesubject baseFinancesubject) {
        log.info("查询收入费用科目列表{}:" , baseFinancesubject);
        startPage();
        //List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);、
@@ -55,8 +53,7 @@
    //@PreAuthorize("@ss.hasPermi('project:financesubject:export')")
    @Log(title = "收入费用科目", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(BaseFinancesubject baseFinancesubject)
    {
    public AjaxResult export(BaseFinancesubject baseFinancesubject) {
        log.info("导出收入费用科目列表{}:" , baseFinancesubject);
        List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
        ExcelUtil<BaseFinancesubject> util = new ExcelUtil<BaseFinancesubject>(BaseFinancesubject.class);
@@ -69,8 +66,7 @@
    @ApiOperation("获取收入费用科目详细信息")
    //@PreAuthorize("@ss.hasPermi('project:financesubject:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        log.info("获取收入费用科目详细信息{}:" , id);
        return AjaxResult.success(baseFinancesubjectService.getById(id));
    }
@@ -81,12 +77,13 @@
    @ApiOperation("新增收入费用科目")
    //@PreAuthorize("@ss.hasPermi('project:financesubject:add')")
    @Log(title = "收入费用科目", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject)
    {
    public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject) {
        log.info("新增收入费用科目{}:" , baseFinancesubject);
        return toAjax(baseFinancesubjectService.save(baseFinancesubject));
        boolean save = baseFinancesubjectService.save(baseFinancesubject);
        log.info("新增收入费用科目baseFinancesubject的ID为:{}", baseFinancesubject.getId());
        return AjaxResult.success(baseFinancesubject);
    }
    /**
@@ -97,8 +94,7 @@
    @Log(title = "收入费用科目", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject)
    {
    public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject) {
        log.info("修改收入费用科目{}:" , baseFinancesubject);
        return toAjax(baseFinancesubjectService.updateById(baseFinancesubject));
    }
@@ -110,8 +106,7 @@
    //@PreAuthorize("@ss.hasPermi('project:financesubject:remove')")
    @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(baseFinancesubjectService.removeByIds(Arrays.asList(ids)));
    }
@@ -137,8 +132,7 @@
    @ApiOperation("根据费用大类获取项目类型")
    @Log(title = "根据费用大类获取项目类型", businessType = BusinessType.OTHER)
    @GetMapping("/getbyexpensetype/{ExpenseType}")
    public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType)
    {
    public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType) {
        log.info("根据费用大类获取项目类型{}:" , ExpenseType);
        /*BaseFinancesubject baseFinancesubject=new BaseFinancesubject();
        baseFinancesubject.setExpensetype(ExpenseType);
@@ -155,8 +149,7 @@
    @ApiOperation("根据费用大类获取项目明细")
    @Log(title = "根据费用大类获取项目明细", businessType = BusinessType.OTHER)
    @GetMapping("/getDetails/{ExpenseType}")
    public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType)
    {
    public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType) {
        log.info("根据费用大类获取项目明细{}:" , ExpenseType);
        return AjaxResult.success(baseFinancesubjectService.getDetails(ExpenseType));
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java
@@ -80,11 +80,13 @@
     */
    @ApiOperation("新增收入费用科目")
    @Log(title = "收入费用科目", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseItemexpense baseItemexpense) {
        log.info("新增收入费用科目{}:" , baseItemexpense);
        return toAjax(baseItemexpenseService.save(baseItemexpense));
        log.info("新增收入费用科目baseItemexpense的ID:{}" , baseItemexpense.getId());
        return AjaxResult.success(baseItemexpense);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java
@@ -81,7 +81,9 @@
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrgancharge baseOrgancharge) {
        log.info("新增人体器官获取费用{}:" , baseOrgancharge);
        return toAjax(baseOrganchargeService.save(baseOrgancharge));
        boolean save = baseOrganchargeService.save(baseOrgancharge);
        log.info("新增人体器官获取费用baseOrgancharge的ID:{}", baseOrgancharge.getId());
        return AjaxResult.success(baseOrgancharge);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java
@@ -81,14 +81,17 @@
    @ApiOperation("新增机构信息")
    //@PreAuthorize("@ss.hasPermi('project:organization:add')")
    @Log(title = "机构管理", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
        log.info("新增机构信息{}:" , baseOrganization);
        String organization = onlyValueCommon.addOnlyValue("organization");
        //"0"+地市编码+医院类型+序号
        baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);
        return toAjax(baseOrganizationService.save(baseOrganization));
        boolean save = baseOrganizationService.save(baseOrganization);
        log.info("新增机构信息baseOrganization的ID{}:", baseOrganization.getId());
        return AjaxResult.success(baseOrganization);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java
@@ -12,6 +12,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -77,11 +78,13 @@
    @ApiOperation("新增差旅城市和补贴标准")
    @PreAuthorize("@ss.hasPermi('project:travelcity:add')")
    @Log(title = "差旅城市和补贴标准", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseTravelcity baseTravelcity) {
        log.info("新增差旅城市和补贴标准{}:", baseTravelcity);
        return toAjax(baseTravelcityService.save(baseTravelcity));
        boolean save = baseTravelcityService.save(baseTravelcity);
        log.info("新增差旅城市和补贴标准baseTravelcity的id{}:", baseTravelcity.getId());
        return AjaxResult.success(baseTravelcity);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java
@@ -80,11 +80,13 @@
     */
    @ApiOperation("新增专家费用分发汇总明细")
    @Log(title = "专家费用分发汇总明细", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDistributedetail serviceDistributedetail) {
        log.info("新增专家费用分发汇总明细:{}", serviceDistributedetail);
        return toAjax(serviceDistributedetailService.save(serviceDistributedetail));
        boolean save = serviceDistributedetailService.save(serviceDistributedetail);
        log.info("新增专家费用分发汇总明细serviceDistributedetail的id:{}", serviceDistributedetail.getId());
        return AjaxResult.success(serviceDistributedetail);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java
@@ -80,11 +80,13 @@
     */
    @ApiOperation("新增专家费用分发汇总主")
    @Log(title = "专家费用分发汇总主", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDistributesummary serviceDistributesummary) {
        log.info("新增专家费用分发汇总主:{}", serviceDistributesummary);
        return toAjax(serviceDistributesummaryService.save(serviceDistributesummary));
        boolean save = serviceDistributesummaryService.save(serviceDistributesummary);
        log.info("新增专家费用分发汇总主serviceDistributesummary的ID:{}", serviceDistributesummary.getId());
        return AjaxResult.success(serviceDistributesummary);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java
@@ -81,11 +81,13 @@
     */
    @ApiOperation("新增捐献附件")
    @Log(title = "捐献附件", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDocumentfiles serviceDocumentfiles) {
        log.info("新增捐献附件:{}", serviceDocumentfiles);
        return toAjax(serviceDocumentfilesService.save(serviceDocumentfiles));
        boolean save = serviceDocumentfilesService.save(serviceDocumentfiles);
        log.info("新增捐献附件serviceDocumentfiles的id:{}", serviceDocumentfiles.getId());
        return AjaxResult.success(serviceDocumentfiles);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
@@ -98,9 +98,9 @@
    @Log(title = "捐献附件", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
    public TableDataInfo add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
        log.info("新增捐献附件信息:{}", serviceDonateannexs.size());
        return toAjax(serviceDonateannexService.saveData(serviceDonateannexs));
        return getDataTable(serviceDonateannexService.saveData(serviceDonateannexs));
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java
@@ -84,11 +84,13 @@
    @ApiOperation("新增捐献要求附件信息")
    //@PreAuthorize("@ss.hasPermi('project:donateannexrequirement:add')")
    @Log(title = "捐献附件要求", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateannexrequirement serviceDonateannexrequirement) {
        log.info("新增捐献要求附件信息:{}", serviceDonateannexrequirement);
        return toAjax(serviceDonateannexrequirementService.save(serviceDonateannexrequirement));
        boolean save = serviceDonateannexrequirementService.save(serviceDonateannexrequirement);
        log.info("新增捐献要求附件信息serviceDonateannexrequirement的ID为:{}", serviceDonateannexrequirement);
        return AjaxResult.success(serviceDonateannexrequirement);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -121,7 +121,7 @@
    @ApiOperation("新增潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
    @Log(title = "捐献基础", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("新增潜在捐献信息:{}", serviceDonatebaseinfo);
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java
@@ -113,12 +113,14 @@
    @ApiOperation("新增捐献完成")
    //@PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
    @Log(title = "捐献完成", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit(interval = 5000)
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        log.info("新增捐献完成:{}", serviceDonatecompletioninfo);
        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
        boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
        log.info("新增捐献完成serviceDonatecompletioninfo的ID:{}", serviceDonatecompletioninfo.getId());
        return AjaxResult.success(serviceDonatecompletioninfo);
    }
//    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java
@@ -80,7 +80,8 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatecomporgan serviceDonatecomporgan) {
        return toAjax(serviceDonatecomporganService.save(serviceDonatecomporgan));
        boolean save = serviceDonatecomporganService.save(serviceDonatecomporgan);
        return AjaxResult.success(serviceDonatecomporgan);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateconsolationfundController.java
@@ -2,6 +2,7 @@
import java.util.Arrays;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,8 +34,7 @@
@Api("资金申请主表")
@RestController
@RequestMapping("/project/donateconsolationfund")
public class ServiceDonateconsolationfundController extends BaseController
{
public class ServiceDonateconsolationfundController extends BaseController {
    @Autowired
    private IServiceDonateconsolationfundService serviceDonateconsolationfundService;
@@ -43,8 +43,7 @@
     */
    @ApiOperation("查询资金申请主表列表")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonateconsolationfund serviceDonateconsolationfund)
    {
    public TableDataInfo list(ServiceDonateconsolationfund serviceDonateconsolationfund) {
        startPage();
        List<ServiceDonateconsolationfund> list = serviceDonateconsolationfundService.queryList(serviceDonateconsolationfund);
        return getDataTable(list);
@@ -56,8 +55,7 @@
    @ApiOperation("导出资金申请主表列表")
    @Log(title = "资金申请主表", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonateconsolationfund serviceDonateconsolationfund)
    {
    public AjaxResult export(ServiceDonateconsolationfund serviceDonateconsolationfund) {
        List<ServiceDonateconsolationfund> list = serviceDonateconsolationfundService.queryList(serviceDonateconsolationfund);
        ExcelUtil<ServiceDonateconsolationfund> util = new ExcelUtil<ServiceDonateconsolationfund>(ServiceDonateconsolationfund.class);
        return util.exportExcel(list, "资金申请主表数据");
@@ -68,8 +66,7 @@
     */
    @ApiOperation("获取资金申请主表详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonateconsolationfundService.getById(id));
    }
@@ -78,11 +75,11 @@
     */
    @ApiOperation("新增资金申请主表")
    @Log(title = "资金申请主表", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund)
    {
        return toAjax(serviceDonateconsolationfundService.save(serviceDonateconsolationfund));
    public AjaxResult add(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund) {
        boolean save = serviceDonateconsolationfundService.save(serviceDonateconsolationfund);
        return AjaxResult.success(serviceDonateconsolationfund);
    }
    /**
@@ -92,8 +89,7 @@
    @Log(title = "资金申请主表", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund)
    {
    public AjaxResult edit(@RequestBody ServiceDonateconsolationfund serviceDonateconsolationfund) {
        return toAjax(serviceDonateconsolationfundService.updateById(serviceDonateconsolationfund));
    }
@@ -103,8 +99,7 @@
    @ApiOperation("删除资金申请主表")
    @Log(title = "资金申请主表", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonateconsolationfundService.removeByIds(Arrays.asList(ids)));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java
@@ -81,10 +81,11 @@
    @ApiOperation("新增捐献流程")
    //@PreAuthorize("@ss.hasPermi('system:donateflowchart:add')")
    @Log(title = "捐献流程", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateflowchart serviceDonateflowchart) {
        return toAjax(serviceDonateflowchartService.save(serviceDonateflowchart));
        boolean save = serviceDonateflowchartService.save(serviceDonateflowchart);
        return AjaxResult.success(serviceDonateflowchart);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java
@@ -35,8 +35,7 @@
@Api("捐献随访")
@RestController
@RequestMapping("/project/donatefollowup")
public class ServiceDonatefollowupController extends BaseController
{
public class ServiceDonatefollowupController extends BaseController {
    @Autowired
    private IServiceDonatefollowupService serviceDonatefollowupService;
@@ -46,8 +45,7 @@
    @ApiOperation("查询捐献随访列表")
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatefollowup serviceDonatefollowup)
    {
    public TableDataInfo list(ServiceDonatefollowup serviceDonatefollowup) {
        startPage();
        //List<ServiceDonatefollowup> list = serviceDonatefollowupService.queryList(serviceDonatefollowup);
        List<ServiceDonatefollowup> list = serviceDonatefollowupService.selectAll(serviceDonatefollowup);
@@ -70,8 +68,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:export')")
    @Log(title = "捐献随访", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatefollowup serviceDonatefollowup)
    {
    public AjaxResult export(ServiceDonatefollowup serviceDonatefollowup) {
        List<ServiceDonatefollowup> list = serviceDonatefollowupService.queryList(serviceDonatefollowup);
        ExcelUtil<ServiceDonatefollowup> util = new ExcelUtil<ServiceDonatefollowup>(ServiceDonatefollowup.class);
        return util.exportExcel(list, "捐献随访数据");
@@ -83,8 +80,7 @@
    @ApiOperation("获取捐献随访详细信息")
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        //return AjaxResult.success(serviceDonatefollowupService.getById(id));
        return AjaxResult.success(serviceDonatefollowupService.selectFollowUpById(id));
    }
@@ -95,11 +91,11 @@
    @ApiOperation("新增捐献随访")
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:add')")
    @Log(title = "捐献随访", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatefollowup serviceDonatefollowup)
    {
        return toAjax(serviceDonatefollowupService.save(serviceDonatefollowup));
    public AjaxResult add(@RequestBody ServiceDonatefollowup serviceDonatefollowup) {
        boolean save = serviceDonatefollowupService.save(serviceDonatefollowup);
        return AjaxResult.success(serviceDonatefollowup);
    }
    /**
@@ -110,8 +106,7 @@
    @Log(title = "捐献随访", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonatefollowup serviceDonatefollowup)
    {
    public AjaxResult edit(@RequestBody ServiceDonatefollowup serviceDonatefollowup) {
        return toAjax(serviceDonatefollowupService.updateById(serviceDonatefollowup));
    }
@@ -123,8 +118,7 @@
    //@PreAuthorize("@ss.hasPermi('project:donatefollowup:remove')")
    @Log(title = "捐献随访", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonatefollowupService.removeByIds(Arrays.asList(ids)));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java
@@ -106,7 +106,7 @@
    @ApiOperation("新增捐献器官信息")
    //@PreAuthorize("@ss.hasPermi('project:donateorgan:add')")
    @Log(title = "捐献器官管理", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateorgan serviceDonateorgan) {
        String organNumber = serviceDonateorgan.getDonorno() + "." + serviceDonateorgan.getOrganno();
@@ -121,7 +121,8 @@
            }
        }
        serviceDonateorgan.setOrgannumber(organNumber);
        return toAjax(serviceDonateorganService.save(serviceDonateorgan));
        boolean save = serviceDonateorganService.save(serviceDonateorgan);
        return AjaxResult.success(serviceDonateorgan);
    }
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java
@@ -27,8 +27,7 @@
@Api("捐献案例器官列")
@RestController
@RequestMapping("/project/donateorganstatics")
public class ServiceDonateorganstaticsController extends BaseController
{
public class ServiceDonateorganstaticsController extends BaseController {
    @Autowired
    private IServiceDonateorganstaticsService serviceDonateorganstaticsService;
@@ -38,8 +37,7 @@
    @ApiOperation("查询捐献案例器官列列表")
    @PreAuthorize("@ss.hasPermi('project:donateorganstatics:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonateorganstatics serviceDonateorganstatics)
    {
    public TableDataInfo list(ServiceDonateorganstatics serviceDonateorganstatics) {
        startPage();
        List<ServiceDonateorganstatics> list = serviceDonateorganstaticsService.queryList(serviceDonateorganstatics);
        return getDataTable(list);
@@ -52,8 +50,7 @@
    @PreAuthorize("@ss.hasPermi('project:donateorganstatics:export')")
    @Log(title = "捐献案例器官列", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonateorganstatics serviceDonateorganstatics)
    {
    public AjaxResult export(ServiceDonateorganstatics serviceDonateorganstatics) {
        List<ServiceDonateorganstatics> list = serviceDonateorganstaticsService.queryList(serviceDonateorganstatics);
        ExcelUtil<ServiceDonateorganstatics> util = new ExcelUtil<ServiceDonateorganstatics>(ServiceDonateorganstatics.class);
        return util.exportExcel(list, "捐献案例器官列数据");
@@ -65,8 +62,7 @@
    @ApiOperation("获取捐献案例器官列详细信息")
    @PreAuthorize("@ss.hasPermi('project:donateorganstatics:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonateorganstaticsService.getById(id));
    }
@@ -78,9 +74,9 @@
    @Log(title = "捐献案例器官列", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics)
    {
        return toAjax(serviceDonateorganstaticsService.save(serviceDonateorganstatics));
    public AjaxResult add(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics) {
        boolean save = serviceDonateorganstaticsService.save(serviceDonateorganstatics);
        return AjaxResult.success(serviceDonateorganstatics);
    }
    /**
@@ -91,8 +87,7 @@
    @Log(title = "捐献案例器官列", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics)
    {
    public AjaxResult edit(@RequestBody ServiceDonateorganstatics serviceDonateorganstatics) {
        return toAjax(serviceDonateorganstaticsService.updateById(serviceDonateorganstatics));
    }
@@ -103,8 +98,7 @@
    @PreAuthorize("@ss.hasPermi('project:donateorganstatics:remove')")
    @Log(title = "捐献案例器官列", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonateorganstaticsService.removeByIds(Arrays.asList(ids)));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java
@@ -124,11 +124,11 @@
    @ApiOperation("新增捐献见证")
    //@PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
    @Log(title = "捐献见证", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
        return toAjax(serviceDonationwitnessService.save(serviceDonationwitness));
        boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
        return AjaxResult.success(serviceDonationwitness);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java
@@ -80,7 +80,8 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        return toAjax(serviceDonationwitnessorganService.save(serviceDonationwitnessorgan));
        boolean save = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
        return AjaxResult.success(serviceDonationwitnessorgan);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java
@@ -79,7 +79,8 @@
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
        return toAjax(serviceDonorchargeorganService.save(serviceDonorchargeorgan));
        boolean save = serviceDonorchargeorganService.save(serviceDonorchargeorgan);
        return AjaxResult.success(serviceDonorchargeorgan);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewopinionsController.java
@@ -33,8 +33,7 @@
 */
@RestController
@RequestMapping("/project/ethicalreviewopinions")
public class ServiceEthicalreviewopinionsController extends BaseController
{
public class ServiceEthicalreviewopinionsController extends BaseController {
    @Autowired
    private IServiceEthicalreviewopinionsService serviceEthicalreviewopinionsService;
@@ -43,16 +42,14 @@
     */
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceEthicalreviewopinions serviceEthicalreviewopinions)
    {
    public TableDataInfo list(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
        startPage();
        List<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
        return getDataTable(list);
    }
    @GetMapping("/listnew")
    public TableDataInfo listnew (EthicalReviewVO ethicalReviewVO)
    {
    public TableDataInfo listnew(EthicalReviewVO ethicalReviewVO) {
        startPage();
        List<EthicalReviewVO> list = serviceEthicalreviewopinionsService.selectVOList(ethicalReviewVO);
        return getDataTable(list);
@@ -65,8 +62,7 @@
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:export')")
    @Log(title = "伦理审查专家意见", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceEthicalreviewopinions serviceEthicalreviewopinions)
    {
    public AjaxResult export(ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
        List<ServiceEthicalreviewopinions> list = serviceEthicalreviewopinionsService.queryList(serviceEthicalreviewopinions);
        ExcelUtil<ServiceEthicalreviewopinions> util = new ExcelUtil<ServiceEthicalreviewopinions>(ServiceEthicalreviewopinions.class);
        return util.exportExcel(list, "伦理审查专家意见数据");
@@ -77,8 +73,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceEthicalreviewopinionsService.getById(id));
    }
@@ -87,11 +82,11 @@
     */
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:add')")
    @Log(title = "伦理审查专家意见", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult add(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions)
    {
        return toAjax(serviceEthicalreviewopinionsService.save(serviceEthicalreviewopinions));
    public AjaxResult add(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
        boolean save = serviceEthicalreviewopinionsService.save(serviceEthicalreviewopinions);
        return AjaxResult.success(serviceEthicalreviewopinions);
    }
    /**
@@ -101,8 +96,7 @@
    @Log(title = "伦理审查专家意见", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions)
    {
    public AjaxResult edit(@RequestBody ServiceEthicalreviewopinions serviceEthicalreviewopinions) {
        return toAjax(serviceEthicalreviewopinionsService.updateById(serviceEthicalreviewopinions));
    }
@@ -112,8 +106,7 @@
    //@PreAuthorize("@ss.hasPermi('project:ethicalreviewopinions:remove')")
    @Log(title = "伦理审查专家意见", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceEthicalreviewopinionsService.removeByIds(Arrays.asList(ids)));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java
@@ -80,11 +80,12 @@
     */
    @ApiOperation("新增费用申请主")
    @Log(title = "费用申请主", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult add(@RequestBody ServiceExpertexpense serviceExpertexpense)
    {
        return toAjax(serviceExpertexpenseService.save(serviceExpertexpense));
        boolean save = serviceExpertexpenseService.save(serviceExpertexpense);
        return AjaxResult.success(serviceExpertexpense);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonController.java
@@ -84,7 +84,7 @@
     */
    //@PreAuthorize("@ss.hasPermi('project:externalperson:add')")
    @Log(title = "外围单位人员", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceExternalperson serviceExternalperson) {
        if (StringUtils.isEmpty(serviceExternalperson.getUserno())) {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExternalpersonGroupController.java
@@ -86,10 +86,11 @@
    @ApiOperation("新增人员和分组组别关联")
    @PreAuthorize("@ss.hasPermi('system:group:add')")
    @Log(title = "人员和分组组别关联", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceExternalpersonGroup serviceExternalpersonGroup) {
        return toAjax(serviceExternalpersonGroupService.save(serviceExternalpersonGroup));
        boolean save = serviceExternalpersonGroupService.save(serviceExternalpersonGroup);
        return AjaxResult.success(serviceExternalpersonGroup);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundController.java
@@ -241,7 +241,7 @@
    @ApiOperation("新增费用申请主")
    //@PreAuthorize("@ss.hasPermi('project:fund:add')")
    @Log(title = "费用申请主", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    @Options(useGeneratedKeys = true, keyProperty = "id")
    public AjaxResult add(@RequestBody ServiceFund serviceFund) {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundSharedController.java
@@ -27,8 +27,7 @@
@Api("费用申请主")
@RestController
@RequestMapping("/system/shared")
public class ServiceFundSharedController extends BaseController
{
public class ServiceFundSharedController extends BaseController {
    @Autowired
    private IServiceFundSharedService serviceFundSharedService;
@@ -38,8 +37,7 @@
    @ApiOperation("查询费用申请主列表")
    @PreAuthorize("@ss.hasPermi('system:shared:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceFundShared serviceFundShared)
    {
    public TableDataInfo list(ServiceFundShared serviceFundShared) {
        startPage();
        List<ServiceFundShared> list = serviceFundSharedService.queryList(serviceFundShared);
        return getDataTable(list);
@@ -52,8 +50,7 @@
    @PreAuthorize("@ss.hasPermi('system:shared:export')")
    @Log(title = "费用申请主", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFundShared serviceFundShared)
    {
    public AjaxResult export(ServiceFundShared serviceFundShared) {
        List<ServiceFundShared> list = serviceFundSharedService.queryList(serviceFundShared);
        ExcelUtil<ServiceFundShared> util = new ExcelUtil<ServiceFundShared>(ServiceFundShared.class);
        return util.exportExcel(list, "费用申请主数据");
@@ -65,8 +62,7 @@
    @ApiOperation("获取费用申请主详细信息")
    @PreAuthorize("@ss.hasPermi('system:shared:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundSharedService.getById(id));
    }
@@ -76,11 +72,11 @@
    @ApiOperation("新增费用申请主")
    @PreAuthorize("@ss.hasPermi('system:shared:add')")
    @Log(title = "费用申请主", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceFundShared serviceFundShared)
    {
        return toAjax(serviceFundSharedService.save(serviceFundShared));
    public AjaxResult add(@RequestBody ServiceFundShared serviceFundShared) {
        boolean save = serviceFundSharedService.save(serviceFundShared);
        return AjaxResult.success(serviceFundShared);
    }
    /**
@@ -91,8 +87,7 @@
    @Log(title = "费用申请主", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFundShared serviceFundShared)
    {
    public AjaxResult edit(@RequestBody ServiceFundShared serviceFundShared) {
        return toAjax(serviceFundSharedService.updateById(serviceFundShared));
    }
@@ -103,8 +98,7 @@
    @PreAuthorize("@ss.hasPermi('system:shared:remove')")
    @Log(title = "费用申请主", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceFundSharedService.removeByIds(Arrays.asList(ids)));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java
@@ -78,10 +78,11 @@
    @ApiOperation("新增费用申请明细")
    //@PreAuthorize("@ss.hasPermi('project:funddetail:add')")
    @Log(title = "费用申请明细", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult add(@RequestBody ServiceFunddetail serviceFunddetail) {
        return toAjax(serviceFunddetailService.save(serviceFunddetail));
        boolean save = serviceFunddetailService.save(serviceFunddetail);
        return AjaxResult.success(serviceFunddetail);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailSharedController.java
@@ -82,11 +82,12 @@
    @ApiOperation("新增费用申请明细")
    @PreAuthorize("@ss.hasPermi('project:funddetailshared:add')")
    @Log(title = "费用申请明细", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceFunddetailShared serviceFunddetailShared)
    {
        return toAjax(serviceFunddetailSharedService.save(serviceFunddetailShared));
        boolean save = serviceFunddetailSharedService.save(serviceFunddetailShared);
        return AjaxResult.success(serviceFunddetailShared);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowController.java
@@ -2,8 +2,10 @@
import java.util.Arrays;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -33,8 +35,7 @@
@Api("资金审批流程")
@RestController
@RequestMapping("/project/fundflow")
public class ServiceFundflowController extends BaseController
{
public class ServiceFundflowController extends BaseController {
    @Autowired
    private IServiceFundflowService serviceFundflowService;
@@ -43,8 +44,7 @@
     */
    @ApiOperation("查询资金审批流程列表")
    @GetMapping("/list")
    public TableDataInfo list(ServiceFundflow serviceFundflow)
    {
    public TableDataInfo list(ServiceFundflow serviceFundflow) {
        startPage();
        List<ServiceFundflow> list = serviceFundflowService.queryList(serviceFundflow);
        return getDataTable(list);
@@ -56,8 +56,7 @@
    @ApiOperation("导出资金审批流程列表")
    @Log(title = "资金审批流程", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFundflow serviceFundflow)
    {
    public AjaxResult export(ServiceFundflow serviceFundflow) {
        List<ServiceFundflow> list = serviceFundflowService.queryList(serviceFundflow);
        ExcelUtil<ServiceFundflow> util = new ExcelUtil<ServiceFundflow>(ServiceFundflow.class);
        return util.exportExcel(list, "资金审批流程数据");
@@ -68,8 +67,7 @@
     */
    @ApiOperation("获取资金审批流程详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundflowService.getById(id));
    }
@@ -78,11 +76,11 @@
     */
    @ApiOperation("新增资金审批流程")
    @Log(title = "资金审批流程", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceFundflow serviceFundflow)
    {
        return toAjax(serviceFundflowService.save(serviceFundflow));
    public AjaxResult add(@RequestBody ServiceFundflow serviceFundflow) {
        boolean save = serviceFundflowService.save(serviceFundflow);
        return AjaxResult.success(serviceFundflow);
    }
    /**
@@ -92,8 +90,7 @@
    @Log(title = "资金审批流程", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFundflow serviceFundflow)
    {
    public AjaxResult edit(@RequestBody ServiceFundflow serviceFundflow) {
        return toAjax(serviceFundflowService.updateById(serviceFundflow));
    }
@@ -103,8 +100,7 @@
    @ApiOperation("删除资金审批流程")
    @Log(title = "资金审批流程", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceFundflowService.removeByIds(Arrays.asList(ids)));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFundflowruleController.java
@@ -2,6 +2,7 @@
import java.util.Arrays;
import java.util.List;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -33,8 +34,7 @@
@Api("资金审批规则")
@RestController
@RequestMapping("/project/fundflowrule")
public class ServiceFundflowruleController extends BaseController
{
public class ServiceFundflowruleController extends BaseController {
    @Autowired
    private IServiceFundflowruleService serviceFundflowruleService;
@@ -43,8 +43,7 @@
     */
    @ApiOperation("查询资金审批规则列表")
    @GetMapping("/list")
    public TableDataInfo list(ServiceFundflowrule serviceFundflowrule)
    {
    public TableDataInfo list(ServiceFundflowrule serviceFundflowrule) {
        startPage();
        List<ServiceFundflowrule> list = serviceFundflowruleService.queryList(serviceFundflowrule);
        return getDataTable(list);
@@ -56,8 +55,7 @@
    @ApiOperation("导出资金审批规则列表")
    @Log(title = "资金审批规则", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceFundflowrule serviceFundflowrule)
    {
    public AjaxResult export(ServiceFundflowrule serviceFundflowrule) {
        List<ServiceFundflowrule> list = serviceFundflowruleService.queryList(serviceFundflowrule);
        ExcelUtil<ServiceFundflowrule> util = new ExcelUtil<ServiceFundflowrule>(ServiceFundflowrule.class);
        return util.exportExcel(list, "资金审批规则数据");
@@ -68,8 +66,7 @@
     */
    @ApiOperation("获取资金审批规则详细信息")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceFundflowruleService.getById(id));
    }
@@ -78,11 +75,11 @@
     */
    @ApiOperation("新增资金审批规则")
    @Log(title = "资金审批规则", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceFundflowrule serviceFundflowrule)
    {
        return toAjax(serviceFundflowruleService.save(serviceFundflowrule));
    public AjaxResult add(@RequestBody ServiceFundflowrule serviceFundflowrule) {
        boolean save = serviceFundflowruleService.save(serviceFundflowrule);
        return AjaxResult.success(serviceFundflowrule);
    }
    /**
@@ -92,8 +89,7 @@
    @Log(title = "资金审批规则", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit    
    public AjaxResult edit(@RequestBody ServiceFundflowrule serviceFundflowrule)
    {
    public AjaxResult edit(@RequestBody ServiceFundflowrule serviceFundflowrule) {
        return toAjax(serviceFundflowruleService.updateById(serviceFundflowrule));
    }
@@ -103,8 +99,7 @@
    @ApiOperation("删除资金审批规则")
    @Log(title = "资金审批规则", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceFundflowruleService.removeByIds(Arrays.asList(ids)));
    }
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java
@@ -90,10 +90,11 @@
    @ApiOperation("新增医学评估")
    //@PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
    @Log(title = "医学评估", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
        return toAjax(serviceMedicalevaluationService.save(serviceMedicalevaluation));
        boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation);
        return AjaxResult.success(serviceMedicalevaluation);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -220,7 +220,7 @@
    @ApiOperation("新增报销申请")
    //@PreAuthorize("@ss.hasPermi('project:reimbursement:add')")
    @Log(title = "报销申请", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    @Options(useGeneratedKeys = true, keyProperty = "id")
    public AjaxResult add(@RequestBody ServiceReimbursement serviceReimbursement) {
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailController.java
@@ -99,7 +99,7 @@
    @ApiOperation("新增报销申请明细")
    //@PreAuthorize("@ss.hasPermi('project:reimbursementdetail:add')")
    @Log(title = "报销申请明细", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceReimbursementdetailVO serviceReimbursementdetailVO) {
        ServiceReimbursementdetail serviceReimbursementdetail = DtoConversionUtils.sourceToTarget(serviceReimbursementdetailVO, ServiceReimbursementdetail.class);
@@ -110,7 +110,8 @@
        if (!CollectionUtils.isEmpty(serviceReimbursementdetailVO.getInvoicefilesList())) {
            serviceReimbursementdetail.setInvoicefiles(JSON.toJSONString(serviceReimbursementdetailVO.getInvoicefilesList()));
        }
        return toAjax(serviceReimbursementdetailService.save(serviceReimbursementdetail));
        boolean save = serviceReimbursementdetailService.save(serviceReimbursementdetail);
        return AjaxResult.success(serviceReimbursementdetail);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementdetailSharedController.java
@@ -82,11 +82,12 @@
    @ApiOperation("新增报销申请明细")
    @PreAuthorize("@ss.hasPermi('project:reimbursementdetailshared:add')")
    @Log(title = "报销申请明细", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceReimbursementdetailShared serviceReimbursementdetailShared)
    {
        return toAjax(serviceReimbursementdetailSharedService.save(serviceReimbursementdetailShared));
        boolean save = serviceReimbursementdetailSharedService.save(serviceReimbursementdetailShared);
        return AjaxResult.success(serviceReimbursementdetailShared);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeController.java
@@ -75,11 +75,12 @@
    @ApiOperation("新增差旅报销付款信息")
    //@PreAuthorize("@ss.hasPermi('project:reimbursementpayee:add')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceReimbursementpayee serviceReimbursementpayee)
    {
        return toAjax(serviceReimbursementpayeeService.save(serviceReimbursementpayee));
        boolean save = serviceReimbursementpayeeService.save(serviceReimbursementpayee);
        return AjaxResult.success(serviceReimbursementpayee);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementpayeeSharedController.java
@@ -82,11 +82,12 @@
    @ApiOperation("新增差旅报销付款信息")
    @PreAuthorize("@ss.hasPermi('project:reimbursementpayeeshared:add')")
    @Log(title = "差旅报销付款信息", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceReimbursementpayeeShared serviceReimbursementpayeeShared)
    {
        return toAjax(serviceReimbursementpayeeSharedService.save(serviceReimbursementpayeeShared));
        boolean save = serviceReimbursementpayeeSharedService.save(serviceReimbursementpayeeShared);
        return AjaxResult.success(serviceReimbursementpayeeShared);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java
@@ -116,10 +116,11 @@
    @ApiOperation("新增亲属确认")
    //@PreAuthorize("@ss.hasPermi('project:relativesconfirmation:add')")
    @Log(title = "捐献亲属确认", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {
        return toAjax(serviceRelativesconfirmationService.save(serviceRelativesconfirmation));
        boolean save = serviceRelativesconfirmationService.save(serviceRelativesconfirmation);
        return AjaxResult.success(serviceRelativesconfirmation);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
@@ -97,10 +97,11 @@
    @ApiOperation("新增系统消息")
    @PreAuthorize("@ss.hasPermi('project:systemmessage:add')")
    @Log(title = "系统消息", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceSystemmessage serviceSystemmessage) {
        return toAjax(serviceSystemmessageService.save(serviceSystemmessage));
        boolean save = serviceSystemmessageService.save(serviceSystemmessage);
        return AjaxResult.success(serviceSystemmessage);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java
@@ -81,11 +81,12 @@
     */
    @ApiOperation("新增住宿费限额标准")
    @Log(title = "住宿费限额标准", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceTravelexpensestandard serviceTravelexpensestandard)
    {
        return toAjax(serviceTravelexpensestandardService.save(serviceTravelexpensestandard));
        boolean save = serviceTravelexpensestandardService.save(serviceTravelexpensestandard);
        return AjaxResult.success(serviceTravelexpensestandard);
    }
    /**
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VServiceDonateorganRegisterController.java
@@ -83,11 +83,12 @@
    @ApiOperation("新增器官登记")
    //@PreAuthorize("@ss.hasPermi('project:register:add')")
    @Log(title = "器官信息登记新", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody VServiceDonateorganRegister vServiceDonateorganRegister)
    {
        return toAjax(vServiceDonateorganRegisterService.save(vServiceDonateorganRegister));
        boolean save = vServiceDonateorganRegisterService.save(vServiceDonateorganRegister);
        return AjaxResult.success(vServiceDonateorganRegister);
    }
    /**
ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateannexService.java
@@ -1,6 +1,7 @@
package com.ruoyi.project.service;
import java.util.List;
import java.util.Map;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonateannex;
@@ -26,5 +27,5 @@
    List<DonateAnnexVO> selectVOList(DonateAnnexVO donateAnnexVO);
    Boolean saveData(List<ServiceDonateannex> serviceDonateannexs);
    List<ServiceDonateannex> saveData(List<ServiceDonateannex> serviceDonateannexs);
}
ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonateannexServiceImpl.java
@@ -99,7 +99,7 @@
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Boolean saveData(List<ServiceDonateannex> serviceDonateannexs) {
    public List<ServiceDonateannex> saveData(List<ServiceDonateannex> serviceDonateannexs) {
        for (ServiceDonateannex serviceDonateannex : serviceDonateannexs) {
            log.info("serviceDonateannex的信息:{}", serviceDonateannex);
            if (serviceDonateannex.getInfoid() == null || serviceDonateannex.getAnnexfilestype() == null) {
@@ -107,7 +107,7 @@
            }
            this.save(serviceDonateannex);
        }
        return true;
        return serviceDonateannexs;
    }
}