Merge remote-tracking branch 'origin/dev_v2.2.0' into dev_v2.2.0

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

@@ -19,6 +19,7 @@ public class ExamTaskDetailCardDto {
     private Integer drawCount;
     private String status;
     private String flowId;
+    private Integer setup;
     // 审核流程taskId
     private String flowTaskId;
 
@@ -134,6 +135,14 @@ public class ExamTaskDetailCardDto {
         this.flowId = flowId;
     }
 
+    public Integer getSetup() {
+        return setup;
+    }
+
+    public void setSetup(Integer setup) {
+        this.setup = setup;
+    }
+
     public String getFlowTaskId() {
         return flowTaskId;
     }

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

@@ -326,7 +326,7 @@ public class ExamTaskPrintServiceImpl extends ServiceImpl<ExamTaskPrintMapper, E
             examStudent.setStudentCode(basicStudent.getStudentCode());
             // 准考证号（年月+000001）
             examStudent.setTicketNumber(createTempNumber(ticketNumberParams));
-            examStudent.setExtendFields(JSON.toJSONString(examTaskPrint.getExtendFields()));
+            examStudent.setExtendFields(examTaskPrint.getExtendFields());
             examStudent.setSiteNumber(String.valueOf(atomicInteger.getAndIncrement()));
             examStudent.setCreateId(examTaskPrint.getCreateId());
             examStudents.add(examStudent);

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CreatePdfUtil.java

@@ -722,7 +722,7 @@ public class CreatePdfUtil {
         }
         String studentHtml = studentContent;
         if (Objects.nonNull(t.getExtendFields())) {
-            JSONArray jsonObjectExtend = JSONArray.parseArray(JSONObject.toJSONString(t.getExtendFields()));//扩展字段
+            JSONArray jsonObjectExtend = (JSONArray) JSONArray.parse(t.getExtendFields());//扩展字段
             if (Objects.nonNull(jsonObjectExtend)) {
                 for (int i = 0; i < jsonObjectExtend.size(); i++) {
                     JSONObject object = (JSONObject) jsonObjectExtend.get(i);

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

@@ -44,7 +44,21 @@
             d.real_name createName,
             a.start_time startTime,
             a.end_time endTime,
-            a.status,
+            CASE
+                WHEN a.user_id IS NULL THEN 'NEW'
+                WHEN a.status = 'DRAFT' THEN 'READY'
+                WHEN
+                    a.status = 'SUBMIT'
+                        AND e.status != 'FINISH'
+                        AND e.status != 'END'
+                THEN
+                    'SUBMIT'
+                WHEN
+                    a.status = 'SUBMIT'
+                        AND e.status = 'FINISH'
+                THEN
+                'FINISH'
+            END status,
             a.enable,
             a.create_id createId,
             a.create_time createTime
@@ -56,6 +70,8 @@
             sys_user c ON a.user_id = c.id
         LEFT JOIN
             sys_user d ON a.create_id = d.id
+        LEFT JOIN
+            t_f_flow_approve e ON a.flow_id = e.flow_id
         <where>
             <if test="schoolId != null and schoolId != ''">
                 and a.school_id = #{schoolId}
@@ -462,7 +478,8 @@
             ifnull(d.make_method, a.make_method) makeMethod,
             a.draw_count drawCount,
             ifnull(d.status, b.status) status,
-            e.flow_id flowId
+            e.flow_id flowId,
+            f.setup
         FROM
             exam_task_detail a
                 LEFT JOIN
@@ -473,6 +490,8 @@
             exam_card b ON a.card_id = b.id
                 left join
             exam_card d on c.card_id = d.id
+                left join
+            t_f_flow_approve f on e.flow_id = f.flow_id
         where a.exam_task_id = #{examTaskId}
     </select>