|
@@ -1033,7 +1033,6 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
params.put("ownershipType", musicGroup.getOwnershipType().name());
|
|
|
ownershipType = musicGroup.getCourseViewType();
|
|
|
}
|
|
|
-
|
|
|
params.put("courseViewType", ownershipType.getCode());
|
|
|
|
|
|
List<SysUserContracts> userContracts = sysUserContractsService.getUserContractWithType(userId, ContractType.PRODUCT, CourseViewTypeEnum.COURSE_lIST.equals(ownershipType)?COURSE_CONTRACT_VERSION:AMR_CONTRACT_VERSION);
|
|
@@ -1117,12 +1116,14 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
|
|
|
Map<String, Object> result = new HashMap<>();
|
|
|
result.put("courseViewType", CourseViewTypeEnum.COURSE_lIST);
|
|
|
+ CourseViewTypeEnum ownershipType = CourseViewTypeEnum.COURSE_lIST;
|
|
|
|
|
|
if(StringUtils.isBlank(musicGroupId)){
|
|
|
params.put("ownershipType", "OWN");
|
|
|
MusicGroup userLastNormalMusicGroup = studentRegistrationDao.getUserLastNormalMusicGroup(userId);
|
|
|
if(Objects.nonNull(userLastNormalMusicGroup)){
|
|
|
result.put("courseViewType", userLastNormalMusicGroup.getCourseViewType());
|
|
|
+ ownershipType = userLastNormalMusicGroup.getCourseViewType();
|
|
|
}
|
|
|
}else{
|
|
|
MusicGroup musicGroup = musicGroupService.get(musicGroupId);
|
|
@@ -1131,8 +1132,11 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
}
|
|
|
params.put("ownershipType", musicGroup.getOwnershipType().name());
|
|
|
result.put("courseViewType", musicGroup.getCourseViewType());
|
|
|
+ ownershipType = musicGroup.getCourseViewType();
|
|
|
}
|
|
|
|
|
|
+ params.put("courseViewType", ownershipType.getCode());
|
|
|
+
|
|
|
templateEngine.render(params, "product"+(CourseViewTypeEnum.COURSE_lIST.equals(result.get("courseViewType"))?COURSE_CONTRACT_VERSION:AMR_CONTRACT_VERSION)+".ftl", srcFile);
|
|
|
|
|
|
String html = "";
|