代码提交

amos-boot-system-ugp/amos-boot-module-ugp-api/src/main/java/com/yeejoin/amos/boot/module/ugp/api/Enum/CompanyExamineEnum.java

@@ -6,8 +6,8 @@ import lombok.Getter;
 @Getter
 @AllArgsConstructor
 public enum CompanyExamineEnum {
-    企业审核("企业审核","未审核","已审核"),
-    部门审核("部门审核","未审核","已审核");
+    企业审核("单位审核","未审核","已审核"),
+    部门审核("项目审核","未审核","已审核");
 
     String name;
     String no;

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectInitiationServiceImpl.java

@@ -271,7 +271,7 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
                 }
 
                 if(ProjectInitiationEnum.安装负责人指定项目资料员.getName().equals(name) || ProjectInitiationEnum.设计负责人指定项目资料员.getName().equals(name) ){
-                    System.out.println(name+"外层==============");
+                    System.out.println(name+"内层==============");
                     dataObject = JSON.parseObject(JSON.toJSONString(o));
                     AjaxResult taskGroupName = Workflow.taskClient.getTaskGroupName(String.valueOf(JSON.parseObject(JSON.toJSONString(o)).getString("id")));
                     if (!ObjectUtils.isEmpty(taskGroupName)) {
@@ -690,13 +690,16 @@ public class ProjectInitiationServiceImpl extends BaseService<ProjectInitiationD
         try {
             AjaxResult ajaxResult = Workflow.taskClient.getTaskNoAuth(instanceId);
             dataObject = JSON.parseObject(JSON.toJSONString(ajaxResult.get("data")));
+            System.out.println(dataObject.toJSONString()+"单个流程名称");
         }catch (Exception e) {
             //当存在多个用户任务时 主要是安装/设计提交资料修改
             logger.error("当前用户存在多个任务");
             JSONObject jsonObject = JSON.parseObject(JSON.toJSONString(Workflow.taskClient.getTasksForDisposal(instanceId)));
             JSONArray jsonArray = jsonObject.getJSONArray("data");
+
             for(Object o:jsonArray){
                 String name = JSON.parseObject(JSON.toJSONString(o)).getString("name");
+                System.out.println(dataObject.toJSONString()+"流程名称循环======");
                 if(ProjectInitiationEnum.安装开工资料修改.getName().equals(name)){
                     return ProjectInitiationEnum.修改资料.getName();
                 }