Эх сурвалжийг харах

Merge remote-tracking branch 'origin/demo_' into demo_

3254194295 2 жил өмнө
parent
commit
d0f85ecf9d
100 өөрчлөгдсөн 190 нэмэгдсэн , 183 устгасан
  1. 1 1
      platform-activiti/src/main/java/com/platform/activiti/bean/ActObj.java
  2. 5 4
      platform-activiti/src/main/java/com/platform/activiti/config/ActivitiConfig.java
  3. 87 81
      platform-activiti/src/main/java/com/platform/activiti/controller/ActivitiController.java
  4. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/dto/ActApplyInfoDTO.java
  5. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/dto/ActAssigneeDTO.java
  6. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/dto/ActModelDTO.java
  7. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActApplyInfo.java
  8. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActAssignee.java
  9. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActAuditRecord.java
  10. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActAuditRequest.java
  11. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActDeployment.java
  12. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActProcessDefinition.java
  13. 1 1
      platform-activiti/src/main/java/com/platform/activiti/dao/mapper/ActAssigneeMapper.java
  14. 1 1
      platform-activiti/src/main/java/com/platform/activiti/enums/ActApplyEnum.java
  15. 1 1
      platform-activiti/src/main/java/com/platform/activiti/listener/CurrentDeptHandlerCandidateUsers.java
  16. 1 1
      platform-activiti/src/main/java/com/platform/activiti/service/ActAssigneeService.java
  17. 1 1
      platform-activiti/src/main/java/com/platform/activiti/service/ActivitiHandleService.java
  18. 1 1
      platform-activiti/src/main/java/com/platform/activiti/service/ActivitiService.java
  19. 1 1
      platform-activiti/src/main/java/com/platform/activiti/service/impl/ActAssigneeServiceImpl.java
  20. 1 1
      platform-activiti/src/main/java/com/platform/activiti/service/impl/ActivitiServiceImpl.java
  21. 1 1
      platform-common/src/main/java/com/platform/common/bean/Checkbox.java
  22. 1 1
      platform-common/src/main/java/com/platform/common/model/ClientInfoVO.java
  23. 1 1
      platform-common/src/main/java/com/platform/common/util/AssertUtils.java
  24. 1 1
      platform-common/src/main/java/com/platform/common/util/Base64Utils.java
  25. 1 1
      platform-common/src/main/java/com/platform/common/util/IdGeneratorUtils.java
  26. 1 1
      platform-common/src/main/java/com/platform/common/util/MoneyUtil.java
  27. 1 1
      platform-common/src/main/java/com/platform/common/util/ReflectUtil.java
  28. 1 1
      platform-dao/src/main/java/com/platform/dao/dto/operate/ArticleDTO.java
  29. 1 1
      platform-dao/src/main/java/com/platform/dao/entity/operate/Article.java
  30. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/ActivitiFormStatusEnum.java
  31. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/CheckJobSbStatusEnum.java
  32. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/CheckJobStatusEnum.java
  33. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/CheckStandardLevelEnum.java
  34. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/CheckStandardTypeEnum.java
  35. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/CheckUserTypeEnum.java
  36. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/DelFlagEnum.java
  37. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/FillCodeValue.java
  38. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/FillInfoType.java
  39. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/FillUseType.java
  40. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/FormActionEnum.java
  41. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/IconEnum.java
  42. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/MaintainJobSbStatusEnum.java
  43. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/MaintainJobStatusEnum.java
  44. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/MaintainStandardTypeEnum.java
  45. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/ModelFilter.java
  46. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/MoneyTypeEnum.java
  47. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/OperateObjectTypeEnum.java
  48. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/OutStoreStatusEnum.java
  49. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseApplyAuditNodeEnum.java
  50. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseApplyStatusEnum.java
  51. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseAuditNodeEnum.java
  52. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseContractPayPeriodEnum.java
  53. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseDemandPlanStatusEnum.java
  54. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseDispatchFeeTypeEnum.java
  55. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseDispatchOrderStatusEnum.java
  56. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseListStatusEnum.java
  57. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseOrderStatusEnum.java
  58. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchasePayTypeEnum.java
  59. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchasePlanStatusEnum.java
  60. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseReportTypeEnum.java
  61. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseStoreFormDetailDelFlagEnum.java
  62. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseStoreFormStatusEnum.java
  63. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/PurchaseTypeEnum.java
  64. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/RepairApplicationFormCategoryEnum.java
  65. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/RepairApplicationFormStatusEnum.java
  66. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/RepairApplicationFormStopEnum.java
  67. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/RepairApplicationFormTypeEnum.java
  68. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/RepairCheckStatusEnum.java
  69. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/RepairFormStatusEnum.java
  70. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/RepairOnlyOneEnum.java
  71. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/RepairReasonStatusEnum.java
  72. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbAllocateApplyStatus.java
  73. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbAllocateTaskAuditType.java
  74. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbAllocateTaskStatus.java
  75. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbAllocateTaskTitle.java
  76. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbAllocateType.java
  77. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbInfoChildEnum.java
  78. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbInfoFinancingEnum.java
  79. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbInfoLevelEnum.java
  80. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbInfoScrapAuditNodeEnum.java
  81. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbInfoShowEnum.java
  82. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbInfoStatusEnum.java
  83. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbInfoStopDetailStatusEnum.java
  84. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbMeasureStatusEnum.java
  85. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbOilAuditType.java
  86. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbOilStatus.java
  87. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbTreeTypeEnum.java
  88. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SbUseType.java
  89. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SortValueEnum.java
  90. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SpareBackFormStatusEnum.java
  91. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SparePartMinStoclWarnStatusEnum.java
  92. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SparePartUsedSourceEnum.java
  93. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SparePartUsedStatusEnum.java
  94. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SparePickFormStatusEnum.java
  95. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/StoreCheckJobStatusEnum.java
  96. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/StoreCheckPlanStatusEnum.java
  97. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/StoreLevelEnum.java
  98. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SupplierAuditNodeEnum.java
  99. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SupplierStatusEnum.java
  100. 1 1
      platform-dao/src/main/java/com/platform/dao/enums/SysDeptManagerType.java

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/bean/ActObj.java

@@ -6,7 +6,7 @@ import lombok.Data;
  * @Description ${DESCRIPTION}
  * @Author chenyuehu
  * @Date 2020/12/16
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 public class ActObj {

+ 5 - 4
platform-activiti/src/main/java/com/platform/activiti/config/ActivitiConfig.java

@@ -15,7 +15,7 @@ import javax.sql.DataSource;
  * @Description activiti工作流配置
  * @Author chenyuehu
  * @Date 2019/6/25
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Configuration
 public class ActivitiConfig {
@@ -40,15 +40,16 @@ public class ActivitiConfig {
         processEngineConfiguration.setLabelFontName("宋体");
 
         processEngineConfiguration.setProcessDiagramGenerator(new DefaultProcessDiagramGenerator());
-        //processEngineConfiguration.setJobExecutorActivate(true);//JobExecutor是管理几个线程计时器的组成部分,JobExecutor对多线程的处理较为笨重缓慢
-        processEngineConfiguration.setAsyncExecutorEnabled(true);//定义为true,使用AsyncExecutor代替默认的JobExecutor;
-        processEngineConfiguration.setAsyncExecutorActivate(true);//定义为true,工作流引擎在启动时就建立启动AsyncExecutor线程
+        // processEngineConfiguration.setJobExecutorActivate(true);//JobExecutor是管理几个线程计时器的组成部分,JobExecutor对多线程的处理较为笨重缓慢
+        // processEngineConfiguration.setAsyncExecutorEnabled(true);//定义为true,使用AsyncExecutor代替默认的JobExecutor;
+        // processEngineConfiguration.setAsyncExecutorActivate(true);//定义为true,工作流引擎在启动时就建立启动AsyncExecutor线程
 
         return processEngineConfiguration;
     }
 
     /**
      * 流程引擎,与spring整合使用factoryBean
+     *
      * @param processEngineConfiguration
      * @return
      */

+ 87 - 81
platform-activiti/src/main/java/com/platform/activiti/controller/ActivitiController.java

@@ -78,7 +78,7 @@ import java.util.stream.Collectors;
  * @Description 流程管理 流程创建、发布 流程节点绑定角色/用户(绑定用户 开始ing) 控制器
  * @Author chenyuehu
  * @Date 2020-01-16 18:01:34
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Controller
 @AllArgsConstructor
@@ -492,8 +492,6 @@ public class ActivitiController {
         endRow = endRow > taskList.size() ? taskList.size() : endRow;
         for (int i = startRow; i < endRow; i++) {
             HistoricTaskInstance task = taskList.get(i);
-            String taskId = task.getId();
-            List<HistoricVariableInstance> historicVars = historyService.createHistoricVariableInstanceQuery().processInstanceId(task.getProcessInstanceId()).list();
             List<HistoricDetail> list = historyService.createHistoricDetailQuery().
                     processInstanceId(task.getProcessInstanceId()).orderByTime().desc().list();
             if (CollectionUtil.isNotEmpty(list)) {
@@ -505,11 +503,11 @@ public class ActivitiController {
                         log.info(applyInfo.toString());
                         applyInfo.setProcessInstanceId(task.getProcessInstanceId());
                         applyInfo.setTaskId(task.getId());
-                        /**如果是自己*/
-                        if (userId.equals(applyInfo.getUserId())) {
-                            applyInfo.setSelf(true);
+                        /**如果是自己发起的,不展示*/
+                        if (!userId.equals(applyInfo.getUserId())) {
+                            tasks.add(applyInfo);
                         }
-                        tasks.add(applyInfo);
+                        break;
                     }
                 }
             }
@@ -523,6 +521,86 @@ public class ActivitiController {
         return R.success(page);
     }
 
+    /**
+     * 展示我发起的任务
+     *
+     * @return
+     */
+    @ResponseBody
+    @GetMapping("/my-task/start/page")
+    public R showTaskListStart(Integer pageNum, Integer pageSize) {
+        UserInfo userInfo = SecurityUtils.getUserInfo();
+        String userId = userInfo.getUserId();
+        //保证运行ing
+        List<ActApplyInfo> infos = new ArrayList<>();
+        List<Task> tasks = this.taskService.createTaskQuery().taskCandidateOrAssigned(userId).orderByTaskCreateTime().desc().list();
+        if (CollectionUtil.isNotEmpty(tasks)) {
+            tasks.forEach(item -> {
+                String taskId = item.getId();
+                Map<String, Object> map = taskService.getVariables(taskId);
+                ActApplyInfo applyInfo = (ActApplyInfo) map.get("data");
+                applyInfo.setProcessInstanceId(item.getProcessInstanceId());
+                applyInfo.setTaskId(item.getId());
+
+                // 找到自己发起的
+                if (userId.equals(applyInfo.getUserId())) {
+                    applyInfo.setSelf(true);
+                    infos.add(applyInfo);
+                }
+            });
+        }
+        List<HistoricTaskInstance> tastListFinish  = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).finished().list();
+        if (CollectionUtil.isNotEmpty(tastListFinish)) {
+            for(HistoricTaskInstance task: tastListFinish){
+                List<HistoricDetail> list = historyService.createHistoricDetailQuery().
+                        processInstanceId(task.getProcessInstanceId()).orderByTime().desc().list();
+                if (CollectionUtil.isNotEmpty(list)) {
+                    for(HistoricDetail historicDetail: list){
+                        HistoricVariableUpdate variable = (HistoricVariableUpdate) historicDetail;
+                        String variableName = variable.getVariableName();
+                        if ("data".equals(variableName)) {
+                            ActApplyInfo applyInfo = (ActApplyInfo)variable.getValue();
+                            log.info(applyInfo.toString());
+                            applyInfo.setProcessInstanceId(task.getProcessInstanceId());
+                            applyInfo.setTaskId(task.getId());
+                            /**如果是自己发起的,展示*/
+                            if (userId.equals(applyInfo.getUserId())) {
+                                infos.add(applyInfo);
+                            }
+                            break;
+                        }
+                    }
+                }
+            };
+        }
+        long total = infos.size();
+        int pages = (int) total / pageSize;
+        pages = total % pageSize == 0 ? pages : (pages + 1);
+        List<ActApplyInfo> result = new ArrayList<>();
+        if (pageNum > pages) {
+            MyPage<ActApplyInfo> page = new MyPage<>(result);
+            page.setTotal(total);
+            page.setPages(pages);
+            page.setPageNum(pageNum);
+            page.setRows(result);
+            page.setPageSize(pageSize);
+            return R.success(page);
+        }
+        int startRow = pageNum > 0 ? (pageNum - 1) * pageSize : 0;
+        int endRow = startRow + pageSize * (pageNum > 0 ? 1 : 0);
+        endRow = endRow > infos.size() ? infos.size() : endRow;
+        for (int i = startRow; i < endRow; i++) {
+            result.add(infos.get(i));
+        }
+        MyPage<ActApplyInfo> page = new MyPage<>(result);
+        page.setTotal(total);
+        page.setPages(pages);
+        page.setPageNum(pageNum);
+        page.setRows(result);
+        page.setPageSize(pageSize);
+        return R.success(page);
+    }
+
     @PostMapping("/audit")
     @ResponseBody
     public R audit(@RequestBody ActApplyInfoDTO applyInfoDTO) {
@@ -538,7 +616,7 @@ public class ActivitiController {
      */
     @ResponseBody
     @GetMapping("/audit/history/{processInstanceId}")
-    public R leaveDetail(@PathVariable("processInstanceId") String processInstanceId) {
+    public R history(@PathVariable("processInstanceId") String processInstanceId) {
         ProcessInstance instance = runtimeService.createProcessInstanceQuery()
                 .processInstanceId(processInstanceId).singleResult();
         //保证运行ing
@@ -575,7 +653,7 @@ public class ActivitiController {
      */
     @ResponseBody
     @GetMapping("/audit/history/user/{userId}")
-    public R history(@PathVariable("userId") String userId) {
+    public R userHistory(@PathVariable("userId") String userId) {
         //保证运行ing
         List<ActApplyInfo> infos = new ArrayList<>();
         List<Task> tasks = this.taskService.createTaskQuery().taskCandidateOrAssigned(userId).orderByTaskCreateTime().desc().list();
@@ -613,78 +691,6 @@ public class ActivitiController {
         return R.success(infos);
     }
 
-    /**
-     * 根据 执行对象id获取审批信息
-     *
-     * @return
-     */
-    @ResponseBody
-    @GetMapping("/audit/all/page")
-    public R all(Integer pageNum, Integer pageSize) {
-        UserInfo userInfo = SecurityUtils.getUserInfo();
-        String userId = userInfo.getUserId();
-        //保证运行ing
-        List<ActApplyInfo> infos = new ArrayList<>();
-        List<Task> tasks = this.taskService.createTaskQuery().taskCandidateOrAssigned(userId).orderByTaskCreateTime().desc().list();
-        if (CollectionUtil.isNotEmpty(tasks)) {
-            tasks.forEach(item -> {
-                String taskId = item.getId();
-
-                Map<String, Object> map = taskService.getVariables(taskId);
-                ActApplyInfo applyInfo = (ActApplyInfo) map.get("data");
-                applyInfo.setProcessInstanceId(item.getProcessInstanceId());
-                applyInfo.setTaskId(item.getId());
-
-                /**如果是自己*/
-                if (userId.equals(applyInfo.getUserId())) {
-                    applyInfo.setSelf(true);
-                }
-                infos.add(applyInfo);
-            });
-        }
-        List<HistoricTaskInstance> list = historyService.createHistoricTaskInstanceQuery().taskAssignee(userId).orderByTaskCreateTime().desc().list();
-        if (CollectionUtil.isNotEmpty(list)) {
-            list.forEach(item -> {
-                ActApplyInfo applyInfo = (ActApplyInfo) item.getProcessVariables().get("data");
-                applyInfo.setProcessInstanceId(item.getProcessInstanceId());
-                applyInfo.setTaskId(item.getId());
-                applyInfo.setHandleFlag(true);
-
-                /**如果是自己*/
-                if (userId.equals(applyInfo.getUserId())) {
-                    applyInfo.setSelf(true);
-                }
-                infos.add(applyInfo);
-            });
-        }
-        long total = infos.size();
-        int pages = (int) total / pageSize;
-        pages = total % pageSize == 0 ? pages : (pages + 1);
-        List<ActApplyInfo> result = new ArrayList<>();
-        if (pageNum > pages) {
-            MyPage<ActApplyInfo> page = new MyPage<>(result);
-            page.setTotal(total);
-            page.setPages(pages);
-            page.setPageNum(pageNum);
-            page.setRows(result);
-            page.setPageSize(pageSize);
-            return R.success(page);
-        }
-        int startRow = pageNum > 0 ? (pageNum - 1) * pageSize : 0;
-        int endRow = startRow + pageSize * (pageNum > 0 ? 1 : 0);
-        endRow = endRow > infos.size() ? infos.size() : endRow;
-        for (int i = startRow; i < endRow; i++) {
-            result.add(infos.get(i));
-        }
-        MyPage<ActApplyInfo> page = new MyPage<>(result);
-        page.setTotal(total);
-        page.setPages(pages);
-        page.setPageNum(pageNum);
-        page.setRows(result);
-        page.setPageSize(pageSize);
-        return R.success(page);
-    }
-
     /**
      * 获取图片:根据流程定义(流程实例,请调用下面方法)
      *

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/dto/ActApplyInfoDTO.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
  * @Description 申请信息
  * @Author chenyuehu
  * @Date 2020/2/6
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 public class ActApplyInfoDTO implements Serializable {

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/dto/ActAssigneeDTO.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @Description 分配
  * @Author chenyuehu
  * @Date 2020-01-16 18:01:34
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 @Accessors(chain = true)

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/dto/ActModelDTO.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
  * @Description 模型
  * @Author chenyuehu
  * @Date 2020-01-16 18:01:34
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 @Accessors(chain = true)

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActApplyInfo.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
  * @Description 申请信息
  * @Author chenyuehu
  * @Date 2020/2/6
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 public class ActApplyInfo implements Serializable {

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActAssignee.java

@@ -10,7 +10,7 @@ import java.io.Serializable;
  * @Description 分配
  * @Author chenyuehu
  * @Date 2020-01-16 18:01:34
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Table(name = "act_assignee")
 @Data

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActAuditRecord.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
  * @Description 审批记录信息
  * @Author chenyuehu
  * @Date 2020/2/6
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 public class ActAuditRecord implements Serializable {

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActAuditRequest.java

@@ -9,7 +9,7 @@ import java.time.LocalDateTime;
  * @Description 审批信息
  * @Author chenyuehu
  * @Date 2020/2/6
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 public class ActAuditRequest implements Serializable {

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActDeployment.java

@@ -10,7 +10,7 @@ import java.util.Date;
  * @Description 流程部署
  * @Author chenyuehu
  * @Date 2020-01-16 18:01:34
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 public class ActDeployment implements Serializable {

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/entity/ActProcessDefinition.java

@@ -7,7 +7,7 @@ import org.activiti.engine.repository.ProcessDefinition;
  * @Description 流程定义实体
  * @Author chenyuehu
  * @Date 2020-01-16 18:01:34
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 public class ActProcessDefinition {

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/dao/mapper/ActAssigneeMapper.java

@@ -9,7 +9,7 @@ import org.springframework.stereotype.Component;
  * @Description 分配信息 mapper
  * @Author chenyuehu
  * @Date 2020-01-16 18:47:25
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Component
 public interface ActAssigneeMapper extends MyMapper<ActAssignee> {

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/enums/ActApplyEnum.java

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 工作流申请类别每集
  * @Author chenyuehu
  * @Date 2019/5/7
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/listener/CurrentDeptHandlerCandidateUsers.java

@@ -20,7 +20,7 @@ import java.util.stream.Collectors;
  * @Description ${DESCRIPTION}
  * @Author chenyuehu
  * @Date 2020/11/6
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 public class CurrentDeptHandlerCandidateUsers implements TaskListener {
 

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/service/ActAssigneeService.java

@@ -11,7 +11,7 @@ import java.util.List;
  * @Description 分配信息 service
  * @Author chenyuehu
  * @Date 2020-01-16 18:04:28
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 public interface ActAssigneeService extends IBaseService<ActAssignee, ActAssigneeDTO> {
 

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/service/ActivitiHandleService.java

@@ -26,7 +26,7 @@ import java.util.Map;
  * @Description 工作流处理 service
  * @Author chenyuehu
  * @Date 2020-01-16 18:04:28
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Component
 public class ActivitiHandleService {

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/service/ActivitiService.java

@@ -9,7 +9,7 @@ import org.activiti.engine.repository.Model;
  * @Description 工作流 service
  * @Author chenyuehu
  * @Date 2020-01-16 18:04:28
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 public interface ActivitiService {
 

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/service/impl/ActAssigneeServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.List;
  * @Description 公示 service 实现类
  * @Author chenyuehu
  * @Date 2020-01-16 18:01:34
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @AllArgsConstructor
 @Service("actAssigneeService")

+ 1 - 1
platform-activiti/src/main/java/com/platform/activiti/service/impl/ActivitiServiceImpl.java

@@ -39,7 +39,7 @@ import java.util.Map;
  * @Description 公示 service 实现类
  * @Author chenyuehu
  * @Date 2020-01-16 18:01:34
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @AllArgsConstructor
 @Service("activitiService")

+ 1 - 1
platform-common/src/main/java/com/platform/common/bean/Checkbox.java

@@ -6,7 +6,7 @@ import lombok.Data;
  * @Description 复选框类
  * @Author chenyuehu
  * @Date 2019/7/29
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 public class Checkbox {

+ 1 - 1
platform-common/src/main/java/com/platform/common/model/ClientInfoVO.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
  * @Description
  * @Author future
  * @Date 2020/8/13
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 @Accessors(chain = true)

+ 1 - 1
platform-common/src/main/java/com/platform/common/util/AssertUtils.java

@@ -7,7 +7,7 @@ import com.platform.common.exception.BusinessException;
  * @Description 断言
  * @Author future
  * @Date 2020/7/28
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 public class AssertUtils {
 

+ 1 - 1
platform-common/src/main/java/com/platform/common/util/Base64Utils.java

@@ -10,7 +10,7 @@ import java.io.InputStream;
  * @Description base64
  * @Author chenyuehu
  * @Date 2019/5/7
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Slf4j
 public class Base64Utils {

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

@@ -6,7 +6,7 @@ import java.time.LocalDateTime;
  * @Description ID生成工具类
  * @Author chenli
  * @Date 2019-05-08
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 public class IdGeneratorUtils {
 

+ 1 - 1
platform-common/src/main/java/com/platform/common/util/MoneyUtil.java

@@ -6,7 +6,7 @@ import java.text.DecimalFormat;
  * @Description 金额工具类
  * @Author chenyuehu
  * @Date 2020/11/3
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 public class MoneyUtil {
 

+ 1 - 1
platform-common/src/main/java/com/platform/common/util/ReflectUtil.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @Description 反射工具类
  * @Author chenyuehu
  * @Date 2019/8/2
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Slf4j
 public class ReflectUtil {

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/dto/operate/ArticleDTO.java

@@ -13,7 +13,7 @@ import java.util.List;
  * @Description 公告DTO
  * @Author chenyuehu
  * @Date 2020-01-16 18:04:28
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Data
 @Accessors(chain = true)

+ 1 - 1
platform-dao/src/main/java/com/platform/dao/entity/operate/Article.java

@@ -13,7 +13,7 @@ import javax.persistence.Transient;
  * @Description 公告实体类
  * @Author chenyuehu
  * @Date 2020-01-16 18:04:28
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Table(name = "t_article")
 @Data

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Description 审批流业务表单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 点巡检任务状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 保养等级
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 是否启用
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 保养任务执行人方式:1使用人,2维修人
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 是否删除(数据状态)
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 表单操作枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 点巡检任务状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 是否启用
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 币种
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 操作对象枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 领用单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 审核节点
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购订单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 审核节点
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 呈报节点
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购订单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 币种
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购发运单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购明细状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购订单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 支付
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购订单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 呈报节点
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购入库单状态
  * @Author liangshiqian
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购入库单状态
  * @Author liangshiqian
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 采购订单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 维修类别枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2020,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 报修单状态枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2020,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 报修单是否停机枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2020,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 维修类别枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2020,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 验收单状态枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2020,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 维修单状态枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2020,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 维修是否唯一
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备是否父子
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备显示设备
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备是否父子
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备一级报废审核节点
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备显示设备
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @Description 设备状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备停机状态表:1未审核,2已审核(变更设备状态)
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -3,7 +3,7 @@ package com.platform.dao.enums;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 
 import lombok.AllArgsConstructor;

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

@@ -9,7 +9,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 退库单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 备件使用状态枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2020,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 设备状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 备件使用状态枚举
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2020,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2020,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 领用单状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 点巡检任务状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 点巡检任务状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -10,7 +10,7 @@ import lombok.Getter;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 审核节点
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -7,7 +7,7 @@ import lombok.Getter;
  * @Description 供应商状态
  * @Author liuyu
  * @Date 2020/05/05
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 @Getter
 @AllArgsConstructor

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

@@ -3,7 +3,7 @@ package com.platform.dao.enums;
  * @Description
  * @Author future
  * @Date 2020/6/30
- * @Version Copyright (c) 2019,安徽阡陌网络科技有限公司 All rights reserved.
+ * @Version Copyright (c) 2019,合肥乾元坤合科技有限公司 All rights reserved.
  */
 
 import lombok.AllArgsConstructor;

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно