From 28c168589258f36b31fdb39add938e564804b3b1 Mon Sep 17 00:00:00 2001 From: yxh <172933527@qq.com> Date: 星期一, 13 三月 2023 20:01:39 +0800 Subject: [PATCH] Default Changelist --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java | 47 +++++++++++++++++------------------------------ 1 files changed, 17 insertions(+), 30 deletions(-) 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 7053711..6091070 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 @@ -1,49 +1,36 @@ package com.ruoyi.web.controller.project; -import java.io.*; -import java.net.URLEncoder; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.stream.Collectors; - +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.annotation.RepeatSubmit; import com.ruoyi.common.config.RuoYiConfig; import com.ruoyi.common.constant.HttpStatus; -import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.SysUser; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.config.ServerConfig; -import com.ruoyi.project.domain.ServiceDonateannex; +import com.ruoyi.project.domain.ServiceDonatebaseinfo; import com.ruoyi.project.domain.vo.TimeVO; +import com.ruoyi.project.service.IServiceDonatebaseinfoService; import com.ruoyi.project.service.IServiceExternalpersonService; import com.ruoyi.system.mapper.SysDeptMapper; -import freemarker.core.XMLOutputFormat; +import freemarker.template.Configuration; import freemarker.template.Template; import freemarker.template.TemplateException; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -//import javafx.scene.input.DataFormat; -import net.sf.jsqlparser.expression.DateTimeLiteralExpression; -import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.security.core.parameters.P; import org.springframework.web.bind.annotation.*; -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.domain.ServiceDonatebaseinfo; -import com.ruoyi.project.service.IServiceDonatebaseinfoService; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; -import freemarker.template.Configuration; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.xml.crypto.Data; +import java.io.*; +import java.text.SimpleDateFormat; +import java.util.*; + +//import javafx.scene.input.DataFormat; /** @@ -166,8 +153,8 @@ serviceDonatebaseinfo.setDonorno(bh); - serviceDonatebaseinfo.setDeptid(user.getDeptId()); - serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId())); + //serviceDonatebaseinfo.setDeptid(user.getDeptId()); + //serviceDonatebaseinfo.setDeptname(sysDeptMapper.getDeptNameByDeptId(user.getDeptId())); return toAjax(serviceDonatebaseinfoService.save(serviceDonatebaseinfo)); } -- Gitblit v1.9.3