bug修改

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

@@ -6,8 +6,8 @@ package com.qmth.distributed.print.business.bean.dto;
 public class ExamTaskDetailDto {
 
     private String id;
-    private String examPrintId;
-    private String examPrintName;
+    private String printPlanId;
+    private String printPlanName;
     private String paperNumber;
     private String courseCode;
     private String courseName;
@@ -34,20 +34,20 @@ public class ExamTaskDetailDto {
         this.id = id;
     }
 
-    public String getExamPrintId() {
-        return examPrintId;
+    public String getPrintPlanId() {
+        return printPlanId;
     }
 
-    public void setExamPrintId(String examPrintId) {
-        this.examPrintId = examPrintId;
+    public void setPrintPlanId(String printPlanId) {
+        this.printPlanId = printPlanId;
     }
 
-    public String getExamPrintName() {
-        return examPrintName;
+    public String getPrintPlanName() {
+        return printPlanName;
     }
 
-    public void setExamPrintName(String examPrintName) {
-        this.examPrintName = examPrintName;
+    public void setPrintPlanName(String printPlanName) {
+        this.printPlanName = printPlanName;
     }
 
     public String getPaperNumber() {

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

@@ -5,58 +5,58 @@ package com.qmth.distributed.print.business.bean.dto;
  */
 public class PrintTaskTotalDto {
 
-    private String totalSubjects;
-    private String packageCount;
-    private String pagesA3;
-    private String pagesA4;
-    private String pagesA3Left;
-    private String pagesA4Left;
-
-    public String getTotalSubjects() {
+    private Integer totalSubjects;
+    private Integer packageCount;
+    private Integer pagesA3;
+    private Integer pagesA4;
+    private Integer pagesA3Left;
+    private Integer pagesA4Left;
+
+    public Integer getTotalSubjects() {
         return totalSubjects;
     }
 
-    public void setTotalSubjects(String totalSubjects) {
+    public void setTotalSubjects(Integer totalSubjects) {
         this.totalSubjects = totalSubjects;
     }
 
-    public String getPackageCount() {
+    public Integer getPackageCount() {
         return packageCount;
     }
 
-    public void setPackageCount(String packageCount) {
+    public void setPackageCount(Integer packageCount) {
         this.packageCount = packageCount;
     }
 
-    public String getPagesA3() {
+    public Integer getPagesA3() {
         return pagesA3;
     }
 
-    public void setPagesA3(String pagesA3) {
+    public void setPagesA3(Integer pagesA3) {
         this.pagesA3 = pagesA3;
     }
 
-    public String getPagesA4() {
+    public Integer getPagesA4() {
         return pagesA4;
     }
 
-    public void setPagesA4(String pagesA4) {
+    public void setPagesA4(Integer pagesA4) {
         this.pagesA4 = pagesA4;
     }
 
-    public String getPagesA3Left() {
+    public Integer getPagesA3Left() {
         return pagesA3Left;
     }
 
-    public void setPagesA3Left(String pagesA3Left) {
+    public void setPagesA3Left(Integer pagesA3Left) {
         this.pagesA3Left = pagesA3Left;
     }
 
-    public String getPagesA4Left() {
+    public Integer getPagesA4Left() {
         return pagesA4Left;
     }
 
-    public void setPagesA4Left(String pagesA4Left) {
+    public void setPagesA4Left(Integer pagesA4Left) {
         this.pagesA4Left = pagesA4Left;
     }
 }

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

@@ -8,6 +8,7 @@ import com.qmth.distributed.print.business.entity.ExamTaskDetail;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Set;
 
 /**
  * <p>
@@ -18,7 +19,7 @@ import java.util.List;
  * @since 2021-03-23
  */
 public interface ExamTaskDetailMapper extends BaseMapper<ExamTaskDetail> {
-    IPage<ExamTaskDetailDto> listPage(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("relateType") String relateType, @Param("printPlanId") Long printPlanId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber);
+    IPage<ExamTaskDetailDto> listPage(Page<ExamTaskDetailDto> page, @Param("schoolId") Long schoolId, @Param("relateType") String relateType, @Param("printPlanId") Long printPlanId, @Param("courseCode") String courseCode, @Param("paperNumber") String paperNumber, @Param("orgIds") Set<Long> orgIds);
 
     List<ExamTaskDetail> listByTemplateId(Long templateId);
 }

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

@@ -52,6 +52,11 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
                                     @Param("schoolId") Long schoolId,
                                     @Param("status") String...status);
 
+    IPage<WorkResult> queryUserByMyWork(IPage<Map> iPage,
+                                    @Param("userId") Long userId,
+                                    @Param("schoolId") Long schoolId,
+                                    @Param("status") String...status);
+
     /**
      * 查询我的工作台
      *
@@ -65,4 +70,5 @@ public interface ExamTaskMapper extends BaseMapper<ExamTask> {
                                           @Param("userId") Long userId,
                                           @Param("schoolId") Long schoolId,
                                           @Param("status") String...status);
+
 }

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

@@ -1,6 +1,7 @@
 package com.qmth.distributed.print.business.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.distributed.print.business.bean.dto.*;
 import com.qmth.distributed.print.business.bean.result.WorkResult;
@@ -74,6 +75,8 @@ public interface ExamTaskService extends IService<ExamTask> {
      */
     IPage<WorkResult> queryByMyWork(IPage<Map> iPage, Long userId, Long schoolId, String... status);
 
+    IPage<WorkResult> queryUserByMyWork(IPage<Map> iPage, Long userId, Long schoolId, String... status);
+
     /**
      * 查询我的工作台-审核待办
      *
@@ -88,4 +91,5 @@ public interface ExamTaskService extends IService<ExamTask> {
     void paperDownload(HttpServletResponse response, Long examTaskId);
 
     ExamTask getByCourseCodeAndPaperNumber(Long schoolId, String courseCode, String paperNumber);
+
 }

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

@@ -125,8 +125,10 @@ public class ExamDetailServiceImpl extends ServiceImpl<ExamDetailMapper, ExamDet
             int printCardCount = totalLeftDto == null ? 0 : totalLeftDto.getPrintCardCount();
             int cardPages = cardPagesA3 % 2 == 0 ? cardPagesA3 / 2 : cardPagesA3 / 2 + 1;
             int totalCardPages = cardPages * printCardCount;
-            printTaskTotalDto.setPagesA3Left(String.valueOf(totalPaperPages + totalCardPages));
+            printTaskTotalDto.setPagesA3Left(totalPaperPages + totalCardPages);
 
+            // todo A4剩余
+            printTaskTotalDto.setPagesA4Left(0);
         }
         return printTaskTotalDto;
     }

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

@@ -11,6 +11,7 @@ import com.qmth.distributed.print.business.bean.params.RelatePaperParam;
 import com.qmth.distributed.print.business.entity.ExamTask;
 import com.qmth.distributed.print.business.entity.ExamTaskDetail;
 import com.qmth.distributed.print.business.mapper.ExamTaskDetailMapper;
+import com.qmth.distributed.print.business.service.CommonService;
 import com.qmth.distributed.print.business.service.ExamTaskDetailService;
 import com.qmth.distributed.print.business.service.ExamTaskService;
 import com.qmth.distributed.print.business.util.ServletUtil;
@@ -20,6 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 /**
  * <p>
@@ -35,6 +37,9 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     @Autowired
     private ExamTaskService examTaskService;
 
+    @Autowired
+    private CommonService commonService;
+
     @Override
     public boolean enable(ExamTaskDetail examTaskDetail) {
         UpdateWrapper<ExamTaskDetail> updateWrapper = new UpdateWrapper<>();
@@ -60,8 +65,9 @@ public class ExamTaskDetailServiceImpl extends ServiceImpl<ExamTaskDetailMapper,
     @Override
     public IPage<ExamTaskDetailDto> list(String relateType, Long printPlanId, String courseCode, String paperNumber, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        Set<Long> orgIds = commonService.listSubOrgIds();
         Page<ExamTaskDetailDto> page = new Page<>(pageNumber, pageSize);
-        IPage<ExamTaskDetailDto> examDetailDtoIPage = this.baseMapper.listPage(page, schoolId, relateType, printPlanId, courseCode, paperNumber);
+        IPage<ExamTaskDetailDto> examDetailDtoIPage = this.baseMapper.listPage(page, schoolId, relateType, printPlanId, courseCode, paperNumber, orgIds);
         return examDetailDtoIPage;
     }
 

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

@@ -558,6 +558,11 @@ public class ExamTaskServiceImpl extends ServiceImpl<ExamTaskMapper, ExamTask> i
         return examTaskMapper.queryByMyWork(iPage, userId, schoolId, status);
     }
 
+    @Override
+    public IPage<WorkResult> queryUserByMyWork(IPage<Map> iPage, Long userId, Long schoolId, String... status) {
+        return examTaskMapper.queryUserByMyWork(iPage, userId, schoolId, status);
+    }
+
     /**
      * 查询我的工作台-审核待办
      *

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

@@ -29,8 +29,11 @@
             c.course_code courseCode,
             c.course_name courseName,
             c.paper_number paperNumber,
-            e.id cardRuleId,
-            e.name cardRuleName,
+            c.card_rule_id cardRuleId,
+            CASE c.card_rule_id
+                WHEN - 1 THEN '全部通卡'
+                ELSE e.name
+            END cardRuleName,
             c.user_id userId,
             f.real_name userName,
             d.exposed_paper_type exposedPaperType,
@@ -39,17 +42,20 @@
             b.total_subjects totalSubjects
         FROM
             exam_detail a
-                LEFT JOIN
+        LEFT JOIN
             exam_detail_course b ON a.id = b.exam_detail_id
-                LEFT JOIN
+        LEFT JOIN
             exam_task c ON a.school_id = c.school_id
-                AND b.course_code = c.course_code
-                LEFT JOIN
+            AND b.course_code = c.course_code
+            AND b.paper_number = c.paper_number
+        LEFT JOIN
             exam_task_detail d ON c.id = d.exam_task_id
-                LEFT JOIN
+        LEFT JOIN
             basic_card_rule e ON c.card_rule_id = e.id
-                LEFT JOIN
+        LEFT JOIN
             sys_user f ON c.user_id = f.id
+        LEFT JOIN
+            sys_user g ON c.create_id = g.id
         <where>
             <if test="schoolId != null and schoolId != ''">
                and a.school_id = #{schoolId}
@@ -71,6 +77,12 @@
             <if test="paperNumber != null and paperNumber != ''">
                 and c.paper_number = #{paperNumber}
             </if>
+            <if test="orgIds != null">
+                AND g.org_id IN
+                <foreach collection="orgIds" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
     </select>
     <select id="listByTemplateId" resultMap="BaseResultMap">

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

@@ -404,6 +404,14 @@
         </where>
     </select>
 
+    <select id="queryUserByMyWork" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
+        <include refid="myworkCommonHead" />
+        <include refid="myworkCommonMiddle" />
+        <where>
+            <include refid="myworkCommonFoot" />
+        </where>
+    </select>
+
     <select id="queryByMyWorkSubmit" resultType="com.qmth.distributed.print.business.bean.result.WorkResult">
         <include refid="myworkCommonHead" />
         <include refid="myworkCommonMiddle" />

distributed-print/src/main/java/com/qmth/distributed/print/api/WorkController.java

@@ -46,7 +46,7 @@ public class WorkController {
     public Result examTaskReady(@RequestParam(value = "pageNumber", required = true) Integer pageNumber,
                                 @RequestParam(value = "pageSize", required = true) Integer pageSize) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY.name(), ExamStatusEnum.STAGE.name()));
+        return ResultUtil.ok(examTaskService.queryUserByMyWork(new Page<>(pageNumber, pageSize), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY.name(), ExamStatusEnum.STAGE.name()));
     }
 
     @ApiOperation(value = "命题待办计数接口")
@@ -54,7 +54,7 @@ public class WorkController {
     @ApiResponses({@ApiResponse(code = 200, message = "返回信息", response = WorkResult.class)})
     public Result examTaskReadyCount() {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(examTaskService.queryByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY.name(),  ExamStatusEnum.STAGE.name()).getRecords().size());
+        return ResultUtil.ok(examTaskService.queryUserByMyWork(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), sysUser.getId(), sysUser.getSchoolId(), ExamStatusEnum.READY.name(),  ExamStatusEnum.STAGE.name()).getRecords().size());
     }
 
     @ApiOperation(value = "命题分配待办接口")