问题修改

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

@@ -1712,9 +1712,9 @@ public class ApplicationMiddleController {
             approvalInfo.setId(UUID.randomUUID().toString());
             approvalInfo.setApplicationId(applicationMiddle.getId());
             if("80".equals(status)) {
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus()));
+                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",status));
             }else{
-                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",applicationMiddle.getStatus())+"：通过审核");
+                approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("中学招生审核流程",status)+"：通过审核");
             }
             approvalInfo.setRemark("通过审核");
             approvalInfo.setFileUrl("");

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

@@ -1835,9 +1835,9 @@ public class ApplicationPrimaryController {
                 approvalInfo.setId(UUID.randomUUID().toString());
                 approvalInfo.setApplicationId(applicationPrimary.getId());
                 if("80".equals(status)) {
-                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
+                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",status));
                 }else{
-                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程", applicationPrimary.getStatus()) + "：通过审核");
+                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程", status) + "：通过审核");
                 }
                 approvalInfo.setRemark("通过审核");
                 approvalInfo.setFileUrl("");

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

@@ -479,11 +479,12 @@ public class PrimarySchoolApiController {
                 applicationPrimary.setCreateBy(subject);
                 applicationPrimary.setDelFlag(false);
 
-                if ("B".equals(applicationPrimaryDTO.getType())){
-                    applicationPrimary.setStatus("40");
-                }else {
-                    applicationPrimary.setStatus("10"); //待网上初审
-                }
+//                if ("B".equals(applicationPrimaryDTO.getType())){
+//                    applicationPrimary.setStatus("40");
+//                }else {
+//                    applicationPrimary.setStatus("10"); //待网上初审
+//                }
+                applicationPrimary.setStatus("10"); //待网上初审
 
 
                 applicationPrimaryService.insert(applicationPrimary);
@@ -516,11 +517,12 @@ public class PrimarySchoolApiController {
                 applicationPrimary.setSchoolNumberId(applicationPrimaryDTO.getSchoolNumberId());
 
 
-                if ("B".equals(applicationPrimaryDTO.getType())){
-                    applicationPrimary.setStatus("40");
-                }else {
-                    applicationPrimary.setStatus("10"); //待网上初审
-                }
+//                if ("B".equals(applicationPrimaryDTO.getType())){
+//                    applicationPrimary.setStatus("40");
+//                }else {
+//                    applicationPrimary.setStatus("10"); //待网上初审
+//                }
+                applicationPrimary.setStatus("10"); //待网上初审
                 applicationPrimary.setUpdateBy(subject);
                 applicationPrimary.setUpdateTime(new Date());