设置民称

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

@@ -1,5 +1,6 @@
 package com.imed.costaccount.model.dto;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,6 +12,7 @@ import javax.validation.constraints.NotNull;
  * @date 2021-07-28 19:44
  */
 @Data
+@ApiModel("成本分摊参数对应修改入参")
 public class CostAccountShareEditDto {
 
     // 责任中心成本对照表的id

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

@@ -12,7 +12,7 @@ import javax.validation.constraints.NotNull;
  * @date 2021-07-28 19:01
  */
 @Data
-@ApiModel
+@ApiModel("成本分摊参数保存对应入参")
 public class CostAccountShareSaveDto {
 
     @ApiModelProperty(name = "responsibilityId",value = "责任中心的Id")

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

@@ -1,5 +1,6 @@
 package com.imed.costaccount.model.dto;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 /**
@@ -8,6 +9,7 @@ import lombok.Data;
  * @date 2021-07-28 16:34
  */
 @Data
+@ApiModel("分摊参数会计入参")
 public class CostShareParamAccountDto {
     /**
      * 传递的会计科目Id集合

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

@@ -1,11 +1,13 @@
 package com.imed.costaccount.model.dto;
 
+import io.swagger.annotations.ApiModel;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
+@ApiModel("菜单修改入参")
 public class MenuEditDTO {
 
     @NotNull(message = "id不能为空")

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

@@ -7,7 +7,7 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel
+@ApiModel("成本会计入参")
 public class ProductAccountDTO {
 
     @NotNull(message = "id不能为空")

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

@@ -322,13 +322,13 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
             List<Object> data = list.get(i);
             log.info("用户输入的数据是{}", data);
             // 成本项目的代码和名称
-            String productCode = data.get(0).toString();
-            String productName = data.get(1).toString();
+            String productCode = data.get(0).toString().trim();
+            String productName = data.get(1).toString().trim();
             // 开单科室 执行科室的代码和名称
-            String openDepartmentName = data.get(2).toString();
-            String openDepartmentCode = data.get(3).toString();
-            String startDepartmentName = data.get(4).toString();
-            String startDepartmentCode = data.get(5).toString();
+            String openDepartmentName = data.get(2).toString().trim();
+            String openDepartmentCode = data.get(3).toString().trim();
+            String startDepartmentName = data.get(4).toString().trim();
+            String startDepartmentCode = data.get(5).toString().trim();
             if (StrUtil.isBlank(openDepartmentCode) && StrUtil.isBlank(openDepartmentName) && StrUtil.isBlank(startDepartmentCode) && StrUtil.isBlank(startDepartmentName)){
                 continue;
             }
@@ -349,9 +349,9 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                 }
             }
             // 检验收入成本项目数据是否存在
-            Product product = productMap.get(productCode + productName);
-            Department department = departmentMap.get(openDepartmentCode + openDepartmentName);
-            Department department1 = departmentMap.get(startDepartmentCode + startDepartmentName);
+            Product product = productMap.get(productCode.trim() + productName.trim());
+            Department department = departmentMap.get(openDepartmentCode.trim()+openDepartmentName.trim());
+            Department department1 = departmentMap.get(startDepartmentCode.trim() + startDepartmentName.trim());
             if (StrUtil.isNotBlank(productCode) && StrUtil.isNotBlank(productName)) {
                 if (Objects.isNull(product)) {
                     IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
@@ -427,7 +427,7 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                     if (Objects.isNull(responsibilityMap.get(responsibilityId))) {
                         IncomeErrorMessage incomeErrorMessage = new IncomeErrorMessage();
                         incomeErrorMessage.setTotal(row);
-                        incomeErrorMessage.setErrMessage("执行科室代码:" + openDepartmentCode + " 名称:" + openDepartmentName + "对应的责任中心不存在");
+                        incomeErrorMessage.setErrMessage("执行科室代码:" + startDepartmentCode + " 名称:" + startDepartmentCode + "对应的责任中心不存在");
                         incomeErrorMessageList.add(incomeErrorMessage);
                     } else {
                         Responsibility responsibility = responsibilityMap.get(responsibilityId);

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

@@ -294,10 +294,6 @@ public class ExcelController {
         writer.setColumnWidth(14, 10);
         writer.setColumnWidth(15, 10);
         writer.setColumnWidth(16, 15);
-
-
-
-
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
         response.setHeader("Content-Disposition", "attachment;filename=" + uuid + ".xls");
         ServletOutputStream out = null;