|
@@ -362,6 +362,7 @@ public class ApplicationPrimaryController {
|
|
}else if(count3 > 0){
|
|
}else if(count3 > 0){
|
|
//工作人员只能查网上初审10和现场初审20
|
|
//工作人员只能查网上初审10和现场初审20
|
|
List statusList = new ArrayList();
|
|
List statusList = new ArrayList();
|
|
|
|
+ statusList.add("5");
|
|
statusList.add("10");
|
|
statusList.add("10");
|
|
statusList.add("20");
|
|
statusList.add("20");
|
|
searchParams.put("orStatus",statusList);
|
|
searchParams.put("orStatus",statusList);
|
|
@@ -476,6 +477,7 @@ public class ApplicationPrimaryController {
|
|
}else if(count3 > 0){
|
|
}else if(count3 > 0){
|
|
//工作人员只能查网上初审10和现场初审20
|
|
//工作人员只能查网上初审10和现场初审20
|
|
List statusList = new ArrayList();
|
|
List statusList = new ArrayList();
|
|
|
|
+ statusList.add("5");
|
|
statusList.add("10");
|
|
statusList.add("10");
|
|
statusList.add("20");
|
|
statusList.add("20");
|
|
searchParams.put("orStatus",statusList);
|
|
searchParams.put("orStatus",statusList);
|
|
@@ -1861,6 +1863,76 @@ public class ApplicationPrimaryController {
|
|
return msgResult;
|
|
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) {
|
|
public static void main(String[] args) {
|
|
String in = "static/primary_tzs.jpg";
|
|
String in = "static/primary_tzs.jpg";
|
|
String out = "uploadImg/primary_tzs_" + "11111" + ".jpg";
|
|
String out = "uploadImg/primary_tzs_" + "11111" + ".jpg";
|