|
|
@@ -981,13 +981,13 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
params.put("isShowVisualSeal", false);
|
|
|
|
|
|
if(StringUtils.isBlank(musicGroupId)){
|
|
|
- params.put("ownershipType", OwnershipType.OWN);
|
|
|
+ params.put("ownershipType", "OWN");
|
|
|
}else{
|
|
|
MusicGroup musicGroup = musicGroupService.get(musicGroupId);
|
|
|
if (musicGroup == null) {
|
|
|
throw new BizException("乐团信息没找到");
|
|
|
}
|
|
|
- params.put("ownershipType", musicGroup.getOwnershipType());
|
|
|
+ params.put("ownershipType", musicGroup.getOwnershipType().name());
|
|
|
}
|
|
|
|
|
|
templateEngine.render(params, "product.ftl", srcFile);
|
|
|
@@ -1001,7 +1001,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
|
|
|
|
|
|
String organCode = "";
|
|
|
- if (params.get("ownershipType") == OwnershipType.OWN) {
|
|
|
+ if (OwnershipType.OWN.name().equals(params.get("ownershipType"))){
|
|
|
organCode = "91440300326364429H";
|
|
|
} else {
|
|
|
organCode = "91420106333619290A";
|
|
|
@@ -1054,8 +1054,9 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
StudentInfo studentInfo = studentRegistrationService.queryStudentInfo(userId);
|
|
|
params.put("studentInfo", studentInfo);
|
|
|
params.put("isShowVisualSeal", true);
|
|
|
+
|
|
|
if(StringUtils.isBlank(musicGroupId)){
|
|
|
- params.put("ownershipType", OwnershipType.OWN);
|
|
|
+ params.put("ownershipType", "OWN");
|
|
|
}else{
|
|
|
MusicGroup musicGroup = musicGroupService.get(musicGroupId);
|
|
|
if (musicGroup == null) {
|
|
|
@@ -1063,6 +1064,7 @@ public class ContractServiceImpl implements ContractService, InitializingBean {
|
|
|
}
|
|
|
params.put("ownershipType", musicGroup.getOwnershipType().name());
|
|
|
}
|
|
|
+
|
|
|
templateEngine.render(params, "product.ftl", srcFile);
|
|
|
|
|
|
String html = "";
|
Joburgess