录取通知书调整

web/src/main/java/com/jpsoft/campus/modules/base/controller/ApplicationPrimaryController.java

@@ -919,7 +919,7 @@ public class ApplicationPrimaryController {
             ApprovalInfo approvalInfo = new ApprovalInfo();
             approvalInfo.setId(UUID.randomUUID().toString());
             approvalInfo.setApplicationId(id);
-            approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：退回");
+            approvalInfo.setOperation(applicationPrimary.getType() + "类生" + dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：退回");
             approvalInfo.setRemark(remark);
             approvalInfo.setFileUrl(fileUrl);
             approvalInfo.setDelFlag(false);
@@ -1046,7 +1046,7 @@ public class ApplicationPrimaryController {
             ApprovalInfo approvalInfo = new ApprovalInfo();
             approvalInfo.setId(UUID.randomUUID().toString());
             approvalInfo.setApplicationId(id);
-            approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：通过");
+            approvalInfo.setOperation(applicationPrimary.getType() + "类生" + dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：通过");
             approvalInfo.setRemark(remark);
             approvalInfo.setFileUrl(fileUrl);
             approvalInfo.setDelFlag(false);
@@ -1608,9 +1608,9 @@ public class ApplicationPrimaryController {
             approvalInfo.setId(UUID.randomUUID().toString());
             approvalInfo.setApplicationId(id);
             if("90".equals(status)) {
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
+                approvalInfo.setOperation(applicationPrimary.getType() + "类生" + dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
             }else{
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：" + typeValue);
+                approvalInfo.setOperation(applicationPrimary.getType() + "类生" + dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus())+"：" + typeValue);
             }
 
             approvalInfo.setRemark(remark);
@@ -1917,9 +1917,9 @@ public class ApplicationPrimaryController {
                 approvalInfo.setId(UUID.randomUUID().toString());
                 approvalInfo.setApplicationId(applicationPrimary.getId());
                 if("80".equals(status)) {
-                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",status));
+                    approvalInfo.setOperation(applicationPrimary.getType() + "类生" + dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",status));
                 }else{
-                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程", status) + "：通过审核");
+                    approvalInfo.setOperation(applicationPrimary.getType() + "类生" + dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程", status) + "：通过审核");
                 }
                 approvalInfo.setRemark("通过审核");
                 approvalInfo.setFileUrl("");
@@ -1994,9 +1994,9 @@ public class ApplicationPrimaryController {
                 approvalInfo.setApplicationId(applicationPrimary.getId());
 
                 if("80".equals(nextStatus)) {
-                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
+                    approvalInfo.setOperation(applicationPrimary.getType() + "类生" + dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
                 }else{
-                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程", applicationPrimary.getStatus()) + "：通过审核");
+                    approvalInfo.setOperation(applicationPrimary.getType() + "类生" + dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程", applicationPrimary.getStatus()) + "：通过审核");
                 }
                 approvalInfo.setRemark("通过审核");
                 approvalInfo.setFileUrl("");
@@ -2094,13 +2094,13 @@ public class ApplicationPrimaryController {
             }
         }
 
-        if(!"Y".equals(type) && !"Z".equals(type)) {
-            if ("374d9974-83e8-41e5-a979-95da0e8c69ea".equals(schoolId)) {
-                //开发区第一小学
-                startD = "28";
-                endD = "28";
-            }
-        }
+//        if(!"Y".equals(type) && !"Z".equals(type)) {
+//            if ("374d9974-83e8-41e5-a979-95da0e8c69ea".equals(schoolId)) {
+//                //开发区第一小学
+//                startD = "28";
+//                endD = "28";
+//            }
+//        }
 
         try{
             BufferedImage im =ImageIO.read(new FileInputStream(inImg));
@@ -2114,9 +2114,9 @@ public class ApplicationPrimaryController {
             g.drawString(personName,410,600);
             g.drawString(userName,830,680);
             g.drawString(startMD,660,940);
-            g.drawString(startD,730,940);
-            g.drawString(endMD,890,940);
-            g.drawString(endD,970,940);
+            g.drawString(startD,780,940);
+//            g.drawString(endMD,890,940);
+//            g.drawString(endD,970,940);
             g.drawString(schoolName,480,1015);
             g.drawString(mothh+"",1000,1590);
             g.drawString(DateUtil.thisDayOfMonth()+"",1060,1590);

web/src/main/java/com/jpsoft/campus/modules/mobile/controller/EnrollControlApiController.java

@@ -57,7 +57,7 @@ public class EnrollControlApiController {
         boolean result = true;
         try {
 
-            if (StringUtils.isBlank(applicationId)) {
+            //if (StringUtils.isBlank(applicationId)) {
                 List<SchoolInfo> schoolInfoList = schoolInfoService.findByEnrollmentType(schoolType);
 
                 if (StringUtils.isNotBlank(studentType)) {
@@ -69,7 +69,7 @@ public class EnrollControlApiController {
                     if (enrollControls.size() == schoolInfoList.size()) {
                         for (EnrollControl enrollControl : enrollControls) {
                             if (enrollControl.getEndTime().compareTo(new Date()) < 0) {
-                                i++;
+                                  i++;
                             }
                         }
 
@@ -99,7 +99,7 @@ public class EnrollControlApiController {
 
 
                 }*/
-            }
+            //}
 
 
             messageResult.setCode(200);