liuyc 3 жил өмнө
parent
commit
b5933f3630
92 өөрчлөгдсөн 122 нэмэгдсэн , 1591 устгасан
  1. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ArchiveTreeDTO.java
  2. 0 6
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ArchiveTreeSortDTO.java
  3. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ContractInfoDTO.java
  4. 1 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ImageClassificationConfigDTO.java
  5. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ProjectInfoDTO.java
  6. 0 6
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/SaveUserInfoByProjectDTO.java
  7. 0 23
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsFormElementDTO.java
  8. 0 23
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsInfoDTO.java
  9. 0 3
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeBatchImportDTO.java
  10. 0 7
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeContractDTO.java
  11. 0 23
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeDTO.java
  12. 0 6
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeDTO2.java
  13. 0 8
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreePrivateDTO.java
  14. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ArchiveTree.java
  15. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ContractInfo.java
  16. 0 1
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ContractRelationJlyz.java
  17. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ImageClassificationConfig.java
  18. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ProjectInfo.java
  19. 0 6
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/SaveUserInfoByProject.java
  20. 0 8
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsFormElement.java
  21. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsInfo.java
  22. 0 23
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTree.java
  23. 0 8
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContract.java
  24. 0 8
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreePrivate.java
  25. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ArchiveTreeVO.java
  26. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ContractInfoVO.java
  27. 0 7
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ContractlnfoCountVO.java
  28. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ImageClassificationConfigVO.java
  29. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ProjectInfoVO.java
  30. 1 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ProjectInfoVO2.java
  31. 0 8
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/SaveUserInfoByProjectVO.java
  32. 0 5
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TreeNodeVO.java
  33. 0 4
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TreeNodeVO2.java
  34. 0 23
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsFormElementVO.java
  35. 0 23
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsInfoVO.java
  36. 0 6
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsNodeTableVO.java
  37. 0 2
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTableOwnerRoleVO.java
  38. 1 8
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeAllListVO.java
  39. 0 7
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO.java
  40. 0 8
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO2.java
  41. 0 1
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO3.java
  42. 0 8
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreePrivateVO.java
  43. 0 1
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreePrivateVO2.java
  44. 0 22
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO.java
  45. 0 7
      blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO2.java
  46. 1 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/ManagerApplication.java
  47. 0 6
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeController.java
  48. 0 23
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java
  49. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ImageClassificationConfigController.java
  50. 12 34
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ProjectInfoController.java
  51. 17 40
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsFormElementController.java
  52. 0 25
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsInfoController.java
  53. 0 7
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java
  54. 11 31
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java
  55. 0 7
      blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java
  56. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeMapper.java
  57. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ContractInfoMapper.java
  58. 0 23
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ImageClassificationConfigMapper.java
  59. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProjectInfoMapper.java
  60. 2 23
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.java
  61. 6 0
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.xml
  62. 0 24
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsInfoMapper.java
  63. 0 1
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.java
  64. 0 25
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.java
  65. 0 7
      blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.java
  66. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeService.java
  67. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IContractInfoService.java
  68. 0 13
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IImageClassificationConfigService.java
  69. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IProjectInfoService.java
  70. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsFormElementService.java
  71. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsInfoService.java
  72. 0 1
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java
  73. 0 6
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreePrivateService.java
  74. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java
  75. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeServiceImpl.java
  76. 1 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java
  77. 0 6
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ImageClassificationConfigServiceImpl.java
  78. 1 24
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ProjectInfoServiceImpl.java
  79. 0 5
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/SaveUserInfoByProjectServiceImpl.java
  80. 67 85
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java
  81. 0 28
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsInfoServiceImpl.java
  82. 0 57
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java
  83. 0 5
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java
  84. 1 47
      blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java
  85. 0 7
      blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ArchiveTreeWrapper.java
  86. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ContractInfoWrapper.java
  87. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ImageClassificationConfigWrapper.java
  88. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ProjectInfoWrapper.java
  89. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsFormElementWrapper.java
  90. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsInfoWrapper.java
  91. 0 6
      blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsTreePrivateWrapper.java
  92. 0 22
      blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsTreeWrapper.java

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ArchiveTreeDTO.java

@@ -1,31 +1,9 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.dto;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.manager.entity.ArchiveTree;
 
-/**
- * 数据传输对象实体类
- *
- * @author liuyc
- * @since 2022-06-29
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ArchiveTreeDTO extends ArchiveTree {

+ 0 - 6
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ArchiveTreeSortDTO.java

@@ -5,12 +5,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.manager.entity.ArchiveTree;
 
-/**
- * 数据传输对象实体类
- *
- * @author liuyc
- * @since 2022-07-26
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ArchiveTreeSortDTO extends ArchiveTree {

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ContractInfoDTO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.dto;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -21,12 +5,6 @@ import org.springblade.manager.entity.ContractInfo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * 合同段信息表数据传输对象实体类
- *
- * @author liuyc
- * @since 2022-04-18
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ContractInfoDTO extends ContractInfo {

+ 1 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ImageClassificationConfigDTO.java

@@ -1,31 +1,10 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.dto;
 
 import org.springblade.manager.entity.ImageClassificationConfig;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * 影像分类配置表数据传输对象实体类
- *
- * @author BladeX
- * @since 2022-05-16
- */
+
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ImageClassificationConfigDTO extends ImageClassificationConfig {

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/ProjectInfoDTO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -25,12 +9,6 @@ import lombok.EqualsAndHashCode;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
-/**
- * 客户级项目表数据传输对象实体类
- *
- * @author liuyc
- * @since 2022-04-18
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ProjectInfoDTO extends ProjectInfo {

+ 0 - 6
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/SaveUserInfoByProjectDTO.java

@@ -10,12 +10,6 @@ import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serializable;
 
-/**
- * 项目合同人员分配传输对象实体类
- *
- * @author liuyc
- * @since 2022-05-09
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

+ 0 - 23
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsFormElementDTO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.dto;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -21,13 +5,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.manager.entity.WbsFormElement;
 
-
-/**
- * wbs表单元素数据传输对象实体类
- *
- * @author liuyc
- * @since 2022-04-27
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WbsFormElementDTO extends WbsFormElement {

+ 0 - 23
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsInfoDTO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.dto;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -22,13 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.manager.entity.WbsInfo;
 
-
-/**
- * wbs动态库信息数据传输对象实体类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WbsInfoDTO extends WbsInfo {

+ 0 - 3
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeBatchImportDTO.java

@@ -4,9 +4,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-/**
- * wbsTree批量导入封装DTO
- */
 @Data
 public class WbsTreeBatchImportDTO implements Serializable {
     private static final long serialVersionUID = 1L;

+ 0 - 7
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeContractDTO.java

@@ -9,13 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springblade.manager.entity.WbsTreeContract;
 
-
-/**
- * 项目分配wbs传输对象实体类
- *
- * @author liuyc
- * @since 2022-05-12
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

+ 0 - 23
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeDTO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.dto;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -24,13 +8,6 @@ import org.springblade.manager.entity.WbsTree;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
-
-/**
- * 数据传输对象实体类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WbsTreeDTO extends WbsTree {

+ 0 - 6
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreeDTO2.java

@@ -5,12 +5,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-/**
- * wbs节点排序dto
- *
- * @author liuyc
- * @since 2022-06-08
- */
 @Data
 public class WbsTreeDTO2 implements Serializable {
     private static final long serialVersionUID = 1L;

+ 0 - 8
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/dto/WbsTreePrivateDTO.java

@@ -1,7 +1,5 @@
 package org.springblade.manager.dto;
 
-
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -9,12 +7,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.springblade.manager.entity.WbsTreePrivate;
 
-/**
- * 项目分配wbs传输对象实体类
- *
- * @author liuyc
- * @since 2022-05-12
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ArchiveTree.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -22,12 +6,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
-/**
- * 实体类
- *
- * @author liuyc
- * @since 2022-06-29
- */
 @Data
 @TableName("m_archive_tree")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ContractInfo.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -26,12 +10,6 @@ import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * 合同段信息表实体类
- *
- * @author liuyc
- * @since 2022-04-14
- */
 @Data
 @TableName("m_contract_info")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 1
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ContractRelationJlyz.java

@@ -1,6 +1,5 @@
 package org.springblade.manager.entity;
 
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ImageClassificationConfig.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -25,12 +9,6 @@ import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * 影像分类配置表实体类
- *
- * @author BladeX
- * @since 2022-05-16
- */
 @Data
 @TableName("m_image_classification_config")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/ProjectInfo.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -27,12 +11,6 @@ import org.springblade.core.mp.base.BaseEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * 客户级项目表实体类
- *
- * @author liuyc
- * @since 2022-04-13
- */
 @Data
 @TableName("m_project_info")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 6
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/SaveUserInfoByProject.java

@@ -10,12 +10,6 @@ import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serializable;
 
-/**
- * 项目合同人员分配传输对象实体类
- *
- * @author liuyc
- * @since 2022-05-09
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

+ 0 - 8
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsFormElement.java

@@ -1,6 +1,5 @@
 package org.springblade.manager.entity;
 
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -8,13 +7,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
-
-/**
- * wbs动态库表单元素实体类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Data
 @TableName("m_wbs_form_element")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsInfo.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -21,12 +5,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
-/**
- * wbs动态库信息实体类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Data
 @TableName("m_wbs_info")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 23
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTree.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.entity;
 
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -25,13 +9,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.mp.base.BaseEntity;
 
-
-/**
- * 实体类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Data
 @TableName("m_wbs_tree")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 8
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreeContract.java

@@ -1,6 +1,5 @@
 package org.springblade.manager.entity;
 
-
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
@@ -10,13 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springblade.core.mp.base.BaseEntity;
 
-
-/**
- * wbs合同段树关系实体类
- *
- * @author liuyc
- * @since 2022-05-12
- */
 @Data
 @TableName("m_wbs_tree_contract")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 8
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/entity/WbsTreePrivate.java

@@ -9,14 +9,6 @@ import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import org.springblade.core.mp.base.BaseEntity;
 
-
-
-/**
- * wbs合同段树关系实体类
- *
- * @author liuyc
- * @since 2022-05-12
- */
 @Data
 @TableName("m_wbs_tree_private")
 @EqualsAndHashCode(callSuper = true)

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ArchiveTreeVO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -28,12 +12,6 @@ import org.springblade.manager.entity.ArchiveTree;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * 视图实体类
- *
- * @author liuyc
- * @since 2022-06-29
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ArchiveTreeVO extends ArchiveTree implements INode<ArchiveTreeVO> {

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ContractInfoVO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.vo;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -23,12 +7,6 @@ import lombok.EqualsAndHashCode;
 
 import java.util.List;
 
-/**
- * 合同段信息表视图实体类
- *
- * @author liuyc
- * @since 2022-04-14
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ContractInfoVO extends ContractInfo {

+ 0 - 7
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ContractlnfoCountVO.java

@@ -1,16 +1,9 @@
 package org.springblade.manager.vo;
 
-
 import lombok.Data;
 
 import java.io.Serializable;
 
-/**
- * 合同段信息统计表视图实体类
- *
- * @author liuyc
- * @since 2022-04-14
- */
 @Data
 public class ContractlnfoCountVO implements Serializable {
 	private static final long serialVersionUID = 1L;

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ImageClassificationConfigVO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.vo;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -21,12 +5,6 @@ import org.springblade.manager.entity.ImageClassificationConfig;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-/**
- * 影像分类配置表视图实体类
- *
- * @author BladeX
- * @since 2022-05-16
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ImageClassificationConfigVO extends ImageClassificationConfig {

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ProjectInfoVO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.vo;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -24,12 +8,6 @@ import lombok.EqualsAndHashCode;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * 客户级项目表视图实体类
- *
- * @author liuyc
- * @since 2022-04-13
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class ProjectInfoVO extends ProjectInfo {

+ 1 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/ProjectInfoVO2.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.vo;
 
 import lombok.Data;
@@ -24,12 +8,7 @@ import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * 客户级项目表视图实体类
- *
- * @author liuyc
- * @since 2022-04-13
- */
+
 @Data
 public class ProjectInfoVO2 implements Serializable {
 	private static final long serialVersionUID = 1L;

+ 0 - 8
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/SaveUserInfoByProjectVO.java

@@ -1,8 +1,6 @@
 package org.springblade.manager.vo;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -10,12 +8,6 @@ import org.springblade.core.mp.base.BaseEntity;
 
 import java.io.Serializable;
 
-/**
- * 项目合同人员分配视图层
- *
- * @author liuyc
- * @since 2022-06-07
- */
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

+ 0 - 5
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TreeNodeVO.java

@@ -2,14 +2,9 @@ package org.springblade.manager.vo;
 
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import io.swagger.models.auth.In;
 import org.springblade.core.tool.node.BaseNode;
 import org.springblade.core.tool.node.TreeNode;
 
-
-/**
- * 重写了TreeNode实体,增加了字段
- */
 public class TreeNodeVO extends BaseNode<TreeNode> {
     private static final long serialVersionUID = 1L;
     private String title;

+ 0 - 4
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/TreeNodeVO2.java

@@ -5,10 +5,6 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import org.springblade.core.tool.node.BaseNode;
 import org.springblade.core.tool.node.TreeNode;
 
-
-/**
- * 重写了TreeNode实体,增加了字段
- */
 public class TreeNodeVO2 extends BaseNode<TreeNode> {
     private static final long serialVersionUID = 1L;
     private String title;

+ 0 - 23
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsFormElementVO.java

@@ -1,32 +1,9 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.vo;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.springblade.manager.entity.WbsFormElement;
 
-
-/**
- * wbs表单元素视图实体类
- *
- * @author liuyc
- * @since 2022-04-27
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WbsFormElementVO extends WbsFormElement {

+ 0 - 23
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsInfoVO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.vo;
 
 import lombok.Data;
@@ -22,13 +6,6 @@ import org.springblade.manager.entity.WbsInfo;
 
 import java.io.Serializable;
 
-
-/**
- * wbs动态库信息视图实体类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Data
 public class WbsInfoVO implements Serializable {
 	private static final long serialVersionUID = 1L;

+ 0 - 6
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsNodeTableVO.java

@@ -5,12 +5,6 @@ import lombok.Data;
 
 import java.io.Serializable;
 
-/**
- * wbs动态库节点表单视图实体类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Data
 public class WbsNodeTableVO implements Serializable {
 

+ 0 - 2
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTableOwnerRoleVO.java

@@ -3,9 +3,7 @@ package org.springblade.manager.vo;
 import lombok.Data;
 import org.springblade.manager.entity.WbsTableOwnerRole;
 
-
 @Data
 public class WbsTableOwnerRoleVO extends WbsTableOwnerRole {
 
-
 }

+ 1 - 8
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeAllListVO.java

@@ -7,13 +7,6 @@ import org.springblade.manager.entity.WbsTreePrivate;
 import java.io.Serializable;
 import java.util.List;
 
-
-/**
- * wbs合同段树关系实体类
- *
- * @author liuyc
- * @since 2022-05-23
- */
 @Data
 public class WbsTreeAllListVO implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -31,7 +24,7 @@ public class WbsTreeAllListVO implements Serializable {
     /**
      * wbs合同段私有树
      */
-//    private List<WbsTreeContractVO> wbsTreeContracts;
+    /*private List<WbsTreeContractVO> wbsTreeContracts;*/
 
 
 }

+ 0 - 7
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO.java

@@ -10,13 +10,6 @@ import org.springblade.core.tool.node.TreeNode;
 import java.util.ArrayList;
 import java.util.List;
 
-
-/**
- * WbsTreeContract树形结构VO
- *
- * @author liuyc
- * @since 2022-08-02
- */
 @Data
 public class WbsTreeContractVO implements INode<WbsTreeContractVO> {
     private static final long serialVersionUID = 1L;

+ 0 - 8
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO2.java

@@ -1,17 +1,9 @@
 package org.springblade.manager.vo;
 
-
 import lombok.Data;
 
 import java.io.Serializable;
 
-
-/**
- * wbs合同段树关系实体类
- *
- * @author liuyc
- * @since 2022-05-23
- */
 @Data
 public class WbsTreeContractVO2 implements Serializable {
     private static final long serialVersionUID = 1L;

+ 0 - 1
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeContractVO3.java

@@ -1,6 +1,5 @@
 package org.springblade.manager.vo;
 
-
 import lombok.Data;
 
 import java.io.Serializable;

+ 0 - 8
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreePrivateVO.java

@@ -1,6 +1,5 @@
 package org.springblade.manager.vo;
 
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -12,13 +11,6 @@ import org.springblade.manager.entity.WbsTreePrivate;
 import java.util.ArrayList;
 import java.util.List;
 
-
-/**
- * 视图实体类
- *
- * @author liuyc
- * @since 2022-05-24
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WbsTreePrivateVO extends WbsTreePrivate implements INode<WbsTreePrivateVO> {

+ 0 - 1
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreePrivateVO2.java

@@ -1,6 +1,5 @@
 package org.springblade.manager.vo;
 
-
 import lombok.Data;
 
 import java.io.Serializable;

+ 0 - 22
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.vo;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -27,12 +11,6 @@ import org.springblade.manager.entity.WbsTree;
 import java.util.ArrayList;
 import java.util.List;
 
-/**
- * 视图实体类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Data
 @EqualsAndHashCode(callSuper = true)
 public class WbsTreeVO extends WbsTree implements INode<WbsTreeVO> {

+ 0 - 7
blade-service-api/blade-manager-api/src/main/java/org/springblade/manager/vo/WbsTreeVO2.java

@@ -10,13 +10,6 @@ import org.springblade.core.tool.node.TreeNode;
 import java.util.ArrayList;
 import java.util.List;
 
-
-/**
- * wbsTree树形结构VO2
- *
- * @author liuyc
- * @since 2022-07-13
- */
 @Data
 public class WbsTreeVO2 implements INode<WbsTreeVO2> {
     private static final long serialVersionUID = 1L;

+ 1 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/ManagerApplication.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager;
 
 import org.springblade.common.constant.LauncherConstant;
@@ -22,14 +6,9 @@ import org.springblade.core.launch.BladeApplication;
 import org.springframework.cloud.client.SpringCloudApplication;
 import org.springframework.scheduling.annotation.EnableAsync;
 
-/**
- * manager启动器
- *
- * @author liuyc
- */
 @EnableBladeFeign
 @SpringCloudApplication
-@EnableAsync //开启异步
+@EnableAsync
 public class ManagerApplication {
 
 	public static void main(String[] args) {

+ 0 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ArchiveTreeController.java

@@ -26,12 +26,6 @@ import java.util.List;
 
 import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 
-/**
- * 归档树 控制器
- *
- * @author liuyc
- * @since 2022-06-29
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/archiveTree")

+ 0 - 23
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ContractInfoController.java

@@ -1,22 +1,5 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.controller;
 
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
@@ -55,12 +38,6 @@ import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.*;
 
-/**
- * 合同段信息表 控制器
- *
- * @author liuyc
- * @since 2022-04-14
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/contractInfo")

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ImageClassificationConfigController.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.controller;
 
 import io.swagger.annotations.Api;
@@ -40,12 +24,6 @@ import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
 
-/**
- * 影像分类配置表 控制器
- *
- * @author liuyc
- * @since 2022-05-16
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/imageClassificationConfig")

+ 12 - 34
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/ProjectInfoController.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -43,12 +27,6 @@ import org.springblade.core.boot.ctrl.BladeController;
 import java.util.List;
 import java.util.Map;
 
-/**
- * 客户级项目表 控制器
- *
- * @author liuyc
- * @since 2022-04-13
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/projectInfo")
@@ -78,7 +56,7 @@ public class ProjectInfoController extends BladeController {
      * 详情
      */
     @GetMapping("/detail2")
-    @ApiOperationSupport(order = 1)
+    @ApiOperationSupport(order = 2)
     @ApiOperation(value = "详情2", notes = "传入projectInfoId、ReferenceWbsTemplateId、ReferenceWbsTemplateType")
     @ApiImplicitParams({
             @ApiImplicitParam(value = "id", name = "id", required = true),
@@ -97,7 +75,7 @@ public class ProjectInfoController extends BladeController {
      * 分页 客户级项目表
      */
     @GetMapping("/list")
-    @ApiOperationSupport(order = 2)
+    @ApiOperationSupport(order = 3)
     @ApiOperation(value = "分页", notes = "传入projectInfo")
     public R<IPage<ProjectInfoVO>> list(ProjectInfo projectInfo, Query query) {
         IPage<ProjectInfo> pages = projectInfoService.page(Condition.getPage(query), Condition.getQueryWrapper(projectInfo));
@@ -110,7 +88,7 @@ public class ProjectInfoController extends BladeController {
      * 自定义分页 客户级项目表
      */
     @GetMapping("/page")
-    @ApiOperationSupport(order = 3)
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "自定义分页", notes = "传入projectInfo")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "current", value = "当前页", required = true),
@@ -126,7 +104,7 @@ public class ProjectInfoController extends BladeController {
      * 新增 客户级项目表
      */
     @PostMapping("/save")
-    @ApiOperationSupport(order = 4)
+    @ApiOperationSupport(order = 5)
     @ApiOperation(value = "新增", notes = "传入projectInfo")
     public R save(@Valid @RequestBody ProjectInfoDTO projectInfo) {
         return R.status(projectInfoService.save(projectInfo));
@@ -136,7 +114,7 @@ public class ProjectInfoController extends BladeController {
      * 修改 客户级项目表
      */
     @PostMapping("/update")
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "修改", notes = "传入projectInfo")
     public R update(@Valid @RequestBody ProjectInfo projectInfo) {
         return R.status(projectInfoService.updateById(projectInfo));
@@ -146,7 +124,7 @@ public class ProjectInfoController extends BladeController {
      * 新增或修改 客户级项目表
      */
     @PostMapping("/submit")
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "新增或修改", notes = "传入projectInfo")
     @ApiImplicitParam(value = "id", name = "id", required = true)
     public R submit(@Valid @RequestBody ProjectInfo projectInfo) {
@@ -162,7 +140,7 @@ public class ProjectInfoController extends BladeController {
      * 删除 客户级项目表
      */
     @PostMapping("/remove")
-    @ApiOperationSupport(order = 7)
+    @ApiOperationSupport(order = 8)
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
     public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
         List<ContractInfo> infos = iContractInfoService.findContractInProject(ids);
@@ -184,7 +162,7 @@ public class ProjectInfoController extends BladeController {
      * 查询业务条数
      */
     @GetMapping("/listContractInfoCount")
-    @ApiOperationSupport(order = 8)
+    @ApiOperationSupport(order = 9)
     @ApiOperation(value = "统计合同数", notes = "null")
     public List<ContractlnfoCountVO> selectContractInfoCount() {
         return projectInfoService.selectContractInfoCount();
@@ -194,7 +172,7 @@ public class ProjectInfoController extends BladeController {
      * 项目私有库分配wbs树下拉框列表type=1质检 =2实验
      */
     @GetMapping("/findWbsTreeList")
-    @ApiOperationSupport(order = 9)
+    @ApiOperationSupport(order = 10)
     @ApiOperation(value = "项目合同段私有库分配wbs树下拉框列表", notes = "null")
     public R<WbsTreeAllListVO> findWbsTreeList(Integer type) {
         WbsTreeAllListVO list = wbsTreeService.findWbsTreeList(type);
@@ -211,7 +189,7 @@ public class ProjectInfoController extends BladeController {
      * 合同段分配wbs时进入默认加载左侧节点树可用)
      */
     @GetMapping("/tree")
-    @ApiOperationSupport(order = 10)
+    @ApiOperationSupport(order = 11)
     @ApiOperation(value = "查询项目私有wbs节点树形结构(多个接口复用)", notes = "wbsId、项目id")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "projectId", value = "项目id", required = true),
@@ -230,7 +208,7 @@ public class ProjectInfoController extends BladeController {
      * 保存或修改分配项目级wbs树
      */
     @PostMapping("/submitWbsTreeInProject")
-    @ApiOperationSupport(order = 11)
+    @ApiOperationSupport(order = 12)
     @ApiOperation(value = "保存或修改分配项目级wbs树", notes = "传入WbsTreeContractDTO")
     public R submitWbsTreeInProject(@RequestBody WbsTreeContractDTO pawDTO) {
         boolean b = wbsTreeService.submitWbsTreeInProject1(pawDTO);
@@ -244,7 +222,7 @@ public class ProjectInfoController extends BladeController {
      * 根据用户id查询项目合同岗位列表信息(用于展示在用户编辑、详情中)
      */
     @GetMapping("/findProjectAndContractList")
-    @ApiOperationSupport(order = 12)
+    @ApiOperationSupport(order = 13)
     @ApiOperation(value = "根据用户id查询项目合同岗位列表信息", notes = "传入用户id")
     public R<List<Map>> findProjectAndContractList(Long userId) {
         List<Map> result = wbsTreeService.findProjectAndContractList(userId);

+ 17 - 40
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsFormElementController.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.controller;
 
 import io.swagger.annotations.*;
@@ -44,13 +28,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.util.ArrayList;
 import java.util.List;
 
-
-/**
- * wbs表单元素 控制器
- *
- * @author liuyc
- * @since 2022-04-27
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/wbsFormElement")
@@ -78,7 +55,7 @@ public class WbsFormElementController extends BladeController {
      * 新增或同步 wbs表单元素
      */
     @PostMapping("/save")
-    @ApiOperationSupport(order = 1)
+    @ApiOperationSupport(order = 2)
     @ApiOperation(value = "新增", notes = "传入wbsFormElement")
     public R save(@Valid @RequestBody WbsFormElementDTO wbsFormElement) {
         return wbsFormElementService.saveAndSyn(wbsFormElement, wbsFormElement.getInitTableName());
@@ -89,7 +66,7 @@ public class WbsFormElementController extends BladeController {
      * 修改 wbs表单元素
      */
     @PostMapping("/update")
-    @ApiOperationSupport(order = 2)
+    @ApiOperationSupport(order = 3)
     @ApiOperation(value = "修改", notes = "传入wbsFormElement")
     public R update(@Valid @RequestBody WbsFormElement wbsFormElement) {
         return R.status(wbsFormElementService.updateById(wbsFormElement));
@@ -100,7 +77,7 @@ public class WbsFormElementController extends BladeController {
      * 新增或修改 wbs表单元素
      */
     @PostMapping("/submit")
-    @ApiOperationSupport(order = 3)
+    @ApiOperationSupport(order = 4)
     @ApiOperation(value = "新增或修改", notes = "传入wbsFormElement")
     public R submit(@Valid @RequestBody WbsFormElement wbsFormElement) {
         return R.status(wbsFormElementService.saveOrUpdate(wbsFormElement));
@@ -110,7 +87,7 @@ public class WbsFormElementController extends BladeController {
      * 批量新增wbs元素 同步实体表
      */
     @PostMapping("/submitBatch")
-    @ApiOperationSupport(order = 3)
+    @ApiOperationSupport(order = 5)
     @ApiOperation(value = "批量新增wbs元素", notes = "传入wbsFormElementList")
     public R submitBatch(@RequestBody WbsFormElementVO2 wbsFormElementVO2) {
         boolean b = wbsFormElementService.submitBatch(wbsFormElementVO2);
@@ -122,7 +99,7 @@ public class WbsFormElementController extends BladeController {
      * 删除 wbs表单元素 同步删除实体表字段
      */
     @PostMapping("/remove")
-    @ApiOperationSupport(order = 4)
+    @ApiOperationSupport(order = 6)
     @ApiOperation(value = "逻辑删除", notes = "传入ids")
     public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam("ids") String ids,
                     @RequestParam("eKey") String eKey, @RequestParam("initTableName") String initTableName) {
@@ -137,7 +114,7 @@ public class WbsFormElementController extends BladeController {
      * 导出Wbs元素模板
      */
     @GetMapping("/export-template")
-    @ApiOperationSupport(order = 5)
+    @ApiOperationSupport(order = 7)
     @ApiOperation(value = "导出WBS元素模板")
     public void exportWbsTree(HttpServletResponse response) {
         List<WbsFormElementExcel> list = new ArrayList<>();
@@ -148,14 +125,14 @@ public class WbsFormElementController extends BladeController {
      * 导入Wbs元素
      */
     @PostMapping("/import-wbsElement")
-    @ApiOperationSupport(order = 6)
+    @ApiOperationSupport(order = 8)
     @ApiOperation(value = "导入WBS元素数据", notes = "传入excel")
     public R importRegion(MultipartFile file) {
         List<WbsFormElementExcel> list = ExcelUtil.read(file, WbsFormElementExcel.class);
         for (WbsFormElementExcel wbsFE : list) {
             if (("字符串").equals(wbsFE.getElementType()) || ("string").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("1");
-                wbsFE.setElementLength("1000");
+                wbsFE.setElementLength("800");
             } else if (("整数").equals(wbsFE.getElementType()) || ("bigint").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("2");
                 wbsFE.setElementLength("20");
@@ -170,13 +147,13 @@ public class WbsFormElementController extends BladeController {
                 wbsFE.setElementLength("20");
             } else if (("签名").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("1");
-                wbsFE.setElementLength("1000");
+                wbsFE.setElementLength("800");
             } else if (("文件").equals(wbsFE.getElementType())) {
                 wbsFE.setElementType("1");
-                wbsFE.setElementLength("1000");
+                wbsFE.setElementLength("800");
             } else {
                 wbsFE.setElementType("1");
-                wbsFE.setElementLength("1000");
+                wbsFE.setElementLength("800");
             }
         }
         return R.data(list, "操作成功");
@@ -185,7 +162,7 @@ public class WbsFormElementController extends BladeController {
     /**
      * 查询当前节点下所有表单
      */
-    @ApiOperationSupport(order = 7)
+    @ApiOperationSupport(order = 9)
     @ApiOperation(value = "查询当前节点下所有表单", notes = "传入该节点id")
     @RequestMapping(value = "/findWbsTreeTableSameLevel", method = RequestMethod.GET)
     public R<List<WbsFormElementDTO2>> findWbsTreeTableSameLevel(@RequestParam("id") String id) {
@@ -196,7 +173,7 @@ public class WbsFormElementController extends BladeController {
     /**
      * wbs树节点手动排序
      */
-    @ApiOperationSupport(order = 8)
+    @ApiOperationSupport(order = 10)
     @ApiOperation(value = "wbs树节点手动排序", notes = "WbsFormElementDTO2集合,id=表单id")
     @RequestMapping(value = "/wbsTreeTableSort", method = RequestMethod.POST)
     public R wbsTreeTableSort(@RequestBody List<WbsFormElementDTO2> wbsTreeDTO) {
@@ -208,7 +185,7 @@ public class WbsFormElementController extends BladeController {
     /**
      * 提交清表关联公有Wbs树并创建元素
      */
-    @ApiOperationSupport(order = 9)
+    @ApiOperationSupport(order = 11)
     @ApiOperation(value = "提交清表关联公有Wbs树并创建元素", notes = "节点id、表名、元素DTO")
     @RequestMapping(value = "/submitExcelRelationWbsTreeAndElement", method = RequestMethod.POST)
     public R submitExcelRelationWbsTreeAndElement(@RequestBody FormElementDTO2 formElementDTO) {
@@ -218,7 +195,7 @@ public class WbsFormElementController extends BladeController {
     /**
      * 元素识别取消关联公有wbs表
      */
-    @ApiOperationSupport(order = 10)
+    @ApiOperationSupport(order = 12)
     @ApiOperation(value = "元素识别取消关联公有wbs表", notes = "传入表id、清表id")
     @RequestMapping(value = "/cancelRelation", method = RequestMethod.GET)
     public R cancelRelation(String id,String excelTabId) {
@@ -231,7 +208,7 @@ public class WbsFormElementController extends BladeController {
     /**
      * 元素识别关联公共WBS模板-查询节点下已关联的所有表单
      */
-    @ApiOperationSupport(order = 11)
+    @ApiOperationSupport(order = 13)
     @ApiOperation(value = "元素识别关联公共WBS模板-查询节点下已关联的所有表单", notes = "传入节点id、清表id")
     @RequestMapping(value = "/searchNodeTables", method = RequestMethod.GET)
     public R<List<WbsNodeTableVO>> searchNodeTables(String nodeId, String excelTabId) {
@@ -245,7 +222,7 @@ public class WbsFormElementController extends BladeController {
     /**
      * 元素识别关联公共WBS模板-关联Wbs元素表
      */
-    @ApiOperationSupport(order = 12)
+    @ApiOperationSupport(order = 14)
     @ApiOperation(value = "元素识别关联公共WBS模板-关联Wbs元素表", notes = "传入FormElementDTO2")
     @RequestMapping(value = "/saveRelation", method = RequestMethod.POST)
     public R relationWbsTab(@RequestBody FormElementDTO2 formElementDTO) {

+ 0 - 25
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsInfoController.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -43,12 +27,6 @@ import org.springblade.core.boot.ctrl.BladeController;
 
 import java.util.List;
 
-/**
- * wbs动态库信息 控制器
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/wbsInfo")
@@ -143,11 +121,8 @@ public class WbsInfoController extends BladeController {
             return R.success("成功");
         }
         return R.fail("失败");
-
-
     }
 
-
     /**
      * 删除 wbs动态库信息
      */

+ 0 - 7
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeContractController.java

@@ -16,13 +16,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-
-/**
- * 合同段wbs树 控制器
- *
- * @author liuyc
- * @since 2022-06-28
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/wbsTreeContract")

+ 11 - 31
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreeController.java

@@ -1,22 +1,5 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.controller;
 
-
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.*;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -59,12 +42,6 @@ import java.util.*;
 
 import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 
-/**
- * 公有Wbs树 控制器
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/wbsTree")
@@ -241,11 +218,14 @@ public class WbsTreeController extends BladeController {
      * 编辑表单元素批量修改
      */
     @PostMapping("/updateBatchElements")
-    @ApiOperationSupport(order = 11)
+    @ApiOperationSupport(order = 10)
     @ApiOperation(value = "编辑表单元素批量修改", notes = "传入WbsFormElement")
     @ApiImplicitParam(name = "ids", value = "元素的id集合", required = true)
     @Transactional(rollbackFor = Exception.class)
     public R updateBatchElements(@RequestBody List<WbsFormElement> wbsFormElementList, @RequestParam("initTableName") String initTableName) {
+        for (WbsFormElement wbsFormElement : wbsFormElementList) {
+            wbsFormElement.setStatus(1);
+        }
         boolean b = wbsFormElementService.updateBatchById(wbsFormElementList);
         if (b) {
             String s = wbsFormElementService.updateAndSyn(wbsFormElementList, initTableName);
@@ -270,7 +250,7 @@ public class WbsTreeController extends BladeController {
      * 导出Wbs树模板
      */
     @GetMapping("/export-template")
-    @ApiOperationSupport(order = 12)
+    @ApiOperationSupport(order = 11)
     @ApiOperation(value = "导出WBS树节点模板")
     public void exportWbsTree(HttpServletResponse response) {
         List<WbsTreeExcel> list = new ArrayList<>();
@@ -281,7 +261,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 导入Wbs模板树
      */
-    @ApiOperationSupport(order = 13)
+    @ApiOperationSupport(order = 12)
     @ApiOperation(value = "导入WBS树节点", notes = "传入excel文件")
     @RequestMapping(value = "/import-wbsTree", method = RequestMethod.POST)
     public R importWbsTree(@RequestPart("excelFile") MultipartFile excelFile,
@@ -308,7 +288,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 查询当前节点所有同级节点
      */
-    @ApiOperationSupport(order = 14)
+    @ApiOperationSupport(order = 13)
     @ApiOperation(value = "查询当前节点所有同级节点", notes = "传入该节点parentId")
     @RequestMapping(value = "/findWbsTreeSameLevel", method = RequestMethod.GET)
     public R<List<WbsTreeDTO2>> findWbsTreeSameLevel(@RequestParam("parentId") String parentId) {
@@ -319,7 +299,7 @@ public class WbsTreeController extends BladeController {
     /**
      * wbs树节点手动排序
      */
-    @ApiOperationSupport(order = 15)
+    @ApiOperationSupport(order = 14)
     @ApiOperation(value = "wbs树节点手动排序", notes = "WbsTreeDTO2集合,id=节点id,sort=节点顺序")
     @RequestMapping(value = "/wbsTreeSort", method = RequestMethod.POST)
     public R wbsTreeSort(@RequestBody List<WbsTreeDTO2> wbsTreeDTO) {
@@ -332,7 +312,7 @@ public class WbsTreeController extends BladeController {
      * 导出WBS元素批量模板
      */
     @GetMapping("/export-batchTemplate")
-    @ApiOperationSupport(order = 16)
+    @ApiOperationSupport(order = 15)
     @ApiOperation(value = "导出WBS元素批量模板")
     public void exportWbsTreeFormBatch(HttpServletResponse response) {
         List<WbsFormElementBatchExcel> list = new ArrayList<>();
@@ -343,7 +323,7 @@ public class WbsTreeController extends BladeController {
     /**
      * Wbs公有树节点批量导入元素表、元素
      */
-    @ApiOperationSupport(order = 17)
+    @ApiOperationSupport(order = 16)
     @ApiOperation(value = "Wbs公有树节点批量导入元素表与元素", notes = "传入excel文件/wbsTree对象")
     @RequestMapping(value = "/import-wbsTreeFormBatch", method = RequestMethod.POST)
     public R importWbsTreeTableAndForm(@RequestParam("excelFile") MultipartFile excelFile,
@@ -366,7 +346,7 @@ public class WbsTreeController extends BladeController {
     /**
      * 批量修改节点下元素表基本信息
      */
-    @ApiOperationSupport(order = 18)
+    @ApiOperationSupport(order = 17)
     @ApiOperation(value = "批量修改节点下元素表基本信息", notes = "传入List<WbsTree>")
     @RequestMapping(value = "/updateBatchNodeTableInfo", method = RequestMethod.POST)
     public R updateBatchNodeTableInfo(@RequestBody List<WbsTree> WbsTrees) {

+ 0 - 7
blade-service/blade-manager/src/main/java/org/springblade/manager/controller/WbsTreePrivateController.java

@@ -41,11 +41,6 @@ import java.util.List;
 
 import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
 
-/**
- * 项目级wbs树 控制器
- *
- * @author liuyc
- */
 @RestController
 @AllArgsConstructor
 @RequestMapping("/wbsPrivate")
@@ -55,9 +50,7 @@ public class WbsTreePrivateController extends BladeController {
     private final IWbsTreePrivateService wbsTreePrivateService;
     private final WbsTreeContractMapper wbsTreeContractMapper;
     private final WbsTreePrivateMapper wbsTreePrivateMapper;
-
     private final IWbsTreeService wbsTreeService;
-
     private final IProjectInfoService projectInfoService;
 
     /**

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ArchiveTreeMapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.mapper;
 
 import feign.Param;
@@ -24,12 +8,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
-/**
- * Mapper 接口
- *
- * @author liuyc
- * @since 2022-06-29
- */
 public interface ArchiveTreeMapper extends BaseMapper<ArchiveTree> {
 
     List<ArchiveTreeVO> lazyTree(@Param("tenantId") String tenantId, @Param("parentId") Long parentId);

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ContractInfoMapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.mapper;
 
 import org.apache.ibatis.annotations.Param;
@@ -29,12 +13,6 @@ import org.springblade.system.user.vo.UserVO2;
 
 import java.util.List;
 
-/**
- * 合同段信息表 Mapper 接口
- *
- * @author liuyc
- * @since 2022-04-14
- */
 public interface ContractInfoMapper extends BaseMapper<ContractInfo> {
 
     List<ContractInfo> selectContractByProjectIds(@Param("ids") List<Long> ids);

+ 0 - 23
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ImageClassificationConfigMapper.java

@@ -1,22 +1,5 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.manager.entity.ImageClassificationConfig;
@@ -24,12 +7,6 @@ import org.springblade.manager.vo.ImageClassificationConfigVO;
 
 import java.util.List;
 
-/**
- * 影像分类配置表 Mapper 接口
- *
- * @author liuyc
- * @since 2022-05-16
- */
 public interface ImageClassificationConfigMapper extends BaseMapper<ImageClassificationConfig> {
 
 	List<ImageClassificationConfigVO> selectImageClassificationConfigPage(IPage page, ImageClassificationConfigVO imageClassificationConfig);

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/ProjectInfoMapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.mapper;
 
 import io.lettuce.core.dynamic.annotation.Param;
@@ -26,12 +10,6 @@ import org.springblade.manager.vo.SingPfxManagementVO;
 
 import java.util.List;
 
-/**
- * 客户级项目表 Mapper 接口
- *
- * @author liuyc
- * @since 2022-04-13
- */
 public interface ProjectInfoMapper extends BaseMapper<ProjectInfo> {
 
 	List<ProjectUserAmountVO> queryProjectUserAmount();

+ 2 - 23
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.java

@@ -1,22 +1,5 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.mapper;
 
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
@@ -29,12 +12,6 @@ import org.springblade.manager.vo.WbsFormElementVO;
 
 import java.util.List;
 
-/**
- * wbs表单元素 Mapper 接口
- *
- * @author liuyc
- * @since 2022-04-27
- */
 public interface WbsFormElementMapper extends BaseMapper<WbsFormElement> {
 
     List<WbsFormElementVO> selectWbsFormElementPage(IPage page, WbsFormElementVO wbsFormElement);
@@ -65,4 +42,6 @@ public interface WbsFormElementMapper extends BaseMapper<WbsFormElement> {
 
     List<WbsTabRelationExcelTab> selectWbsTabRelationExcelTab(String id, String excelId);
 
+    void deleteElement(@Param("wbsFormElement") WbsFormElement wbsFormElement);
+
 }

+ 6 - 0
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsFormElementMapper.xml

@@ -70,6 +70,12 @@
           AND wbs_tab_id = #{id}
     </delete>
 
+    <delete id="deleteElement">
+        DELETE
+        FROM m_wbs_form_element
+        WHERE id = #{wbsFormElement.id}
+    </delete>
+
     <select id="selectWbsFormElementPage" resultMap="wbsFormElementResultMap">
         select *
         from m_wbs_form_element

+ 0 - 24
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsInfoMapper.java

@@ -1,35 +1,11 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.manager.entity.WbsInfo;
-import org.springblade.manager.vo.WbsInfoVO;
 
 import java.util.List;
 
-/**
- * wbs动态库信息 Mapper 接口
- *
- * @author liuyc
- * @since 2022-04-25
- */
 public interface WbsInfoMapper extends BaseMapper<WbsInfo> {
 
 	List<WbsInfo> selectWbsInfoPage(IPage page, WbsInfo wbsInfo);

+ 0 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeContractMapper.java

@@ -9,7 +9,6 @@ import org.springblade.manager.vo.*;
 import java.util.ArrayList;
 import java.util.List;
 
-
 public interface WbsTreeContractMapper extends BaseMapper<WbsTreeContract> {
 
     List<WbsTreeContract> selectQueryCurrentNodeByAncestors(@Param("ids") List<String> ids, @Param("contractId") String contractId);

+ 0 - 25
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreeMapper.java

@@ -1,40 +1,15 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.mapper;
 
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.manager.dto.WbsTreeDTO2;
 import org.springblade.manager.entity.WbsFormElement;
 import org.springblade.manager.entity.WbsTree;
-import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.vo.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
-/**
- * Mapper 接口
- *
- * @author liuyc
- * @since 2022-04-25
- */
 public interface WbsTreeMapper extends BaseMapper<WbsTree> {
 
     List<WbsTreeVO> selectWbsTreePage(IPage page, WbsTreeVO wbsTree);

+ 0 - 7
blade-service/blade-manager/src/main/java/org/springblade/manager/mapper/WbsTreePrivateMapper.java

@@ -13,13 +13,6 @@ import org.springblade.manager.vo.WbsTreeVO;
 
 import java.util.List;
 
-
-/**
- * Mapper 接口
- *
- * @author liuyc
- * @since 2022-05-24
- */
 public interface WbsTreePrivateMapper extends BaseMapper<WbsTreePrivate> {
     List<WbsTreePrivate> selectAll(Integer wbsType);
 

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IArchiveTreeService.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service;
 
 import org.springblade.manager.dto.ArchiveTreeDTO;
@@ -25,12 +9,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
-/**
- *  服务类
- *
- * @author liuyc
- * @since 2022-06-29
- */
 public interface IArchiveTreeService extends BaseService<ArchiveTree> {
 
 	boolean initArchiveTree();

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IContractInfoService.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -29,12 +13,6 @@ import org.springblade.system.user.vo.UserVO2;
 
 import java.util.List;
 
-/**
- * 合同段信息表 服务类
- *
- * @author liuyc
- * @since 2022-04-14
- */
 public interface IContractInfoService extends BaseService<ContractInfo> {
 
     List<String> getProcessContractByJLContractId(String contractId);

+ 0 - 13
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IImageClassificationConfigService.java

@@ -23,21 +23,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
-/**
- * 影像分类配置表 服务类
- *
- * @author BladeX
- * @since 2022-05-16
- */
 public interface IImageClassificationConfigService extends BaseService<ImageClassificationConfig> {
 
-	/**
-	 * 自定义分页
-	 *
-	 * @param page
-	 * @param imageClassificationConfig
-	 * @return
-	 */
 	IPage<ImageClassificationConfigVO> selectImageClassificationConfigPage(IPage<ImageClassificationConfigVO> page, ImageClassificationConfigVO imageClassificationConfig);
 
     List<ImageClassificationConfig> selectByType(String type);

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IProjectInfoService.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service;
 
 import org.springblade.manager.vo.*;
@@ -23,12 +7,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
-/**
- * 客户级项目表 服务类
- *
- * @author liuyc
- * @since 2022-04-13
- */
 public interface IProjectInfoService extends BaseService<ProjectInfo> {
 
 	List<ProjectUserAmountVO> queryProjectUserAmount();

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsFormElementService.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service;
 
 
@@ -32,12 +16,6 @@ import org.springblade.manager.vo.WbsNodeTableVO;
 
 import java.util.List;
 
-/**
- * wbs表单元素 服务类
- *
- * @author liuyc
- * @since 2022-04-27
- */
 public interface IWbsFormElementService extends BaseService<WbsFormElement> {
 
     IPage<WbsFormElementVO> selectWbsFormElementPage(IPage<WbsFormElementVO> page, WbsFormElementVO wbsFormElement);

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsInfoService.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service;
 
 
@@ -25,12 +9,6 @@ import org.springblade.manager.vo.WbsInfoVO;
 
 import java.util.List;
 
-/**
- * wbs动态库信息 服务类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 public interface IWbsInfoService extends BaseService<WbsInfo> {
 
 	IPage<WbsInfo> selectWbsInfoPage(IPage<WbsInfo> page, WbsInfo wbsInfo);

+ 0 - 1
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeContractService.java

@@ -10,7 +10,6 @@ import org.springblade.manager.vo.*;
 
 import java.util.List;
 
-
 public interface IWbsTreeContractService extends BaseService<WbsTreeContract> {
 
     List<WbsTreeContract> selectQueryCurrentNodeByAncestors(List<String> ids, String contractId);

+ 0 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreePrivateService.java

@@ -10,12 +10,6 @@ import org.springblade.manager.vo.WbsTreePrivateVO;
 
 import java.util.List;
 
-/**
- * 服务类
- *
- * @author liuyc
- * @since 2022-05-24
- */
 public interface IWbsTreePrivateService extends BaseService<WbsTreePrivate> {
     List<WbsTreePrivateVO> tree(String wbsId, String projectId);
 

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/service/IWbsTreeService.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service;
 
 import org.springblade.core.mp.base.BaseService;
@@ -32,12 +16,6 @@ import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 
-/**
- * 服务类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 public interface IWbsTreeService extends BaseService<WbsTree> {
 
     IPage<WbsTreeVO> selectWbsTreePage(IPage<WbsTreeVO> page, WbsTreeVO wbsTree);

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ArchiveTreeServiceImpl.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -40,12 +24,6 @@ import org.springframework.stereotype.Service;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * 服务实现类
- *
- * @author liuyc
- * @since 2022-06-29
- */
 @Service
 @AllArgsConstructor
 public class ArchiveTreeServiceImpl extends BaseServiceImpl<ArchiveTreeMapper, ArchiveTree> implements IArchiveTreeService {

+ 1 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ContractInfoServiceImpl.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
@@ -52,12 +36,6 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * 合同段信息表 服务实现类
- *
- * @author liuyc
- * @since 2022-04-14
- */
 @Service
 @AllArgsConstructor
 public class ContractInfoServiceImpl
@@ -210,6 +188,7 @@ public class ContractInfoServiceImpl
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
+    @Deprecated
     public boolean saveAndUpdateContract(ContractInfoVO contractInfo) {
         //新增
         if (contractInfo.getId() == null) {

+ 0 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ImageClassificationConfigServiceImpl.java

@@ -27,12 +27,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
 
-/**
- * 影像分类配置表 服务实现类
- *
- * @author liuyc
- * @since 2022-05-16
- */
 @Service
 public class ImageClassificationConfigServiceImpl extends BaseServiceImpl<ImageClassificationConfigMapper, ImageClassificationConfig> implements IImageClassificationConfigService {
 

+ 1 - 24
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/ProjectInfoServiceImpl.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service.impl;
 
 import org.springblade.manager.vo.*;
@@ -29,12 +13,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import javax.annotation.Resource;
 import java.util.List;
 
-/**
- * 客户级项目表 服务实现类
- *
- * @author liuyc
- * @since 2022-04-13
- */
 @Service
 public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, ProjectInfo> implements IProjectInfoService {
 
@@ -80,8 +58,7 @@ public class ProjectInfoServiceImpl extends BaseServiceImpl<ProjectInfoMapper, P
 
     @Override
     public List<ContractlnfoCountVO> selectContractInfoCount() {
-        List<ContractlnfoCountVO> contractlnfoCountVO = contractInfoMapper.selectContractInfoCount();
-        return contractlnfoCountVO;
+        return contractInfoMapper.selectContractInfoCount();
     }
 
 

+ 0 - 5
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/SaveUserInfoByProjectServiceImpl.java

@@ -21,11 +21,6 @@ import java.util.List;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-/**
- * 服务实现类
- *
- * @author liuyc
- */
 @Service
 @AllArgsConstructor
 public class SaveUserInfoByProjectServiceImpl

+ 67 - 85
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsFormElementServiceImpl.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -60,12 +44,6 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-/**
- * wbs表单元素 服务实现类
- *
- * @author liuyc
- * @since 2022-04-27
- */
 @Service
 @AllArgsConstructor
 public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMapper, WbsFormElement> implements IWbsFormElementService {
@@ -179,77 +157,81 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
     public R saveAndSyn(WbsFormElement wbsFormElement, String tableName) {
         //新增元素字段
         //查询当前元素表中元素的最后一个key_?值
-        QueryWrapper<WbsFormElement> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("f_id", wbsFormElement.getFId());
-        List<WbsFormElement> wbsFormElements = baseMapper.selectList(queryWrapper);
-        String substring = "";
-        List<String> eKeyNum = new ArrayList<>();
-        if (wbsFormElements.size() > 0) {
-            for (WbsFormElement formElement : wbsFormElements) {
-                String eKey = formElement.getEKey();
-                substring = eKey.split("_")[1];
-            }
-            if (StringUtils.isNotEmpty(substring)) {
-                long newFiled = Long.parseLong(substring) + 1;
-                String substring1 = "key_" + newFiled;
-                eKeyNum.add(substring1);
-                if (wbsFormElement.getEType() == 4) {
-                    wbsFormElement.setELength(0);
+        try {
+            QueryWrapper<WbsFormElement> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("f_id", wbsFormElement.getFId());
+            List<WbsFormElement> wbsFormElements = baseMapper.selectList(queryWrapper);
+            String substring = "";
+            List<String> eKeyNum = new ArrayList<>();
+            if (wbsFormElements.size() > 0) {
+                for (WbsFormElement formElement : wbsFormElements) {
+                    String eKey = formElement.getEKey();
+                    substring = eKey.split("_")[1];
                 }
-            }
-            wbsFormElement.setEKey(eKeyNum.get(eKeyNum.size() - 1));
-        } else {
-            wbsFormElement.setEKey("key_1");
-        }
-        String newName = wbsFormElement.getEKey();
-
-        //同步
-        StringBuilder sbr1 = new StringBuilder();
-        String fieldType = judgeDataType(wbsFormElement.getEType());
-        if ("varchar".equals(fieldType)) {
-            if (wbsFormElement.getELength() > 1000 || wbsFormElement.getELength() < 10) {
-                return R.fail("请输入正确的字符串长度,范围为10-1000");
+                if (StringUtils.isNotEmpty(substring)) {
+                    long newFiled = Long.parseLong(substring) + 1;
+                    String substring1 = "key_" + newFiled;
+                    eKeyNum.add(substring1);
+                    if (wbsFormElement.getEType() == 4) {
+                        wbsFormElement.setELength(0);
+                    }
+                }
+                wbsFormElement.setEKey(eKeyNum.get(eKeyNum.size() - 1));
             } else {
-                baseMapper.insert(wbsFormElement);
-                sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
-                String sql = newName + " " + sbr1;
-                baseMapper.alterAddFiled(sql, tableName);
-                return R.data(wbsFormElement, "操作成功");
+                wbsFormElement.setEKey("key_1");
             }
-        } else if ("bigint".equals(fieldType)) {
-            if (wbsFormElement.getELength() > 255 || wbsFormElement.getELength() < 10) {
-                return R.fail("请输入正确的整数长度,范围为10-255");
-            } else {
-                baseMapper.insert(wbsFormElement);
-                sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
-                String sql = newName + " " + sbr1;
-                baseMapper.alterAddFiled(sql, tableName);
-                return R.data(wbsFormElement, "操作成功");
-            }
-        } else if ("decimal".equals(fieldType)) {
-            if (wbsFormElement.getELength() > 65 || wbsFormElement.getELength() < 10) {
-                return R.fail("请输入正确的小数长度,范围为10-65");
-            } else {
+            String newName = wbsFormElement.getEKey();
+            wbsFormElement.setStatus(1);
+            //同步
+            StringBuilder sbr1 = new StringBuilder();
+            String fieldType = judgeDataType(wbsFormElement.getEType());
+            if ("varchar".equals(fieldType)) {
+                if (wbsFormElement.getELength() > 1000 || wbsFormElement.getELength() < 10) {
+                    return R.fail("请输入正确的字符串长度,范围为10-1000");
+                } else {
+                    baseMapper.insert(wbsFormElement);
+                    sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+                    String sql = newName + " " + sbr1;
+                    baseMapper.alterAddFiled(sql, tableName);
+                    return R.data(wbsFormElement, "操作成功");
+                }
+            } else if ("bigint".equals(fieldType)) {
+                if (wbsFormElement.getELength() > 255 || wbsFormElement.getELength() < 10) {
+                    return R.fail("请输入正确的整数长度,范围为10-255");
+                } else {
+                    baseMapper.insert(wbsFormElement);
+                    sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+                    String sql = newName + " " + sbr1;
+                    baseMapper.alterAddFiled(sql, tableName);
+                    return R.data(wbsFormElement, "操作成功");
+                }
+            } else if ("decimal".equals(fieldType)) {
+                if (wbsFormElement.getELength() > 65 || wbsFormElement.getELength() < 10) {
+                    return R.fail("请输入正确的小数长度,范围为10-65");
+                } else {
+                    baseMapper.insert(wbsFormElement);
+                    sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+                    String sql = newName + " " + sbr1;
+                    baseMapper.alterAddFiled(sql, tableName);
+                    return R.data(wbsFormElement, "操作成功");
+                }
+            } else if ("datetime".equals(fieldType)) {
                 baseMapper.insert(wbsFormElement);
-                sbr1.append(" ").append(fieldType).append("(").append(wbsFormElement.getELength()).append(")");
+                sbr1.append(" ").append(fieldType).append("(").append(0).append(")");
                 String sql = newName + " " + sbr1;
                 baseMapper.alterAddFiled(sql, tableName);
                 return R.data(wbsFormElement, "操作成功");
             }
-        } else if ("datetime".equals(fieldType)) {
-            baseMapper.insert(wbsFormElement);
-            sbr1.append(" ").append(fieldType).append("(").append(0).append(")");
-            String sql = newName + " " + sbr1;
-            baseMapper.alterAddFiled(sql, tableName);
-            return R.data(wbsFormElement, "操作成功");
+        } catch (Exception e) {
+            //手动回滚
+            baseMapper.deleteElement(wbsFormElement);
+            throw new ServiceException("未找到实体表,新增失败");
         }
 
         return R.fail("操作失败");
-
     }
 
     @Override
@@ -286,11 +268,11 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             try {
                 baseMapper.updateFiledType(initTableName, eKey, eType, eLength);
             } catch (Exception e) {
-                e.printStackTrace();
+                throw new ServiceException("未找到实体表,修改失败");
             }
         }
-        return "0";
 
+        return "0";
     }
 
     @Override
@@ -446,6 +428,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public boolean saveRelation(FormElementDTO2 formElementDTO) {
         try {
             //获取当前元素表与清表关系信息
@@ -659,7 +642,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             case "字符串":
             case "签名":
             case "文件":
-                return 1000;
+                return 800;
             case "整数":
             case "数值":
             case "小数":
@@ -673,7 +656,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     private Integer getElementLength2(String type) {
         switch (type) {
             case "varchar":
-                return 1000;
+                return 800;
             case "bigint":
             case "decimal":
                 return 20;
@@ -688,7 +671,7 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
             case 1:  //字符串
             case 7:  //文件
             case 6:  //签名
-                return "1000";
+                return "800";
             case 2:  //整数
             case 5:  //数值
             case 3:  //小数
@@ -742,5 +725,4 @@ public class WbsFormElementServiceImpl extends BaseServiceImpl<WbsFormElementMap
     }
 
 
-
 }

+ 0 - 28
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsInfoServiceImpl.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -34,12 +18,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 
-/**
- * wbs动态库信息 服务实现类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Service
 @AllArgsConstructor
 public class WbsInfoServiceImpl extends BaseServiceImpl<WbsInfoMapper, WbsInfo> implements IWbsInfoService {
@@ -63,17 +41,12 @@ public class WbsInfoServiceImpl extends BaseServiceImpl<WbsInfoMapper, WbsInfo>
     public boolean submit(WbsInfoDTO wbsInfo) {
         WbsTree wbsTree1 = wbsTreeService.selectGenNodeByWbsId(wbsInfo.getId());
         if (wbsTree1 != null) {
-
             baseMapper.updateById(wbsInfo);
-
             int row = wbsTreeService.updateByCondition(wbsInfo.getId(), wbsInfo.getWbsName(), wbsInfo.getStatus());
-
             return row > 0;
 
         } else {
-
             int row = baseMapper.insert(wbsInfo);
-
             if (row > 0) {
                 Long wbsId = wbsInfo.getId();
                 String nodeName = wbsInfo.getWbsName();
@@ -88,7 +61,6 @@ public class WbsInfoServiceImpl extends BaseServiceImpl<WbsInfoMapper, WbsInfo>
                 wbsTree.setFullName(nodeName);
                 wbsTree.setType(1);
                 return wbsTreeService.save(wbsTree);
-
             }
         }
 

+ 0 - 57
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeContractServiceImpl.java

@@ -26,11 +26,6 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * 服务实现类
- *
- * @author liuyc
- */
 @Service
 @AllArgsConstructor
 public class WbsTreeContractServiceImpl
@@ -283,34 +278,6 @@ public class WbsTreeContractServiceImpl
                         if (Long.parseLong(id) == (wbsTreePrivate.getId())) {
                             WbsTreeContract wbsTreeContract = getWbsTreeContract(wbsTreePrivate, pawDTO);
                             wbsTreeContracts.add(wbsTreeContract);
-
-                            /*//获取当前新增表单的上级父节点
-                            WbsTreeContract wbsTreeContracts1 = baseMapper.selectOne(Wrappers.<WbsTreeContract>query().lambda()
-                                    .eq(WbsTreeContract::getId, wbsTreeContract.getParentId())
-                                    .eq(WbsTreeContract::getContractId, pawDTO.getContractId())
-                                    .eq(WbsTreeContract::getProjectId, pawDTO.getProjectId())
-                                    .eq(WbsTreeContract::getWbsId, pawDTO.getWbsId())
-                                    .eq(WbsTreeContract::getType, 1)
-                            );
-                            if (wbsTreeContracts1 != null) {
-                                //获取上级父级节点同级别的复制或新增节点
-                                List<WbsTreeContract> wbsTreeContracts2 = baseMapper.selectList(Wrappers.<WbsTreeContract>query().lambda()
-                                        .eq(WbsTreeContract::getOldId, wbsTreeContracts1.getId())
-                                        .eq(WbsTreeContract::getContractId, pawDTO.getContractId())
-                                        .eq(WbsTreeContract::getProjectId, pawDTO.getProjectId())
-                                        .eq(WbsTreeContract::getWbsId, pawDTO.getWbsId())
-                                        .eq(WbsTreeContract::getType, 1)
-                                );
-                                if (wbsTreeContracts2.size() > 0) {
-                                    //将表单同步到复制或新增的节点下
-                                    for (WbsTreeContract treeContract : wbsTreeContracts2) {
-                                        wbsTreeContract.setPKeyId(SnowFlakeUtil.getId());
-                                        wbsTreeContract.setParentId(treeContract.getId());
-                                        wbsTreeContracts.add(wbsTreeContract);
-                                    }
-                                }
-                            }*/
-
                         }
                     });
                 });
@@ -335,30 +302,6 @@ public class WbsTreeContractServiceImpl
                 //获取当前节点、表的信息
                 List<WbsTreeContract> wbsTreeContractList = baseMapper.selectTableListInfo(ids1, pawDTO.getWbsId(), pawDTO.getProjectId(), pawDTO.getContractId());
 
-                /*//获取当前表的pKeyId
-                List<Long> pKeyIds = wbsTreeContractList.stream().filter(f -> f.getType() == 2).
-                        map(WbsTreeContract::getPKeyId).collect(Collectors.toList());
-
-                //判断客户端在当前节点下的元素表是否有填报记录
-                List<InformationQuery> inFormationQueryInfoList = baseMapper.selectInformationQueryInfo(pKeyIds);
-
-                List<WbsTreeContract> wbsTreeContractTables = new ArrayList<>();
-
-                for (WbsTreeContract wbsTreeContract : wbsTreeContractList) {
-                    for (InformationQuery informationQuery : inFormationQueryInfoList) {
-                        if (informationQuery.getWbsId().equals(wbsTreeContract.getPKeyId())) {
-                            wbsTreeContractTables.add(wbsTreeContract);
-                        }
-                    }
-                }
-
-                List<WbsTreeContract> collect = wbsTreeContractList.stream()
-                        .filter(f ->
-                                wbsTreeContractTables.stream().map(WbsTreeContract::getParentId).collect(Collectors.toList()).contains(f.getId()))
-                        .collect(Collectors.toList());
-                List<String> nodeNames = collect.stream().map(WbsTreeContract::getDeptName).collect(Collectors.toList());
-                */
-
                 List<WbsTreeContract> tableNames = new ArrayList<>();
                 if (wbsTreeContractList.size() > 0) {
                     for (WbsTreeContract wbsTreeContract : wbsTreeContractList) {

+ 0 - 5
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreePrivateServiceImpl.java

@@ -32,11 +32,6 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-/**
- * 服务实现类
- *
- * @author liuyc
- */
 @Service
 @AllArgsConstructor
 public class WbsTreePrivateServiceImpl extends BaseServiceImpl<WbsTreePrivateMapper, WbsTreePrivate> implements IWbsTreePrivateService {

+ 1 - 47
blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsTreeServiceImpl.java

@@ -1,22 +1,5 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
 import net.sourceforge.pinyin4j.PinyinHelper;
@@ -28,7 +11,6 @@ import net.sourceforge.pinyin4j.format.exception.BadHanyuPinyinOutputFormatCombi
 import org.apache.commons.lang.StringUtils;
 import org.springblade.common.utils.SnowFlakeUtil;
 import org.springblade.core.log.exception.ServiceException;
-import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -45,12 +27,10 @@ import org.springblade.manager.entity.*;
 import org.springblade.manager.excel.WbsExcelBatchUtil;
 import org.springblade.manager.excel.WbsExcelUtil;
 import org.springblade.manager.mapper.*;
-import org.springblade.manager.service.IFormulaService;
 import org.springblade.manager.service.IWbsFormElementService;
 import org.springblade.manager.service.IWbsTreeService;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.manager.vo.*;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,12 +41,6 @@ import java.io.IOException;
 import java.util.*;
 import java.util.stream.Collectors;
 
-/**
- * 服务实现类
- *
- * @author liuyc
- * @since 2022-04-25
- */
 @Service
 @AllArgsConstructor
 public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree> implements IWbsTreeService {
@@ -377,7 +351,7 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
             case "字符串":
             case "签名":
             case "文件":
-                return 255;
+                return 800;
             case "整数":
             case "数值":
             case "小数":
@@ -472,17 +446,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return null;
     }
 
-    private String selectTableIdByTableName(String id) {
-        QueryWrapper<WbsTree> queryWrapper = new QueryWrapper<>();
-        queryWrapper.in("id", id);
-        WbsTree wbsTree = wbsTreeMapper.selectOne(queryWrapper);
-        if (!("").equals(wbsTree) && wbsTree != null) {
-            return "-1";
-        }
-        assert wbsTree != null;
-        return String.valueOf(wbsTree.getId());
-    }
-
     @Override
     @Transactional(rollbackFor = Exception.class)
     public boolean importWbsTree(MultipartFile excelFile, WbsTree wbsTreeFu, WbsTree wbsTree1) throws IOException {
@@ -750,7 +713,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
     @Override
     public List<WbsTreeDTO2> findWbsTreeSameLevel(String parentId) {
-
         return baseMapper.selectWbsTreeListByParentId(parentId);
     }
 
@@ -763,7 +725,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
             //同步项目私有节点排序
             wbsTreePrivateMapper.updateSortById3(wbsTree.getId(), wbsTree.getSort());
-
             number++;
         }
         return true;
@@ -874,7 +835,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     }
 
                     //TODO删除
-
                 }
 
             } else if (pawDTO.getReferenceType().equals("private")) {
@@ -936,7 +896,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                     }
 
                     //TODO删除
-
                 }
             }
         }
@@ -1068,7 +1027,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
                     baseMapper.deleteBatch(ids2, pawDTO.getPrimaryKeyId(), pawDTO.getProjectId());
                     baseMapper.deleteBatch2(ids2, pawDTO.getPrimaryKeyId(), pawDTO.getProjectId());
-
                 }
             }
         }
@@ -1213,7 +1171,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
                                 }
                             }
-
                         });
                         return true;
                     }
@@ -1324,7 +1281,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
                         });
 
                         wbsTreePrivateService.saveBatch(lists, 10000);
-
                         return true;
                     }
                 }
@@ -1387,7 +1343,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
 
                     baseMapper.deleteBatch(ids2, pawDTO.getPrimaryKeyId(), pawDTO.getProjectId());
                     baseMapper.deleteBatch2(ids2, pawDTO.getPrimaryKeyId(), pawDTO.getProjectId());
-
                 }
 
             }
@@ -1466,7 +1421,6 @@ public class WbsTreeServiceImpl extends BaseServiceImpl<WbsTreeMapper, WbsTree>
         return true;
     }
 
-
     public List<WbsTree> findAllNodeList(String wbsTreeIds) {
         if (StringUtils.isNotEmpty(wbsTreeIds)) {
             String[] ids = wbsTreeIds.split(",");

+ 0 - 7
blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ArchiveTreeWrapper.java

@@ -1,6 +1,5 @@
 package org.springblade.manager.wrapper;
 
-
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.manager.entity.ArchiveTree;
@@ -10,12 +9,6 @@ import org.springblade.manager.vo.ArchiveTreeVO;
 
 import java.util.Objects;
 
-/**
- * Warpper
- *
- * @author liuyc
- * @since 2022-06-29
- */
 public class ArchiveTreeWrapper extends BaseEntityWrapper<ArchiveTree, ArchiveTreeVO> {
 
     public static ArchiveTreeWrapper build() {

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ContractInfoWrapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -22,12 +6,6 @@ import org.springblade.manager.entity.ContractInfo;
 import org.springblade.manager.vo.ContractInfoVO;
 import java.util.Objects;
 
-/**
- * 合同段信息表包装类,返回视图层所需的字段
- *
- * @author liuyc
- * @since 2022-04-14
- */
 public class ContractInfoWrapper extends BaseEntityWrapper<ContractInfo, ContractInfoVO>  {
 
 	public static ContractInfoWrapper build() {

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ImageClassificationConfigWrapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -22,12 +6,6 @@ import org.springblade.manager.entity.ImageClassificationConfig;
 import org.springblade.manager.vo.ImageClassificationConfigVO;
 import java.util.Objects;
 
-/**
- * 影像分类配置表包装类,返回视图层所需的字段
- *
- * @author BladeX
- * @since 2022-05-16
- */
 public class ImageClassificationConfigWrapper extends BaseEntityWrapper<ImageClassificationConfig, ImageClassificationConfigVO>  {
 
 	public static ImageClassificationConfigWrapper build() {

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/ProjectInfoWrapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -25,12 +9,6 @@ import org.springblade.system.user.entity.User;
 
 import java.util.Objects;
 
-/**
- * 客户级项目表包装类,返回视图层所需的字段
- *
- * @author liuyc
- * @since 2022-04-13
- */
 public class ProjectInfoWrapper extends BaseEntityWrapper<ProjectInfo, ProjectInfoVO> {
 
     public static ProjectInfoWrapper build() {

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsFormElementWrapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -23,12 +7,6 @@ import org.springblade.manager.vo.WbsFormElementVO;
 
 import java.util.Objects;
 
-/**
- * wbs表单元素包装类,返回视图层所需的字段
- *
- * @author liuyc
- * @since 2022-04-27
- */
 public class WbsFormElementWrapper extends BaseEntityWrapper<WbsFormElement, WbsFormElementVO>  {
 
 	public static WbsFormElementWrapper build() {

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsInfoWrapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -23,12 +7,6 @@ import org.springblade.manager.vo.WbsInfoVO;
 
 import java.util.Objects;
 
-/**
- * wbs动态库信息包装类,返回视图层所需的字段
- *
- * @author liuyc
- * @since 2022-04-25
- */
 public class WbsInfoWrapper extends BaseEntityWrapper<WbsInfo, WbsInfoVO>  {
 
 	public static WbsInfoWrapper build() {

+ 0 - 6
blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsTreePrivateWrapper.java

@@ -6,12 +6,6 @@ import org.springblade.manager.entity.WbsTreePrivate;
 import org.springblade.manager.vo.WbsTreePrivateVO;
 import java.util.Objects;
 
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author liuyc
- * @since 2022-05-24
- */
 public class WbsTreePrivateWrapper extends BaseEntityWrapper<WbsTreePrivate, WbsTreePrivateVO> {
     public static WbsTreePrivateWrapper build() {
         return new WbsTreePrivateWrapper();

+ 0 - 22
blade-service/blade-manager/src/main/java/org/springblade/manager/wrapper/WbsTreeWrapper.java

@@ -1,19 +1,3 @@
-/*
- *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
- *
- *  Redistribution and use in source and binary forms, with or without
- *  modification, are permitted provided that the following conditions are met:
- *
- *  Redistributions of source code must retain the above copyright notice,
- *  this list of conditions and the following disclaimer.
- *  Redistributions in binary form must reproduce the above copyright
- *  notice, this list of conditions and the following disclaimer in the
- *  documentation and/or other materials provided with the distribution.
- *  Neither the name of the dreamlu.net developer nor the names of its
- *  contributors may be used to endorse or promote products derived from
- *  this software without specific prior written permission.
- *  Author: Chill 庄骞 (smallchill@163.com)
- */
 package org.springblade.manager.wrapper;
 
 import org.springblade.core.mp.support.BaseEntityWrapper;
@@ -23,12 +7,6 @@ import org.springblade.manager.vo.WbsTreeVO;
 
 import java.util.Objects;
 
-/**
- * 包装类,返回视图层所需的字段
- *
- * @author liuyc
- * @since 2022-04-25
- */
 public class WbsTreeWrapper extends BaseEntityWrapper<WbsTree, WbsTreeVO>  {
 
 	public static WbsTreeWrapper build() {