bug

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/dto/ExamTaskDto.java

@@ -25,6 +25,7 @@ public class ExamTaskDto {
     private Long startTime;
     private Long endTime;
     private String status;
+    private Boolean review;
     private Boolean enable;
     private String createId;
     private String createName;
@@ -128,6 +129,14 @@ public class ExamTaskDto {
         this.specialty = specialty;
     }
 
+    public Boolean getReview() {
+        return review;
+    }
+
+    public void setReview(Boolean review) {
+        this.review = review;
+    }
+
     public String getCardRuleId() {
         return cardRuleId;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/mapper/ExamTaskMapper.java

@@ -10,7 +10,6 @@ import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.enums.MakeMethodEnum;
 import com.qmth.distributed.print.business.enums.PrintPlanStatusEnum;
 import com.qmth.teachcloud.common.bean.dto.BlurryUserDto;
-import com.qmth.teachcloud.common.enums.FlowStatusEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -29,7 +28,7 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
 
     IPage<ExamTaskDto> listPage(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("enable") Boolean enable, @Param("status") String status, @Param("cardRuleId") Long cardRuleId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("orgIds") Set<Long> orgIds, @Param("userName") String userName, @Param("createName") String createName);
 
-    List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("param") String param);
+    List<BlurryUserDto> listUser(@Param("schoolId") Long schoolId, @Param("param") String param, @Param("orgIds") Set<Long> orgIds);
 
     IPage<ExamTaskDto> listTaskApply(Page<ExamTaskDto> page, @Param("schoolId") Long schoolId, @Param("auditStatus") String auditStatus, @Param("cardRuleId") Long cardRuleId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("startTime") Long startTime, @Param("endTime") Long endTime, @Param("userId") Long userId, @Param("orgIds") Set<Long> orgIds, @Param("userName") String userName);
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/service/impl/ExamTaskServiceImpl.java

@@ -184,7 +184,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
             printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
             printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINT_FINISH);
-            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId,record.getCourseCode(),cellPaperNumber, printPlanStatusEnumList);
+            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, record.getCourseCode(), cellPaperNumber, printPlanStatusEnumList);
             record.setApproveFormStatus(examPackageDetailDatasource.size() > 0);
         }
         return examTaskDtoIPage;
@@ -235,7 +235,8 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
     @Override
     public List<BlurryUserDto> listUser(String param) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return this.baseMapper.listUser(schoolId, SystemConstant.translateSpecificSign(param));
+        Set<Long> orgIds = teachcloudCommonService.listSubOrgIds(null);
+        return this.baseMapper.listUser(schoolId, SystemConstant.translateSpecificSign(param), orgIds);
     }
 
     @Override
@@ -714,7 +715,12 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         for (ExamTaskDto record : examTaskDtoIPage.getRecords()) {
 //            List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId,record.getCourseCode(),paperNumber, printPlanStatusEnumList);
 //            record.setApproveFormStatus(examPackageDetailDatasource.size() > 0);
-            record.setApproveFormStatus(true);
+            if ((record.getReview() && FlowGdykdxApproveSetupEnum.FINISH.name().equals(record.getAuditStatus())
+                    || (!record.getReview()))) {
+                record.setApproveFormStatus(true);
+            } else {
+                record.setApproveFormStatus(false);
+            }
         }
         return examTaskDtoIPage;
     }
@@ -986,19 +992,19 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             throw ExceptionResultEnum.ERROR.exception("参数有误");
         }
         ExamTask task = this.getById(examTask.getId());
-        if(!task.getReview()){
+        if (!task.getReview()) {
             throw ExceptionResultEnum.ERROR.exception("命题任务不需要审核，不能撤回");
         }
-        if(Objects.isNull(task.getFlowId())){
+        if (Objects.isNull(task.getFlowId())) {
             throw ExceptionResultEnum.ERROR.exception("审核流程有误，不能撤回");
         }
 
         TFFlowApprove tfFlowApprove = tfFlowApproveService.findByFlowId(task.getFlowId());
-        if(Objects.isNull(tfFlowApprove)){
+        if (Objects.isNull(tfFlowApprove)) {
             throw ExceptionResultEnum.ERROR.exception("审核流程进度丢失，不能撤回");
         }
 
-        if(!tfFlowApprove.getSetup().equals(FlowGdykdxApproveSetupEnum.PRIMARY_APPROVE.getSetup())){
+        if (!tfFlowApprove.getSetup().equals(FlowGdykdxApproveSetupEnum.PRIMARY_APPROVE.getSetup())) {
             throw ExceptionResultEnum.ERROR.exception("当前审核节点不能撤回");
         }
 
@@ -1735,7 +1741,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
 //                .stream()
 //                .filter(e -> OrgTypeEnum.COLLEGE.equals(e.getType()))
 //                .collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(collegeList)){
+        if (CollectionUtils.isEmpty(collegeList)) {
             throw ExceptionResultEnum.ERROR.exception("找不到学院");
         }
         SysOrg college = collegeList.get(0);
@@ -1781,13 +1787,13 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         List<PrintPlanStatusEnum> printPlanStatusEnumList = new ArrayList<>();
         printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINTING);
         printPlanStatusEnumList.add(PrintPlanStatusEnum.PRINT_FINISH);
-        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId,examTask.getCourseCode(),paperNumber, printPlanStatusEnumList);
-        if (examPackageDetailDatasource.size() == 0){
+        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getCourseCode(), paperNumber, printPlanStatusEnumList);
+        if (examPackageDetailDatasource.size() == 0) {
             throw ExceptionResultEnum.ERROR.exception("任务处理中，请稍后查看！");
         }
         for (ExamPackageDetail packageDetail : examPackageDetailDatasource) {
             ExamDetailStatusEnum examDetailStatusEnum = packageDetail.getExamDetailStatus();
-            if(ExamDetailStatusEnum.NEW.equals(examDetailStatusEnum) || ExamDetailStatusEnum.READY.equals(examDetailStatusEnum)){
+            if (ExamDetailStatusEnum.NEW.equals(examDetailStatusEnum) || ExamDetailStatusEnum.READY.equals(examDetailStatusEnum)) {
                 throw ExceptionResultEnum.ERROR.exception("任务处理中，请稍后查看！");
             }
         }
@@ -1855,7 +1861,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
             throw ExceptionResultEnum.ERROR.exception("未找到命题任务");
         }
 
-        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId,examTask.getCourseCode(),paperNumber, null);
+        List<ExamPackageDetail> examPackageDetailDatasource = this.baseMapper.findExamPackageDetailByPaperNumber(schoolId, examTask.getCourseCode(), paperNumber, null);
         ExamObjectDto examObjectDto = this.buildExamObjectDtoByPackageDatasource(examPackageDetailDatasource);
 
 
@@ -1933,7 +1939,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                         .collect(Collectors.toList());
                 List<String> packageCodeList = examPackageDetailCell.stream().map(ExamPackageDetail::getPackageCode).distinct().collect(Collectors.toList());
                 String packageCode = "";
-                if (packageCodeList.size() > 0){
+                if (packageCodeList.size() > 0) {
                     packageCode = packageCodeList.get(0);
                 }
 
@@ -1965,14 +1971,14 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     Integer studentCellCount = examPackageDetail.getExamDetailCourseTotalSubjects();
                     studentCount = studentCount + studentCellCount;
                     String clazzIdCell = examPackageDetail.getClazzIds();
-                    if(StringUtils.isNotBlank(clazzIdCell)){
+                    if (StringUtils.isNotBlank(clazzIdCell)) {
                         for (String s : clazzIdCell.split(separator)) {
                             clazzIds.add(Long.valueOf(s));
                         }
                     }
                 }
 
-                if(!CollectionUtils.isEmpty(clazzIds)) {
+                if (!CollectionUtils.isEmpty(clazzIds)) {
                     classNames = basicClazzService.findClazzNamesByClazzIds(clazzIds, separator);
                     printCount = studentCount + " + " + backupCount;
                     printTotalCount = printTotalCount + studentCount + backupCount;
@@ -1981,7 +1987,7 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
                     ExamRoomInfo examRoomInfo = new ExamRoomInfo();
                     examRoomInfo.setPackageCode(packageCode);
                     examRoomInfo.setClazzNames(classNames);
-                    examRoomInfo.setCampusNames(basicCampusService.findCampusNamesByClazzIdList(clazzIds,","));
+                    examRoomInfo.setCampusNames(basicCampusService.findCampusNamesByClazzIdList(clazzIds, ","));
                     examRoomInfo.setStudentCount(studentCount);
                     examRoomInfo.setPrintCount(printCount);
                     examRoomInfoList.add(examRoomInfo);

distributed-print-business/src/main/resources/mapper/ExamTaskMapper.xml

@@ -147,6 +147,12 @@
             <if test="param != null and param != ''">
                 and b.real_name like concat('%', #{param}, '%')
             </if>
+            <if test="orgIds != null">
+                AND a.org_id IN
+                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="listTaskApply" resultType="com.qmth.distributed.print.business.bean.dto.ExamTaskDto">
@@ -172,6 +178,7 @@
             d.name teachingRoomName,
             e.status  auditStatus,
             a.enable,
+            a.review,
             a.create_id createId,
             a.create_time createTime,
             e.setup,