liusheng
2 天以前 3165f71939bf0783787fbe19ac77063c23ec22bc
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java
@@ -1,7 +1,6 @@
package com.ruoyi.web.controller.project;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
@@ -14,6 +13,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.config.ServerConfig;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
@@ -30,9 +30,9 @@
import java.io.*;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.*;
//import javafx.scene.input.DataFormat;
/**
@@ -70,7 +70,7 @@
     * 查询捐献基础列表
     */
    @ApiOperation("潜在捐献信息列表")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("潜在捐献信息列表:{}", serviceDonatebaseinfo);
@@ -89,12 +89,11 @@
        return getDataTable(list);
    }
    /**
     * 导出捐献基础列表
     */
    @ApiOperation("导出潜在捐献信息列表")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:export')")
    @Log(title = "捐献基础", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatebaseinfo serviceDonatebaseinfo) {
@@ -108,18 +107,26 @@
     * 获取捐献基础详细信息
     */
    @ApiOperation("通过id获得潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:query')")
    //// @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));
        ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(id);
        if (serviceDonatebaseinfo.getBirthday() != null) {
            Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
            serviceDonatebaseinfo.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
            serviceDonatebaseinfo.setAgeunit(map.get("ageUnit"));
            serviceDonatebaseinfo.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
            serviceDonatebaseinfo.setAgeunit2(map.get("ageUnit2"));
        }
        return AjaxResult.success(serviceDonatebaseinfo);
    }
    /**
     * 新增捐献基础
     */
    @ApiOperation("新增潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:add')")
    @Log(title = "捐献基础", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
@@ -161,7 +168,7 @@
     * 修改捐献基础
     */
    @ApiOperation("修改潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:edit')")
    @Log(title = "捐献基础", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
@@ -174,7 +181,7 @@
     * 删除捐献基础
     */
    @ApiOperation("删除潜在捐献信息")
    //@PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:remove')")
    @Log(title = "捐献基础", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {