diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java index 72852b3c..c4642219 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/grab/SynchronizationService/SyncZyCcjg.java @@ -41,16 +41,16 @@ public class SyncZyCcjg extends BaseSync { * @param param */ public void run(Map param){ -// try { -// zyCcjgService.getCcjg(); -// } catch (Exception e) { -// e.printStackTrace(); -// } -// try { -// zyInfoService.updateInfoZyStatus(); -// } catch (Exception e) { -// e.printStackTrace(); -// } + try { + zyCcjgService.getCcjg(); + } catch (Exception e) { + e.printStackTrace(); + } + try { + zyInfoService.updateInfoZyStatus(); + } catch (Exception e) { + e.printStackTrace(); + } try { wjxWjxxService.updateCeyanStatus(); diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java index 1d9c4fb1..8f696672 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/wjxWjxx/controller/WjxWjxxController.java @@ -707,6 +707,7 @@ public class WjxWjxxController extends JeecgController @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req) { LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + wjxWjxx.setTeacherNo(user.getUsername()); Page pageList = wjxWjxxService.listOther(wjxWjxx, new Page<>(pageNo, pageSize)); return Result.OK(pageList); } diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java index cbb751bb..7931e288 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/zyInfoStudent/controller/ZyInfoStudentController.java @@ -686,19 +686,19 @@ public class ZyInfoStudentController extends JeecgController zyInfoStudentQueryWrapper = new QueryWrapper<>(); - zyInfoStudentQueryWrapper.eq("create_by",user.getUsername()); - zyInfoStudentQueryWrapper.eq("main_id",zyInfoStudent.getMainId()); - zyInfoStudentQueryWrapper.last("limit 1"); - ZyInfoStudent zyInfoStudent2 = zyInfoStudentService.getOne(zyInfoStudentQueryWrapper); - if(zyInfoStudent2!=null){ - //20241107新增判断,看原来是否有数据,防止重复添加,将原来的id赋值到请求数据里 - zyInfoStudent.setId(zyInfoStudent2.getId()); - stuPar.setFilePath(zyInfoStudent.getFilePath()); - zyInfoStudent =stuPar; - }else{ + //20241107新增判断,看原来是否有数据,防止重复添加 +// QueryWrapper zyInfoStudentQueryWrapper = new QueryWrapper<>(); +// zyInfoStudentQueryWrapper.eq("create_by",user.getUsername()); +// zyInfoStudentQueryWrapper.eq("main_id",zyInfoStudent.getMainId()); +// zyInfoStudentQueryWrapper.last("limit 1"); +// ZyInfoStudent zyInfoStudent2 = zyInfoStudentService.getOne(zyInfoStudentQueryWrapper); +// if(zyInfoStudent2!=null){ +// //20241107新增判断,看原来是否有数据,防止重复添加,将原来的id赋值到请求数据里 +// zyInfoStudent.setId(zyInfoStudent2.getId()); +// stuPar.setFilePath(zyInfoStudent.getFilePath()); +// zyInfoStudent =stuPar; +// }else{ ZyInfoStudent zyInfoStudent1 = new ZyInfoStudent(); zyInfoStudent1.setMainId(zyInfo.getId()); zyInfoStudent1.setCreateBy(user.getUsername()); @@ -708,7 +708,7 @@ public class ZyInfoStudentController extends JeecgController