@ -9,6 +9,7 @@ import com.hxhq.business.domain.MjyJcgj;
import com.hxhq.business.domain.StudyJcgj ;
import com.hxhq.business.domain.StudyJcgj ;
import com.hxhq.business.dto.home.HomeCountDto ;
import com.hxhq.business.dto.home.HomeCountDto ;
import com.hxhq.business.dto.study.StudyListDto ;
import com.hxhq.business.dto.study.StudyListDto ;
import com.hxhq.business.enums.archive.ArchiveLogTypeEnum ;
import com.hxhq.business.enums.study.StudyBorrowStatusEnum ;
import com.hxhq.business.enums.study.StudyBorrowStatusEnum ;
import com.hxhq.business.enums.study.StudyStatusEnum ;
import com.hxhq.business.enums.study.StudyStatusEnum ;
import com.hxhq.business.enums.study.StudyTypeEnum ;
import com.hxhq.business.enums.study.StudyTypeEnum ;
@ -17,6 +18,8 @@ import com.hxhq.business.enums.zykgl.JcmcysEnum;
import com.hxhq.business.form.common.SignForm ;
import com.hxhq.business.form.common.SignForm ;
import com.hxhq.business.form.study.StudySaveForm ;
import com.hxhq.business.form.study.StudySaveForm ;
import com.hxhq.business.form.study.StudySearchForm ;
import com.hxhq.business.form.study.StudySearchForm ;
import com.hxhq.business.service.IArchiveLogService ;
import com.hxhq.business.service.INoticeService ;
import com.hxhq.business.service.IStudyJcgjService ;
import com.hxhq.business.service.IStudyJcgjService ;
import com.hxhq.business.utils.JctUtil ;
import com.hxhq.business.utils.JctUtil ;
import com.hxhq.business.utils.ObjectCompareUtil ;
import com.hxhq.business.utils.ObjectCompareUtil ;
@ -49,6 +52,10 @@ public class StudyServiceImpl extends ServiceImpl implements
private IStudyJcgjService studyJcgjService ;
private IStudyJcgjService studyJcgjService ;
@Autowired
@Autowired
private ISysUserService sysUserService ;
private ISysUserService sysUserService ;
@Autowired
private INoticeService noticeService ;
@Autowired
private IArchiveLogService archiveLogService ;
private QueryWrapper < StudyListDto > getListBaseQuery ( StudySearchForm form ) {
private QueryWrapper < StudyListDto > getListBaseQuery ( StudySearchForm form ) {
QueryWrapper < StudyListDto > queryWrapper = new QueryWrapper ( ) ;
QueryWrapper < StudyListDto > queryWrapper = new QueryWrapper ( ) ;
@ -381,6 +388,8 @@ public class StudyServiceImpl extends ServiceImpl implements
sign . setQmyy ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "申请归档" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "申请归档" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "申请归档" : "" ) ;
sign . setQmyy ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "申请归档" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "申请归档" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "申请归档" : "" ) ;
sign . setQmyyEn ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "Apply for Archiving" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "Apply for Archiving" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "Apply for Archiving" : "" ) ;
sign . setQmyyEn ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "Apply for Archiving" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "Apply for Archiving" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "Apply for Archiving" : "" ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , JcmcysEnum . blue , null , null , sign ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , JcmcysEnum . blue , null , null , sign ) ;
archiveLogService . saveInfo ( ArchiveLogTypeEnum . sy , StudyTypeEnum . getEnumByValue ( info . getType ( ) ) , info . getId ( ) , info . getName ( ) , info . getSn ( ) , info . getLeaderName ( ) , "申请归档" ) ;
}
}
@Override
@Override
@ -403,6 +412,8 @@ public class StudyServiceImpl extends ServiceImpl implements
sign . setQmyy ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "申请解档" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "申请解档" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "申请解档" : "" ) ;
sign . setQmyy ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "申请解档" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "申请解档" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "申请解档" : "" ) ;
sign . setQmyyEn ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "Apply for De-archiving" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "Apply for De-archiving" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "Apply for De-archiving" : "" ) ;
sign . setQmyyEn ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "Apply for De-archiving" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "Apply for De-archiving" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "Apply for De-archiving" : "" ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , JcmcysEnum . blue , null , null , sign ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , JcmcysEnum . blue , null , null , sign ) ;
archiveLogService . saveInfo ( ArchiveLogTypeEnum . sy , StudyTypeEnum . getEnumByValue ( info . getType ( ) ) , info . getId ( ) , info . getName ( ) , info . getSn ( ) , info . getLeaderName ( ) , "申请解档" ) ;
}
}
@Override
@Override
@ -427,6 +438,8 @@ public class StudyServiceImpl extends ServiceImpl implements
sign . setQmyy ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "申请借阅" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "申请借阅" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "申请借阅" : "" ) ;
sign . setQmyy ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "申请借阅" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "申请借阅" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "申请借阅" : "" ) ;
sign . setQmyyEn ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "Apply for Check-out" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "Apply for Check-out" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "Apply for Check-out" : "" ) ;
sign . setQmyyEn ( info . getType ( ) . equals ( StudyTypeEnum . sy . getValue ( ) ) ? "Apply for Check-out" : info . getType ( ) . equals ( StudyTypeEnum . fsy . getValue ( ) ) ? "Apply for Check-out" : info . getType ( ) . equals ( StudyTypeEnum . mjy . getValue ( ) ) ? "Apply for Check-out" : "" ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , JcmcysEnum . blue , null , null , sign ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , JcmcysEnum . blue , null , null , sign ) ;
archiveLogService . saveInfo ( ArchiveLogTypeEnum . sy , StudyTypeEnum . getEnumByValue ( info . getType ( ) ) , info . getId ( ) , info . getName ( ) , info . getSn ( ) , info . getLeaderName ( ) , "申请借阅" ) ;
}
}
@Override
@Override
@ -514,6 +527,8 @@ public class StudyServiceImpl extends ServiceImpl implements
sign . setQmyy ( study . getStatus ( ) . equals ( StudyStatusEnum . ysd . getValue ( ) ) ? "拒绝归档" : "同意归档" ) ;
sign . setQmyy ( study . getStatus ( ) . equals ( StudyStatusEnum . ysd . getValue ( ) ) ? "拒绝归档" : "同意归档" ) ;
sign . setQmyyEn ( study . getStatus ( ) . equals ( StudyStatusEnum . ysd . getValue ( ) ) ? "Reject Archiving" : "Approve Archiving" ) ;
sign . setQmyyEn ( study . getStatus ( ) . equals ( StudyStatusEnum . ysd . getValue ( ) ) ? "Reject Archiving" : "Approve Archiving" ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , study . getStatus ( ) . equals ( StudyStatusEnum . ysd . getValue ( ) ) ? JcmcysEnum . red : JcmcysEnum . blue , null , null , sign ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , study . getStatus ( ) . equals ( StudyStatusEnum . ysd . getValue ( ) ) ? JcmcysEnum . red : JcmcysEnum . blue , null , null , sign ) ;
archiveLogService . saveInfo ( ArchiveLogTypeEnum . sy , StudyTypeEnum . getEnumByValue ( info . getType ( ) ) , info . getId ( ) , info . getName ( ) , info . getSn ( ) , info . getLeaderName ( ) , study . getStatus ( ) . equals ( StudyStatusEnum . ysd . getValue ( ) ) ? "拒绝归档" : "同意归档" ) ;
}
}
@Override
@Override
@ -534,6 +549,8 @@ public class StudyServiceImpl extends ServiceImpl implements
sign . setQmyy ( study . getStatus ( ) . equals ( StudyStatusEnum . gd . getValue ( ) ) ? "拒绝解档" : "同意解档" ) ;
sign . setQmyy ( study . getStatus ( ) . equals ( StudyStatusEnum . gd . getValue ( ) ) ? "拒绝解档" : "同意解档" ) ;
sign . setQmyyEn ( study . getStatus ( ) . equals ( StudyStatusEnum . gd . getValue ( ) ) ? "Reject De-archiving" : "Approve De-archiving" ) ;
sign . setQmyyEn ( study . getStatus ( ) . equals ( StudyStatusEnum . gd . getValue ( ) ) ? "Reject De-archiving" : "Approve De-archiving" ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , study . getStatus ( ) . equals ( StudyStatusEnum . gd . getValue ( ) ) ? JcmcysEnum . red : JcmcysEnum . blue , null , null , sign ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , study . getStatus ( ) . equals ( StudyStatusEnum . gd . getValue ( ) ) ? JcmcysEnum . red : JcmcysEnum . blue , null , null , sign ) ;
archiveLogService . saveInfo ( ArchiveLogTypeEnum . sy , StudyTypeEnum . getEnumByValue ( info . getType ( ) ) , info . getId ( ) , info . getName ( ) , info . getSn ( ) , info . getLeaderName ( ) , study . getStatus ( ) . equals ( StudyStatusEnum . gd . getValue ( ) ) ? "拒绝解档" : "同意解档" ) ;
}
}
@Override
@Override
@ -555,6 +572,8 @@ public class StudyServiceImpl extends ServiceImpl implements
sign . setQmyy ( study . getBorrowStatus ( ) . equals ( StudyBorrowStatusEnum . wjy . getValue ( ) ) ? "拒绝借阅" : "同意借阅" ) ;
sign . setQmyy ( study . getBorrowStatus ( ) . equals ( StudyBorrowStatusEnum . wjy . getValue ( ) ) ? "拒绝借阅" : "同意借阅" ) ;
sign . setQmyyEn ( study . getBorrowStatus ( ) . equals ( StudyBorrowStatusEnum . wjy . getValue ( ) ) ? "Reject Check-out" : "Approve Check-out" ) ;
sign . setQmyyEn ( study . getBorrowStatus ( ) . equals ( StudyBorrowStatusEnum . wjy . getValue ( ) ) ? "Reject Check-out" : "Approve Check-out" ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , study . getBorrowStatus ( ) . equals ( StudyBorrowStatusEnum . wjy . getValue ( ) ) ? JcmcysEnum . red : JcmcysEnum . blue , null , null , sign ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , study . getBorrowStatus ( ) . equals ( StudyBorrowStatusEnum . wjy . getValue ( ) ) ? JcmcysEnum . red : JcmcysEnum . blue , null , null , sign ) ;
archiveLogService . saveInfo ( ArchiveLogTypeEnum . sy , StudyTypeEnum . getEnumByValue ( info . getType ( ) ) , info . getId ( ) , info . getName ( ) , info . getSn ( ) , info . getLeaderName ( ) , study . getBorrowStatus ( ) . equals ( StudyBorrowStatusEnum . wjy . getValue ( ) ) ? "拒绝借阅" : "同意借阅" ) ;
}
}
@Override
@Override
@ -575,6 +594,8 @@ public class StudyServiceImpl extends ServiceImpl implements
sign . setQmyy ( "确认归还" ) ;
sign . setQmyy ( "确认归还" ) ;
sign . setQmyyEn ( "Confirm Check-in" ) ;
sign . setQmyyEn ( "Confirm Check-in" ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , JcmcysEnum . blue , null , null , sign ) ;
studyJcgjService . saveInfo ( study . getId ( ) , JcgjlxEnum . lc , JcmcysEnum . blue , null , null , sign ) ;
archiveLogService . saveInfo ( ArchiveLogTypeEnum . sy , StudyTypeEnum . getEnumByValue ( info . getType ( ) ) , info . getId ( ) , info . getName ( ) , info . getSn ( ) , info . getLeaderName ( ) , "确认归还" ) ;
}
}
/ / endregion
/ / endregion