|
@@ -1615,7 +1615,7 @@ public class ApplicationPrimaryController {
|
|
|
SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getOfferId());
|
|
|
PersonInfo personInfo = personInfoService.get(applicationPrimary.getPersonId());
|
|
|
StudentInfo studentInfo = studentInfoService.get(applicationPrimary.getStudentId());
|
|
|
- String bdUrl = toPressText(code,personInfo.getName(),studentInfo.getName(), schoolInfo.getName());
|
|
|
+ String bdUrl = toPressText(code,personInfo.getName(),studentInfo.getName(), schoolInfo.getName(),schoolInfo.getId());
|
|
|
String uploadUrl = uploadImg(bdUrl);
|
|
|
if(StringUtils.isNotEmpty(uploadUrl)){
|
|
|
applicationPrimary.setOfferImg(uploadUrl);
|
|
@@ -1837,7 +1837,7 @@ public class ApplicationPrimaryController {
|
|
|
SchoolInfo schoolInfo = schoolInfoService.get(applicationPrimary.getOfferId());
|
|
|
PersonInfo personInfo = personInfoService.get(applicationPrimary.getPersonId());
|
|
|
StudentInfo studentInfo = studentInfoService.get(applicationPrimary.getStudentId());
|
|
|
- String bdUrl = toPressText(code, personInfo.getName(), studentInfo.getName(), schoolInfo.getName());
|
|
|
+ String bdUrl = toPressText(code, personInfo.getName(), studentInfo.getName(), schoolInfo.getName(),schoolInfo.getId());
|
|
|
String uploadUrl = uploadImg(bdUrl);
|
|
|
|
|
|
if(StringUtils.isNotEmpty(uploadUrl)){
|
|
@@ -2002,7 +2002,7 @@ public class ApplicationPrimaryController {
|
|
|
|
|
|
@ApiOperation(value="全部通过")
|
|
|
@RequestMapping(value = "toPressText",method = RequestMethod.POST)
|
|
|
- public String toPressText(String offerCode,String personName,String userName,String schoolName){
|
|
|
+ public String toPressText(String offerCode,String personName,String userName,String schoolName,String schoolId){
|
|
|
String in = "static/primary_tzs.jpg";
|
|
|
String out = "uploadImg/primary_tzs_" + offerCode + ".jpg";
|
|
|
String inImg = Resource.class.getResource("/").getPath() + in;
|
|
@@ -2011,6 +2011,12 @@ public class ApplicationPrimaryController {
|
|
|
String startD = "24";
|
|
|
String endD = "25";
|
|
|
|
|
|
+ if("374d9974-83e8-41e5-a979-95da0e8c69ea".equals(schoolId)){
|
|
|
+ //开发区第一小学
|
|
|
+ startD = "28";
|
|
|
+ endD = "28";
|
|
|
+ }
|
|
|
+
|
|
|
try{
|
|
|
BufferedImage im =ImageIO.read(new FileInputStream(inImg));
|
|
|
int mothh = DateUtil.thisMonth() +1;
|