xiao547607 4 gadi atpakaļ
vecāks
revīzija
cbf63fb03a

+ 1 - 0
common/src/main/java/com/jpsoft/campus/modules/base/dao/ApplicationPrimaryDAO.java

@@ -23,4 +23,5 @@ public interface ApplicationPrimaryDAO {
 
 	List<ApplicationPrimary> findByStudentId(String id);
 	ApplicationPrimary findByStudentNameAndIdCard(String studentName, String idCard,String schoolId);
+	List<ApplicationPrimary> findByIds(List<String> ids);
 }

+ 2 - 0
common/src/main/java/com/jpsoft/campus/modules/base/service/ApplicationPrimaryService.java

@@ -22,4 +22,6 @@ public interface ApplicationPrimaryService {
 
 	List<ApplicationPrimary> findByStudentId(String id);
 	ApplicationPrimary findByStudentNameAndIdCard(String studentName, String idCard,String schoolId);
+
+	List<ApplicationPrimary> findByIds(List<String> ids);
 }

+ 5 - 0
common/src/main/java/com/jpsoft/campus/modules/base/service/impl/ApplicationPrimaryServiceImpl.java

@@ -100,4 +100,9 @@ public class ApplicationPrimaryServiceImpl implements ApplicationPrimaryService
 	public ApplicationPrimary findByStudentNameAndIdCard(String studentName, String idCard,String schoolId){
 		return applicationPrimaryDAO.findByStudentNameAndIdCard(studentName,idCard,schoolId);
 	}
+
+	@Override
+	public List<ApplicationPrimary> findByIds(List<String> ids){
+		return applicationPrimaryDAO.findByIds(ids);
+	}
 }

+ 8 - 0
common/src/main/resources/mapper/base/ApplicationPrimary.xml

@@ -341,4 +341,12 @@
         AND t2.id_card = #{idCard}
         AND t1.school_id = #{schoolId}
     </select>
+    <select id="findByIds" resultMap="ApplicationPrimaryMap">
+        select * from base_application_primary
+        where del_flag=0
+        <foreach collection="ids" item="id" open="and id_ in(" separator="," close=")">
+            #{id}
+        </foreach>
+        order by create_time asc
+    </select>
 </mapper>

+ 2 - 0
web/src/main/java/com/jpsoft/campus/modules/base/controller/ApplicationMiddleController.java

@@ -329,6 +329,7 @@ public class ApplicationMiddleController {
         }else if(count3 > 0){
             //工作人员只能查网上初审10和现场初审20
             List statusList = new ArrayList();
+            statusList.add("5");
             statusList.add("10");
             statusList.add("20");
             searchParams.put("orStatus",statusList);
@@ -438,6 +439,7 @@ public class ApplicationMiddleController {
             }else if(count3 > 0){
                 //工作人员只能查网上初审10和现场初审20
                 List statusList = new ArrayList();
+                statusList.add("5");
                 statusList.add("10");
                 statusList.add("20");
                 searchParams.put("orStatus",statusList);

+ 72 - 0
web/src/main/java/com/jpsoft/campus/modules/base/controller/ApplicationPrimaryController.java

@@ -362,6 +362,7 @@ public class ApplicationPrimaryController {
         }else if(count3 > 0){
             //工作人员只能查网上初审10和现场初审20
             List statusList = new ArrayList();
+            statusList.add("5");
             statusList.add("10");
             statusList.add("20");
             searchParams.put("orStatus",statusList);
@@ -476,6 +477,7 @@ public class ApplicationPrimaryController {
             }else if(count3 > 0){
                 //工作人员只能查网上初审10和现场初审20
                 List statusList = new ArrayList();
+                statusList.add("5");
                 statusList.add("10");
                 statusList.add("20");
                 searchParams.put("orStatus",statusList);
@@ -1861,6 +1863,76 @@ public class ApplicationPrimaryController {
         return msgResult;
     }
 
+    @ApiOperation(value="全部通过")
+    @RequestMapping(value = "allNextByIds",method = RequestMethod.POST)
+    public MessageResult<Map> allNextByIds(
+            @RequestParam(value="idList",defaultValue="") String idList,
+            @RequestParam(value="status",defaultValue="") String status,
+            @RequestParam(value="nextStatus",defaultValue="") String nextStatus,
+            @RequestAttribute String subject){
+
+        //当前用户ID
+        System.out.println(subject);
+
+        MessageResult<Map> msgResult = new MessageResult<>();
+
+        Map<String,Object> searchParams = new HashMap<>();
+        User user = userService.get(subject);
+
+        try {
+
+            List<Sort> sortList = new ArrayList<>();
+            sortList.add(new Sort("a.create_time", "desc"));
+
+            List<String> idsList = new ArrayList<>();
+            if(StringUtils.isNotEmpty(idList)) {
+               String[] ids = idList.split(",");
+               idsList = Arrays.asList(ids);
+            }else{
+                msgResult.setResult(true);
+                return msgResult;
+            }
+            searchParams.put("status", status);
+
+            List<ApplicationPrimary> apList = applicationPrimaryService.findByIds(idsList);
+            for (ApplicationPrimary applicationPrimary : apList) {
+                if(applicationPrimary.getStatus().equals(status)){
+                    applicationPrimary.setStatus(nextStatus);
+                }else{
+                    continue;
+                }
+
+                applicationPrimary.setUpdateBy(subject);
+                applicationPrimary.setUpdateTime(new Date());
+
+                ApprovalInfo approvalInfo = new ApprovalInfo();
+                approvalInfo.setId(UUID.randomUUID().toString());
+                approvalInfo.setApplicationId(applicationPrimary.getId());
+
+                if("80".equals(nextStatus)) {
+                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程",applicationPrimary.getStatus()));
+                }else{
+                    approvalInfo.setOperation(dataDictionaryService.findNameByCatalogNameAndValue("小学招生审核流程", applicationPrimary.getStatus()) + ":通过审核");
+                }
+                approvalInfo.setRemark("通过审核");
+                approvalInfo.setFileUrl("");
+                approvalInfo.setDelFlag(false);
+                approvalInfo.setCreateBy(subject);
+                approvalInfo.setCreateTime(new Date());
+
+                int affectCount = approvalInfoService.insert(approvalInfo);
+
+                applicationPrimaryService.update(applicationPrimary);
+            }
+
+            msgResult.setResult(true);
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+
+        return msgResult;
+    }
+
     public static void main(String[] args) {
         String in = "static/primary_tzs.jpg";
         String out = "uploadImg/primary_tzs_" + "11111" + ".jpg";

+ 2 - 0
web/src/main/resources/application.yml

@@ -2,6 +2,8 @@ server:
   port: 8086
   servlet:
     context-path: /campus-admission-server
+  tomcat:
+    max-http-post-size: -1
 
 spring:
   servlet: