hfxc226 2 роки тому
батько
коміт
a8715e69e5
71 змінених файлів з 193 додано та 193 видалено
  1. 32 32
      db/设备管理系统.pdm
  2. 1 1
      platform-common/src/main/java/com/platform/common/enums/ResultCode.java
  3. 2 2
      platform-common/src/main/java/com/platform/common/util/IdGeneratorUtils.java
  4. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/check/CheckJobDTO.java
  5. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/check/CheckProjectDTO.java
  6. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/firm/FirmProducerDTO.java
  7. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/firm/FirmSupplierDTO.java
  8. 2 2
      platform-dao/src/main/java/com/platform/dao/dto/lubricationmanage/LubricationJobDTO.java
  9. 3 3
      platform-dao/src/main/java/com/platform/dao/dto/lubricationmanage/LubricationStandardDTO.java
  10. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/maintain/MaintainJobDTO.java
  11. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/maintain/MaintainProjectDTO.java
  12. 2 2
      platform-dao/src/main/java/com/platform/dao/dto/maintainmanage/MaintainJobDTO.java
  13. 3 3
      platform-dao/src/main/java/com/platform/dao/dto/maintainmanage/MaintainStandardDTO.java
  14. 4 4
      platform-dao/src/main/java/com/platform/dao/dto/maintainmanage/MaintainStandardDTO.java~merged
  15. 2 2
      platform-dao/src/main/java/com/platform/dao/dto/part/PartInfoDTO.java
  16. 6 6
      platform-dao/src/main/java/com/platform/dao/dto/part/PartTypeDTO.java
  17. 2 2
      platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java
  18. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/repair/RepairFormDTO.java
  19. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/repair/RepairPartUsedDTO.java
  20. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartUsedDTO.java
  21. 2 2
      platform-dao/src/main/java/com/platform/dao/entity/check/CheckJob.java
  22. 1 1
      platform-dao/src/main/java/com/platform/dao/entity/check/CheckProject.java
  23. 1 1
      platform-dao/src/main/java/com/platform/dao/entity/firm/FirmProducer.java
  24. 1 1
      platform-dao/src/main/java/com/platform/dao/entity/firm/FirmSupplier.java
  25. 2 2
      platform-dao/src/main/java/com/platform/dao/entity/lubricationmanage/LubricationJob.java
  26. 2 2
      platform-dao/src/main/java/com/platform/dao/entity/lubricationmanage/LubricationStandard.java
  27. 1 1
      platform-dao/src/main/java/com/platform/dao/entity/maintain/MaintainJob.java
  28. 1 1
      platform-dao/src/main/java/com/platform/dao/entity/maintain/MaintainProject.java
  29. 4 4
      platform-dao/src/main/java/com/platform/dao/entity/part/PartInfo.java
  30. 6 6
      platform-dao/src/main/java/com/platform/dao/entity/part/PartType.java
  31. 2 2
      platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java
  32. 1 1
      platform-dao/src/main/java/com/platform/dao/entity/repair/RepairForm.java
  33. 2 2
      platform-dao/src/main/java/com/platform/dao/entity/sqarepartmanage/SparePartUsed.java
  34. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/OperateObjectTypeEnum.java
  35. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/YesNoEnum.java
  36. 1 1
      platform-dao/src/main/java/com/platform/dao/mapper/part/PartInfoMapper.java
  37. 1 1
      platform-dao/src/main/java/com/platform/dao/mapper/part/PartTypeMapper.java
  38. 1 1
      platform-dao/src/main/java/com/platform/dao/util/SelectUtil.java
  39. 1 1
      platform-dao/src/main/java/com/platform/dao/util/TreeUtil.java
  40. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/export/check/ExportCheckProjectVO.java
  41. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/export/firm/ExportFirmProducerVO.java
  42. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/export/firm/ExportFirmSupplierVO.java
  43. 4 4
      platform-dao/src/main/java/com/platform/dao/vo/export/lubricationmanage/ExportLubricationJobVO.java
  44. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/export/lubricationmanage/ExportLubricationStandardVO.java
  45. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/export/maintain/ExportMaintainProjectVO.java
  46. 4 4
      platform-dao/src/main/java/com/platform/dao/vo/export/maintainmanage/ExportMaintainJobVO.java
  47. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/export/maintainmanage/ExportMaintainStandardVO.java
  48. 3 3
      platform-dao/src/main/java/com/platform/dao/vo/export/part/ExportPartInfoVO.java
  49. 11 11
      platform-dao/src/main/java/com/platform/dao/vo/export/part/ExportPartTypeVO.java
  50. 1 1
      platform-dao/src/main/java/com/platform/dao/vo/export/repair/ExportRepairProjectVO.java
  51. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/export/sqarepartmanage/ExportSparePartUsedReportVO.java
  52. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/export/sqarepartmanage/ExportSparePartUsedVO.java
  53. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckJobVO.java
  54. 3 3
      platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckProjectVO.java
  55. 1 1
      platform-dao/src/main/java/com/platform/dao/vo/query/firm/FirmProducerVO.java
  56. 1 1
      platform-dao/src/main/java/com/platform/dao/vo/query/firm/FirmSupplierVO.java
  57. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/query/maintain/MaintainJobVO.java
  58. 3 3
      platform-dao/src/main/java/com/platform/dao/vo/query/maintain/MaintainProjectVO.java
  59. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java
  60. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/repair/RepairCheckVO.java
  61. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/repair/RepairFormVO.java
  62. 2 2
      platform-dao/src/main/java/com/platform/dao/vo/spare/SparePartUsedVO.java
  63. 14 14
      platform-rest/src/main/java/com/platform/rest/controller/part/PartInfoController.java
  64. 14 14
      platform-rest/src/main/java/com/platform/rest/controller/part/PartTypeController.java
  65. 0 0
      platform-rest/src/main/resources/templates/test.ftl
  66. 0 0
      platform-rest/src/main/resources/templates/test.vm
  67. 1 1
      platform-service/src/main/java/com/platform/service/part/PartInfoService.java
  68. 1 1
      platform-service/src/main/java/com/platform/service/part/PartTypeService.java
  69. 1 1
      platform-service/src/main/java/com/platform/service/part/impl/PartInfoServiceImpl.java
  70. 1 1
      platform-service/src/main/java/com/platform/service/part/impl/PartTypeServiceImpl.java
  71. 2 2
      platform-service/src/main/java/com/platform/service/sb/impl/SbPositionServiceImpl.java

+ 32 - 32
db/设备管理系统.pdm

@@ -4258,8 +4258,8 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:PhysicalDiagram>
 <o:PhysicalDiagram Id="o15">
 <a:ObjectID>F49327BA-6EC6-44BE-B2EC-B16A38371D12</a:ObjectID>
-<a:Name>部基础信息</a:Name>
-<a:Code>部基础信息</a:Code>
+<a:Name>部基础信息</a:Name>
+<a:Code>部基础信息</a:Code>
 <a:CreationDate>1588670972</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671065</a:ModificationDate>
@@ -10698,13 +10698,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o17">
 <a:ObjectID>BCA25335-3224-4064-B7B1-2DD0F4339B94</a:ObjectID>
-<a:Name>部基础信息表</a:Name>
+<a:Name>部基础信息表</a:Name>
 <a:Code>t_part_info</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1590544302</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部基础信息表</a:Comment>
+<a:Comment>部基础信息表</a:Comment>
 <a:PhysicalOptions>ENGINE = InnoDB AUTO_INCREMENT = 20 CHARACTER SET = utf8 COLLATE = utf8_bin COMMENT = &#39;设备信息表&#39; ROW_FORMAT = Compact</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -10723,13 +10723,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o275">
 <a:ObjectID>D1A66AA4-203F-415E-A018-CE52A31B3648</a:ObjectID>
-<a:Name>部编号</a:Name>
+<a:Name>部编号</a:Name>
 <a:Code>no</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671065</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部编号</a:Comment>
+<a:Comment>部编号</a:Comment>
 <a:DataType>varchar(50)</a:DataType>
 <a:Length>50</a:Length>
 <a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,55={9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,4=utf8
@@ -10738,7 +10738,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o276">
 <a:ObjectID>FEB1B76A-66BA-4505-AC13-B6806EDE4549</a:ObjectID>
-<a:Name>部名称</a:Name>
+<a:Name>部名称</a:Name>
 <a:Code>name</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -10753,7 +10753,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o277">
 <a:ObjectID>CBF2FA8D-8512-4D5C-A406-E70759DE5AF0</a:ObjectID>
-<a:Name>部类别id</a:Name>
+<a:Name>部类别id</a:Name>
 <a:Code>type_id</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -10766,7 +10766,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o278">
 <a:ObjectID>745CE32E-F617-4909-984D-E3628537D895</a:ObjectID>
-<a:Name>部等级</a:Name>
+<a:Name>部等级</a:Name>
 <a:Code>level</a:Code>
 <a:CreationDate>1586340064</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -10790,7 +10790,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o280">
 <a:ObjectID>5F0447F5-FDF9-4FCC-BBE3-52E3D39BEEDB</a:ObjectID>
-<a:Name>部来源方式</a:Name>
+<a:Name>部来源方式</a:Name>
 <a:Code>source_type</a:Code>
 <a:CreationDate>1586338049</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -10925,7 +10925,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o291">
 <a:ObjectID>A0751E6A-5DA8-41D2-86BE-99F0C936FB9E</a:ObjectID>
-<a:Name>部图片</a:Name>
+<a:Name>部图片</a:Name>
 <a:Code>sb_image</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -11061,13 +11061,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Table>
 <o:Table Id="o19">
 <a:ObjectID>63750C3E-897A-46EE-BCF9-7595825A213F</a:ObjectID>
-<a:Name>部类别</a:Name>
+<a:Name>部类别</a:Name>
 <a:Code>t_part_type</a:Code>
 <a:CreationDate>1586338317</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1590544310</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部类别</a:Comment>
+<a:Comment>部类别</a:Comment>
 <a:PhysicalOptions>ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = &#39;部门管理&#39; ROW_FORMAT = Compact</a:PhysicalOptions>
 <a:TotalSavingCurrency/>
 <c:Columns>
@@ -11320,13 +11320,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o318">
 <a:ObjectID>64832082-B22A-488F-8CBC-9039083318EA</a:ObjectID>
-<a:Name>部id</a:Name>
+<a:Name>部id</a:Name>
 <a:Code>part_id</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671135</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部id</a:Comment>
+<a:Comment>部id</a:Comment>
 <a:DataType>varchar(64)</a:DataType>
 <a:Length>64</a:Length>
 <a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,55={9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,4=utf8
@@ -12019,13 +12019,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o368">
 <a:ObjectID>84562D18-B5E6-4136-A5C6-1B94B4D247EB</a:ObjectID>
-<a:Name>部id</a:Name>
+<a:Name>部id</a:Name>
 <a:Code>part_id</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671282</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部id</a:Comment>
+<a:Comment>部id</a:Comment>
 <a:DataType>varchar(60)</a:DataType>
 <a:Length>60</a:Length>
 <a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,55={9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,4=utf8
@@ -12034,13 +12034,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o369">
 <a:ObjectID>65E61709-7539-4629-9225-9E85C965BF92</a:ObjectID>
-<a:Name>部名称</a:Name>
+<a:Name>部名称</a:Name>
 <a:Code>part_name</a:Code>
 <a:CreationDate>1587453724</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671282</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部名称</a:Comment>
+<a:Comment>部名称</a:Comment>
 <a:DataType>varchar(60)</a:DataType>
 <a:Length>60</a:Length>
 </o:Column>
@@ -12279,13 +12279,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o387">
 <a:ObjectID>167A8B7A-85A6-4968-AF02-B4A82D57495C</a:ObjectID>
-<a:Name>部id</a:Name>
+<a:Name>部id</a:Name>
 <a:Code>part_id</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671282</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部id</a:Comment>
+<a:Comment>部id</a:Comment>
 <a:DataType>varchar(60)</a:DataType>
 <a:Length>60</a:Length>
 <a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,55={9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,4=utf8
@@ -12851,13 +12851,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o427">
 <a:ObjectID>49234045-DEE3-481A-ADEB-38D01F0DF070</a:ObjectID>
-<a:Name>部id</a:Name>
+<a:Name>部id</a:Name>
 <a:Code>part_id</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671298</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部id</a:Comment>
+<a:Comment>部id</a:Comment>
 <a:DataType>varchar(60)</a:DataType>
 <a:Length>60</a:Length>
 <a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,55={9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,4=utf8
@@ -12866,13 +12866,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o428">
 <a:ObjectID>7D37A8A6-38E0-422D-A056-7F6A099F1A29</a:ObjectID>
-<a:Name>部名称</a:Name>
+<a:Name>部名称</a:Name>
 <a:Code>part_name</a:Code>
 <a:CreationDate>1587453724</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671298</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部名称</a:Comment>
+<a:Comment>部名称</a:Comment>
 <a:DataType>varchar(60)</a:DataType>
 <a:Length>60</a:Length>
 </o:Column>
@@ -13111,13 +13111,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o446">
 <a:ObjectID>ED8AE899-A554-4DBA-ABA7-7BDA3F5CD197</a:ObjectID>
-<a:Name>部id</a:Name>
+<a:Name>部id</a:Name>
 <a:Code>part_id</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1588671298</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部id</a:Comment>
+<a:Comment>部id</a:Comment>
 <a:DataType>varchar(60)</a:DataType>
 <a:Length>60</a:Length>
 <a:ExtendedAttributesText>{F4F16ECD-F2F1-4006-AF6F-638D5C65F35E},MYSQL50,55={9480E6AA-83DD-4AA7-9C91-E48F709C29D9},CharSet,4=utf8
@@ -15234,7 +15234,7 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o593">
 <a:ObjectID>36A24C43-F4B3-44B7-8A8B-B3165D5AD979</a:ObjectID>
-<a:Name>部id</a:Name>
+<a:Name>部id</a:Name>
 <a:Code>part_id</a:Code>
 <a:CreationDate>1586335538</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
@@ -16803,13 +16803,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o708">
 <a:ObjectID>7F1C24A1-1134-4509-8B19-93D1BC0AA211</a:ObjectID>
-<a:Name>部id</a:Name>
+<a:Name>部id</a:Name>
 <a:Code>part_id</a:Code>
 <a:CreationDate>1586336071</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1591347725</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部id</a:Comment>
+<a:Comment>部id</a:Comment>
 <a:DataType>varchar(64)</a:DataType>
 <a:Length>64</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>
@@ -17362,13 +17362,13 @@ LABL 0 新宋体,8,N</a:FontList>
 </o:Column>
 <o:Column Id="o750">
 <a:ObjectID>DEE88080-2E1C-4E13-A235-A6BA67C66FF1</a:ObjectID>
-<a:Name>部id</a:Name>
+<a:Name>部id</a:Name>
 <a:Code>part_id</a:Code>
 <a:CreationDate>1586336071</a:CreationDate>
 <a:Creator>Administrator</a:Creator>
 <a:ModificationDate>1591585153</a:ModificationDate>
 <a:Modifier>Administrator</a:Modifier>
-<a:Comment>部id</a:Comment>
+<a:Comment>部id</a:Comment>
 <a:DataType>varchar(64)</a:DataType>
 <a:Length>64</a:Length>
 <a:Column.Mandatory>1</a:Column.Mandatory>

+ 1 - 1
platform-common/src/main/java/com/platform/common/enums/ResultCode.java

@@ -95,7 +95,7 @@ public enum ResultCode {
     PLAN_NOT_NULL(202052,"计划不能为空", "plan can not be null"),
     STANDARD_NOT_NULL(202053,"标准不能为空", "standard can not be null"),
     SBS_NOT_NULL(202054,"复制设备信息不能为空", "copy sb info  can not be null"),
-    PARTS_NOT_NULL(202054,"复制部信息不能为空", "copy part info  can not be null"),
+    PARTS_NOT_NULL(202054,"复制部信息不能为空", "copy part info  can not be null"),
 
     /**
      * 微信服务器token验证错误

+ 2 - 2
platform-common/src/main/java/com/platform/common/util/IdGeneratorUtils.java

@@ -99,7 +99,7 @@ public class IdGeneratorUtils {
     }
 
     /**
-     * 生成部编码
+     * 生成部编码
      *
      * @param countNum
      * @return
@@ -109,7 +109,7 @@ public class IdGeneratorUtils {
     }
 
     /**
-     * 生成设备部类型编码
+     * 生成设备部类型编码
      *
      * @param countNum
      * @return

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/check/CheckJobDTO.java

@@ -67,7 +67,7 @@ public class CheckJobDTO extends BaseDTO implements Serializable {
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/check/CheckProjectDTO.java

@@ -46,7 +46,7 @@ public class CheckProjectDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
     private String partId;
 

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/firm/FirmProducerDTO.java

@@ -27,7 +27,7 @@ public class FirmProducerDTO extends BaseDTO implements Serializable {
     @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
     private String id;
     /**
-     * 类型:1.表示设备,2.表示部,3.表示备件
+     * 类型:1.表示设备,2.表示部,3.表示备件
      */
     private Integer type;
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/firm/FirmSupplierDTO.java

@@ -27,7 +27,7 @@ public class FirmSupplierDTO extends BaseDTO implements Serializable {
     @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
     private String id;
     /**
-     * 类型:1.表示设备,2.表示部,3.表示备件
+     * 类型:1.表示设备,2.表示部,3.表示备件
      */
     private Integer type;
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/dto/lubricationmanage/LubricationJobDTO.java

@@ -38,12 +38,12 @@ public class LubricationJobDTO extends BaseDTO implements Serializable {
     private String sbName;
 
     /**
-   * 部id
+   * 部id
    */
     private String partId;
 
     /**
-   * 部名称
+   * 部名称
    */
     private String partName;
 

+ 3 - 3
platform-dao/src/main/java/com/platform/dao/dto/lubricationmanage/LubricationStandardDTO.java

@@ -34,7 +34,7 @@ public class LubricationStandardDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
     private String partId;
 
@@ -83,7 +83,7 @@ public class LubricationStandardDTO extends BaseDTO implements Serializable {
    */
   private String keyword;
     /**
-     * 复制对象类型 1-设备 2-部
+     * 复制对象类型 1-设备 2-部
      */
     private Integer copyType;
 
@@ -93,7 +93,7 @@ public class LubricationStandardDTO extends BaseDTO implements Serializable {
     private List<String> sbIds;
 
     /**
-     * 部id
+     * 部id
      */
     private List<String> partIds;
 

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/maintain/MaintainJobDTO.java

@@ -39,7 +39,7 @@ public class MaintainJobDTO extends BaseDTO implements Serializable {
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/maintain/MaintainProjectDTO.java

@@ -39,7 +39,7 @@ public class MaintainProjectDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
     private String partId;
 

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/dto/maintainmanage/MaintainJobDTO.java

@@ -38,12 +38,12 @@ public class MaintainJobDTO extends BaseDTO implements Serializable {
     private String sbName;
 
     /**
-   * 部id
+   * 部id
    */
     private String partId;
 
     /**
-   * 部名称
+   * 部名称
    */
     private String partName;
 

+ 3 - 3
platform-dao/src/main/java/com/platform/dao/dto/maintainmanage/MaintainStandardDTO.java

@@ -34,7 +34,7 @@ public class MaintainStandardDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
     private String partId;
 
@@ -83,7 +83,7 @@ public class MaintainStandardDTO extends BaseDTO implements Serializable {
    */
   private String keyword;
     /**
-     * 复制对象类型 1-设备 2-部
+     * 复制对象类型 1-设备 2-部
      */
     private Integer copyType;
 
@@ -93,7 +93,7 @@ public class MaintainStandardDTO extends BaseDTO implements Serializable {
     private List<String> sbIds;
 
     /**
-     * 部id
+     * 部id
      */
     private List<String> partIds;
 

+ 4 - 4
platform-dao/src/main/java/com/platform/dao/dto/maintainmanage/MaintainStandardDTO.java~merged

@@ -73,7 +73,7 @@ public class MaintainStandardDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
     private String partId;
 
@@ -88,7 +88,7 @@ public class MaintainStandardDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
     private String partId;
 
@@ -155,7 +155,7 @@ public class MaintainStandardDTO extends BaseDTO implements Serializable {
    */
   private String keyword;
     /**
-     * 复制对象类型 1-设备 2-部
+     * 复制对象类型 1-设备 2-部
      */
     private Integer copyType;
 
@@ -199,7 +199,7 @@ public class MaintainStandardDTO extends BaseDTO implements Serializable {
     private List<String> sbIds;
 
     /**
-     * 部id
+     * 部id
      */
     private List<String> partIds;
 

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/dto/part/PartInfoDTO.java

@@ -13,7 +13,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
- * @Description 部信息DTO
+ * @Description 部信息DTO
  * @Author liuyu
  * @Date 2020-04-24 09:27:01
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
@@ -30,7 +30,7 @@ public class PartInfoDTO extends BaseDTO implements Serializable {
     private String id;
 
     /**
-     * 部编号
+     * 部编号
      */
     private String no;
 

+ 6 - 6
platform-dao/src/main/java/com/platform/dao/dto/part/PartTypeDTO.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * @Description 部类别DTO
+ * @Description 部类别DTO
  * @Author liuyu
  * @Date 2020-04-24 09:27:42
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
@@ -22,23 +22,23 @@ import java.time.LocalDateTime;
 public class PartTypeDTO extends BaseDTO implements Serializable {
 
     /**
-     * 部id
+     * 部id
      */
     @NotNull(groups = {UpdateGroup.class}, message = "ID不能为空")
     private String id;
 
     /**
-     * 部编码
+     * 部编码
      */
     private String no;
 
     /**
-     * 部名称
+     * 部名称
      */
     private String name;
 
     /**
-     * 部类型 1:大类2:子类
+     * 部类型 1:大类2:子类
      */
     private Integer type;
 
@@ -48,7 +48,7 @@ public class PartTypeDTO extends BaseDTO implements Serializable {
     private Integer sort;
 
     /**
-     * 上层部id
+     * 上层部id
      */
     private String parentId;
 

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/dto/repair/RepairApplicationFormDTO.java

@@ -81,7 +81,7 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
      */
     private Integer planFlag;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -253,7 +253,7 @@ public class RepairApplicationFormDTO extends BaseDTO implements Serializable {
     @Transient
     private String sbName;
     /**
-     * 部名称
+     * 部名称
      */
     @Transient
     private String partName;

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/repair/RepairFormDTO.java

@@ -42,7 +42,7 @@ public class RepairFormDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-     * 部
+     * 部
      */
     private String partId;
 

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/repair/RepairPartUsedDTO.java

@@ -108,7 +108,7 @@ public class RepairPartUsedDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-     * 部id
+     * 部id
      */
     private String partId;
 

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/sqarepartmanage/SparePartUsedDTO.java

@@ -46,7 +46,7 @@ public class SparePartUsedDTO extends BaseDTO implements Serializable {
     private String sbId;
 
     /**
-     * 部id
+     * 部id
      */
     private String partId;
 

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/entity/check/CheckJob.java

@@ -88,11 +88,11 @@ public class CheckJob implements Serializable {
     @Transient
     private Integer sbLevel;
     /**
-     * 部名称
+     * 部名称
      */
     private String partId;
     /**
-     * 部名称
+     * 部名称
      */
     @Transient
     private String partName;

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/check/CheckProject.java

@@ -44,7 +44,7 @@ public class CheckProject implements Serializable{
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/firm/FirmProducer.java

@@ -27,7 +27,7 @@ public class FirmProducer implements Serializable {
     @Id
     private String id;
     /**
-     * 类型:1.表示设备,2.表示部,3.表示备件
+     * 类型:1.表示设备,2.表示部,3.表示备件
      */
     private Integer type;
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/firm/FirmSupplier.java

@@ -27,7 +27,7 @@ public class FirmSupplier implements Serializable {
     @Id
     private String id;
     /**
-     * 类型:1.表示设备,2.表示部,3.表示备件
+     * 类型:1.表示设备,2.表示部,3.表示备件
      */
     private Integer type;
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/entity/lubricationmanage/LubricationJob.java

@@ -34,7 +34,7 @@ public class LubricationJob implements Serializable{
      */
     private String sbName;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -42,7 +42,7 @@ public class LubricationJob implements Serializable{
      */
     private String principal;
     /**
-     * 部名称
+     * 部名称
      */
     private String partName;
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/entity/lubricationmanage/LubricationStandard.java

@@ -30,7 +30,7 @@ public class LubricationStandard implements Serializable{
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -82,7 +82,7 @@ public class LubricationStandard implements Serializable{
     @Transient
     private String sbName;
     /**
-     * 部名称
+     * 部名称
      */
     @Transient
     private String partName;

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/maintain/MaintainJob.java

@@ -39,7 +39,7 @@ public class MaintainJob implements Serializable {
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/maintain/MaintainProject.java

@@ -35,7 +35,7 @@ public class MaintainProject implements Serializable{
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**

+ 4 - 4
platform-dao/src/main/java/com/platform/dao/entity/part/PartInfo.java

@@ -14,7 +14,7 @@ import java.time.LocalDateTime;
 import java.util.List;
 
 /**
- * @Description 部信息实体类
+ * @Description 部信息实体类
  * @Author liuyu
  * @Date 2020-04-24 09:27:01
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
@@ -29,7 +29,7 @@ public class PartInfo implements Serializable {
     @Id
     private String id;
     /**
-     * 部编号
+     * 部编号
      */
     private String no;
     /**
@@ -37,7 +37,7 @@ public class PartInfo implements Serializable {
      */
     private String name;
     /**
-     * 部类别
+     * 部类别
      */
     private String typeId;
     /**
@@ -85,7 +85,7 @@ public class PartInfo implements Serializable {
     @Transient
     private String sbName;
     /**
-     * 部类型
+     * 部类型
      */
     @Transient
     private String typeName;

+ 6 - 6
platform-dao/src/main/java/com/platform/dao/entity/part/PartType.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * @Description 部类别实体类
+ * @Description 部类别实体类
  * @Author liuyu
  * @Date 2020-04-24 09:27:42
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
@@ -20,20 +20,20 @@ import java.time.LocalDateTime;
 public class PartType implements Serializable {
 
     /**
-     * 部id
+     * 部id
      */
     @Id
     private String id;
     /**
-     * 部编码
+     * 部编码
      */
     private String no;
     /**
-     * 部名称
+     * 部名称
      */
     private String name;
     /**
-     * 部类型 1:大类2:子类
+     * 部类型 1:大类2:子类
      */
     private Integer type;
     /**
@@ -45,7 +45,7 @@ public class PartType implements Serializable {
      */
     private Integer delFlag;
     /**
-     * 上层部id
+     * 上层部id
      */
     private String parentId;
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/entity/repair/RepairApplicationForm.java

@@ -59,7 +59,7 @@ public class RepairApplicationForm implements Serializable {
      */
     private Integer planFlag;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -273,7 +273,7 @@ public class RepairApplicationForm implements Serializable {
     @Transient
     private String sbName;
     /**
-     * 部名称
+     * 部名称
      */
     @Transient
     private String partName;

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/repair/RepairForm.java

@@ -42,7 +42,7 @@ public class RepairForm implements Serializable {
     private String sbId;
 
     /**
-     * 部
+     * 部
      */
     private String partId;
 

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/entity/sqarepartmanage/SparePartUsed.java

@@ -47,7 +47,7 @@ public class SparePartUsed implements Serializable {
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -122,7 +122,7 @@ public class SparePartUsed implements Serializable {
     @Transient
     private String updateUserName;
     /**
-     * 部名称
+     * 部名称
      */
     @Transient
     private String partName;

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/enums/OperateObjectTypeEnum.java

@@ -18,7 +18,7 @@ public enum OperateObjectTypeEnum {
      */
     SB(1),
     /**
-     * 部
+     * 部
      */
     PART(2)
     ;

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/enums/YesNoEnum.java

@@ -18,7 +18,7 @@ public enum YesNoEnum {
      */
     YES(1),
     /**
-     * 部
+     * 部
      */
     NO(0)
     ;

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/mapper/part/PartInfoMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 
 /**
- * @Description 部信息 mapper
+ * @Description 部信息 mapper
  * @Author liuyu
  * @Date 2020-04-24 09:27:01
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/mapper/part/PartTypeMapper.java

@@ -9,7 +9,7 @@ import java.util.List;
 
 
 /**
- * @Description 部类别 mapper
+ * @Description 部类别 mapper
  * @Author liuyu
  * @Date 2020-04-24 09:27:42
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/util/SelectUtil.java

@@ -57,7 +57,7 @@ public class SelectUtil {
     }
 
     /**
-     * 设备部下拉款
+     * 设备部下拉款
      *
      * @return
      */

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/util/TreeUtil.java

@@ -367,7 +367,7 @@ public class TreeUtil {
     }
 
     /**
-     * 创建部类型树
+     * 创建部类型树
      *
      * @param types
      * @param root

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/check/ExportCheckProjectVO.java

@@ -35,9 +35,9 @@ public class ExportCheckProjectVO implements Serializable {
   private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
-  @Excel(name = "部id", orderNum = "4")
+  @Excel(name = "部id", orderNum = "4")
   private String partId;
 
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/firm/ExportFirmProducerVO.java

@@ -24,9 +24,9 @@ public class ExportFirmProducerVO implements Serializable {
     private String id;
 
     /**
-     * 类型:1.表示设备,2.表示部,3.表示备件
+     * 类型:1.表示设备,2.表示部,3.表示备件
      */
-    @Excel(name = "类型:1.表示设备,2.表示部,3.表示备件", orderNum = "2")
+    @Excel(name = "类型:1.表示设备,2.表示部,3.表示备件", orderNum = "2")
     private Integer type;
 
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/firm/ExportFirmSupplierVO.java

@@ -24,9 +24,9 @@ public class ExportFirmSupplierVO implements Serializable {
     private String id;
 
     /**
-     * 类型:1.表示设备,2.表示部,3.表示备件
+     * 类型:1.表示设备,2.表示部,3.表示备件
      */
-    @Excel(name = "类型:1.表示设备,2.表示部,3.表示备件", orderNum = "2")
+    @Excel(name = "类型:1.表示设备,2.表示部,3.表示备件", orderNum = "2")
     private Integer type;
 
     /**

+ 4 - 4
platform-dao/src/main/java/com/platform/dao/vo/export/lubricationmanage/ExportLubricationJobVO.java

@@ -36,15 +36,15 @@ public class ExportLubricationJobVO implements Serializable {
   private String sbName;
 
     /**
-   * 部id
+   * 部id
    */
-  @Excel(name = "部id", orderNum = "4")
+  @Excel(name = "部id", orderNum = "4")
   private String partId;
 
     /**
-   * 部名称
+   * 部名称
    */
-  @Excel(name = "部名称", orderNum = "5")
+  @Excel(name = "部名称", orderNum = "5")
   private String partName;
 
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/lubricationmanage/ExportLubricationStandardVO.java

@@ -30,9 +30,9 @@ public class ExportLubricationStandardVO implements Serializable {
   private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
-  @Excel(name = "部id", orderNum = "3")
+  @Excel(name = "部id", orderNum = "3")
   private String partId;
 
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/maintain/ExportMaintainProjectVO.java

@@ -36,9 +36,9 @@ public class ExportMaintainProjectVO implements Serializable {
   private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
-  @Excel(name = "部id", orderNum = "4")
+  @Excel(name = "部id", orderNum = "4")
   private String partId;
 
     /**

+ 4 - 4
platform-dao/src/main/java/com/platform/dao/vo/export/maintainmanage/ExportMaintainJobVO.java

@@ -36,15 +36,15 @@ public class ExportMaintainJobVO implements Serializable {
   private String sbName;
 
     /**
-   * 部id
+   * 部id
    */
-  @Excel(name = "部id", orderNum = "4")
+  @Excel(name = "部id", orderNum = "4")
   private String partId;
 
     /**
-   * 部名称
+   * 部名称
    */
-  @Excel(name = "部名称", orderNum = "5")
+  @Excel(name = "部名称", orderNum = "5")
   private String partName;
 
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/maintainmanage/ExportMaintainStandardVO.java

@@ -30,9 +30,9 @@ public class ExportMaintainStandardVO implements Serializable {
   private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
-  @Excel(name = "部id", orderNum = "3")
+  @Excel(name = "部id", orderNum = "3")
   private String partId;
 
     /**

+ 3 - 3
platform-dao/src/main/java/com/platform/dao/vo/export/part/ExportPartInfoVO.java

@@ -9,7 +9,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 /**
- * @Description 部信息导出VO
+ * @Description 部信息导出VO
  * @Author liuyu
  * @Date 2020-04-24 09:27:01
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
@@ -25,9 +25,9 @@ public class ExportPartInfoVO implements Serializable {
     private String id;
 
     /**
-     * 部编号
+     * 部编号
      */
-    @Excel(name = "部编号", orderNum = "2")
+    @Excel(name = "部编号", orderNum = "2")
     private String no;
 
     /**

+ 11 - 11
platform-dao/src/main/java/com/platform/dao/vo/export/part/ExportPartTypeVO.java

@@ -8,7 +8,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 /**
- * @Description 部类别导出VO
+ * @Description 部类别导出VO
  * @Author liuyu
  * @Date 2020-04-24 09:27:42
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
@@ -18,27 +18,27 @@ import java.time.LocalDateTime;
 public class ExportPartTypeVO implements Serializable {
 
     /**
-     * 部id
+     * 部id
      */
-    @Excel(name = "部id", orderNum = "1")
+    @Excel(name = "部id", orderNum = "1")
     private String id;
 
     /**
-     * 部编码
+     * 部编码
      */
-    @Excel(name = "部编码", orderNum = "2")
+    @Excel(name = "部编码", orderNum = "2")
     private String no;
 
     /**
-     * 部名称
+     * 部名称
      */
-    @Excel(name = "部名称", orderNum = "3")
+    @Excel(name = "部名称", orderNum = "3")
     private String name;
 
     /**
-     * 部类型 1:大类2:子类
+     * 部类型 1:大类2:子类
      */
-    @Excel(name = "部类型 1:大类2:子类", orderNum = "4")
+    @Excel(name = "部类型 1:大类2:子类", orderNum = "4")
     private Integer type;
 
     /**
@@ -54,9 +54,9 @@ public class ExportPartTypeVO implements Serializable {
     private Integer delFlag;
 
     /**
-     * 上层部id
+     * 上层部id
      */
-    @Excel(name = "上层部id", orderNum = "7")
+    @Excel(name = "上层部id", orderNum = "7")
     private String parentId;
 
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/vo/export/repair/ExportRepairProjectVO.java

@@ -30,7 +30,7 @@ public class ExportRepairProjectVO implements Serializable {
   private String no;
 
     /**
-   * 部id
+   * 部id
    */
   @Excel(name = "名称", orderNum = "4")
   private String name;

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/sqarepartmanage/ExportSparePartUsedReportVO.java

@@ -26,9 +26,9 @@ public class ExportSparePartUsedReportVO implements Serializable {
   private String sbName;
 
   /**
-   * 部
+   * 部
    */
-  @Excel(name = "部", orderNum = "2")
+  @Excel(name = "部", orderNum = "2")
   private String partName;
 
   /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/export/sqarepartmanage/ExportSparePartUsedVO.java

@@ -34,9 +34,9 @@ public class ExportSparePartUsedVO implements Serializable {
   private String sbId;
 
     /**
-   * 部id
+   * 部id
    */
-  @Excel(name = "部id", orderNum = "3")
+  @Excel(name = "部id", orderNum = "3")
   private String partId;
 
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckJobVO.java

@@ -72,7 +72,7 @@ public class CheckJobVO implements Serializable{
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -185,7 +185,7 @@ public class CheckJobVO implements Serializable{
      */
     private Integer sbLevel;
     /**
-     * 部名称
+     * 部名称
      */
     private String partName;
     /**

+ 3 - 3
platform-dao/src/main/java/com/platform/dao/vo/query/check/CheckProjectVO.java

@@ -47,7 +47,7 @@ public class CheckProjectVO implements Serializable{
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -99,11 +99,11 @@ public class CheckProjectVO implements Serializable{
      */
     private String sbNo;
     /**
-     * 部名称
+     * 部名称
      */
     private String partName;
     /**
-     * 部编码
+     * 部编码
      */
     private String partNo;
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/vo/query/firm/FirmProducerVO.java

@@ -30,7 +30,7 @@ public class FirmProducerVO extends BaseVO implements Serializable {
      */
     private String id;
     /**
-     * 类型:1.表示设备,2.表示部,3.表示备件
+     * 类型:1.表示设备,2.表示部,3.表示备件
      */
     private Integer type;
     /**

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/vo/query/firm/FirmSupplierVO.java

@@ -24,7 +24,7 @@ public class FirmSupplierVO extends BaseVO implements Serializable {
      */
     private String id;
     /**
-     * 类型:1.表示设备,2.表示部,3.表示备件
+     * 类型:1.表示设备,2.表示部,3.表示备件
      */
     private Integer type;
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/query/maintain/MaintainJobVO.java

@@ -33,7 +33,7 @@ public class MaintainJobVO implements Serializable{
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -121,7 +121,7 @@ public class MaintainJobVO implements Serializable{
      */
     private String sbName;
     /**
-     * 部名称
+     * 部名称
      */
     private String partName;
     /**

+ 3 - 3
platform-dao/src/main/java/com/platform/dao/vo/query/maintain/MaintainProjectVO.java

@@ -32,7 +32,7 @@ public class MaintainProjectVO implements Serializable{
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -76,11 +76,11 @@ public class MaintainProjectVO implements Serializable{
      */
     private String sbNo;
     /**
-     * 部名称
+     * 部名称
      */
     private String partName;
     /**
-     * 部编码
+     * 部编码
      */
     private String partNo;
     /**

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/repair/RepairApplicationFormVO.java

@@ -71,7 +71,7 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
      */
     private Integer planFlag;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -238,7 +238,7 @@ public class RepairApplicationFormVO extends BaseVO implements Serializable {
     @Transient
     private String sbNo;
     /**
-     * 部名称
+     * 部名称
      */
     @Transient
     private String partName;

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/repair/RepairCheckVO.java

@@ -74,7 +74,7 @@ public class RepairCheckVO extends BaseVO implements Serializable {
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -117,7 +117,7 @@ public class RepairCheckVO extends BaseVO implements Serializable {
     private String sbName;
 
     /**
-     * 部名称
+     * 部名称
      */
     private String partName;
 

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/repair/RepairFormVO.java

@@ -40,7 +40,7 @@ public class RepairFormVO extends BaseVO implements Serializable {
     private String sbId;
 
     /**
-     * 部
+     * 部
      */
     private String partId;
     /**
@@ -162,7 +162,7 @@ public class RepairFormVO extends BaseVO implements Serializable {
     private String sbName;
 
     /**
-     * 部名称
+     * 部名称
      */
     private String partName;
 

+ 2 - 2
platform-dao/src/main/java/com/platform/dao/vo/spare/SparePartUsedVO.java

@@ -39,7 +39,7 @@ public class SparePartUsedVO extends BaseVO implements Serializable {
      */
     private String sbId;
     /**
-     * 部id
+     * 部id
      */
     private String partId;
     /**
@@ -114,7 +114,7 @@ public class SparePartUsedVO extends BaseVO implements Serializable {
      */
     private String updateUserName;
     /**
-     * 部名称
+     * 部名称
      */
     private String partName;
     /**

+ 14 - 14
platform-rest/src/main/java/com/platform/rest/controller/part/PartInfoController.java

@@ -22,7 +22,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
- * @Description 部信息 控制器
+ * @Description 部信息 控制器
  * @Author liuyu
  * @Date 2020-04-24 09:27:01
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
@@ -48,10 +48,10 @@ public class PartInfoController {
     /**
      * 新增记录
      *
-     * @param partInfoDTO 部信息DTO
+     * @param partInfoDTO 部信息DTO
      * @return R
      */
-    @SysLog("新增部信息")
+    @SysLog("新增部信息")
     @PostMapping
     @PreAuthorize("@pms.hasPermission('part-infos-add')")
     public R save(@Validated({AddGroup.class}) @RequestBody PartInfoDTO partInfoDTO) {
@@ -61,10 +61,10 @@ public class PartInfoController {
     /**
      * 修改记录
      *
-     * @param partInfoDTO 部信息DTO
+     * @param partInfoDTO 部信息DTO
      * @return R
      */
-    @SysLog("修改部信息")
+    @SysLog("修改部信息")
     @PutMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('part-infos-edit')")
     public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody PartInfoDTO partInfoDTO) {
@@ -90,7 +90,7 @@ public class PartInfoController {
      * @param id 主键
      * @return R
      */
-    @SysLog("删除部信息")
+    @SysLog("删除部信息")
     @DeleteMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('part-infos-del')")
     public R removeById(@PathVariable String id) {
@@ -104,7 +104,7 @@ public class PartInfoController {
      * @param ids 主键
      * @return R
      */
-    @SysLog("批量删除部信息")
+    @SysLog("批量删除部信息")
     @DeleteMapping("")
     @PreAuthorize("@pms.hasPermission('part-infos-del')")
     public R removeIds(@RequestBody List<String> ids) {
@@ -117,7 +117,7 @@ public class PartInfoController {
      *
      * @param pageNum     当前页码
      * @param pageSize    每页条数
-     * @param partInfoDTO 部信息DTO
+     * @param partInfoDTO 部信息DTO
      * @return R
      */
     @GetMapping("/page")
@@ -128,7 +128,7 @@ public class PartInfoController {
     /**
      * 获取列表
      *
-     * @param partInfoDTO 部信息DTO
+     * @param partInfoDTO 部信息DTO
      * @return R
      */
     @GetMapping("")
@@ -148,23 +148,23 @@ public class PartInfoController {
     }
 
     /**
-     * 部信息导出
+     * 部信息导出
      *
-     * @param partInfoDTO 部信息DTO
+     * @param partInfoDTO 部信息DTO
      * @return R
      */
     @GetMapping("/export")
-    @SysLog("部信息导出")
+    @SysLog("部信息导出")
     @PreAuthorize("@pms.hasPermission('part-infos-export')")
     public void export(HttpServletResponse response, PartInfoDTO partInfoDTO) {
         List<PartInfo> list = partInfoService.getModelListByDTO(partInfoDTO);
-        ExcelUtil.exportResponseDict(response, ExportPartInfoVO.class, BeanConverterUtil.copyListProperties(list, ExportPartInfoVO.class), "部信息");
+        ExcelUtil.exportResponseDict(response, ExportPartInfoVO.class, BeanConverterUtil.copyListProperties(list, ExportPartInfoVO.class), "部信息");
     }
 
     /**
      * 获取列表
      *
-     * @param partInfoDTO 部信息DTO
+     * @param partInfoDTO 部信息DTO
      * @return R
      */
     @GetMapping("options")

+ 14 - 14
platform-rest/src/main/java/com/platform/rest/controller/part/PartTypeController.java

@@ -21,7 +21,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
- * @Description 部类别 控制器
+ * @Description 部类别 控制器
  * @Author liuyu
  * @Date 2020-04-24 09:27:42
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.
@@ -47,10 +47,10 @@ public class PartTypeController {
     /**
      * 新增记录
      *
-     * @param partTypeDTO 部类别DTO
+     * @param partTypeDTO 部类别DTO
      * @return R
      */
-    @SysLog("新增部类别")
+    @SysLog("新增部类别")
     @PostMapping
     @PreAuthorize("@pms.hasPermission('part-types-add')")
     public R save(@Validated({AddGroup.class}) @RequestBody PartTypeDTO partTypeDTO) {
@@ -60,10 +60,10 @@ public class PartTypeController {
     /**
      * 修改记录
      *
-     * @param partTypeDTO 部类别DTO
+     * @param partTypeDTO 部类别DTO
      * @return R
      */
-    @SysLog("修改部类别")
+    @SysLog("修改部类别")
     @PutMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('part-types-edit')")
     public R update(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody PartTypeDTO partTypeDTO) {
@@ -77,7 +77,7 @@ public class PartTypeController {
      * @param id 主键
      * @return R
      */
-    @SysLog("删除部类别")
+    @SysLog("删除部类别")
     @DeleteMapping("/{id}")
     @PreAuthorize("@pms.hasPermission('part-types-del')")
     public R removeById(@PathVariable String id) {
@@ -91,7 +91,7 @@ public class PartTypeController {
      * @param ids 主键
      * @return R
      */
-    @SysLog("批量删除部类别")
+    @SysLog("批量删除部类别")
     @DeleteMapping("")
     @PreAuthorize("@pms.hasPermission('part-types-del')")
     public R removeIds(@RequestBody List<String> ids) {
@@ -104,7 +104,7 @@ public class PartTypeController {
      *
      * @param pageNum     当前页码
      * @param pageSize    每页条数
-     * @param partTypeDTO 部类别DTO
+     * @param partTypeDTO 部类别DTO
      * @return R
      */
     @GetMapping("/page")
@@ -115,7 +115,7 @@ public class PartTypeController {
     /**
      * 获取列表
      *
-     * @param partTypeDTO 部类别DTO
+     * @param partTypeDTO 部类别DTO
      * @return R
      */
     @GetMapping("")
@@ -124,23 +124,23 @@ public class PartTypeController {
     }
 
     /**
-     * 部类别导出
+     * 部类别导出
      *
-     * @param partTypeDTO 部类别DTO
+     * @param partTypeDTO 部类别DTO
      * @return R
      */
     @GetMapping("/export")
-    @SysLog("部类别导出")
+    @SysLog("部类别导出")
     @PreAuthorize("@pms.hasPermission('part-types-export')")
     public void export(HttpServletResponse response, PartTypeDTO partTypeDTO) {
         List<PartType> list = partTypeService.getModelListByDTO(partTypeDTO);
-        ExcelUtil.exportResponseDict(response, ExportPartTypeVO.class, BeanConverterUtil.copyListProperties(list, ExportPartTypeVO.class), "部类别");
+        ExcelUtil.exportResponseDict(response, ExportPartTypeVO.class, BeanConverterUtil.copyListProperties(list, ExportPartTypeVO.class), "部类别");
     }
 
     /**
      * 获取类型树
      *
-     * @param partTypeDTO 部类别DTO
+     * @param partTypeDTO 部类别DTO
      * @return R
      */
     @GetMapping("tree")

Різницю між файлами не показано, бо вона завелика
+ 0 - 0
platform-rest/src/main/resources/templates/test.ftl


Різницю між файлами не показано, бо вона завелика
+ 0 - 0
platform-rest/src/main/resources/templates/test.vm


+ 1 - 1
platform-service/src/main/java/com/platform/service/part/PartInfoService.java

@@ -7,7 +7,7 @@ import com.platform.service.base.IBaseService;
 import java.util.List;
 
 /**
- * @Description 部信息 service
+ * @Description 部信息 service
  * @Author liuyu
  * @Date 2020-04-24 09:27:01
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.

+ 1 - 1
platform-service/src/main/java/com/platform/service/part/PartTypeService.java

@@ -7,7 +7,7 @@ import com.platform.service.base.IBaseService;
 import java.util.List;
 
 /**
- * @Description 部类别 service
+ * @Description 部类别 service
  * @Author liuyu
  * @Date 2020-04-24 09:27:42
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.

+ 1 - 1
platform-service/src/main/java/com/platform/service/part/impl/PartInfoServiceImpl.java

@@ -22,7 +22,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * @Description 部信息 service 实现类
+ * @Description 部信息 service 实现类
  * @Author liuyu
  * @Date 2020-04-24 09:27:01
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.

+ 1 - 1
platform-service/src/main/java/com/platform/service/part/impl/PartTypeServiceImpl.java

@@ -18,7 +18,7 @@ import tk.mybatis.mapper.weekend.WeekendCriteria;
 import java.util.List;
 
 /**
- * @Description 部类别 service 实现类
+ * @Description 部类别 service 实现类
  * @Author liuyu
  * @Date 2020-04-24 09:27:42
  * @Version Copyright (c) 2019,北京乾元坤和科技有限公司 All rights reserved.

+ 2 - 2
platform-service/src/main/java/com/platform/service/sb/impl/SbPositionServiceImpl.java

@@ -116,7 +116,7 @@ public class SbPositionServiceImpl extends BaseServiceImpl<SbPositionMapper, SbP
     @Override
     public List<MyCommonTree> getSbTreeVOList(SbPositionDTO model) {
         List<SbInfo> sbInfoList = sbInfoMapper.selectAll();
-        // 查询所有的部
+        // 查询所有的部
         List<PartInfo> partInfoList = partInfoMapper.selectAll();
         // 查询所有使用备件
         List<SparePartUsedVO> sparePartUsedList = sparePartUsedMapper.selectVOList(new SparePartUsedDTO());
@@ -171,7 +171,7 @@ public class SbPositionServiceImpl extends BaseServiceImpl<SbPositionMapper, SbP
             }
         });
 
-        // 处理所有部
+        // 处理所有部
         Map<String, MyCommonTree> sbPartTreeMap = MapUtils.newHashMap();
         partInfoList.forEach(item -> {
             MyCommonTree vo = new MyCommonTree();

Деякі файли не було показано, через те що забагато файлів було змінено