修改bug
This commit is contained in:
parent
ddb6b32165
commit
0f7e6fdabc
|
@ -41,16 +41,16 @@ public class SyncZyCcjg extends BaseSync {
|
|||
* @param param
|
||||
*/
|
||||
public void run(Map<String, Object> 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();
|
||||
|
|
|
@ -707,6 +707,7 @@ public class WjxWjxxController extends JeecgController<WjxWjxx, IWjxWjxxService>
|
|||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
||||
HttpServletRequest req) {
|
||||
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
wjxWjxx.setTeacherNo(user.getUsername());
|
||||
Page<WjxWjxx> pageList = wjxWjxxService.listOther(wjxWjxx, new Page<>(pageNo, pageSize));
|
||||
return Result.OK(pageList);
|
||||
}
|
||||
|
|
|
@ -686,19 +686,19 @@ public class ZyInfoStudentController extends JeecgController<ZyInfoStudent, IZyI
|
|||
ZyInfo zyInfo = zyInfoService.getById(zyInfoStudent.getMainId());
|
||||
if(stuPar==null) {
|
||||
|
||||
//20241107新增判断,看原来是否有数据,防止重复添加
|
||||
LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
|
||||
QueryWrapper<ZyInfoStudent> 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<ZyInfoStudent> 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<ZyInfoStudent, IZyI
|
|||
zyInfoStudentService.save(zyInfoStudent1);
|
||||
stuPar =zyInfoStudent1;
|
||||
zyInfoStudent =zyInfoStudent1;
|
||||
}
|
||||
// }
|
||||
|
||||
}else{
|
||||
stuPar.setFilePath(zyInfoStudent.getFilePath());
|
||||
|
|
Loading…
Reference in New Issue