Преглед изворни кода

添加责任中心保存分摊级别的Id

ljx пре 4 година
родитељ
комит
6d957cc7c8

+ 6 - 4
src/main/java/com/imed/costaccount/model/Responsibility.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;
+
 /**
  * 责任中心表
  * 
@@ -60,6 +58,10 @@ public class Responsibility implements Serializable {
 	 * 责任类型 1. 收费中心,2.成本(费用)中心
 	 */
 	private Integer responsibilityType;
+	/**
+	 * 分摊级别的Id
+	 */
+	private Integer shareId;
 	/**
 	 * 分摊级别 如果是顶层默认为0
 	 */

+ 3 - 0
src/main/java/com/imed/costaccount/model/dto/ResponsibilitySaveDTO.java

@@ -31,6 +31,9 @@ public class ResponsibilitySaveDTO {
     @ApiModelProperty(name = "responsibilityType",value = "收益类型 1. 收费中心,2.成本(费用)中心")
     private Integer responsibilityType;
 
+    @ApiModelProperty(name = "shareId",value = "分摊级别的Id")
+    private Integer shareId;
+
 //    @NotNull(message = "分摊级别不能为空")
     @ApiModelProperty(name = "shareLevel",value = "分摊级别(分摊接口中获取,暂时可写死)")
     private Integer shareLevel;

+ 1 - 1
src/main/java/com/imed/costaccount/service/impl/DepartmentServiceImpl.java

@@ -97,7 +97,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
         Map<String, List<Department>> map =
                 departmentList.stream().collect(Collectors.groupingBy(Department::getDepartmentCode));
         if (!CollectionUtils.isEmpty(map.get(departmentRequest.getDepartmentCode()))){
-            throw new CostException(500,"代码"+departmentRequest.getDepartmentCode()+"已存在");
+            throw new CostException(500,"科室代码"+departmentRequest.getDepartmentCode()+"已存在");
         }
         departmentRequest.setHospId(hospId);
         Department department = BeanUtil.convertObj(departmentRequest, Department.class);

+ 0 - 1
src/main/java/com/imed/costaccount/service/impl/HospitalServiceImpl.java

@@ -45,7 +45,6 @@ public class HospitalServiceImpl extends ServiceImpl<HospitalMapper, Hospital> i
     public PageUtils queryList(Integer current, Integer pageSize, Integer hospId, String name) {
         Page<Hospital> hosptailPage = new Page<>(current, pageSize);
         Page<Hospital> pages = this.page(hosptailPage, new QueryWrapper<Hospital>().lambda()
-//                .eq(!StringUtils.isEmpty(hospId), Hospital::getId, hospId)
                 .like(!StringUtils.isEmpty(name), Hospital::getName, name));
         List<Hospital> records = pages.getRecords();
         List<HospitalVO> hospitalVOList = BeanUtil.convertList(records, HospitalVO.class);

+ 1 - 0
src/main/resources/mapper/ResponsibilityMapper.xml

@@ -13,6 +13,7 @@
         <result property="hospId" column="hosp_id"/>
         <result property="isGatherCenter" column="is_gather_center"/>
         <result property="responsibilityType" column="responsibility_type"/>
+        <result property="shareId" column="share_id"/>
         <result property="shareLevel" column="share_level"/>
         <result property="shareName" column="share_name"/>
         <result property="createTime" column="create_time"/>