|
@@ -4115,7 +4115,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
int oldState = oneReport.getState();
|
|
int oldState = oneReport.getState();
|
|
int channel = oldState == -1?0:1; //0-导入审核, 项目报告审核
|
|
int channel = oldState == -1?0:1; //0-导入审核, 项目报告审核
|
|
List<Report> rList = reportMapper.selectList(new QueryWrapper<Report>().select("id, group_id, project_id, creator_id, create_date").in("id", ListUtil.convertIdsArrayToList(reportIds)));
|
|
List<Report> rList = reportMapper.selectList(new QueryWrapper<Report>().select("id, group_id, project_id, creator_id, create_date").in("id", ListUtil.convertIdsArrayToList(reportIds)));
|
|
- if (timeTypeMapper.selectById(company.getId()).getReportAuditType() == 2) {
|
|
|
|
|
|
+ TimeType timeType = timeTypeMapper.selectById(company.getId());
|
|
|
|
+ if (timeType.getReportAuditType() == 2 || timeType.getReportAuditType() == 9) {
|
|
//退回任务分组审核状态
|
|
//退回任务分组审核状态
|
|
List<Report> newList = new ArrayList<>();
|
|
List<Report> newList = new ArrayList<>();
|
|
for (Report r : rList) {
|
|
for (Report r : rList) {
|
|
@@ -6862,7 +6863,8 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
|
|
.setRejectReason(reason).setRejectUserid(user.getId()).setRejectUsername(user.getName()),
|
|
.setRejectReason(reason).setRejectUserid(user.getId()).setRejectUsername(user.getName()),
|
|
eq);
|
|
eq);
|
|
|
|
|
|
- if (timeTypeMapper.selectById(company.getId()).getReportAuditType() == 2) {
|
|
|
|
|
|
+ TimeType timeType = timeTypeMapper.selectById(company.getId());
|
|
|
|
+ if (timeType.getReportAuditType() == 2 || timeType.getReportAuditType() == 9) {
|
|
List<Report> rList = list;
|
|
List<Report> rList = list;
|
|
//退回任务分组审核状态
|
|
//退回任务分组审核状态
|
|
List<Report> newList = new ArrayList<>();
|
|
List<Report> newList = new ArrayList<>();
|