3.2.5 bug修复

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

@@ -0,0 +1,65 @@
+package com.qmth.distributed.print.business.entity;
+
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.qmth.teachcloud.common.annotation.EditKey;
+import com.qmth.teachcloud.common.base.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 考务数据（考场关联科目对应的卷型）
+ * </p>
+ *
+ * @author xf
+ * @since 2022-05-15
+ */
+@TableName("exam_detail_course_paper_type")
+public class ExamDetailCoursePaperType implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    @EditKey
+    private Long id;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("exam_detail_course_id")
+    private Long examDetailCourseId;
+
+    @ApiModelProperty(value = "当前试卷类型")
+    @TableField("paper_type")
+    private String paperType;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getExamDetailCourseId() {
+        return examDetailCourseId;
+    }
+
+    public void setExamDetailCourseId(Long examDetailCourseId) {
+        this.examDetailCourseId = examDetailCourseId;
+    }
+
+    public String getPaperType() {
+        return paperType;
+    }
+
+    public void setPaperType(String paperType) {
+        this.paperType = paperType;
+    }
+}

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

@@ -33,11 +33,11 @@ public class TCStatistics extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "开课学院名称")
     private String collegeName;
 
-    @ApiModelProperty(value = "开课部门id")
+    @ApiModelProperty(value = "开课学院id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long teachingRoomId;
 
-    @ApiModelProperty(value = "开课部门名称")
+    @ApiModelProperty(value = "开课学院名称")
     private String teachingRoomName;
 
     @ApiModelProperty(value = "课程名称")

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

@@ -33,11 +33,11 @@ public class TCStatisticsTemp extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "开课学院名称")
     private String collegeName;
 
-    @ApiModelProperty(value = "开课部门id")
+    @ApiModelProperty(value = "开课学院id")
     @JsonSerialize(using = ToStringSerializer.class)
     private Long teachingRoomId;
 
-    @ApiModelProperty(value = "开课部门名称")
+    @ApiModelProperty(value = "开课学院名称")
     private String teachingRoomName;
 
     @ApiModelProperty(value = "课程名称")

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

@@ -0,0 +1,29 @@
+package com.qmth.distributed.print.business.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.distributed.print.business.bean.dto.ExamDetailCourseDto;
+import com.qmth.distributed.print.business.bean.dto.SyncExamTaskDto;
+import com.qmth.distributed.print.business.entity.ExamDetailCourse;
+import com.qmth.distributed.print.business.entity.ExamDetailCoursePaperType;
+import com.qmth.distributed.print.business.enums.ExamTaskSyncStatusEnum;
+import com.qmth.distributed.print.business.enums.SyncCardTypeEnum;
+import com.qmth.teachcloud.common.entity.BasicCourse;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * <p>
+ * 考务数据（考场关联科目对应的卷型） Mapper 接口
+ * </p>
+ *
+ * @author xf
+ * @since 2023-05-15
+ */
+public interface ExamDetailCoursePaperTypeMapper extends BaseMapper<ExamDetailCoursePaperType> {
+
+}

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

@@ -0,0 +1,17 @@
+package com.qmth.distributed.print.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.distributed.print.business.entity.ExamDetailCoursePaperType;
+
+/**
+ * <p>
+ * 考务数据（考场关联科目对应卷型） 服务类
+ * </p>
+ *
+ * @author xf
+ * @since 2023-05-15
+ */
+public interface ExamDetailCoursePaperTypeService extends IService<ExamDetailCoursePaperType> {
+
+    void deleteByExamDetailCourseId(Long examDetailCourseId);
+}

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

@@ -68,6 +68,47 @@ public class BasicExamRuleServiceImpl extends ServiceImpl<BasicExamRuleMapper, B
                 }
             }
             basicExamRule.setRequiredFields(JSON.toJSONString(enumResultList));
+
+            List<EnumResult> extendFields = JSON.parseArray(basicExamRule.getExtendFields(), EnumResult.class);
+            if(!CollectionUtils.isEmpty(extendFields)){
+                requiredFields.addAll(extendFields);
+            }
+            // 签到表范围
+            JSONObject signJson = JSON.parseObject(basicExamRule.getSignScope());
+            List<JSONObject> signScopeBasicFields = JSON.parseArray(signJson.getString("basic"), JSONObject.class);
+            List<JSONObject> newSignScopeBasicFields = new ArrayList<>();
+            for (JSONObject enumResult : signScopeBasicFields) {
+                Optional<EnumResult> resultOptional = requiredFields.stream().filter(t -> enumResult.getString("code").equals(t.getCode())).findFirst();
+                if(resultOptional.isPresent() && resultOptional.get().getEnable()){
+                    newSignScopeBasicFields.add(enumResult);
+                }
+            }
+            signJson.put("basic", newSignScopeBasicFields);
+
+            List<JSONObject> signScopeTableFields = JSON.parseArray(signJson.getString("table"), JSONObject.class);
+            List<JSONObject> newSignScopeTableFields = new ArrayList<>();
+            for (JSONObject enumResult : signScopeTableFields) {
+                Optional<EnumResult> resultOptional = requiredFields.stream().filter(t -> enumResult.getString("code").equals(t.getCode())).findFirst();
+                if(resultOptional.isPresent() && resultOptional.get().getEnable()){
+                    newSignScopeTableFields.add(enumResult);
+                }
+            }
+            signJson.put("table", newSignScopeTableFields);
+            basicExamRule.setSignScope(JSON.toJSONString(signJson));
+
+            // 卷袋贴范围
+            JSONObject packageJson = JSON.parseObject(basicExamRule.getPackageScope());
+            List<JSONObject> packageScopeFields = JSON.parseArray(packageJson.getString("basic"), JSONObject.class);
+            List<JSONObject> newPackageScopeFields = new ArrayList<>();
+            for (JSONObject enumResult : packageScopeFields) {
+                Optional<EnumResult> resultOptional = requiredFields.stream().filter(t -> enumResult.getString("code").equals(t.getCode())).findFirst();
+                if(resultOptional.isPresent() && resultOptional.get().getEnable()){
+                    newPackageScopeFields.add(enumResult);
+                }
+            }
+            packageJson.put("basic", newPackageScopeFields);
+            basicExamRule.setPackageScope(JSON.toJSONString(packageJson));
+
         }
         return basicExamRule;
     }

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

@@ -0,0 +1,27 @@
+package com.qmth.distributed.print.business.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.distributed.print.business.entity.ExamDetailCoursePaperType;
+import com.qmth.distributed.print.business.mapper.ExamDetailCoursePaperTypeMapper;
+import com.qmth.distributed.print.business.service.ExamDetailCoursePaperTypeService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 考务数据（考场关联科目对应卷型） 服务实现类
+ * </p>
+ *
+ * @author xf
+ * @since 2023-05-15
+ */
+@Service
+public class ExamDetailCoursePaperTypeServiceImpl extends ServiceImpl<ExamDetailCoursePaperTypeMapper, ExamDetailCoursePaperType> implements ExamDetailCoursePaperTypeService {
+
+    @Override
+    public void deleteByExamDetailCourseId(Long examDetailCourseId) {
+        UpdateWrapper<ExamDetailCoursePaperType> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.lambda().eq(ExamDetailCoursePaperType::getExamDetailCourseId, examDetailCourseId);
+        this.remove(updateWrapper);
+    }
+}

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

@@ -82,9 +82,6 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Resource
     ExamDetailService detailService;
 
-    @Resource
-    ExamDetailCourseService detailCourseService;
-
     @Resource
     ExamPrintPlanService examPrintPlanService;
 
@@ -121,24 +118,15 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Resource
     CreatePdfUtil createPdfUtil;
 
-    @Resource
-    CreatePrintPdfUtil createPrintPdfUtil;
-
     @Resource
     RedisTemplate<String, Object> redisTemplate;
 
-    @Resource
-    BasicExamRuleService basicExamRuleService;
-
     @Resource
     TBTaskService tbTaskService;
 
     @Resource
     BasicCardRuleService basicCardRuleService;
 
-    @Resource
-    TeachcloudCommonService teachcloudCommonService;
-
     @Resource
     ConvertUtil convertUtil;
 
@@ -188,6 +176,9 @@ public class TaskLogicServiceImpl implements TaskLogicService {
     @Resource
     BasicPrintConfigService basicPrintConfigService;
 
+    @Resource
+    ExamDetailCoursePaperTypeService examDetailCoursePaperTypeService;
+
     /**
      * 创建pdf前置条件
      *
@@ -263,6 +254,8 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 List<PdfDto> backupPaperPdfList = new ArrayList<>();//备份试卷
                 List<PdfDto> backupCardPdfList = new ArrayList<>();//备份题卡
 
+                List<ExamDetailCoursePaperType> examDetailCoursePaperTypes = new ArrayList<>();
+
                 String printContent = examPrintPlan.getPrintContent();
                 if (StringUtils.isBlank(printContent)) {
                     return null;
@@ -366,6 +359,14 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                     examTaskDetail.setRelatePaperType(String.join(",", relatePaperTypes));
                     examDetailCourse.setPaperType(String.join(",", studentPaperTypes));
 
+                    studentPaperTypes.forEach(m->{
+                        ExamDetailCoursePaperType examDetailCoursePaperType = new ExamDetailCoursePaperType();
+                        examDetailCoursePaperType.setId(SystemConstant.getDbUuid());
+                        examDetailCoursePaperType.setExamDetailCourseId(examDetailCourse.getId());
+                        examDetailCoursePaperType.setPaperType(m);
+                        examDetailCoursePaperTypes.add(examDetailCoursePaperType);
+                    });
+
                     // 试卷数据组装
                     if (printContent.contains("PAPER")) {
                         List<PaperPdfDto> paperPdfDto = createPdfUtil.getPaperPdfFile(examDetailCourse.getPaperType(), examTaskDetail, fileTempList);
@@ -474,8 +475,12 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 }
                 examDetailCourse.setAttachmentId(jsonObject.toJSONString());
                 examTaskDetailService.saveOrUpdateBatch(examTaskDetailList);
+
+                examDetailCoursePaperTypeService.deleteByExamDetailCourseId(examDetailCourse.getId());
+                examDetailCoursePaperTypeService.saveBatch(examDetailCoursePaperTypes);
             }
-            detailCourseService.saveOrUpdateBatch(examDetailCourseList);
+            examDetailCourseService.saveOrUpdateBatch(examDetailCourseList);
+
         }
         return basicAttachmentList;
     }
@@ -587,7 +592,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 } else {
                     examDetailCourseQueryWrapper.lambda().eq(ExamDetailCourse::getExamDetailId, examDetail.getId());
                 }
-                List<ExamDetailCourse> examDetailCourseList = detailCourseService.list(examDetailCourseQueryWrapper);
+                List<ExamDetailCourse> examDetailCourseList = examDetailCourseService.list(examDetailCourseQueryWrapper);
 
                 // 考场内没有任务课程数据，直接跳过
                 if(CollectionUtils.isEmpty(examDetailCourseList)){
@@ -1630,7 +1635,7 @@ public class TaskLogicServiceImpl implements TaskLogicService {
                 for (int y = 0; y < Objects.requireNonNull(statisticsTempList).size(); y++) {
                     StatisticsImportDto statisticsImportDto = (StatisticsImportDto) statisticsTempList.get(y);
                     SysOrg collegeOrg = this.validSysOrgExists(collegeOrgMap, statisticsImportDto.getCollegeName(), sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "开课学院");
-                    SysOrg teachingRoomOrg = this.validSysOrgExists(teachingRoomMap, statisticsImportDto.getTeachingRoomName(), sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "开课部门");
+                    SysOrg teachingRoomOrg = this.validSysOrgExists(teachingRoomMap, statisticsImportDto.getTeachingRoomName(), sysUser.getSchoolId(), excelErrorTemp, (y + 1), (i + 1), "开课学院");
                     BasicCourse basicCourse = this.validBasicCourseExists(courseMap, statisticsImportDto.getCourseName(), sysUser.getSchoolId(), statisticsImportDto.getCourseCode(), excelErrorTemp, (y + 1), (i + 1));
                     String teacherName = statisticsImportDto.getTeacherName();
                     String clazzNames = statisticsImportDto.getClazzName();

distributed-print-business/src/main/resources/db/log/脚本-xiaof.sql

@@ -37,4 +37,13 @@ update exam_card t set t.card_rule_id = (select bpc.card_rule_id from basic_prin
                                          where FIND_IN_SET(t.id, REPLACE(REPLACE(substring_index(substring_index(CONVERT((etd.paper_attachment_ids ->>'$[*].cardId') USING utf8), ']', 1), '[',-1),' "','"'),'"','')) )
 where t.type = 'CUSTOM' and t.card_rule_id is null and t.id > 0;
 
+
+CREATE TABLE `exam_detail_course_paper_type` (
+      `id` BIGINT(20) NOT NULL,
+      `exam_detail_course_id` BIGINT(20) NOT NULL,
+      `paper_type` VARCHAR(1) NOT NULL COMMENT '卷型',
+      PRIMARY KEY (`id`));
+ALTER TABLE `exam_detail_course_paper_type`
+    ADD INDEX `idx_exam_detail_course_id` (`exam_detail_course_id` ASC) VISIBLE;
+
 -----------------------3.2.5 end----------------------

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

@@ -12,42 +12,28 @@
         eps.mark_leader markLeader
         from
         (SELECT
-        ep.id,
-        ep.school_id schoolId,
-        ep.exam_id examId,
-        ep.third_relate_id thirdRelateId,
-        ep.third_relate_name thirdRelateName,
-        ep.examTaskId,
-        ep.paper_number paperNumber,
-        ep.course_code courseCode,
-        ep.course_name courseName,
-        ep.sequence,
-        es.paper_type paperType,
-        ep.status,
-        ep.propositionTeacherId,
-        ep.transferId,
-        ep.sync_end_time syncEndTime
-        FROM
-        (SELECT
         distinct eps.id,
         et.id as examTaskId,
         et.sequence,
         et.org_id orgId,
         et.user_id propositionTeacherId,
         et.transfer_id transferId,
-        ed.school_id,
-        ed.exam_id,
-        edc.paper_number,
-        edc.course_code,
-        edc.course_name,
-        ets.third_relate_id,
-        ets.sync_end_time,
-        tsse.exam_name third_relate_name,
+        ed.school_id schoolId,
+        ed.exam_id examId,
+        edc.paper_number paperNumber,
+        edc.course_code courseCode,
+        edc.course_name courseName,
+        edcpt.paper_type paperType,
+        ets.third_relate_id thirdRelateId,
+        ets.sync_end_time syncEndTime,
+        tsse.exam_name thirdRelateName,
         IFNULL(eps.status, 'INIT') status
         FROM
         exam_detail ed
         left join exam_detail_course edc on
         ed.id = edc.exam_detail_id
+        left join exam_detail_course_paper_type edcpt on
+        edc.id = edcpt.exam_detail_course_id
         left join exam_task_sync ets on
         edc.school_id = ets.school_id
         and ed.exam_id = ets.exam_id
@@ -66,7 +52,7 @@
         and eps.exam_id = et.exam_id
         and eps.paper_number = edc.paper_number
         and eps.paper_type = edc.paper_type
-        <where>1 = 1
+        <where>
             and ed.school_id = #{schoolId}
             AND ets.sync_status = #{syncStatus}
             AND be.enable = TRUE
@@ -76,58 +62,39 @@
             <if test="examId != null">
                 and be.id = #{examId}
             </if>
-        </where>
-        ) ep
-        LEFT JOIN
-        (SELECT DISTINCT
-        es.school_id, es.exam_id, es.paper_number, es.paper_type
-        FROM
-        exam_student es
-        JOIN basic_exam be ON es.exam_id = be.id
-        <where>1 = 1
-            and es.school_id = #{schoolId}
-            <if test="semesterId != null">
-                and be.semester_id = #{semesterId}
-            </if>
-            <if test="examId != null">
-                and be.id = #{examId}
+            and (et.transfer_id = #{propositionTeacherId}
+            or et.user_id = #{propositionTeacherId})
+            <if test="structureStatusEnums != null and structureStatusEnums != ''">
+                <choose>
+                    <when test="ready != null and ready != '' and ready == true">
+                        AND IFNULL(eps.status, 'INIT') IN
+                        <foreach collection="structureStatusEnums" item="item" index="index" open="(" separator=
+                                "," close=")">
+                            #{item}
+                        </foreach>
+                    </when>
+                    <otherwise>
+                        AND ifnull(eps.status, 'INIT') NOT IN
+                        <foreach collection="structureStatusEnums" item="item" index="index" open="(" separator
+                                ="," close=")">
+                            #{item}
+                        </foreach>
+                    </otherwise>
+                </choose>
             </if>
-        </where>
-        ) es ON es.exam_id = ep.exam_id
-        and es.paper_number = ep.paper_number
-        WHERE 1 = 1
-        and (ep.transferId = #{propositionTeacherId}
-        or ep.propositionTeacherId = #{propositionTeacherId})
-        <if test="structureStatusEnums != null and structureStatusEnums != ''">
-            <choose>
-                <when test="ready != null and ready != '' and ready == true">
-                    AND ep.status IN
-                    <foreach collection="structureStatusEnums" item="item" index="index" open="(" separator=
-                            "," close=")">
+            <if test="dpr != null">
+                <if test="dpr.requestUserId != null">
+                    AND et.user_id = #{dpr.requestUserId}
+                </if>
+                <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
+                    AND et.org_id IN
+                    <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
                         #{item}
                     </foreach>
-                </when>
-                <otherwise>
-                    AND ifnull(ep.status, 'INIT') NOT IN
-                    <foreach collection="structureStatusEnums" item="item" index="index" open="(" separator
-                            ="," close=")">
-                        #{item}
-                    </foreach>
-                </otherwise>
-            </choose>
-        </if>
-        <if test="dpr != null">
-            <if test="dpr.requestUserId != null">
-                AND ep.propositionTeacherId = #{dpr.requestUserId}
-            </if>
-            <if test="dpr.orgIdSet != null and dpr.orgIdSet != '' and dpr.orgIdSet.size > 0">
-                AND ep.orgId IN
-                <foreach collection="dpr.orgIdSet" item="item" index="index" open="(" separator="," close=")">
-                    #{item}
-                </foreach>
+                </if>
             </if>
-        </if>
-        order by ep.sync_end_time desc
+        </where>
+        order by ets.sync_end_time desc
         ) temp
         left join exam_paper_structure eps on
         eps.id = temp.id

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/BasicCourseExportDto.java

@@ -23,7 +23,7 @@ public class BasicCourseExportDto {
     @ExcelProperty(name = "课程编码", width = 20, index = 2)
     private String courseCode;
 
-    @ExcelProperty(name = "开课部门", width = 20, index = 3)
+    @ExcelProperty(name = "开课学院", width = 20, index = 3)
     private String teachingRoomName;
 
     @ApiModelProperty(value = "班级信息集合")

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/BasicCourseImportDto.java

@@ -25,8 +25,8 @@ public class BasicCourseImportDto implements Serializable {
     @NotNull
     private String courseCode;
 
-    @ExcelNote(value = "开课部门")
-    @ExcelProperty(name = "开课部门", width = 30, index = 3)
+    @ExcelNote(value = "开课学院")
+    @ExcelProperty(name = "开课学院", width = 30, index = 3)
     @NotNull
     private String teachingRoomName;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/bean/dto/excel/StatisticsImportDto.java

@@ -18,7 +18,7 @@ public class StatisticsImportDto implements Serializable {
     @NotNull
     private String collegeName;
 
-    @ExcelNote(value = "开课部门")
+    @ExcelNote(value = "开课学院")
     @NotNull
     private String teachingRoomName;
 

teachcloud-common/src/main/java/com/qmth/teachcloud/common/service/impl/BasicCourseServiceImpl.java

@@ -327,7 +327,7 @@ public class BasicCourseServiceImpl extends ServiceImpl<BasicCourseMapper, Basic
                         .eq(SysOrg::getEnable, true)
                         .eq(SysOrg::getName, teachingRoomName));
                 if (Objects.isNull(sysOrg)) {
-                    throw ExceptionResultEnum.ERROR.exception("输入的开课部门【" + teachingRoomName + "】不存在");
+                    throw ExceptionResultEnum.ERROR.exception("输入的开课学院【" + teachingRoomName + "】不存在");
                 }
                 Long teachingRoomId = sysOrg.getId();
                 LinkedHashSet<Long> clazzIdSet = new LinkedHashSet<>(), teachIdSet = new LinkedHashSet<>();

teachcloud-report-business/src/main/resources/mapper/ExamDetailCoursePaperTypeMapper.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="com.qmth.distributed.print.business.mapper.ExamDetailCoursePaperTypeMapper">
+</mapper>