1.多级撤回后任务状态不正确

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgChangeRegistrationNameMapper.xml

@@ -59,7 +59,7 @@
             AND ur.receive_org_code = #{orgCode}
         </if>
         <if test="dto.type == 'company'">
-            and ur.use_unit_credit_code = #{orgCode}
+            and ur.use_unit_credit_code = #{dto.useUnitCreditCode}
         </if>
     </where>
     order by ur.rec_date desc

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgChangeRegistrationNameController.java

@@ -114,6 +114,7 @@ public class JgChangeRegistrationNameController extends BaseController {
         ReginParams reginParams = getSelectedOrgInfo();
         if(reginParams.getCompany().getLevel().equals(COMPANY_TYPE_COMPANY)){
             dto.setType(COMPANY_TYPE_COMPANY);
+            dto.setUseUnitCreditCode(reginParams.getCompany().getCompanyCode());
         } else {
             dto.setType(COMPANY_TYPE_SUPERVISION);
         }

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

@@ -810,13 +810,19 @@ public class CommonServiceImpl implements ICommonService {
         List<TaskV2Model> list = result.stream().sorted((r1, r2) -> r2.getSequenceNbr().compareTo(r1.getSequenceNbr())).collect(Collectors.toList());
         TaskV2Model model = list.get(0);
         Systemctl.taskV2Client.delete(String.valueOf(model.getSequenceNbr()));
-        if (list.size()>1){
+        if (list.size() >1){
             TaskV2Model lastTaskModel = list.get(1);
             lastTaskModel.setEndUserId(null);
             lastTaskModel.setEndDate(null);
             lastTaskModel.setTaskStatus(0);
             lastTaskModel.setTaskStatusLabel("待处理");
             lastTaskModel.setFlowCode(obj.get("nextTaskId").toString());
+            if(obj.get("flowStatus") != null){
+                lastTaskModel.setFlowStatus(Integer.valueOf(obj.get("flowStatus").toString()));
+            }
+            if(obj.get("flowStatusLabel") != null){
+                lastTaskModel.setFlowStatusLabel(obj.get("flowStatusLabel").toString());
+            }
             String urlParams = "";
             try {
                 urlParams = "&" + toQueryParams(obj);

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/JgChangeRegistrationNameServiceImpl.java

@@ -411,6 +411,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
         jsonObject.put("nextTaskId", jgChangeRegistrationName.getNextTaskId());
         jsonObject.put("nextExecuteUser", jgChangeRegistrationName.getNextExecutorIds());
         jsonObject.put("taskType", BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
+        jsonObject.put("flowStatus", this.getTaskCodeByName(jgChangeRegistrationName.getAuditStatus()));
+        jsonObject.put("flowStatusLabel", jgChangeRegistrationName.getAuditStatus());
         commonService.rollbackTask(instanceId, jsonObject);
     }