Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/common/enums/ResultCodeEnum.java

@@ -22,7 +22,7 @@ public enum  ResultCodeEnum {
     TOKEN_EXPIRED(410, "访问令牌已过期", "Token Expired"),
     USER_NOT_FOUND(411, "用户不存在"),
     USERPASSWORD_NOT_BLANK(412, "用户名密码不正确"),
-    HOSPITAL_NOT_FOUND(413, "医院不存在"),
+    HOSPITAL_NOT_FOUND(413, "医院不存在,请检查链接"),
     USER_NOT_SYS(414, "用户没有系统权限"),
     USER_ADD_EXCEPTION(422,"当创建一个对象时，发生一个验证错误"),
     SERVER_ERROR(500,"服务器异常"),

src/main/java/com/imed/costaccount/service/CostDepartmentProfitService.java

@@ -6,8 +6,6 @@ import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.CostDepartmentProfit;
 import org.apache.poi.ss.usermodel.Sheet;
 
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 科室损益计算
  *
@@ -46,9 +44,8 @@ public interface CostDepartmentProfitService extends IService<CostDepartmentProf
      * 科室损益计算导出
      * @param date
      * @param hospId
-     * @param response
      * @param reportType
      */
-    void getDepartProfitReport(String date, Long hospId, HttpServletResponse response, Integer reportType);
+    void getDepartProfitReport(String date, Long hospId, Integer reportType);
 }
 

src/main/java/com/imed/costaccount/service/HospProfitAndLossService.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.HospProfitAndLoss;
 
-import javax.servlet.http.HttpServletResponse;
-
 /**
  * 全院损益表
  *
@@ -38,9 +36,8 @@ public interface HospProfitAndLossService extends IService<HospProfitAndLoss> {
      * 导出全院损益计算
      * @param date yyyy-MM-dd
      * @param hospId
-     * @param response
      */
-    void hospProfitReport(String date, Long hospId, HttpServletResponse response);
+    void hospProfitReport(String date, Long hospId);
 
     /**
      *

src/main/java/com/imed/costaccount/service/impl/CostDepartmentProfitServiceImpl.java

@@ -27,7 +27,6 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
@@ -403,12 +402,11 @@ public class CostDepartmentProfitServiceImpl extends ServiceImpl<CostDepartmentP
      * 科室损益计算导出
      *  @param date
      * @param hospId
-     * @param response
      * @param reportType
      */
     @Override
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
-    public void getDepartProfitReport(String date, Long hospId, HttpServletResponse response, Integer reportType) {
+    public void getDepartProfitReport(String date, Long hospId, Integer reportType) {
         DateTime dateTime = DateUtil.parse(date);
         int year = DateUtil.year(dateTime);
         int month = DateUtil.month(dateTime)+1;

src/main/java/com/imed/costaccount/service/impl/HospProfitAndLossServiceImpl.java

@@ -9,10 +9,12 @@ import cn.hutool.poi.excel.ExcelUtil;
 import cn.hutool.poi.excel.ExcelWriter;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.enums.CalcTypeEnum;
 import com.imed.costaccount.common.enums.ReportTypeEnum;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.mapper.HospProfitAndLossMapper;
 import com.imed.costaccount.model.*;
 import com.imed.costaccount.model.vo.RelationVO;
 import com.imed.costaccount.model.vo.ReportFormVO;
@@ -20,13 +22,9 @@ import com.imed.costaccount.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-
-import com.imed.costaccount.mapper.HospProfitAndLossMapper;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
@@ -405,10 +403,9 @@ public class HospProfitAndLossServiceImpl extends ServiceImpl<HospProfitAndLossM
      *
      * @param date     yyyy-MM-dd
      * @param hospId
-     * @param response
      */
     @Override
-    public void hospProfitReport(String date, Long hospId, HttpServletResponse response) {
+    public void hospProfitReport(String date, Long hospId) {
         DateTime parse = DateUtil.parse(date);
         int year = DateUtil.year(parse);
         int month = DateUtil.month(parse) + 1;

src/main/java/com/imed/costaccount/web/CostDepartmentProfitController.java

@@ -10,7 +10,6 @@ import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 
 
@@ -53,10 +52,10 @@ public class CostDepartmentProfitController {
      */
     @ApiOperation("科室损益计算输出")
     @PostMapping("/getDepartProfitReport")
-    public Result getDepartProfitReport(@RequestParam String date,@RequestParam Integer reportType, HttpServletResponse response) {
+    public Result getDepartProfitReport(@RequestParam String date,@RequestParam Integer reportType) {
         try {
             Long hospId = UserContext.getHospId();
-            costDepartmentProfitService.getDepartProfitReport(date,hospId,response,reportType);
+            costDepartmentProfitService.getDepartProfitReport(date,hospId,reportType);
         } catch (Exception e) {
             throw new CostException(500,"生成错误");
         }

src/main/java/com/imed/costaccount/web/HospProfitAndLossController.java

@@ -9,8 +9,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletResponse;
-
 @Api(tags = "全院损益相关")
 @RestController
 @RequestMapping("/costAccount/hospProfitAndLoss")
@@ -42,9 +40,9 @@ public class HospProfitAndLossController extends AbstractController {
 
     @ApiOperation("全院损益计算输出")
     @PostMapping("/report")
-    public Result hospProfitReport(@RequestParam String date, HttpServletResponse response) {
+    public Result hospProfitReport(@RequestParam String date) {
         try {
-            hospProfitAndLossService.hospProfitReport(date,getHospId(),response);
+            hospProfitAndLossService.hospProfitReport(date,getHospId());
         } catch (Exception e) {
             throw new CostException(500,"生成错误");
         }