1.工作台查询列表接口平台已经倒叙排列，直接使用即可，之前遗漏未修改完整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -1348,8 +1348,7 @@ public class CommonServiceImpl implements ICommonService {
             flowTaskVo.setAssignee(assignee);
             ProcessTaskDTO processTaskDTO = cmWorkflowService.assign(flowTaskVo);
             // 修改待办
-            List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(instanceId).getResult();
-            List<TaskV2Model> collect = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
+            List<TaskV2Model> collect = taskV2FeignService.selectListByRelationId(instanceId).getResult();
             if (collect.isEmpty()) {
                 return null;
             }
@@ -1648,8 +1647,7 @@ public class CommonServiceImpl implements ICommonService {
      */
     public void rollbackTask(String id, JSONObject obj) {
 
-        List<TaskV2Model> result = taskV2FeignService.selectListByRelationId(id).getResult();
-        List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
+        List<TaskV2Model> list = taskV2FeignService.selectListByRelationId(id).getResult();
         TaskV2Model model = list.get(0);
         taskV2FeignService.delete(String.valueOf(model.getSequenceNbr()));
 

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgUseRegistrationServiceImpl.java

@@ -15,11 +15,9 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
-import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.entity.TzsBaseEntity;
-import com.yeejoin.amos.boot.biz.common.service.IDataDictionaryService;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
@@ -957,7 +955,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                 params.put("taskStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
                 params.put("taskStatusLabel", jgUseRegistration.getStatus());
                 TaskMessageDto taskMessageDto = new TaskMessageDto();
-                taskMessageDto.setEQU_LIST_CODE(String.valueOf(jsonObject.get("EQU_LIST_CODE")));
+                this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto);
                 params.put("model", taskMessageDto);
                 TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(params);
                 // 创建新的代办
@@ -966,7 +964,7 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
                     BeanUtils.copyProperties(taskV2Model, taskModelDto);
                     TaskMessageDto taskMessageDto1 = new TaskMessageDto();
                     BeanUtil.copyProperties(jgUseRegistration, taskMessageDto1);
-                    taskMessageDto1.setEQU_LIST_CODE(String.valueOf(jsonObject.get("EQU_LIST_CODE")));
+                    this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto1);
                     // taskMessageDto.setEquipId(jgUseRegistrationEq.getEquId());
                     taskModelDto.setModel(taskMessageDto1);
                     taskModelDto.setTaskName(workflowResultDto.getNextTaskName());
@@ -1820,6 +1818,9 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
             jsonObject.put("taskType", BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode());
             jsonObject.put("flowStatus", commonServiceImpl.getDictionaryCodeByName(jgUseRegistration.getStatus()));
             jsonObject.put("flowStatusLabel", jgUseRegistration.getStatus());
+            jsonObject.remove("otherAccessories");
+            jsonObject.remove("instanceStatus");
+            setEquListCode2Json(jgUseRegistration, jsonObject);
             // 非单位办理
             if (!"unit".equals(manageType)) {
                 LambdaQueryWrapper<JgUseRegistrationEq> lambda1 = new QueryWrapper<JgUseRegistrationEq>().lambda();
@@ -1845,6 +1846,12 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
         }
     }
 
+    private void setEquListCode2Json(JgUseRegistration jgUseRegistration, JSONObject jsonObject) {
+        TaskMessageDto taskMessageDto = new TaskMessageDto();
+        this.setEquListForWorkSpace(jgUseRegistration, taskMessageDto);
+        jsonObject.put("EQU_LIST_CODE", taskMessageDto.getEQU_LIST_CODE());
+    }
+
 
     @Transactional(rollbackFor = Exception.class)
     public void deleteBatch(List<Long> ids) {