1、修改任务审批退回接口

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanServiceImpl.java

@@ -225,7 +225,7 @@ public class RiskPlanServiceImpl implements IRiskPlanService {
             RiskPlanTask riskPlanTask1 = new RiskPlanTask();
             riskPlanTask1.setPlanId(lastRiskPlanTask.getPlanId());
             riskPlanTask1.setTaskKey(RiskPlanStatusType.WAIT_RETURN.getStatus());
-            riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getStatus());
+            riskPlanTask1.setTaskName(RiskPlanStatusType.WAIT_RETURN.getTitle());
             riskPlanTask1.setStatus("running");
             riskPlanTask1.setStartTime(new Date());
             riskPlanTaskService.insertRiskPlanTask(riskPlanTask1);

censoft-rongtong/src/main/java/com/censoft/censoftrongtong/service/impl/RiskPlanUserBuildingServiceImpl.java

@@ -109,6 +109,7 @@ public class RiskPlanUserBuildingServiceImpl
             RiskPlanUserBuilding planUserBuilding = getOne(wrapper);
             planUserBuilding.setTaskResult(dto.getTaskResult());
             planUserBuilding.setTaskOpinion(dto.getTaskOpinion());
+            planUserBuilding.setStatus("return");
             planUserBuilding.setApprovalUserId(userId);
             updateById(planUserBuilding);
         });

censoft-rongtong/src/main/resources/mapper/system/RiskPlanTaskMapper.xml

@@ -43,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="getLastRiskPlanTaskByPlanId" resultMap="RiskPlanTaskResult">
         <include refid="selectRiskPlanTaskVo"/>
         where plan_id = #{id}
-        order BY start_time desc
+        order BY start_time desc,id desc
         limit 1
     </select>