07 29 02 fix_add login codes

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

@@ -23,4 +23,6 @@ public class AccountingEditDTO {
     @NotEmpty(message = "科目名称不能为空")
     private String accountingName;
 
+
+
 }

src/main/java/com/imed/costaccount/model/ProductDTO.java → src/main/java/com/imed/costaccount/model/dto/ProductDTO.java

@@ -1,4 +1,4 @@
-package com.imed.costaccount.model;
+package com.imed.costaccount.model.dto;
 
 import io.swagger.annotations.ApiModel;
 import lombok.Data;
@@ -6,7 +6,7 @@ import lombok.Data;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel
+@ApiModel("成本项目保存对象")
 public class ProductDTO {
 
     @NotNull(message = "成本代码不能为空")

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

@@ -2,21 +2,25 @@ package com.imed.costaccount.model.dto;
 
 
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 @Data
-@ApiModel
+@ApiModel("成本项目管理编辑入参对象")
 public class ProductEditDTO {
 
+    @ApiModelProperty(name = "id",value = "成本项目id")
     @NotNull(message = "id不能为空")
     private Integer id;
 
+    @ApiModelProperty(name = "productName",value = "成本名称")
     @NotBlank(message = "成本名称不能为空")
     private String productName;
 
+    @ApiModelProperty(name = "productCode",value = "成本科目代码")
     @NotBlank(message = "成本科目代码不能为空")
     private String productCode;
 

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

@@ -28,7 +28,7 @@ public class ResponsibilityEditDTO {
     private String responsibilityName;
 
     @NotNull(message = "是否汇总中心不能为空")
-    @ApiModelProperty(name = "isGatherCenter",value = "是否汇总中心（前端校验如果用户责任中心是一级那么必定是汇总中心，反之不是）")
+    @ApiModelProperty(name = "isGatherCenter",value = "是否汇总中心")
     private Integer isGatherCenter;
 
     @NotNull(message = "收益类型 1. 收费中心，2.成本(费用)中心")

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

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

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

@@ -13,7 +13,7 @@ import java.util.List;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@ApiModel(description = "责任中心列表视图对象")
+@ApiModel("责任中心列表视图对象")
 public class CostResponsibilityVO{
 
     @ApiModelProperty(name = "id",value = "主键")

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

@@ -2,6 +2,7 @@ package com.imed.costaccount.model.vo;
 
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
 import java.util.List;
@@ -19,5 +20,6 @@ public class SelectAccountingVO {
 
     private String label;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
     private List<SelectAccountingVO> children;
 }

src/main/java/com/imed/costaccount/model/vo/test.json

@@ -1,24 +0,0 @@
-[
-  {
-    "id": 1,
-    "responsibilityId": 2,
-    "responsibilityName": "23423",
-    "child": [
-      {
-        "id": 1,
-        "responsibilityId": 3,
-        "responsibilityName": "234223",
-        "departments": [
-          {
-            "departmentId": 1,
-            "departmentName": "234234"
-          },
-          {
-            "departmentId": 1,
-            "departmentName": "234234"
-          }
-        ]
-      }
-    ]
-  }
-]

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

@@ -3,7 +3,7 @@ package com.imed.costaccount.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.imed.costaccount.common.util.PageUtils;
 import com.imed.costaccount.model.Product;
-import com.imed.costaccount.model.ProductDTO;
+import com.imed.costaccount.model.dto.ProductDTO;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.ProductEditDTO;
 import com.imed.costaccount.model.vo.CommonVO;

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

@@ -16,20 +16,22 @@ import java.util.List;
  * 责任中心表
  *
  * @author huangrui
- * @email 
+ * @email
  * @date 2021-07-27 10:41:59
  */
 public interface ResponsibilityService extends IService<Responsibility> {
 
     /**
      * 责任中心列表不分页
+     *
+     * @param user 当前登录人员
      * @return
-     * @param user
      */
     List<CostResponsibilityVO> getList(User user);
 
     /**
      * 新增责任中心
+     *
      * @param responsibilitySaveDTO {@link ResponsibilitySaveDTO }
      * @param user
      */
@@ -37,6 +39,7 @@ public interface ResponsibilityService extends IService<Responsibility> {
 
     /**
      * 编辑责任中心
+     *
      * @param responsibilityEditDTO {@link ResponsibilityEditDTO}
      * @param user
      */
@@ -44,12 +47,14 @@ public interface ResponsibilityService extends IService<Responsibility> {
 
     /**
      * 删除责任中心
+     *
      * @param id
      */
     void deleteCenter(Integer id);
 
     /**
      * 获取部门树列表
+     *
      * @param user
      * @return
      */
@@ -59,6 +64,7 @@ public interface ResponsibilityService extends IService<Responsibility> {
 
     /**
      * 获取可不是汇总中心列表
+     *
      * @param hospId
      * @return
      */

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

@@ -6,16 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.imed.costaccount.common.exception.CostException;
 import com.imed.costaccount.common.util.PageUtils;
-import com.imed.costaccount.model.ProductDTO;
+import com.imed.costaccount.model.dto.ProductDTO;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.ProductEditDTO;
 import com.imed.costaccount.model.vo.CommonVO;
 import com.imed.costaccount.model.vo.ProductVO;
 import com.imed.costaccount.utils.BeanUtil;
-import io.swagger.models.auth.In;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;

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

@@ -30,8 +30,11 @@ import java.util.stream.Collectors;
 public class ResponsibilityServiceImpl extends ServiceImpl<ResponsibilityMapper, Responsibility> implements ResponsibilityService {
 
 
-    @Autowired
-    private CostShareLevelServiceImpl costShareLevelService;
+    private final CostShareLevelServiceImpl costShareLevelService;
+
+    public ResponsibilityServiceImpl(CostShareLevelServiceImpl costShareLevelService) {
+        this.costShareLevelService = costShareLevelService;
+    }
 
     /**
      * 责任中心列表不分页

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

@@ -2,8 +2,7 @@ package com.imed.costaccount.web;
 
 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.ProductDTO;
+import com.imed.costaccount.model.dto.ProductDTO;
 import com.imed.costaccount.model.User;
 import com.imed.costaccount.model.dto.ProductEditDTO;
 import com.imed.costaccount.model.vo.CommonVO;
@@ -11,11 +10,9 @@ import com.imed.costaccount.service.ProductService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.shiro.SecurityUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.sql.ResultSet;
 import java.util.Arrays;
 import java.util.List;
 

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

@@ -24,7 +24,7 @@ import java.util.List;
 @RequestMapping("/costAccount/responsibility")
 public class ResponsibilityController {
 
-    private ResponsibilityService responsibilityService;
+    private final ResponsibilityService responsibilityService;
 
     public ResponsibilityController(ResponsibilityService responsibilityService) {
         this.responsibilityService = responsibilityService;