diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java index 6d2a0c2da..963bca1d7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/phone/service/impl/ToDoCenterServiceImpl.java @@ -148,6 +148,21 @@ public class ToDoCenterServiceImpl implements IToDoCenterService { // 判断当前用户在这个认证流程中 有几个任务。 责任人 接受、责任人 提交交付物、认证工程审批 if (CollectionUtils.isNotEmpty(pidEos)) { + + List rzgcsjsPidEos = pidEos.stream().filter(pidEo -> { + boolean flag = ( + StringUtils.equals(pidEo.getTaskDefinitionKey(), CertificationFlowNodeEnum.RZGCSJSRW.getKey()) + || StringUtils.equals(pidEo.getTaskDefinitionKey(), CertificationFlowNodeEnum.ZRRJJRW.getKey()) + ); + return flag; + }).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(rzgcsjsPidEos)) { + ProcessInfoVO processInfoVOTemp = new ProcessInfoVO(); + BeanUtils.copyProperties(data, processInfoVOTemp); + processInfoVOTemp.setTaskDefinitionKey(CertificationFlowNodeEnum.CHECKLIST_VERIFICATION.getKey()); + datasTemp.add(processInfoVOTemp); + } + List zrrjsrwPidEos = pidEos.stream().filter(pidEo -> { return StringUtils.equals(pidEo.getTaskDefinitionKey(), CertificationFlowNodeEnum.ZRRJSRW.getKey()); }).collect(Collectors.toList()); diff --git a/jero-web/src/views/phoneView/toDoCenter.vue b/jero-web/src/views/phoneView/toDoCenter.vue index 80d70767c..5557acc9d 100644 --- a/jero-web/src/views/phoneView/toDoCenter.vue +++ b/jero-web/src/views/phoneView/toDoCenter.vue @@ -7,7 +7,7 @@ + :placeholder="$t('phoneSearch')" />
@@ -18,7 +18,7 @@
- +
@@ -35,29 +35,31 @@ v-for="(item,index) in toDoProcessList" :key="index">
- {{item.serialNumber}} + {{ item.serialNumber }}
{{$t('category')}} - {{item.flowTypeShow}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('category') }} + {{ item.flowTypeShow }}
{{$t('project')}} - {{item.projectName}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('project') }} + {{ item.projectName }}
{{$t('node')}} - {{item.taskDefinitionKeyName || '--'}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('node') }} + {{ item.taskDefinitionKeyName || '--' }}
{{$t('cutoffTime')}} - {{item.endTime || '--'}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('cutoffTime') }} + {{ item.endTime || '--' }}
-
+
+
@@ -78,28 +80,28 @@ v-for="(item,index) in processDoneList" :key="index">
- {{item.serialNumber}} + {{ item.serialNumber }}
{{$t('category')}} - {{item.flowTypeShow}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('category') }} + {{ item.flowTypeShow }}
{{$t('project')}} - {{item.projectName}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('project') }} + {{ item.projectName }}
{{$t('node')}} - {{item.taskDefinitionKeyName || '--'}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('node') }} + {{ item.taskDefinitionKeyName || '--' }}
- - - - - + + + + +
@@ -123,28 +125,28 @@ v-for="(item,index) in sentProcessList" :key="index">
- {{item.serialNumber}} + {{ item.serialNumber }}
{{$t('category')}} - {{item.flowTypeShow}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('category') }} + {{ item.flowTypeShow }}
{{$t('project')}} - {{item.projectName}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('project') }} + {{ item.projectName }}
{{$t('node')}} - {{item.taskDefinitionKeyName || '--'}} + :class="{'content-box-left-one':language == 'en-us' ? true : false}">{{ $t('node') }} + {{ item.taskDefinitionKeyName || '--' }}
- - - - - + + + + +
@@ -153,10 +155,10 @@
- {{$t('phoneSearch')}} - {{$t('todocenter')}} - {{$t('taskStatistics')}} - {{$t('mine')}} + {{ $t('phoneSearch') }} + {{ $t('todocenter') }} + {{ $t('taskStatistics') }} + {{ $t('mine') }} - {{$t('designComplianceProcess')}} + {{ $t('designComplianceProcess') }}
- {{$t('validationComplianceProcess')}} + {{ $t('validationComplianceProcess') }}
- {{$t('preHomoFlow')}} + {{ $t('preHomoFlow') }}
@@ -200,7 +202,7 @@ :key="index" :class="{'checkboxGroup-text-color':selectModelColor(item.value)}" @click="selectModelClick(item.value)"> - {{item.text}} + {{ item.text }} @@ -220,16 +222,16 @@
- {{$t('phoneReset')}} - {{$t('query')}} + {{ $t('phoneReset') }} + {{ $t('query') }}
@@ -237,333 +239,326 @@ \ No newline at end of file