|
@@ -75,13 +75,14 @@ public class CaseAddSceneConsumer {
|
|
caseEntity.setCaseTitle(kNumber);
|
|
caseEntity.setCaseTitle(kNumber);
|
|
caseEntity.setUserName(user.getUserName());
|
|
caseEntity.setUserName(user.getUserName());
|
|
caseEntity.setSysUserId(jyUser.getSysUserId());
|
|
caseEntity.setSysUserId(jyUser.getSysUserId());
|
|
|
|
+ caseEntity.setKNumber(kNumber);
|
|
caseService.save(caseEntity);
|
|
caseService.save(caseEntity);
|
|
}
|
|
}
|
|
|
|
|
|
CaseParam caseParam = new CaseParam();
|
|
CaseParam caseParam = new CaseParam();
|
|
caseParam.setCaseId(caseEntity.getCaseId());
|
|
caseParam.setCaseId(caseEntity.getCaseId());
|
|
|
|
|
|
- caseParam.setSceneNumParam(getSceneParam(scenePlus));
|
|
|
|
|
|
+ caseParam.setSceneNumParam(getSceneParam(kNumber));
|
|
|
|
|
|
caseService.addScene(caseParam);
|
|
caseService.addScene(caseParam);
|
|
|
|
|
|
@@ -94,16 +95,19 @@ public class CaseAddSceneConsumer {
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
- public List<SceneNumParam> getSceneParam (ScenePlus scenePlus){
|
|
|
|
- List<Integer> typeList = getTypeBySceneSource(scenePlus.getSceneSource());
|
|
|
|
-
|
|
|
|
|
|
+ public List<SceneNumParam> getSceneParam (String KNumber){
|
|
List<SceneNumParam> params = new ArrayList<>();
|
|
List<SceneNumParam> params = new ArrayList<>();
|
|
- for (Integer type : typeList) {
|
|
|
|
- SceneNumParam sceneNumParam = new SceneNumParam();
|
|
|
|
- sceneNumParam.setNumList(Arrays.asList(scenePlus.getNum()));
|
|
|
|
- sceneNumParam.setType(type);
|
|
|
|
- params.add(sceneNumParam);
|
|
|
|
|
|
+ List<ScenePlus> scenePlus = scenePlusService.getKNumber(KNumber);
|
|
|
|
+ for (ScenePlus plus : scenePlus) {
|
|
|
|
+ List<Integer> typeList = getTypeBySceneSource(plus.getSceneSource());
|
|
|
|
+ for (Integer type : typeList) {
|
|
|
|
+ SceneNumParam sceneNumParam = new SceneNumParam();
|
|
|
|
+ sceneNumParam.setNumList(Arrays.asList(plus.getNum()));
|
|
|
|
+ sceneNumParam.setType(type);
|
|
|
|
+ params.add(sceneNumParam);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
return params;
|
|
return params;
|
|
}
|
|
}
|
|
|
|
|