Merge branch 'dev_v2.2.2' of http://git.qmth.com.cn/wangliang/distributed-print-service into dev_v2.2.2

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/TFFlowLogResult.java

@@ -54,19 +54,15 @@ public class TFFlowLogResult extends ApproveUserResult implements Serializable {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long schoolId;
 
-    @ApiModelProperty(value = "审核步骤中文")
-    private String approveSetupStr;
+    @ApiModelProperty(value = "试卷附件")
+    private String paperAttachmentId;
 
-    public String getApproveSetupStr() {
-        if (Objects.nonNull(approveSetup)) {
-            return FlowApproveSetupEnum.convertToRemark(approveSetup);
-        } else {
-            return approveSetupStr;
-        }
+    public String getPaperAttachmentId() {
+        return paperAttachmentId;
     }
 
-    public void setApproveSetupStr(String approveSetupStr) {
-        this.approveSetupStr = approveSetupStr;
+    public void setPaperAttachmentId(String paperAttachmentId) {
+        this.paperAttachmentId = paperAttachmentId;
     }
 
     public Long getFlowId() {

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/TFFlowLog.java

@@ -61,6 +61,9 @@ public class TFFlowLog extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "待审核人id")
     private String pendApproveId;
 
+    @ApiModelProperty(value = "试卷附件")
+    private String paperAttachmentId;
+
     public TFFlowLog() {
 
     }
@@ -87,6 +90,14 @@ public class TFFlowLog extends BaseEntity implements Serializable {
         insertInfo(userId);
     }
 
+    public String getPaperAttachmentId() {
+        return paperAttachmentId;
+    }
+
+    public void setPaperAttachmentId(String paperAttachmentId) {
+        this.paperAttachmentId = paperAttachmentId;
+    }
+
     public String getPendApproveId() {
         return pendApproveId;
     }

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

@@ -989,7 +989,7 @@ public class ActivitiServiceImpl implements ActivitiService {
         if (Objects.nonNull(tfFlowLogResultList) && tfFlowLogResultList.size() > 0) {
             flowTaskSubmitPeopleAllResultList = new LinkedList<>();
             for (TFFlowLogResult t : tfFlowLogResultList) {
-                ApproveUserResult submitUser = new ApproveUserResult(t.getOrgName(), t.getOrgType(), t.getLoginName(), t.getRealName(), t.getSchoolId(), t.getCode(), t.getMobileNumber(), t.getCreateTime());
+                ApproveUserResult submitUser = new ApproveUserResult(t.getOrgName(), t.getOrgType(), t.getLoginName(), t.getRealName(), t.getSchoolId(), t.getCode(), t.getMobileNumber(), t.getCreateTime(), t.getPaperAttachmentId());
                 FlowTaskSubmitPeopleAllResult flowTaskSubmitPeopleAllResult = new FlowTaskSubmitPeopleAllResult(t.getFlowId(), submitUser);
 
                 if (Objects.nonNull(t.getPendApproveId())) {
@@ -1105,6 +1105,7 @@ public class ActivitiServiceImpl implements ActivitiService {
         flowSubmitVaild(task, sysUser.getId());
         tfFlowLog.setApproveSetup(FlowApproveSetupEnum.SUBMIT.getSetup());
         tfFlowLog.setApproveOperation(FlowApproveOperationEnum.SUBMIT);
+        tfFlowLog.setPaperAttachmentId((String) map.get(SystemConstant.PAPAER_ATTACHMENT_IDS));
         tfFlowApprove.setStatus(FlowStatusEnum.AUDITING);
         tfFlowApprove.setSetup(FlowApproveSetupEnum.PRIMARY_APPROVE.getSetup());
         map.computeIfAbsent(SystemConstant.APPROVE_DIRECTOR_USER_IDS, v -> map.get(SystemConstant.APPROVE_USER_IDS));
@@ -1323,6 +1324,7 @@ public class ActivitiServiceImpl implements ActivitiService {
         tfFlowLog.setApproveSetup(FlowApproveSetupEnum.THREE_APPROVE.getSetup());
         tfFlowLog.setApproveOperation(FlowApproveOperationEnum.APPROVE);
         tfFlowLog.setApproveId(userId);
+        tfFlowLog.setPaperAttachmentId((String) map.get(SystemConstant.PAPAER_ATTACHMENT_IDS));
         tfFlowApprove.setStatus(FlowStatusEnum.AUDITING);
         tfFlowApprove.setSetup(FlowApproveSetupEnum.FOUR_APPROVE.getSetup());
         tfFlowApproveLog.setThreeApproveId(userId);

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

@@ -46,9 +46,6 @@ public class TSyncExamStudentScoreServiceImpl extends ServiceImpl<TSyncExamStude
     @Resource
     FileStoreUtil fileStoreUtil;
 
-    @Resource
-    TeachcloudCommonService teachcloudCommonService;
-
     /**
      * 同步成绩查询列表
      *

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

@@ -228,7 +228,7 @@
         select
         t.*
         from
-        (SELECT
+        (SELECT distinct
         a.id,
         a.school_id schoolId,
         a.course_code courseCode,
@@ -349,6 +349,8 @@
         e.name teachingRoomName
         FROM
         exam_task a
+        left join t_exam_task_flow tetf on
+            a.id = tetf.exam_task_id
         LEFT JOIN
         basic_card_rule b ON a.card_rule_id = b.id
         LEFT JOIN
@@ -364,7 +366,7 @@
         <where>
             a.enable = true and a.review = true
             and (f.status = 'AUDITING' or f.status = 'REJECT' or f.status = 'FINISH')
-            and EXISTS (
+            and tetf.flow_id in (
             select
             aht.PROC_INST_ID_
             from
@@ -403,8 +405,7 @@
                 tffal.task_id = tetf.exam_task_id
             where (tffal.primary_approve_id = #{currentUserId} or tffal.second_approve_id = #{currentUserId}
             OR tffal.three_approve_id = #{currentUserId}
-            OR tffal.four_approve_id = #{currentUserId})
-            AND t.PROC_INST_ID_ = tetf.flow_id)
+            OR tffal.four_approve_id = #{currentUserId}))
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
             </if>

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

@@ -20,6 +20,7 @@
             tffl.flow_id as flowId,
             tffl.task_id as examTaskId,
             tffl.id,
+            tffl.paper_attachment_id as paperAttachmentId,
             su.school_id as schoolId,
             su.login_name as loginName,
             su.real_name as realName,

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/params/ApproveUserResult.java

@@ -1,11 +1,13 @@
 package com.qmth.teachcloud.common.bean.params;
 
+import com.alibaba.fastjson.JSONArray;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.OrgTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description: 审批人 result
@@ -23,11 +25,14 @@ public class ApproveUserResult extends SysUser implements Serializable {
     @ApiModelProperty(value = "机构类型")
     private OrgTypeEnum orgType;
 
+    @ApiModelProperty(value = "试卷urls")
+    private String paperUrls;
+
     public ApproveUserResult() {
 
     }
 
-    public ApproveUserResult(String orgName, OrgTypeEnum orgType, String loginName, String realName, Long schoolId, String code, String mobileNumber, Long createTime) {
+    public ApproveUserResult(String orgName, OrgTypeEnum orgType, String loginName, String realName, Long schoolId, String code, String mobileNumber, Long createTime,String paperUrls) {
         this.orgName = orgName;
         this.orgType = orgType;
         setLoginName(loginName);
@@ -36,6 +41,15 @@ public class ApproveUserResult extends SysUser implements Serializable {
         setCode(code);
         setMobileNumber(mobileNumber);
         setCreateTime(createTime);
+        this.paperUrls = paperUrls;
+    }
+
+    public String getPaperUrls() {
+        return paperUrls;
+    }
+
+    public void setPaperUrls(String paperUrls) {
+        this.paperUrls = paperUrls;
     }
 
     public String getOrgName() {

teachcloud-common/src/main/java/com/qmth/teachcloud/common/enums/PageSizeEnum.java

@@ -109,6 +109,6 @@ public enum PageSizeEnum {
                 return e;
             }
         }
-        return null;
+        throw ExceptionResultEnum.ERROR.exception("pdf格式不符合标准规范，请提供标准的pdf（可使用wps、office的word转换）");
     }
 }