Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/common/shiro/ShiroConfig.java

@@ -47,6 +47,8 @@ public class ShiroConfig {
         filterMap.put("/captcha.jpg", "anon");
         filterMap.put("/costAccount/getHospArea/**","anon");
         filterMap.put("/costAccount/excel/getImportUserTemplate","anon");
+        filterMap.put("/costAccount/excel/getDepartmentTemplate","anon");
+        filterMap.put("/costAccount/excel/getImportProductTemplate","anon");
         filterMap.put("/costAccount/login", "anon");
         filterMap.put("/**/*.jpg", "anon");
         filterMap.put("/**/*.png", "anon");

src/main/java/com/imed/costaccount/common/token/JwtUtil.java

@@ -8,11 +8,9 @@ import com.auth0.jwt.algorithms.Algorithm;
 import com.auth0.jwt.exceptions.JWTDecodeException;
 import com.auth0.jwt.interfaces.DecodedJWT;
 import com.imed.costaccount.common.exception.CostException;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
-import java.time.Duration;
 import java.util.Date;
 
 @Component
@@ -24,7 +22,7 @@ public class JwtUtil {
     @Value("${cost.jwt.expire}")
     private Integer expire;
 
-    public String createToken(int userId) {
+    public String createToken(Long userId) {
         Date date = DateUtil.offset(new DateTime(), DateField.DAY_OF_YEAR, expire).toJdkDate();
         Algorithm algorithm = Algorithm.HMAC256(secret);
         String token = JWT.create().withClaim("userId", userId).withExpiresAt(date).sign(algorithm);

src/main/java/com/imed/costaccount/mapper/ResponsibilityDepartmentMapper.java

@@ -22,5 +22,5 @@ public interface ResponsibilityDepartmentMapper extends BaseMapper<Responsibilit
      * @param responsibilityId
      * @return
      */
-    List<DepartVO> getDepartByCenterId(@Param("responsibilityId") Integer responsibilityId);
+    List<DepartVO> getDepartByCenterId(@Param("responsibilityId") Long responsibilityId);
 }

src/main/java/com/imed/costaccount/model/Accounting.java

@@ -29,7 +29,7 @@ public class Accounting implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 会计科目名称
 	 */
@@ -49,11 +49,11 @@ public class Accounting implements Serializable {
 	/**
 	 * 医院Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 会计科目父级id
 	 */
-	private Integer parentId;
+	private Long parentId;
 
 	private String allParentIds;
 	/**

src/main/java/com/imed/costaccount/model/AccountingProduct.java

@@ -3,15 +3,13 @@ package com.imed.costaccount.model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 会计科目成本对照表
  * 
@@ -31,15 +29,15 @@ public class AccountingProduct implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 会计科目Id
 	 */
-	private Integer accountingId;
+	private Long accountingId;
 	/**
 	 * 医院Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 成本收入Id
 	 */

src/main/java/com/imed/costaccount/model/CostAccountShare.java

@@ -27,7 +27,7 @@ public class CostAccountShare implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 责任中心Id
 	 */
@@ -47,7 +47,7 @@ public class CostAccountShare implements Serializable {
 	/**
 	 * 医院Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 成本项目Id
 	 *

src/main/java/com/imed/costaccount/model/CostResponsibilityDepartment.java

@@ -29,7 +29,7 @@ public class CostResponsibilityDepartment implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 责任中心Id
 	 */
@@ -41,7 +41,7 @@ public class CostResponsibilityDepartment implements Serializable {
 	/**
 	 * 医院Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 创建时间13位时间戳
 	 */

src/main/java/com/imed/costaccount/model/CostShareLevel.java

@@ -29,7 +29,7 @@ public class CostShareLevel implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 分摊层级数名称
 	 */
@@ -41,7 +41,7 @@ public class CostShareLevel implements Serializable {
 	/**
 	 * 医院Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 目标层级
 	 */

src/main/java/com/imed/costaccount/model/CostShareParam.java

@@ -27,7 +27,7 @@ public class CostShareParam implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 分摊参数名称
 	 */
@@ -44,7 +44,7 @@ public class CostShareParam implements Serializable {
 	/**
 	 * 医院Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 计算方式
 	 */

src/main/java/com/imed/costaccount/model/Demo.java

@@ -9,7 +9,7 @@ import lombok.experimental.Accessors;
 @TableName("demo")
 public class Demo {
 
-    private Integer id;
+    private Long id;
 
     private String name;
 }

src/main/java/com/imed/costaccount/model/Department.java

@@ -3,15 +3,13 @@ package com.imed.costaccount.model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 科室表
  * 
@@ -31,7 +29,7 @@ public class Department implements Serializable {
 	 * 科室Id
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 科室名称
 	 */
@@ -43,7 +41,7 @@ public class Department implements Serializable {
 	/**
 	 * 医院或院区Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 创建时间13位时间戳
 	 */

src/main/java/com/imed/costaccount/model/Hospital.java

@@ -3,15 +3,13 @@ package com.imed.costaccount.model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 医院表
  * 
@@ -31,7 +29,7 @@ public class Hospital implements Serializable {
 	 * 医院或者病区Id
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 是否是院区(0不是 1是)
 	 */

src/main/java/com/imed/costaccount/model/Product.java

@@ -3,15 +3,13 @@ package com.imed.costaccount.model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 成本管理表
  * 
@@ -31,7 +29,7 @@ public class Product implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 成本/收入项目名称
 	 */
@@ -43,7 +41,7 @@ public class Product implements Serializable {
 	/**
 	 * 医院Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 创建时间13位时间戳
 	 */

src/main/java/com/imed/costaccount/model/Responsibility.java

@@ -29,7 +29,7 @@ public class Responsibility implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 名称
 	 */
@@ -45,11 +45,11 @@ public class Responsibility implements Serializable {
 	/**
 	 * 上级id
 	 */
-	private Integer parentId;
+	private Long parentId;
 	/**
 	 * 医院id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 是否汇总中心1.是，2.不是
 	 */

src/main/java/com/imed/costaccount/model/ResponsibilityDepartment.java

@@ -3,15 +3,13 @@ package com.imed.costaccount.model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 责任中心科室对照表
  * 
@@ -31,19 +29,19 @@ public class ResponsibilityDepartment implements Serializable {
 	 * 主键
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 责任中心Id
 	 */
-	private Integer responsibilityId;
+	private Long responsibilityId;
 	/**
 	 * 科室名称Id
 	 */
-	private Integer departmentId;
+	private Long departmentId;
 	/**
 	 * 医院Id
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 创建时间13位时间戳
 	 */

src/main/java/com/imed/costaccount/model/User.java

@@ -3,16 +3,14 @@ package com.imed.costaccount.model;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.io.Serializable;
-import java.util.Date;
-
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+
 /**
  * 用户表
  * 
@@ -32,7 +30,7 @@ public class User implements Serializable {
 	 * 主键自增
 	 */
 	@TableId
-	private Integer id;
+	private Long id;
 	/**
 	 * 用户名称
 	 */
@@ -54,7 +52,7 @@ public class User implements Serializable {
 	/**
 	 * 医院id（医院表主键）
 	 */
-	private Integer hospId;
+	private Long hospId;
 	/**
 	 * 创建时间13位时间戳
 	 */

src/main/java/com/imed/costaccount/model/dto/AccountProductSaveDTO.java

@@ -5,8 +5,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -16,7 +14,7 @@ public class AccountProductSaveDTO {
 
     @ApiModelProperty(name="id",value = "会计科目id")
     @NotNull(message = "会计科目id不能为空")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name="products",value = "成本项目id列表")
 //    @NotEmpty(message = "成本项目id不能为空")

src/main/java/com/imed/costaccount/model/dto/AccountingEditDTO.java

@@ -13,7 +13,7 @@ public class AccountingEditDTO {
 
     @NotNull(message = "id不能为空")
     @ApiModelProperty(name = "id",value = "需要编辑类目的id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "accountingCode",value = "科目代码")
     @NotEmpty(message = "科目代码不能为空")

src/main/java/com/imed/costaccount/model/dto/AccountingSaveDTO.java

@@ -13,7 +13,7 @@ public class AccountingSaveDTO {
 
     @ApiModelProperty(name = "id",value = "父级id，如果需要新增顶级，那么传0")
     @NotNull(message = "层级id不能为空，顶层传0")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "accountingCode",value = "新增科目代码")
     @NotEmpty(message = "新增科目代码不能为空")

src/main/java/com/imed/costaccount/model/dto/CostAccountShareEditDto.java

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotNull;
 public class CostAccountShareEditDto {
 
     // 责任中心成本对照表的id
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "responsibilityId",value = "责任中心的Id")
     @NotNull(message = "责任中心Id不能为空")

src/main/java/com/imed/costaccount/model/dto/CostAccountShareSaveDto.java

@@ -17,7 +17,7 @@ public class CostAccountShareSaveDto {
 
     @ApiModelProperty(name = "responsibilityId",value = "责任中心的Id")
     @NotNull(message = "责任中心Id不能为空")
-    private Integer responsibilityId;
+    private Long responsibilityId;
 
     @ApiModelProperty(name = "shareLevel",value = "责任中心分摊层级")
     private Integer shareLevel;
@@ -29,7 +29,7 @@ public class CostAccountShareSaveDto {
     private String responsibilityName;
 
     @ApiModelProperty(name = "accountingId",value = "成本项目的Id")
-    private Integer accountingId=0;
+    private Long accountingId=0L;
 
     @ApiModelProperty(name = "accountingName",value = "成本项目名称")
     private String accountingName;

src/main/java/com/imed/costaccount/model/dto/CostShareLevelEditDto.java

@@ -16,15 +16,19 @@ import javax.validation.constraints.NotNull;
 public class CostShareLevelEditDto {
     @ApiModelProperty(name = "id",value = "分摊层级的Id")
     private Integer id;
+
     @ApiModelProperty(name = "shareName",value = "分摊层级数名称")
     @NotNull(message = "层级名称不能为空")
     private String shareName;
+
     @ApiModelProperty(name = "leverSort",value = "分摊层级序号")
     @NotNull(message = "层级序号不能为空")
     private Integer leverSort;
+
     @ApiModelProperty(name = "targetLevel",value = "目标层级")
     @NotNull(message = "目标层级不能为空")
     private Integer targetLevel;
+
     @ApiModelProperty(name = "calcType",value = "计算方式  0合并计算  1 分开计算")
     @NotNull(message = "计算方式不能为空")
     private Integer calcType;

src/main/java/com/imed/costaccount/model/dto/CostShareParamAccountDto.java

@@ -24,5 +24,5 @@ public class CostShareParamAccountDto {
     /**
      * 关联的医院的Id
      */
-    private Integer hospId;
+    private Long hospId;
 }

src/main/java/com/imed/costaccount/model/dto/CostShareParamEditDto.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
 public class CostShareParamEditDto {
     @ApiModelProperty(name = "shareParamName",value = "原始分摊参数Id不能为空")
     @NotNull(message = "原始分摊参数Id不能为空")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "shareParamName",value = "分摊参数名称不能为空")
     @NotNull(message = "分摊参数名称不能为空")
@@ -28,7 +28,7 @@ public class CostShareParamEditDto {
     /**
      * 医院Id
      */
-    private Integer hospId;
+    private Long hospId;
 
     @ApiModelProperty(name = "calcType",value = "分摊参数的计算方式")
     @NotNull(message = "分摊参数计算方式不能为空")

src/main/java/com/imed/costaccount/model/dto/CostShareParamSaveDto.java

@@ -24,7 +24,7 @@ public class CostShareParamSaveDto {
     /**
      * 医院Id
      */
-    private Integer hospId;
+    private Long hospId;
 
     @ApiModelProperty(name = "calcType",value = "分摊参数的计算方式")
     @NotNull(message = "分摊参数计算方式不能为空")

src/main/java/com/imed/costaccount/model/dto/DepartDTO.java

@@ -3,7 +3,6 @@ package com.imed.costaccount.model.dto;
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -12,8 +11,8 @@ import java.util.List;
 public class DepartDTO {
 
     @NotNull(message = "责任中心id不能为空")
-    private Integer responsibilityId;
+    private Long responsibilityId;
 
 //    @NotEmpty(message = "选择部门不能为空")
-    private List<Integer> departmentIds;
+    private List<Long> departmentIds;
 }

src/main/java/com/imed/costaccount/model/dto/DepartmentDto.java

@@ -13,11 +13,11 @@ import lombok.Data;
 @ApiModel("科室信息dto参数")
 public class DepartmentDto {
     @ApiModelProperty(name = "id",value = "科室的Id")
-    private Integer id;
+    private Long id;
     @ApiModelProperty(name = "departmentName",value = "科室的名称")
     private String departmentName;
     @ApiModelProperty(name = "departmentCode",value = "科室的Id")
     private String departmentCode;
     @ApiModelProperty(name = "hospId",value = "医院的Id")
-    private Integer hospId;
+    private Long hospId;
 }

src/main/java/com/imed/costaccount/model/dto/DepartmentRequest.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 @ApiModel("科室信息保存request参数")
 public class DepartmentRequest {
     @ApiModelProperty(name = "id",value = "科室的Id")
-    private Integer id;
+    private Long id;
     @ApiModelProperty(name = "departmentName",value = "科室的名称")
     @NotNull(message = "科室名称不能为空")
     private String departmentName;
@@ -23,5 +23,5 @@ public class DepartmentRequest {
     @NotNull(message = "科室代码不能为空")
     private String departmentCode;
     @ApiModelProperty(name = "hospId",value = "医院的Id")
-    private Integer hospId;
+    private Long hospId;
 }

src/main/java/com/imed/costaccount/model/dto/HospitalDto.java

@@ -21,7 +21,7 @@ public class HospitalDto {
 
     @ApiModelProperty(name = "id",value = "医院或者病区Id")
     @NotNull(message = "医院/病区的id ")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "name",value = "医院或院区名称")
     @NotNull(message = "医院/病区的名称不能为空")

src/main/java/com/imed/costaccount/model/dto/LoginDTO.java

@@ -20,8 +20,8 @@ public class LoginDTO {
 
     @ApiModelProperty(name = "hospSign", value = "医院标识")
 //    @NotBlank(message = "医院标识不为空")
-    private String hospSign = "AMIlF1mv6bLSPAil";
+    private String hospSign ;
 
     @ApiModelProperty(name = "id",value = "分院id(可能不存在)")
-    private Integer id;
+    private Long id;
 }

src/main/java/com/imed/costaccount/model/dto/ProductAccountDTO.java

@@ -11,7 +11,7 @@ import javax.validation.constraints.NotNull;
 public class ProductAccountDTO {
 
     @NotNull(message = "id不能为空")
-    private Integer id;
+    private Long id;
 
     @NotBlank(message = "成本名称不能为空")
     private String productName;

src/main/java/com/imed/costaccount/model/dto/ProductEditDTO.java

@@ -14,7 +14,7 @@ public class ProductEditDTO {
 
     @ApiModelProperty(name = "id",value = "成本项目id")
     @NotNull(message = "id不能为空")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "productName",value = "成本名称")
     @NotBlank(message = "成本名称不能为空")

src/main/java/com/imed/costaccount/model/dto/ResponsibilityEditDTO.java

@@ -13,10 +13,10 @@ public class ResponsibilityEditDTO {
 
     @ApiModelProperty(name = "id",value = "责任id主键")
     @NotNull(message = "责任主键不为空")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "parentId",value = "父级id，如果不为顶级责任中心，必传")
-    private Integer parentId;
+    private Long parentId;
 
 
     @ApiModelProperty(name = "responsibilityCode",value = "责任中心代码（后台校验唯一性）")

src/main/java/com/imed/costaccount/model/dto/ResponsibilitySaveDTO.java

@@ -13,7 +13,7 @@ import javax.validation.constraints.NotNull;
 public class ResponsibilitySaveDTO {
 
     @ApiModelProperty(name = "ApiModelProperty",value = "责任级别id，新增一级不传，如果是添加二级责任中心，那么必传")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "responsibilityCode",value = "责任中心代码（后台校验唯一性）")
     @NotBlank(message = "责任中心代码不能为空")

src/main/java/com/imed/costaccount/model/dto/ShareParamEditDto.java

@@ -19,7 +19,7 @@ public class ShareParamEditDto {
      * 当前责任中心成本的Id
      */
     @NotNull(message = "责任中心成本Id不能为空")
-    private Integer id;
+    private Long id;
     /**
      * 分摊参数设置比例的集合
      */

src/main/java/com/imed/costaccount/model/dto/UserDto.java

@@ -16,7 +16,7 @@ import javax.validation.constraints.NotNull;
 @ApiModel("操作用户相关参数dto参数")
 public class UserDto {
     @ApiModelProperty(name = "id", value = "编号")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "name", value = "姓名")
     @NotBlank(message = "姓名")
@@ -30,7 +30,7 @@ public class UserDto {
     private String password;
 
     @ApiModelProperty(name = "hospId", value = "医院Id")
-    private Integer hospId;
+    private Long hospId;
 
     @ApiModelProperty(name = "hospitalStatus", value = "在院状态")
     @NotNull(message = "在院状态不能为空")

src/main/java/com/imed/costaccount/model/vo/AccountProductVO.java

@@ -13,7 +13,7 @@ import java.util.List;
 public class AccountProductVO {
 
     @ApiModelProperty(name = "id",value = "会计科目主键")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "accountingName",value = "会计科目名称")
     private String accountingName;

src/main/java/com/imed/costaccount/model/vo/AccountVO.java

@@ -10,7 +10,7 @@ import java.util.List;
 @ApiModel
 public class AccountVO {
 
-    private Integer id;
+    private Long id;
 
     private String accountingName;
 

src/main/java/com/imed/costaccount/model/vo/CenterDepartmentVO.java

@@ -12,7 +12,7 @@ public class CenterDepartmentVO {
 
 //    private Integer id;
 
-    private Integer responsibilityId;
+    private Long responsibilityId;
 
     private String responsibilityName;
 

src/main/java/com/imed/costaccount/model/vo/CommonVO.java

@@ -10,7 +10,7 @@ import lombok.Setter;
 @Setter
 public class CommonVO {
 
-    private Integer id;
+    private Long id;
 
     private String name;
 }

src/main/java/com/imed/costaccount/model/vo/CostAccountShareVO.java

@@ -14,7 +14,7 @@ import lombok.Data;
 public class CostAccountShareVO {
 
     @ApiModelProperty(name = "id",value = "责任中心成本对照相关Id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "responsibilityId",value = "责任中心的Id")
     private Integer responsibilityId;

src/main/java/com/imed/costaccount/model/vo/CostDepartmentVO.java

@@ -17,7 +17,7 @@ import lombok.*;
 @ApiModel
 public class CostDepartmentVO {
     @ApiModelProperty(name = "departmentName",value = "科室Id")
-    private Integer id;
+    private Long id;
     @ApiModelProperty(name = "departmentName",value = "科室的名称")
     private String departmentName;
     @ApiModelProperty(name = "departmentCode",value = "科室的Id")

src/main/java/com/imed/costaccount/model/vo/CostResponsibilityLevelVO.java

@@ -13,9 +13,9 @@ import lombok.Data;
 @ApiModel
 public class CostResponsibilityLevelVO {
     @ApiModelProperty(name = "id",value = "主键")
-    private Integer id;
+    private Long id;
 
-    private Integer responsibilityId;
+    private Long responsibilityId;
 
     @ApiModelProperty(name = "responsibilityName",value = "名称")
     private String responsibilityName;

src/main/java/com/imed/costaccount/model/vo/CostResponsibilityVO.java

@@ -1,6 +1,5 @@
 package com.imed.costaccount.model.vo;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +16,7 @@ import java.util.List;
 public class CostResponsibilityVO{
 
     @ApiModelProperty(name = "id",value = "主键")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "responsibilityName",value = "名称")
     private String responsibilityName;

src/main/java/com/imed/costaccount/model/vo/CostShareLevelVO.java

@@ -17,7 +17,7 @@ import lombok.*;
 @ApiModel
 public class CostShareLevelVO {
     @ApiModelProperty(name = "id",value = "分摊层级的Id")
-    private Integer id;
+    private Long id;
     @ApiModelProperty(name = "shareName",value = "分摊层级数名称")
     private String shareName;
     @ApiModelProperty(name = "leverSort",value = "分摊层级序号")

src/main/java/com/imed/costaccount/model/vo/CostShareParamStatusVO.java

@@ -13,7 +13,7 @@ import lombok.Data;
 @ApiModel("成本分摊参数显示是否被成本分摊对应选中")
 public class CostShareParamStatusVO {
     @ApiModelProperty(name = "id",value = "分摊参数的Id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "shareParamName",value = "分摊参数的名称")
     private String shareParamName;

src/main/java/com/imed/costaccount/model/vo/CostShareParamVO.java

@@ -14,7 +14,7 @@ import lombok.Data;
 public class CostShareParamVO {
 
     @ApiModelProperty(name = "id",value = "分摊参数的Id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "shareParamName",value = "分摊参数的名称")
     private String shareParamName;

src/main/java/com/imed/costaccount/model/vo/DepartVO.java

@@ -5,7 +5,7 @@ import lombok.Data;
 @Data
 public class DepartVO {
 
-    private Integer departmentId;
+    private Long departmentId;
 
     private String departmentName;
 

src/main/java/com/imed/costaccount/model/vo/DepartmentVO.java

@@ -17,13 +17,13 @@ import lombok.*;
 @ApiModel
 public class DepartmentVO {
     @ApiModelProperty(name = "id",value = "科室的Id")
-    private Integer id;
+    private Long id;
     @ApiModelProperty(name = "departmentName",value = "科室的名称")
     private String departmentName;
     @ApiModelProperty(name = "departmentCode",value = "科室的Id")
     private String departmentCode;
     @ApiModelProperty(name = "hospId",value = "医院的Id")
-    private Integer hospId;
+    private Long hospId;
     @ApiModelProperty(name = "createTime",value = "创建时间时间戳")
     private Long createTime;
 

src/main/java/com/imed/costaccount/model/vo/HospitalAllVO.java

@@ -14,7 +14,7 @@ import lombok.Data;
 public class HospitalAllVO {
 
     @ApiModelProperty(name = "id",value = "医院或者病区Id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "name",value = "医院或院区名称")
     private String name;

src/main/java/com/imed/costaccount/model/vo/HospitalVO.java

@@ -18,7 +18,7 @@ import lombok.*;
 public class HospitalVO {
 
     @ApiModelProperty(name = "id",value = "医院或者病区Id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "name",value = "医院或院区名称")
     private String name;

src/main/java/com/imed/costaccount/model/vo/LoginVO.java

@@ -16,7 +16,7 @@ public class LoginVO {
     @ApiModelProperty(name = "token",value = "登录返回jwt字符串")
     private String token;
     @ApiModelProperty(name = "userid",value = "登录返回用户Id")
-    private Integer userid;
+    private Long userid;
     @ApiModelProperty(name = "name",value = "登录返回用户名称")
     private String name;
 }

src/main/java/com/imed/costaccount/model/vo/ProductVO.java

@@ -9,7 +9,7 @@ import lombok.Data;
 public class ProductVO {
 
     @ApiModelProperty(name = "id",value = "成本项目id")
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(name = "productCode",value = "成本项目代码")
     private String productCode;

src/main/java/com/imed/costaccount/model/vo/SelectAccountingVO.java

@@ -10,10 +10,10 @@ import java.util.List;
 @Data
 public class SelectAccountingVO {
 
-    private Integer value;
+    private Long value;
 
     @JsonIgnore
-    private Integer parentId;
+    private Long parentId;
 
     @JsonIgnore
     private String allParentIds;

src/main/java/com/imed/costaccount/model/vo/ShareParamProportionVO.java

@@ -14,7 +14,7 @@ public class ShareParamProportionVO {
     /**
      * 分摊参数的Id
      */
-    private Integer id;
+    private Long id;
     /**
      * 分摊参数的名称
      */

src/main/java/com/imed/costaccount/model/vo/UserVO.java

@@ -16,12 +16,16 @@ import lombok.*;
 @Builder
 @ApiModel
 public class UserVO {
+
     @ApiModelProperty(name = "id",value = "用户的Id")
-    private Integer id;
+    private Long id;
+
     @ApiModelProperty(name = "name",value = "用户姓名")
     private String name;
+
     @ApiModelProperty(name = "account",value = "账号")
     private String account;
+
     @ApiModelProperty(name = "hospitalStatus",value = "再院状态")
     private Integer hospitalStatus;
 }

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

@@ -54,6 +54,6 @@ public interface AccountingService extends IService<Accounting> {
      * @param id
      * @param user
      */
-    void deleteAccount(Integer id, User user);
+    void deleteAccount(Long id, User user);
 }
 

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

@@ -26,7 +26,7 @@ public interface CostAccountShareService extends IService<CostAccountShare> {
      * @param name
      * @return
      */
-    PageUtils queryList(Integer current, Integer pageSize, String name,Integer hospId);
+    PageUtils queryList(Integer current, Integer pageSize, String name,Long hospId);
 
     /**
      * 保存责任中心成本对照表
@@ -52,7 +52,7 @@ public interface CostAccountShareService extends IService<CostAccountShare> {
      * @param hospId
      * @return
      */
-    List<ShareParamProportionVO> selectShareParamById(Integer id, Integer hospId);
+    List<ShareParamProportionVO> selectShareParamById(Integer id, Long hospId);
 
     /**
      * 成本分摊参数中被分摊参数对应选中的状态
@@ -60,6 +60,6 @@ public interface CostAccountShareService extends IService<CostAccountShare> {
      * @param hospId
      * @return
      */
-    List<CostShareParamStatusVO> getAllShareParamStatusById(Integer id, Integer hospId);
+    List<CostShareParamStatusVO> getAllShareParamStatusById(Integer id, Long hospId);
 }
 

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

@@ -25,7 +25,7 @@ public interface CostShareLevelService extends IService<CostShareLevel> {
      * @param hospId
      * @return
      */
-    PageUtils queryList(Integer current, Integer pageSize, String name, Integer hospId);
+    PageUtils queryList(Integer current, Integer pageSize, String name, Long hospId);
 
     /**
      * 保存
@@ -44,6 +44,6 @@ public interface CostShareLevelService extends IService<CostShareLevel> {
      * @param hospId
      * @return
      */
-    List<CostShareLevelVO> getAll(Integer hospId);
+    List<CostShareLevelVO> getAll(Long hospId);
 }
 

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

@@ -25,7 +25,7 @@ public interface CostShareParamService extends IService<CostShareParam> {
      * @param name
      * @return
      */
-    PageUtils queryList(Integer current, Integer pageSize, String name,Integer hospId);
+    PageUtils queryList(Integer current, Integer pageSize, String name,Long hospId);
 
     /**
      * 保存分摊参数
@@ -51,7 +51,7 @@ public interface CostShareParamService extends IService<CostShareParam> {
      * @param hospId
      * @return
      */
-    List<CostShareParamVO> getAll(Integer hospId);
+    List<CostShareParamVO> getAll(Long hospId);
 
     /**
      * 根据医院的Id分摊参数的ID获取对应的分摊参数的数据
@@ -59,7 +59,7 @@ public interface CostShareParamService extends IService<CostShareParam> {
      * @param hospId
      * @return
      */
-    CostShareParamVO getByHospIdAndAPramId(Integer id, Integer hospId);
+    CostShareParamVO getByHospIdAndAPramId(Integer id, Long hospId);
 
     List<Integer> selectIsSelect(Integer shareParamId);
 

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

@@ -2,6 +2,7 @@ package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.Department;
 import com.imed.costaccount.model.dto.DepartmentRequest;
 
@@ -23,7 +24,7 @@ public interface DepartmentService extends IService<Department> {
      * @param name
      * @return
      */
-    PageUtils queryList(Integer current, Integer pageSize,Integer hospId ,String name);
+    PageUtils queryList(Integer current, Integer pageSize,Long hospId ,String name);
 
     /**
      * 根据指定条件查询科室的相关信息
@@ -33,7 +34,7 @@ public interface DepartmentService extends IService<Department> {
      * @param hospId
      * @return
      */
-    List<Department> getByDepartment(Integer id,String departmentName,String departmentCode,Integer hospId);
+    List<Department> getByDepartment(Integer id,String departmentName,String departmentCode,Long hospId);
 
     /**
      * 保存科室信息
@@ -46,5 +47,13 @@ public interface DepartmentService extends IService<Department> {
      * @param departmentRequest
      */
     void updateByDepartment(DepartmentRequest departmentRequest);
+
+    /**
+     * 导入科室信息
+     * @param read
+     * @param hospId
+     * @return
+     */
+    Result importDepartment(List<List<Object>> read, Long hospId);
 }
 

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

@@ -39,7 +39,7 @@ public interface HospitalService extends IService<Hospital> {
      * @param pageSize
      * @return
      */
-    PageUtils queryList(Integer current, Integer pageSize,Integer hospId, String name);
+    PageUtils queryList(Integer current, Integer pageSize,Long hospId, String name);
 
     /**
      * 添加医院信息
@@ -67,6 +67,6 @@ public interface HospitalService extends IService<Hospital> {
 //     * @param str
 //     * @return
 //     */
-//    Integer getByNameAndCheck(Integer hospId, String str);
+//    Integer getByNameAndCheck(Long hospId, String str);
 }
 

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

@@ -2,6 +2,7 @@ package com.imed.costaccount.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.Product;
 import com.imed.costaccount.model.dto.ProductDTO;
 import com.imed.costaccount.model.User;
@@ -49,5 +50,13 @@ public interface ProductService extends IService<Product> {
      * @return
      */
     List<CommonVO> getProducts(User user);
+
+    /**
+     * 批量导入收入成本信息
+     * @param read
+     * @param hospId
+     * @return
+     */
+    Result importProduct(List<List<Object>> read, Long hospId);
 }
 

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

@@ -68,6 +68,6 @@ public interface ResponsibilityService extends IService<Responsibility> {
      * @param hospId
      * @return
      */
-    List<CostResponsibilityLevelVO> getLevelTwo(Integer hospId);
+    List<CostResponsibilityLevelVO> getLevelTwo(Long hospId);
 }
 

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

@@ -7,11 +7,9 @@ import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.LoginDTO;
 import com.imed.costaccount.model.dto.UserDto;
 import com.imed.costaccount.model.vo.LoginVO;
-import org.springframework.web.multipart.MultipartFile;
 import com.imed.costaccount.model.vo.UserVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 用户表
@@ -37,7 +35,7 @@ public interface UserService extends IService<User> {
      * @param hospId
      * @return
      */
-    PageUtils queryList(Integer page, Integer pageSize, Integer hospId,String name);
+    PageUtils queryList(Integer page, Integer pageSize, Long hospId,String name);
 
     /**
      * 根据用户的姓名查询用户

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

@@ -120,7 +120,7 @@ public class AccountingProductServiceImpl extends ServiceImpl<AccountingProductM
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void saveAccountProduct(AccountProductSaveDTO accountProductSaveDTO, User user) {
         // 删除所有原来的关系
-        Integer accountId = accountProductSaveDTO.getId();
+        Long accountId = accountProductSaveDTO.getId();
         this.remove(new LambdaQueryWrapper<AccountingProduct>().eq(AccountingProduct::getAccountingId, accountId));
 
         List<Integer> products = accountProductSaveDTO.getProducts();

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

@@ -117,7 +117,7 @@ public class AccountingServiceImpl extends ServiceImpl<AccountingMapper, Account
         this.checkAccountingCode(accountingSaveDTO.getAccountingCode(), user.getHospId());
 
         // 新增逻辑
-        Integer parentId = accountingSaveDTO.getId();
+        Long parentId = accountingSaveDTO.getId();
         // 不是顶层的
         String allParentIds = "0";
         if (parentId != 0) {
@@ -154,7 +154,7 @@ public class AccountingServiceImpl extends ServiceImpl<AccountingMapper, Account
     }
 
 
-    private void checkAccountingCode(String code, Integer hospId) {
+    private void checkAccountingCode(String code, Long hospId) {
         List<Accounting> list = this.baseMapper.selectList(
                 new QueryWrapper<Accounting>().lambda().select(Accounting::getId)
                         .eq(Accounting::getAccountingCode, code)
@@ -229,7 +229,7 @@ public class AccountingServiceImpl extends ServiceImpl<AccountingMapper, Account
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void updateAccount(AccountingEditDTO accountingEditDTO, User user) {
         // TODO: 2021/7/28 追踪溯源需求不满足
-        Integer id = accountingEditDTO.getId();
+        Long id = accountingEditDTO.getId();
 //        this.checkAccountingCode(accountingEditDTO.getAccountingCode(), user.getHospId());
         Accounting one = this.baseMapper.selectOne(
                 new QueryWrapper<Accounting>().lambda()
@@ -296,7 +296,7 @@ public class AccountingServiceImpl extends ServiceImpl<AccountingMapper, Account
         accounting.setAccountingCode(accounting.getAccountingCode());
         accounting.setCreateTime(System.currentTimeMillis());
         // 新增逻辑
-        Integer parentId = byId.getParentId();
+        Long parentId = byId.getParentId();
         // 不是顶层的
         String allParentIds = "0";
         if (parentId != 0) {
@@ -321,7 +321,7 @@ public class AccountingServiceImpl extends ServiceImpl<AccountingMapper, Account
      * @param accounts
      * @return
      */
-    private List<Accounting> getAndAllChild(List<Integer> ids, Integer hospId, List<Accounting> accounts) {
+    private List<Accounting> getAndAllChild(List<Long> ids, Long hospId, List<Accounting> accounts) {
 
         List<Accounting> list = this.list(
                 new LambdaQueryWrapper<Accounting>()
@@ -343,13 +343,13 @@ public class AccountingServiceImpl extends ServiceImpl<AccountingMapper, Account
      */
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public void deleteAccount(Integer id, User user) {
+    public void deleteAccount(Long id, User user) {
         List<Accounting> list = new ArrayList<>();
         List<Accounting> andAllChild = this.getAndAllChild(Arrays.asList(id), user.getHospId(), list);
         if (CollUtil.isEmpty(andAllChild)) {
             this.removeById(id);
         }
-        List<Integer> collect = andAllChild.stream().map(Accounting::getId).collect(Collectors.toList());
+        List<Long> collect = andAllChild.stream().map(Accounting::getId).collect(Collectors.toList());
         collect.add(id);
         this.removeByIds(collect);
     }

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

@@ -58,7 +58,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
      * @return
      */
     @Override
-    public PageUtils queryList(Integer current, Integer pageSize, String name, Integer hospId) {
+    public PageUtils queryList(Integer current, Integer pageSize, String name, Long hospId) {
         Page<CostAccountShare> costAccountSharePage = new Page<>(current, pageSize);
         Page<CostAccountShare> pages = this.page(costAccountSharePage, new QueryWrapper<CostAccountShare>().lambda()
                 .eq(!StringUtils.isEmpty(hospId), CostAccountShare::getHospId, hospId)
@@ -74,12 +74,12 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
         return pageUtils;
     }
 
-    private void getMessage(Integer hospId, List<CostAccountShareVO> costAccountShareList) {
+    private void getMessage(Long hospId, List<CostAccountShareVO> costAccountShareList) {
         // 设置责任中心的数据 与 会计科目的数据从对应的id里面获取
         List<Responsibility> list = responsibilityService.list(new QueryWrapper<Responsibility>().lambda().eq(Responsibility::getHospId, hospId));
         List<Accounting> accountingList = accountingService.list(new QueryWrapper<Accounting>().lambda().eq(Accounting::getHospId, hospId));
-        Map<Integer, List<Responsibility>> resMap = list.stream().collect(Collectors.groupingBy(Responsibility::getId));
-        Map<Integer, List<Accounting>> accountMap = accountingList.stream().collect(Collectors.groupingBy(Accounting::getId));
+        Map<Long, List<Responsibility>> resMap = list.stream().collect(Collectors.groupingBy(Responsibility::getId));
+        Map<Long, List<Accounting>> accountMap = accountingList.stream().collect(Collectors.groupingBy(Accounting::getId));
         costAccountShareList.forEach(i->{
             Integer id = i.getResponsibilityId();
             List<Responsibility> responsibilities = resMap.get(id);
@@ -111,7 +111,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void addCostAccountShare(CostAccountShareSaveDto costAccountShareSaveDto) {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         // 检验输入的数据的合理性
         checkAccountShare(costAccountShareSaveDto, hospId);
         // 检验输入的责任中心是否存在
@@ -132,8 +132,8 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
      * @param costAccountShareSaveDto
      * @param hospId
      */
-    private void checkAccountShare(CostAccountShareSaveDto costAccountShareSaveDto, Integer hospId) {
-        Integer responsibilityId = costAccountShareSaveDto.getResponsibilityId();
+    private void checkAccountShare(CostAccountShareSaveDto costAccountShareSaveDto, Long hospId) {
+        Long responsibilityId = costAccountShareSaveDto.getResponsibilityId();
         Responsibility responsibility = responsibilityService.getOne(new QueryWrapper<Responsibility>().lambda().eq(Responsibility::getHospId,hospId).eq(Responsibility::getId, responsibilityId));
         if (Objects.isNull(responsibility)){
             throw new CostException(500,"输入的责任不存在");
@@ -188,8 +188,8 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void updateByCostAccountShare(CostAccountShareEditDto costAccountShareEditDto) {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
-        Integer id = costAccountShareEditDto.getId();
+        Long hospId = user.getHospId();
+        Long id = costAccountShareEditDto.getId();
         CostAccountShare costAccountShare = baseMapper.selectById(id);
         if (Objects.isNull(costAccountShare)){
             throw new CostException(500,"责任中心成本数据不存在");
@@ -219,8 +219,8 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
     public void updateShareParam(ShareParamEditDto shareParamEditDto) {
         List<ShareParamProportionVO> shareParamProportionVOList1 = shareParamEditDto.getShareParamProportionVOList();
             User user = (User) SecurityUtils.getSubject().getPrincipal();
-            Integer hospId = user.getHospId();
-            Integer id = shareParamEditDto.getId();
+        Long hospId = user.getHospId();
+        Long id = shareParamEditDto.getId();
             CostAccountShare costAccountShare = baseMapper.selectOne(new QueryWrapper<CostAccountShare>().lambda()
                     .eq(CostAccountShare::getHospId, hospId)
                     .eq(CostAccountShare::getId, id));
@@ -231,7 +231,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
             List<ShareParamProportionVO> shareParamProportionVOList = shareParamEditDto.getShareParamProportionVOList();
             // 检验输入的成本分摊参数是否存在
             List<CostShareParamVO> costShareParamServiceAll = costShareParamService.getAll(hospId);
-            Map<Integer, List<CostShareParamVO>> listMap = costShareParamServiceAll.stream().collect(Collectors.groupingBy(CostShareParamVO::getId));
+            Map<Long, List<CostShareParamVO>> listMap = costShareParamServiceAll.stream().collect(Collectors.groupingBy(CostShareParamVO::getId));
             shareParamProportionVOList.forEach(i->{
                 if (CollectionUtils.isEmpty(listMap.get(i.getId()))){
                     throw new CostException(500,"分摊名称:"+i.getShareParamName()+"未找到");
@@ -248,9 +248,9 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
             }
 
             // 判断添加的分摊是否存在一样的
-            HashMap<Integer, ShareParamProportionVO> hashMap = new HashMap<>();
+            HashMap<Long, ShareParamProportionVO> hashMap = new HashMap<>();
             shareParamProportionVOList.forEach(i->{
-                Integer paramId = i.getId();
+                Long paramId = i.getId();
                 if (hashMap.containsKey(paramId)){
                     throw new CostException(500,"不可以添加相同的分摊参数");
                 }
@@ -274,7 +274,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
      * @return
      */
     @Override
-    public List<ShareParamProportionVO> selectShareParamById(Integer id, Integer hospId) {
+    public List<ShareParamProportionVO> selectShareParamById(Integer id, Long hospId) {
         CostAccountShare costAccountShare = baseMapper.selectOne(new QueryWrapper<CostAccountShare>().lambda()
                 .eq(CostAccountShare::getHospId, hospId).eq(CostAccountShare::getId, id));
         if (Objects.isNull(costAccountShare)){
@@ -292,7 +292,7 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
      * @return
      */
     @Override
-    public List<CostShareParamStatusVO> getAllShareParamStatusById(Integer id, Integer hospId) {
+    public List<CostShareParamStatusVO> getAllShareParamStatusById(Integer id, Long hospId) {
         List<CostShareParamVO> costShareParamServiceAll = costShareParamService.getAll(hospId);
         CostAccountShare costAccountShare = baseMapper.selectById(id);
         if (Objects.isNull(costAccountShare)){
@@ -302,9 +302,9 @@ public class CostAccountShareServiceImpl extends ServiceImpl<CostAccountShareMap
         List<CostShareParamStatusVO> costShareParamStatusVOList = BeanUtil.convertList(costShareParamServiceAll, CostShareParamStatusVO.class);
         if (!StringUtils.isEmpty(paramList)) {
             List<ShareParamProportionVO> shareParamProportionVOList = JsonUtil.toList(paramList, ShareParamProportionVO.class);
-            Map<Integer, List<ShareParamProportionVO>> map = shareParamProportionVOList.stream().collect(Collectors.groupingBy(ShareParamProportionVO::getId));
+            Map<Long, List<ShareParamProportionVO>> map = shareParamProportionVOList.stream().collect(Collectors.groupingBy(ShareParamProportionVO::getId));
             costShareParamStatusVOList.forEach(i -> {
-                Integer paramId = i.getId();
+                Long paramId = i.getId();
                 if (!CollectionUtils.isEmpty(map.get(paramId))) {
                     i.setShareParamStatus(NumberConstant.ONE);
                 }

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

@@ -37,7 +37,7 @@ public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper,
      * @return
      */
     @Override
-    public PageUtils queryList(Integer current, Integer pageSize, String name, Integer hospId) {
+    public PageUtils queryList(Integer current, Integer pageSize, String name, Long hospId) {
         Page<CostShareLevel> costShareLevelPage = new Page<>(current, pageSize);
         Page<CostShareLevel> pages = this.page(costShareLevelPage, new QueryWrapper<CostShareLevel>().lambda()
                 .eq(!StringUtils.isEmpty(hospId), CostShareLevel::getHospId, hospId)
@@ -59,7 +59,7 @@ public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper,
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void addCostShareLevel(CostShareLevelSaveDto costShareLevelSaveDto) {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         CostShareLevel costShareLevel = BeanUtil.convertObj(costShareLevelSaveDto, CostShareLevel.class);
         costShareLevel.setCreateTime(System.currentTimeMillis());
         costShareLevel.setHospId(hospId);
@@ -75,7 +75,7 @@ public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper,
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void updateByCostShareLevel(CostShareLevelEditDto costShareLevelEditDto) {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         Integer id = costShareLevelEditDto.getId();
         CostShareLevel costShareLevel = baseMapper.selectById(id);
         if (Objects.isNull(costShareLevel)){
@@ -96,7 +96,7 @@ public class CostShareLevelServiceImpl extends ServiceImpl<CostShareLevelMapper,
      * @return
      */
     @Override
-    public List<CostShareLevelVO> getAll(Integer hospId) {
+    public List<CostShareLevelVO> getAll(Long hospId) {
         QueryWrapper<CostShareLevel> wrapper = new QueryWrapper<>();
         wrapper.eq(!StringUtils.isEmpty(hospId),"hosp_id",hospId);
         List<CostShareLevel> costShareLevels = baseMapper.selectList(wrapper);

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

@@ -40,7 +40,7 @@ public class CostShareParamServiceImpl extends ServiceImpl<CostShareParamMapper,
      * @return
      */
     @Override
-    public PageUtils queryList(Integer current, Integer pageSize, String name,Integer hospId) {
+    public PageUtils queryList(Integer current, Integer pageSize, String name,Long hospId) {
         Page<CostShareParam> costShareParamPage = new Page<>(current, pageSize);
         Page<CostShareParam> pages = this.page(costShareParamPage, new QueryWrapper<CostShareParam>().lambda()
                 .eq(!StringUtils.isEmpty(hospId), CostShareParam::getHospId, hospId)
@@ -90,7 +90,7 @@ public class CostShareParamServiceImpl extends ServiceImpl<CostShareParamMapper,
     @Override
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void updateCostShareParam(CostShareParamEditDto costShareParamEditDto) {
-        Integer id = costShareParamEditDto.getId();
+        Long id = costShareParamEditDto.getId();
         CostShareParam costShareParam = baseMapper.selectById(id);
         if (Objects.isNull(costShareParam)){
             throw new CostException(500,"对不起分摊参数不存在");
@@ -147,7 +147,7 @@ public class CostShareParamServiceImpl extends ServiceImpl<CostShareParamMapper,
      */
     @Override
     @ApiOperation("获取所有的分摊参数的集合数据")
-    public List<CostShareParamVO> getAll(Integer hospId) {
+    public List<CostShareParamVO> getAll(Long hospId) {
         List<CostShareParam> costShareParamList = baseMapper.selectList(new QueryWrapper<CostShareParam>().lambda()
                 .eq(CostShareParam::getHospId, hospId));
         List<CostShareParamVO> costShareParamVOList = BeanUtil.convertList(costShareParamList, CostShareParamVO.class);
@@ -162,7 +162,7 @@ public class CostShareParamServiceImpl extends ServiceImpl<CostShareParamMapper,
      * @return
      */
     @Override
-    public CostShareParamVO getByHospIdAndAPramId(Integer id, Integer hospId) {
+    public CostShareParamVO getByHospIdAndAPramId(Integer id, Long hospId) {
         CostShareParam costShareParam = baseMapper.selectOne(new QueryWrapper<CostShareParam>().lambda()
                 .eq(CostShareParam::getHospId, hospId)
                 .eq(CostShareParam::getId, id));

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

@@ -1,6 +1,8 @@
 package com.imed.costaccount.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -8,6 +10,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.BeanUtil;
 import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.common.util.Result;
+import com.imed.costaccount.constants.NumberConstant;
 import com.imed.costaccount.mapper.DepartmentMapper;
 import com.imed.costaccount.model.Department;
 import com.imed.costaccount.model.Hospital;
@@ -15,6 +19,7 @@ import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.DepartmentRequest;
 import com.imed.costaccount.model.vo.DepartmentVO;
 import com.imed.costaccount.service.DepartmentService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -23,11 +28,13 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+@Slf4j
 @Service("departmentService")
 public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Department> implements DepartmentService {
 
@@ -43,7 +50,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
      * @return
      */
     @Override
-    public PageUtils queryList(Integer current, Integer pageSize,Integer hospId, String name) {
+    public PageUtils queryList(Integer current, Integer pageSize,Long hospId, String name) {
         Page<Department> departPage = new Page<>(current, pageSize);
         Page<Department> pages = this.page(departPage, new QueryWrapper<Department>().lambda()
                 .eq(!StringUtils.isEmpty(hospId), Department::getHospId, hospId)
@@ -72,7 +79,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
      * @return
      */
     @Override
-    public List<Department> getByDepartment(Integer id,String departmentName,String departmentCode,Integer hospId) {
+    public List<Department> getByDepartment(Integer id,String departmentName,String departmentCode,Long hospId) {
         LambdaQueryWrapper<Department> wrapper = new QueryWrapper<Department>().lambda()
                 .eq(!StringUtils.isEmpty(id), Department::getId, id)
                 .like(!StringUtils.isEmpty(departmentName), Department::getDepartmentName, departmentName)
@@ -92,7 +99,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void addDepartment(DepartmentRequest departmentRequest) {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         // 查询所有的科室信息
         List<Department> departmentList = baseMapper.selectList(new QueryWrapper<Department>().lambda().eq(Department::getHospId, hospId));
         Map<String, List<Department>> map =
@@ -116,8 +123,8 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void updateByDepartment(DepartmentRequest departmentRequest) {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
-        Integer id = departmentRequest.getId();
+        Long hospId = user.getHospId();
+        Long id = departmentRequest.getId();
         Department department = baseMapper.selectById(id);
         if (Objects.isNull(department)){
             throw new CostException("未找到相关科室信息");
@@ -137,4 +144,83 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         departmentResponse.setHospId(hospId);
         baseMapper.insert(departmentResponse);
     }
+
+    /**
+     * 导入科室信息
+     *
+     * @param list
+     * @param hospId
+     * @return
+     */
+    @Override
+    public Result importDepartment(List<List<Object>> list, Long hospId) {
+        for (int i = list.size() - 1; i >= 0; i--) {
+            if (i == NumberConstant.ZERO || i == NumberConstant.ONE || i == NumberConstant.TWO || i == NumberConstant.THREE) {
+                list.remove(list.get(i));
+            }
+        }
+        log.info("读取的数据为：{}", list);
+        List<Department> departmentList = new ArrayList<>();
+        List<String> errRowNums = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            List<Object> data = list.get(i);
+            log.info("得到用户输入的数据为：{}", data);
+            Department department = new Department();
+            department.setHospId(hospId);
+            department.setCreateTime(System.currentTimeMillis());
+            int size = data.size();
+            if (size != 5) {
+                // 补充读取的null问题
+                if (size == 4) {
+                    data.add(StrUtil.EMPTY);
+                }
+                for (int j = 0; j < 3; j++) {
+                    if (Objects.isNull(data.get(j))) {
+                        data.set(j, StrUtil.EMPTY);
+                    }
+                }
+            }
+            for (int j = 0; j < 3; j++) {
+                String str = String.valueOf(data.get(j));
+                log.info("得到的字符串{}", str);
+                if (StrUtil.isBlank(str)) {
+                    errRowNums.add("" + (i + 3));
+                }
+
+                if (j == 0) {
+                    //  Excel里面输入医院名称  根据医院名称解析
+                    Hospital hospital = hospitalService.getByName(str);
+                    department.setHospId(hospital.getId());
+                } else if (j == 1) {
+                    department.setDepartmentName(str);
+                } else {
+                    department.setDepartmentCode(str);
+                }
+            }
+            departmentList.add(department);
+        }
+        if (CollUtil.isNotEmpty(errRowNums)) {
+            String collect = errRowNums.stream().collect(Collectors.joining(StrUtil.COMMA));
+            throw new CostException(500, "第" + collect + "行数据异常");
+        }
+        // 校验输入的Department是否存在  输入的科室里面筛选出已经存在的科室信息
+        List<Department> realDepartments = new ArrayList<>();
+        departmentList.forEach(i -> {
+            Department one = getOne(
+                    new QueryWrapper<Department>().lambda()
+                            .eq(Department::getDepartmentCode, i.getDepartmentCode())
+                            .eq(Department::getHospId, i.getHospId())
+            );
+            if (Objects.nonNull(one)) {
+                realDepartments.add(one);
+            }
+        });
+        departmentList = departmentList.stream().filter(i -> !realDepartments.stream().map(Department::getDepartmentCode).collect(Collectors.toList()).contains(i.getDepartmentCode())).collect(Collectors.toList());
+        this.saveBatch(departmentList);
+        if (CollectionUtils.isEmpty(realDepartments)){
+            return Result.build(200,"数据导入成功",null);
+        }else {
+            return Result.build(200, "有" + realDepartments.size() + "条数据已存在，未被导入", null);
+        }
+    }
 }

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

@@ -42,7 +42,7 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
      * @return
      */
     @Override
-    public PageUtils queryList(Integer current, Integer pageSize, Integer hospId, String name) {
+    public PageUtils queryList(Integer current, Integer pageSize, Long hospId, String name) {
         Page<Hospital> hosptailPage = new Page<>(current, pageSize);
         Page<Hospital> pages = this.page(hosptailPage, new QueryWrapper<Hospital>().lambda()
                 .like(!StringUtils.isEmpty(name), Hospital::getName, name).orderByDesc(Hospital::getCreateTime));
@@ -227,7 +227,7 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
 //     * @return
 //     */
 //    @Override
-//    public Integer getByNameAndCheck(Integer hospId, String str) {
+//    public Integer getByNameAndCheck(Long hospId, String str) {
 //        // 得到这个hospId 相关的所有医院或院区id
 //        Hospital byId = this.getById(hospId);
 //        if (Objects.isNull(byId)) {

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

@@ -3,11 +3,15 @@ package com.imed.costaccount.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.PageUtils;
+import com.imed.costaccount.common.util.Result;
+import com.imed.costaccount.constants.NumberConstant;
 import com.imed.costaccount.mapper.ProductMapper;
+import com.imed.costaccount.model.Hospital;
 import com.imed.costaccount.model.Product;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.ProductDTO;
@@ -16,19 +20,25 @@ import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.ProductVO;
 import com.imed.costaccount.service.ProductService;
 import com.imed.costaccount.utils.BeanUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
-
+@Slf4j
 @Service("productService")
 public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> implements ProductService {
 
+    @Autowired
+    private HospitalServiceImpl hospitalService;
 
     /**
      * 分页查询
@@ -72,7 +82,7 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         this.save(product);
     }
 
-    private void checkProductCode(String code, Integer hospId) {
+    private void checkProductCode(String code, Long hospId) {
         List<Product> list = this.list(
                 new LambdaQueryWrapper<Product>()
                         .eq(Product::getProductCode, code)
@@ -128,4 +138,83 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
             return commonVO;
         }).collect(Collectors.toList());
     }
+
+    /**
+     * 批量导入收入成本信息
+     *
+     * @param list
+     * @param hospId
+     * @return
+     */
+    @Override
+    public Result importProduct(List<List<Object>> list, Long hospId) {
+        for (int i = list.size() - 1; i >= 0; i--) {
+            if (i == NumberConstant.ZERO || i == NumberConstant.ONE || i == NumberConstant.TWO || i == NumberConstant.THREE) {
+                list.remove(list.get(i));
+            }
+        }
+        log.info("读取的数据为：{}", list);
+        List<Product> productList = new ArrayList<>();
+        List<String> errRowNums = new ArrayList<>();
+        for (int i = 0; i < list.size(); i++) {
+            List<Object> data = list.get(i);
+            log.info("得到用户输入的数据为：{}", data);
+            Product product = new Product();
+            product.setHospId(hospId);
+            product.setCreateTime(System.currentTimeMillis());
+            int size = data.size();
+            if (size != 5) {
+                // 补充读取的null问题
+                if (size == 4) {
+                    data.add(StrUtil.EMPTY);
+                }
+                for (int j = 0; j < 3; j++) {
+                    if (Objects.isNull(data.get(j))) {
+                        data.set(j, StrUtil.EMPTY);
+                    }
+                }
+            }
+            for (int j = 0; j < 3; j++) {
+                String str = String.valueOf(data.get(j));
+                log.info("得到的字符串{}", str);
+                if (StrUtil.isBlank(str)) {
+                    errRowNums.add("" + (i + 3));
+                }
+
+                if (j == 0) {
+                    //  Excel里面输入医院名称  根据医院名称解析
+                    Hospital hospital = hospitalService.getByName(str);
+                    product.setHospId(hospital.getId());
+                } else if (j == 1) {
+                    product.setProductName(str);
+                } else {
+                    product.setProductCode(str);
+                }
+            }
+            productList.add(product);
+        }
+        if (CollUtil.isNotEmpty(errRowNums)) {
+            String collect = errRowNums.stream().collect(Collectors.joining(StrUtil.COMMA));
+            throw new CostException(500, "第" + collect + "行数据异常");
+        }
+        // 校验输入的Department是否存在  输入的科室里面筛选出已经存在的科室信息
+        List<Product> realProducts = new ArrayList<>();
+        productList.forEach(i -> {
+            Product one = getOne(
+                    new QueryWrapper<Product>().lambda()
+                            .eq(Product::getProductCode, i.getProductCode())
+                            .eq(Product::getHospId, i.getHospId())
+            );
+            if (Objects.nonNull(one)) {
+                realProducts.add(one);
+            }
+        });
+        productList = productList.stream().filter(i -> !realProducts.stream().map(Product::getProductCode).collect(Collectors.toList()).contains(i.getProductCode())).collect(Collectors.toList());
+        this.saveBatch(productList);
+        if (CollectionUtils.isEmpty(realProducts)){
+            return Result.build(200,"数据导入成功",null);
+        }else {
+            return Result.build(200, "有" + realProducts.size() + "条数据已存在，未被导入", null);
+        }
+    }
 }

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

@@ -68,8 +68,8 @@ public class ResponsibilityDepartmentServiceImpl
     @Override
     @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Exception.class)
     public void saveCenterDepart(DepartDTO departDTO, User user) {
-        Integer responsibilityId = departDTO.getResponsibilityId();
-        Integer hospId = user.getHospId();
+        Long responsibilityId = departDTO.getResponsibilityId();
+        Long hospId = user.getHospId();
         List<ResponsibilityDepartment> list = this.list(
                 new LambdaQueryWrapper<ResponsibilityDepartment>().select(ResponsibilityDepartment::getId)
                         .eq(ResponsibilityDepartment::getResponsibilityId, responsibilityId)
@@ -78,7 +78,7 @@ public class ResponsibilityDepartmentServiceImpl
         if (CollUtil.isNotEmpty(list)) {
             this.removeByIds(list.stream().map(ResponsibilityDepartment::getId).collect(Collectors.toList()));
         }
-        List<Integer> departmentIds = departDTO.getDepartmentIds();
+        List<Long> departmentIds = departDTO.getDepartmentIds();
         if (CollUtil.isEmpty(departmentIds)) {
             return ;
         }

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

@@ -84,9 +84,9 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void addResponsibilityCenter(ResponsibilitySaveDTO responsibilitySaveDTO, User user) {
         // 如果是一级分类parentId为0
-        Integer id = responsibilitySaveDTO.getId();
+        Long id = responsibilitySaveDTO.getId();
         if (Objects.isNull(id)) {
-            id = 0;
+            id = 0L;
         }
         checkCode(responsibilitySaveDTO.getResponsibilityCode(), user.getHospId());
 
@@ -114,7 +114,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         this.save(center);
     }
 
-    private void checkCode(String code, Integer hospId) {
+    private void checkCode(String code, Long hospId) {
         // 校验责任代码唯一性
         Responsibility one = this.getOne(
                 new LambdaQueryWrapper<Responsibility>().select(Responsibility::getId)
@@ -136,7 +136,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
     @Override
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void editResponsibility(ResponsibilityEditDTO responsibilityEditDTO, User user) {
-        Integer id = responsibilityEditDTO.getId();
+        Long id = responsibilityEditDTO.getId();
         Responsibility center = this.getById(id);
         if (Objects.isNull(center)) {
             throw new CostException(ErrorCodeEnum.DATA_NOT_EXIST);
@@ -173,7 +173,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public void updateAllResp(Responsibility center, ResponsibilityEditDTO dto, User user, List<Responsibility> list) {
         // 删除原有的父节点数据
-        Integer id = dto.getId();
+        Long id = dto.getId();
         this.removeById(id);
         this.checkCode(dto.getResponsibilityCode(), user.getHospId());
         // 新增父节点数据
@@ -202,7 +202,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
     @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public void updateCurResp(Responsibility center, ResponsibilityEditDTO dto, User user) {
         // 删除
-        Integer id = dto.getId();
+        Long id = dto.getId();
         this.removeById(id);
         // 校验code
         this.checkCode(dto.getResponsibilityCode(), user.getHospId());
@@ -218,7 +218,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
             newResponsibility.setShareId(null)
                     .setShareLevel(0)
                     .setShareName(null)
-                    .setParentId(0)
+                    .setParentId(0L)
                     .setResponsibilityLevel(1);
         }
         if (dto.getParentId() == 0) {
@@ -237,10 +237,10 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
      * @param hospId
      */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public void updateParent(ResponsibilityEditDTO dto, Responsibility responsibility, Integer hospId) {
+    public void updateParent(ResponsibilityEditDTO dto, Responsibility responsibility, Long hospId) {
 
         // 删除原有的父节点数据
-        Integer id = dto.getId();
+        Long id = dto.getId();
         this.removeById(id);
         List<Responsibility> child = this.list(new QueryWrapper<Responsibility>().lambda().eq(Responsibility::getParentId, id));
         // 如果修改是否汇总中心 从是 -> 否那么子节点直接删除
@@ -290,9 +290,9 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
      * @param hospId
      */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
-    public void updateCurrent(ResponsibilityEditDTO dto, Responsibility responsibility, Integer hospId) {
+    public void updateCurrent(ResponsibilityEditDTO dto, Responsibility responsibility, Long hospId) {
         // 删除原有的父节点数据
-        Integer id = dto.getId();
+        Long id = dto.getId();
         this.removeById(id);
 
         this.checkCode(dto.getResponsibilityCode(), hospId);
@@ -308,7 +308,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
             newResponsibility.setShareId(null)
                     .setShareLevel(0)
                     .setShareName(null)
-                    .setParentId(0)
+                    .setParentId(0L)
                     .setResponsibilityLevel(1);
         }
         this.save(newResponsibility);
@@ -327,7 +327,7 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
         if (Objects.isNull(center)) {
             throw new CostException(ErrorCodeEnum.DATA_NOT_EXIST);
         }
-        Integer parentId = center.getParentId();
+        Long parentId = center.getParentId();
         if (parentId == 0) {
             this.deleteAllSonCenter(id);
             return;
@@ -420,13 +420,13 @@ public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper,
      * @return
      */
     @Override
-    public List<CostResponsibilityLevelVO> getLevelTwo(Integer hospId) {
+    public List<CostResponsibilityLevelVO> getLevelTwo(Long hospId) {
         List<Responsibility> responsibilities = baseMapper.selectList(new QueryWrapper<Responsibility>().lambda()
                 .eq(Responsibility::getHospId, hospId)
                 .eq(Responsibility::getIsGatherCenter, NumberConstant.TWO));
         List<CostResponsibilityLevelVO> costResponsibilityLevelVOS = BeanUtil.convertList(responsibilities, CostResponsibilityLevelVO.class);
         List<CostShareLevelVO> costShareLevelServiceAll = costShareLevelService.getAll(hospId);
-        Map<Integer, List<CostShareLevelVO>> listMap = costShareLevelServiceAll.stream().collect(Collectors.groupingBy(CostShareLevelVO::getId));
+        Map<Long, List<CostShareLevelVO>> listMap = costShareLevelServiceAll.stream().collect(Collectors.groupingBy(CostShareLevelVO::getId));
         // 设置责任中心的计算方式
         costResponsibilityLevelVOS.forEach(i -> {
             i.setResponsibilityId(i.getId());

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

@@ -68,7 +68,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     @Override
     public LoginVO login(LoginDTO loginDTO) {
         String hospSign = loginDTO.getHospSign();
-        Integer id = loginDTO.getId();
+        Long id = loginDTO.getId();
         if (Objects.isNull(id)) {
             Hospital hospital = hosptailService.getBySign(hospSign);
             id = hospital.getId();
@@ -101,7 +101,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
      * @return
      */
     @Override
-    public PageUtils queryList(Integer page, Integer pageSize, Integer hospId, String name) {
+    public PageUtils queryList(Integer page, Integer pageSize, Long hospId, String name) {
         Page<User> userPage = new Page<>(page, pageSize);
         Page<User> pages = this.page(userPage,
                 new QueryWrapper<User>().lambda().
@@ -138,7 +138,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
     public void saveUser(UserDto userDto) {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         // 医院的Id
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
 
         User userRequest = BeanUtil.convertObj(userDto, User.class);
         if (StringUtils.isEmpty(userDto.getPassword())) {
@@ -173,6 +173,8 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
         if (!StringUtils.isEmpty(userDto.getPassword())) {
             String newPassWord = SecureUtil.md5(userDto.getPassword());
             userRequest.setPassword(newPassWord);
+        }else {
+            userRequest.setPassword(user.getPassword());
         }
         baseMapper.insert(userRequest);
     }
@@ -262,7 +264,7 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
 //     * @param str
 //     * @return
 //     */
-//    private Integer getByNameAndCheck(Integer hospId, String str) {
+//    private Integer getByNameAndCheck(Long hospId, String str) {
 //        Integer thisHospAreaId = this.hosptailService.getByNameAndCheck(hospId, str);
 //        return thisHospAreaId;
 //    }

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

@@ -1,7 +1,6 @@
 package com.imed.costaccount.web;
 
 import com.imed.costaccount.common.util.Result;
-import com.imed.costaccount.model.Accounting;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.AccountingEditDTO;
 import com.imed.costaccount.model.dto.AccountingSaveDTO;
@@ -16,7 +15,6 @@ import org.apache.shiro.SecurityUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.util.Arrays;
 import java.util.List;
 
 
@@ -79,7 +77,7 @@ public class AccountingController {
 
     @ApiOperation("删除")
     @PostMapping("/delete")
-    public Result delete(@RequestParam Integer id){
+    public Result delete(@RequestParam Long id){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         accountingService.deleteAccount(id,user);
         return Result.ok();

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

@@ -44,7 +44,7 @@ public class CostAccountShareController {
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name", required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         PageUtils pageUtils = costAccountShareService.queryList(current,pageSize,name,hospId);
         return Result.ok(pageUtils);
     }
@@ -88,7 +88,7 @@ public class CostAccountShareController {
                                              @RequestParam(value = "pageSize", defaultValue = "2") Integer pageSize,
                                              Integer id){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         List<CostShareParamStatusVO> costShareParamStatusVOList= costAccountShareService.getAllShareParamStatusById(id,hospId);
         Page<CostShareParamStatusVO> page = new Page<>(current, pageSize);
         page.setRecords(costShareParamStatusVOList);
@@ -104,7 +104,7 @@ public class CostAccountShareController {
     @ApiOperation("获取指定责任中心成本的分摊参数集合")
     public Result getShareParamById(Integer id){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         List<ShareParamProportionVO> shareParamProportionVOList = costAccountShareService.selectShareParamById(id,hospId);
         return Result.ok(shareParamProportionVOList);
     }

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

@@ -40,7 +40,7 @@ public class CostShareLevelController {
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name", required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         PageUtils pageUtils= costShareLevelService.queryList(current,pageSize,name,hospId);
         return Result.ok(pageUtils);
     }
@@ -59,7 +59,7 @@ public class CostShareLevelController {
     @ApiOperation("查询所有分摊层级数据")
     public Result getAll(){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         List<CostShareLevelVO> costShareLevelVOList = costShareLevelService.getAll(hospId);
         return Result.ok(costShareLevelVOList);
     }

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

@@ -42,7 +42,7 @@ public class CostShareParamController {
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                         @RequestParam(value = "name",required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         PageUtils pageUtils= costShareParamService.queryList(current,pageSize,name,hospId);
         return Result.ok(pageUtils);
     }
@@ -51,7 +51,7 @@ public class CostShareParamController {
     @ApiOperation("根据Id获取指定成本参数")
     public Result getById(Integer id){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         CostShareParamVO costShareParamVO = costShareParamService.getByHospIdAndAPramId(id, hospId);
         return Result.ok(costShareParamVO);
     }
@@ -61,7 +61,7 @@ public class CostShareParamController {
     @ApiOperation("获取所有的分摊参数的信息")
     public Result getAll(){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         List<CostShareParamVO> costShareParamVOList= costShareParamService.getAll(hospId);
         return Result.ok(costShareParamVOList);
     }
@@ -75,7 +75,7 @@ public class CostShareParamController {
     @ApiOperation("为成本参数添加对应科目信息")
     public Result updateCostShareParamByAccountId(@RequestBody CostShareParamAccountDto costShareParamAccountDto){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         costShareParamAccountDto.setHospId(hospId);
 		CostShareParam costShareParam = costShareParamService.updateCostShareParamByAccountId(costShareParamAccountDto);
         return Result.ok(costShareParam);
@@ -88,7 +88,7 @@ public class CostShareParamController {
     @ApiOperation("添加分摊参数信息")
     public Result save(@RequestBody @Valid CostShareParamSaveDto costShareParamSaveDto){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         costShareParamSaveDto.setHospId(hospId);
 		costShareParamService.addCostShareParam(costShareParamSaveDto);
         return Result.ok();
@@ -101,7 +101,7 @@ public class CostShareParamController {
     @ApiOperation("修改参数信息")
     public Result update(@RequestBody @Valid  CostShareParamEditDto costShareParamEditDto){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         costShareParamEditDto.setHospId(hospId);
 		costShareParamService.updateCostShareParam(costShareParamEditDto);
         return Result.ok();

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

@@ -40,7 +40,7 @@ public class DepartmentController {
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name",required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         PageUtils pageUtils= departmentService.queryList(current,pageSize,hospId,name);
         return Result.ok(pageUtils);
     }
@@ -54,7 +54,7 @@ public class DepartmentController {
     public Result getDepartmentId(@RequestParam(name = "id",required = false) Integer id,
                                   @RequestParam(name = "departmentName",required = false) String departmentName,
                                   @RequestParam(name = "departmentCode",required = false) String departmentCode,
-                                  @RequestParam(name = "hospId",required = false) Integer hospId){
+                                  @RequestParam(name = "hospId",required = false) Long hospId){
 		List<Department> departmentList = departmentService.getByDepartment(id,departmentName,departmentCode,hospId);
         return Result.ok(departmentList);
     }

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

@@ -9,11 +9,14 @@ import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.Result;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.service.UserService;
+import com.imed.costaccount.service.impl.DepartmentServiceImpl;
+import com.imed.costaccount.service.impl.ProductServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.shiro.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -37,12 +40,18 @@ public class ExcelController {
 
     private UserService userService;
 
+    @Autowired
+    private DepartmentServiceImpl departmentService;
+
+    @Autowired
+    private ProductServiceImpl productService;
+
     public ExcelController(UserService userService) {
         this.userService = userService;
     }
 
     @ApiOperation("用户导出模板设置")
-    @GetMapping("/getImportUserTemplate")
+    @GetMapping("/getcurrentTemplate")
     public void getImportUserTemplate(HttpServletResponse response) throws IOException {
         User user = (User) SecurityUtils.getSubject().getPrincipal();
         // TODO: 2021/7/26 暂时没有登录
@@ -89,6 +98,116 @@ public class ExcelController {
             throw new CostException(500, "导入失败");
         }
     }
+    /**
+     * 科室模板导出功能设置
+     */
+    @ApiOperation("科室导出模板设置")
+    @GetMapping("/getDepartmentTemplate")
+    public void getImportDepartmentTemplate(HttpServletResponse response) throws IOException {
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        String uuid = UUID.randomUUID().toString();
+        String url = System.getProperty("java.io.tmpdir") + File.separator + uuid + File.separator + uuid + ".xls";
+        FileUtil.del(FileUtil.file(url));
+
+        ExcelWriter writer = new ExcelWriter(url);
+        // 样式
+        Sheet sheet = writer.getSheet();
+        // 内容
+        writer.merge(0, 1, 0, 2, "为了保证成功导入，请勿修改模板格式", false);
+        writer.passCurrentRow();
+        writer.passCurrentRow();
+        writer.merge(2, 2, 0, 2, "医院科室批量导入", false);
+        writer.passCurrentRow();
+        writer.setColumnWidth(0,20);
+        writer.setColumnWidth(1,15);
+        writer.setColumnWidth(2,15);
+        writer.writeRow(Arrays.asList("院区","科室名称", "科室代码"));
+
+        // 写入响应
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
+        response.setHeader("Content-Disposition", "attachment;filename=" + uuid + ".xls");
+        ServletOutputStream out = null;
+
+        out = response.getOutputStream();
+        writer.flush(out, true);
+        writer.close();
+        IoUtil.close(out);
+    }
+    /**
+     * 批量导入科室信息
+     */
+    @PostMapping("/importDepartment")
+    @ApiOperation("导入科室信息")
+    public Result importDepartment(@RequestParam("file") MultipartFile file){
+        InputStream in;
+        try {
+            in = file.getInputStream();
+            ExcelReader reader = ExcelUtil.getReader(in);
+            List<List<Object>> read = reader.read();
+            log.info("最开始：read={}",read);
+            log.info("-------------------------------------------------------------------");
+            User user = (User) SecurityUtils.getSubject().getPrincipal();
+            Long hospId = user.getHospId();
+            return departmentService.importDepartment(read, hospId);
+        }catch (IOException e){
+            e.printStackTrace();;
+            throw new CostException(500, "导入失败");
+        }
+    }
+    /**
+     *  收入成本项目批量导入模板
+     */
+    @ApiOperation("收入成本导出模板设置")
+    @GetMapping("/getImportProductTemplate")
+    public void getImportProductTemplate(HttpServletResponse response) throws IOException {
+        User user = (User) SecurityUtils.getSubject().getPrincipal();
+        String uuid = UUID.randomUUID().toString();
+        String url = System.getProperty("java.io.tmpdir") + File.separator + uuid + File.separator + uuid + ".xls";
+        FileUtil.del(FileUtil.file(url));
 
+        ExcelWriter writer = new ExcelWriter(url);
+        // 样式
+        Sheet sheet = writer.getSheet();
+        // 内容
+        writer.merge(0, 1, 0, 2, "为了保证成功导入，请勿修改模板格式", false);
+        writer.passCurrentRow();
+        writer.passCurrentRow();
+        writer.merge(2, 2, 0, 2, "医院成本收入批量导入", false);
+        writer.passCurrentRow();
+        writer.setColumnWidth(0,20);
+        writer.setColumnWidth(1,15);
+        writer.setColumnWidth(2,15);
+        writer.writeRow(Arrays.asList("院区","成本项目名", "成本项目编号"));
 
+        // 写入响应
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
+        response.setHeader("Content-Disposition", "attachment;filename=" + uuid + ".xls");
+        ServletOutputStream out = null;
+
+        out = response.getOutputStream();
+        writer.flush(out, true);
+        writer.close();
+        IoUtil.close(out);
+    }
+    /**
+     *  收入成本项目批量导入
+     */
+    @PostMapping("/importProduct")
+    @ApiOperation("批量导入收入成本信息")
+    public Result importProduct(@RequestParam("file") MultipartFile file){
+        InputStream in;
+        try {
+            in = file.getInputStream();
+            ExcelReader reader = ExcelUtil.getReader(in);
+            List<List<Object>> read = reader.read();
+            log.info("最开始：read={}",read);
+            log.info("-------------------------------------------------------------------");
+            User user = (User) SecurityUtils.getSubject().getPrincipal();
+            Long hospId = user.getHospId();
+            return productService.importProduct(read, hospId);
+        }catch (IOException e){
+            e.printStackTrace();;
+            throw new CostException(500, "导入失败");
+        }
+    }
 }

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

@@ -51,7 +51,7 @@ public class HospitalController {
                        @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                        @RequestParam(value = "name",required = false) String name){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         PageUtils pageUtils = hospitalService.queryList(current,pageSize,hospId,name);
         return Result.ok(pageUtils);
     }

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

@@ -44,7 +44,7 @@ public class ResponsibilityController {
     @ApiOperation("获取可不是汇总中心列表")
     public Result getLevelTwo(){
         User user = (User) SecurityUtils.getSubject().getPrincipal();
-        Integer hospId = user.getHospId();
+        Long hospId = user.getHospId();
         List<CostResponsibilityLevelVO> costResponsibilityLevelVOList= responsibilityService.getLevelTwo(hospId);
         return Result.ok(costResponsibilityLevelVOList);
     }