Commit 6e7ce862 authored by litengwei's avatar litengwei

预案子任务配置

parent c210bc14
...@@ -109,9 +109,7 @@ public class EmergencyTaskController extends BaseController{ ...@@ -109,9 +109,7 @@ public class EmergencyTaskController extends BaseController{
obligationId = null; obligationId = null;
} }
CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize); CommonPageable commonPageable = new CommonPageable(pageNumber, pageSize);
if (StringUtils.isEmpty(planType) && redisTemplate.hasKey("planType")) {
planType = redisTemplate.boundValueOps("planType").get(0, -1);
}
if (StringUtils.isNotEmpty(planType) && "0".equals(planType)) { if (StringUtils.isNotEmpty(planType) && "0".equals(planType)) {
planType = null; planType = null;
} }
......
...@@ -106,7 +106,7 @@ public class EmergencyTaskServiceImpl implements IEmergencyTaskService { ...@@ -106,7 +106,7 @@ public class EmergencyTaskServiceImpl implements IEmergencyTaskService {
List<String> roleList = emergencyTaskContent.getRoleCodeList(); List<String> roleList = emergencyTaskContent.getRoleCodeList();
for (String role : roleList for (String role : roleList
) { ) {
String json = taskJson.replace("_content", emergencyTaskContent.getContent()).replace("__stepCode", emergencyTaskContent.getStepCode()); String json = taskJson.replace("_content", emergencyTaskContent.getContent()).replace("_stepCode", emergencyTaskContent.getStepCode());
emergencyTaskContent.setButtonJson(json); emergencyTaskContent.setButtonJson(json);
EmergencyTaskRole emergencyTaskRole = emergencyTaskRoleMapper.selectById(Long.valueOf(role)); EmergencyTaskRole emergencyTaskRole = emergencyTaskRoleMapper.selectById(Long.valueOf(role));
emergencyTaskContent.setRoleCode(emergencyTaskRole.getCode()); emergencyTaskContent.setRoleCode(emergencyTaskRole.getCode());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment