1.大中型统计报表-部门/个人绩效扣分查询/导出

2.大中型统计报表-绩效扣分详情列表查询/导出
3.资产统计报表接口优化

biz-base/src/main/java/com/dayou/controller/AssetsStatisticalStatementController.java

@@ -69,7 +69,7 @@ public class AssetsStatisticalStatementController extends BaseController{
      * @param dto 查询dto
      * @return Page<AssetsPerformanceDeductionDetailVO>
      */
-    @GetMapping("/department/getAssetsPerformanceDeductionDetail")
+    @GetMapping("/getAssetsPerformanceDeductionDetail")
     public RestResponse<Page<AssetsPerformanceDeductionDetailVO>> getAssetsPerformanceDeductionDetail(Page page, AssetsStatisticalSelectDTO dto) {
         return RestResponse.data(assetsStatisticalStatementService.getAssetsPerformanceDeductionDetail(page, dto));
     }
@@ -78,16 +78,20 @@ public class AssetsStatisticalStatementController extends BaseController{
      * 错误详情列表导出
      * @param dto 查询dto
      */
-    @GetMapping("/department/getAssetsPerformanceDeductionDetail/export")
+    @GetMapping("/getAssetsPerformanceDeductionDetail/export")
     public void assetsPerformanceDeductionDetailExport(AssetsStatisticalSelectDTO dto, HttpServletResponse response) throws IOException {
         List<AssetsPerformanceDeductionDetailVO> result = assetsStatisticalStatementService.assetsPerformanceDeductionDetailExport(dto);
         String fileName = "资产评估部绩效扣分详情_" + dto.getCheckLoop();
-        if (dto.getMistakeType().equals("normal")){
-            fileName += "_" + "一般错误";
-        } else if (dto.getMistakeType().equals("hard")) {
-            fileName += "_" + "较大错误";
-        }else {
-            fileName += "_" + "重大错误";
+        switch (dto.getMistakeType()) {
+            case "normal":
+                fileName += "_" + "一般错误";
+                break;
+            case "hard":
+                fileName += "_" + "较大错误";
+                break;
+            case "fatal":
+                fileName += "_" + "重大错误";
+                break;
         }
         exportPlus(response, fileName, result, AssetsPerformanceDeductionDetailVO.class);
     }

biz-base/src/main/java/com/dayou/controller/MajorStatisticalStatementController.java

@@ -5,6 +5,7 @@ import com.dayou.common.RestResponse;
 import com.dayou.dto.MajorStatisticalSelectDTO;
 import com.dayou.service.IMajorStatisticalStatementService;
 import com.dayou.vo.MajorLedgerVO;
+import com.dayou.vo.MajorPerformanceDeductionDetailVO;
 import com.dayou.vo.MajorPerformanceDeductionVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -48,7 +49,7 @@ public class MajorStatisticalStatementController extends BaseController{
      * @param dto 查询dto
      * @return RestResponse<List<MajorPerformanceDeductionVO>>
      */
-    @GetMapping("/getMajorPerformanceDeductionVO")
+    @GetMapping("/department/getMajorPerformanceDeductionVO")
     public RestResponse<List<MajorPerformanceDeductionVO>> getMajorPerformanceDeductionVO(MajorStatisticalSelectDTO dto) {
         return RestResponse.data(majorStatisticalStatementService.getMajorPerformanceDeductionVO(dto));
     }
@@ -57,10 +58,63 @@ public class MajorStatisticalStatementController extends BaseController{
      * 评估部绩效扣分查询
      * @param dto 查询dto
      */
-    @GetMapping("/getMajorPerformanceDeductionVO/export")
+    @GetMapping("/department/getMajorPerformanceDeductionVO/export")
     public void exportMajorPerformanceDeductionVO(MajorStatisticalSelectDTO dto, HttpServletResponse response) throws IOException {
         List<MajorPerformanceDeductionVO> result = majorStatisticalStatementService.getMajorPerformanceDeductionVO(dto);
         exportPlus(response,"评估部绩效扣分表数据",result, MajorPerformanceDeductionVO.class);
     }
 
+    /**
+     * 评估人员绩效扣分查询
+     * @param dto 查询dto
+     * @return RestResponse<List<MajorPerformanceDeductionVO>>
+     */
+    @GetMapping("/evaluator/getMajorPerformanceDeductionVO")
+    public RestResponse<List<MajorPerformanceDeductionVO>> getMajorPerformanceDeductionVOByEvaluator(MajorStatisticalSelectDTO dto) {
+        return RestResponse.data(majorStatisticalStatementService.getMajorPerformanceDeductionVOByEvaluator(dto));
+    }
+
+    /**
+     * 评估人员绩效扣分查询
+     * @param dto 查询dto
+     */
+    @GetMapping("/evaluator/getMajorPerformanceDeductionVO/export")
+    public void exportMajorPerformanceDeductionVOByEvaluator(MajorStatisticalSelectDTO dto, HttpServletResponse response) throws IOException {
+        List<MajorPerformanceDeductionVO> result = majorStatisticalStatementService.getMajorPerformanceDeductionVOByEvaluator(dto);
+        exportPlus(response,"评估人员绩效扣分表数据",result, MajorPerformanceDeductionVO.class);
+    }
+
+    /**
+     * 查询错误详情列表
+     * @param page 分页
+     * @param dto 查询dto
+     * @return Page<MajorPerformanceDeductionDetailVO>
+     */
+    @GetMapping("/getMajorPerformanceDeductionDetailVO")
+    public RestResponse<Page<MajorPerformanceDeductionDetailVO>> getMajorPerformanceDeductionDetailVO(Page page, MajorStatisticalSelectDTO dto) {
+        return RestResponse.data(majorStatisticalStatementService.getMajorPerformanceDeductionDetailVO(page, dto));
+    }
+
+    /**
+     * 导出错误详情列表
+     * @param dto 查询dto
+     */
+    @GetMapping("/getMajorPerformanceDeductionDetailVO/export")
+    public void exportMajorPerformanceDeductionDetailVO(MajorStatisticalSelectDTO dto, HttpServletResponse response) throws IOException {
+        List<MajorPerformanceDeductionDetailVO> result = majorStatisticalStatementService.exportMajorPerformanceDeductionDetailVO(dto);
+        String fileName = "资产评估部绩效扣分详情_" + dto.getCheckLoop();
+        switch (dto.getMistakeType()) {
+            case "normal":
+                fileName += "_" + "一般错误";
+                break;
+            case "hard":
+                fileName += "_" + "较大错误";
+                break;
+            case "fatal":
+                fileName += "_" + "重大错误";
+                break;
+        }
+        exportPlus(response, fileName, result, MajorPerformanceDeductionDetailVO.class);
+    }
+
 }

dao/src/main/java/com/dayou/mapper/MajorStatisticalStatementMapper.java

@@ -3,6 +3,7 @@ package com.dayou.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.dto.MajorStatisticalSelectDTO;
 import com.dayou.vo.MajorLedgerVO;
+import com.dayou.vo.MajorPerformanceDeductionDetailVO;
 import com.dayou.vo.MajorPerformanceDeductionVO;
 import org.apache.ibatis.annotations.Param;
 
@@ -32,4 +33,25 @@ public interface MajorStatisticalStatementMapper {
      */
     List<MajorPerformanceDeductionVO> getMajorPerformanceDeductionVO(@Param("dto") MajorStatisticalSelectDTO dto);
 
+    /**
+     * 评估人员绩效扣分查询
+     * @param dto 查询dto
+     * @return List<MajorPerformanceDeductionVO>
+     */
+    List<MajorPerformanceDeductionVO> getMajorPerformanceDeductionVOByEvaluator(@Param("dto") MajorStatisticalSelectDTO dto);
+
+    /**
+     * 查询错误详情列表
+     * @param page 分页
+     * @param dto 查询dto
+     * @return Page<MajorPerformanceDeductionDetailVO>
+     */
+    Page<MajorPerformanceDeductionDetailVO> getMajorPerformanceDeductionDetailVO(@Param("page") Page page, @Param("dto") MajorStatisticalSelectDTO dto);
+
+    /**
+     * 导出错误详情列表
+     * @param dto 查询dto
+     * @return List<MajorPerformanceDeductionDetailVO>
+     */
+    List<MajorPerformanceDeductionDetailVO> exportMajorPerformanceDeductionDetailVO(@Param("dto") MajorStatisticalSelectDTO dto);
 }

dao/src/main/resources/mapper/MajorStatisticalStatementMapper.xml

@@ -192,4 +192,120 @@
         </where>
         GROUP BY department.id
     </select>
+
+    <!--评估人员绩效扣分查询-->
+    <select id="getMajorPerformanceDeductionVOByEvaluator" resultType="com.dayou.vo.MajorPerformanceDeductionVO">
+        SELECT user.id AS userId,
+        user.userName,
+        user.departmentId,
+        user.departmentName,
+        COALESCE ( SUM( reCheckPer.normal_mistake ), 0 ) * 3 AS reCheckNormalMistakeScore,
+        COALESCE ( SUM( reCheckPer.hard_mistake ), 0 ) * 8 AS reCheckHardMistakeScore,
+        COALESCE ( SUM( reCheckPer.fatal_mistake ), 0 ) * 41 AS reCheckFatalMistakeScore,
+        COALESCE ( (COALESCE ( SUM( reCheckPer.normal_mistake ), 0 ) *3 ) + (COALESCE ( SUM( reCheckPer.hard_mistake ), 0 ) * 8) + (COALESCE ( SUM( reCheckPer.fatal_mistake ), 0 ) * 41) , 0) AS allMistakeScore
+        FROM (SELECT user.id AS id,
+        user.`name` AS userName,
+        department.name AS departmentName,
+        department.id AS departmentId
+        FROM user,post,user_post,sorted_department,department
+        WHERE `user`.id = user_post.user_id
+        AND user_post.post_id = post.id
+        AND post.department_id = sorted_department.department_id
+        AND sorted_department.department_id = department.id
+        AND sorted_department.deleted = 0
+        AND user_post.deleted = 0
+        AND sorted_department.business_type = 'MAJOR_BUSINESS'
+        GROUP BY user.id
+        ) AS user
+        LEFT JOIN (
+        SELECT
+        principal_id,
+        major.created,
+        major_production.id AS production_id
+        FROM
+        major
+        LEFT JOIN major_production ON major_production.major_id = major.id
+        AND major_production.deleted = 0
+        ) AS orderInfo ON user.id = orderInfo.principal_id
+        LEFT JOIN ( SELECT production_id, fatal_mistake, hard_mistake, normal_mistake FROM
+        business_production_performance WHERE business_type = 'MAJOR_BUSINESS' AND check_loop = '复审'
+        <if test="dto != null and dto.startTime != null and dto.endTime!= null">
+            AND (business_production_performance.modified BETWEEN #{dto.startTime} AND #{dto.endTime})
+        </if>
+        ) AS reCheckPer ON reCheckPer.production_id = orderInfo.production_id
+        <where>
+            <if test="dto != null and dto.departmentId != null">
+                AND user.departmentId = #{dto.departmentId}
+            </if>
+            <if test="dto != null and dto.userName != null">
+                AND user.userName LIKE CONCAT('%',#{dto.userName},'%')
+            </if>
+        </where>
+        GROUP BY user.id
+    </select>
+
+    <!--查询错误详情SQL-->
+    <sql id="majorPerformanceDeductionDetailQuery">
+        SELECT performance.id,
+        major.order_id            AS orderId,
+        major.financial AS financial,
+        major.members             AS members,
+        major.evaluate_aim AS evaluateAim,
+        production.name     AS projectName,
+        customer.name              AS customerName,
+        production.report_no   AS productionNo,
+        (CASE production.production
+        WHEN 'STATEMENT' THEN '意见书'
+        WHEN 'LETTER' THEN '意见函'
+        WHEN 'REPORT' THEN '评估报告'
+        END)                  AS productionType,
+        principal.name             AS principalName,
+        checker.name               AS checkerName,
+        (CASE #{dto.mistakeType}
+        WHEN 'normal' THEN performance.normal_mistake
+        WHEN 'hard' THEN performance.hard_mistake
+        WHEN 'fatal' THEN performance.fatal_mistake
+        ELSE '-'
+        END)                  AS mistakeCount,
+        (CASE #{dto.mistakeType}
+        WHEN 'normal' THEN performance.normal_mistake * 3
+        WHEN 'hard' THEN performance.hard_mistake * 8
+        WHEN 'fatal' THEN performance.fatal_mistake * 41
+        ELSE '-'
+        END)                  AS mistakeScore,
+        production.evaluate_amount AS evaluateAmount,
+        performance.modified       AS checkTime,
+        performance.reason         AS reason
+        FROM major
+        LEFT JOIN major_production AS production ON major.id = production.major_id
+        LEFT JOIN business_production_performance AS performance ON production.id = performance.production_id
+        LEFT JOIN customer_company AS customer ON customer.id = major.clientele_id
+        LEFT JOIN user AS principal ON principal.id = major.principal_id
+        LEFT JOIN user AS checker ON checker.id = performance.check_id
+        WHERE major.department_id = #{dto.departmentId}
+        AND performance.check_loop = #{dto.checkLoop}
+        AND (performance.modified BETWEEN #{dto.startTime} AND #{dto.endTime})
+        <if test="dto.principalId != null">
+            AND major.principal_id = #{dto.principalId}
+        </if>
+        <if test="dto.mistakeType == 'normal' ">
+            AND performance.normal_mistake > 0
+        </if>
+        <if test="dto.mistakeType == 'hard' ">
+            AND performance.hard_mistake > 0
+        </if>
+        <if test="dto.mistakeType == 'fatal' ">
+            AND performance.fatal_mistake > 0
+        </if>
+    </sql>
+
+    <!--查询错误详情列表-->
+    <select id="getMajorPerformanceDeductionDetailVO" resultType="com.dayou.vo.MajorPerformanceDeductionDetailVO">
+        <include refid="majorPerformanceDeductionDetailQuery" />
+    </select>
+
+    <!--导出错误详情列表-->
+    <select id="exportMajorPerformanceDeductionDetailVO" resultType="com.dayou.vo.MajorPerformanceDeductionDetailVO">
+        <include refid="majorPerformanceDeductionDetailQuery" />
+    </select>
 </mapper>

domain/src/main/java/com/dayou/dto/MajorStatisticalSelectDTO.java

@@ -39,11 +39,31 @@ public class MajorStatisticalSelectDTO {
     private String keyWord;
 
     /**
+     * 用户名
+     */
+    private String userName;
+
+    /**
      * 业务节点实例code
      */
     private String nodeCode;
 
     /**
+     * 审核轮次
+     */
+    private String checkLoop;
+
+    /**
+     * 错误类型(normal、hard、fatal)
+     */
+    private String mistakeType;
+
+    /**
+     * 效率类型(接单:order、预评:statement、报告:report、应收款:should、实收款:real)
+     */
+    private String efficiencyType;
+
+    /**
      * 筛选开始时间
      */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")

domain/src/main/java/com/dayou/vo/MajorPerformanceDeductionDetailVO.java

@@ -0,0 +1,105 @@
+package com.dayou.vo;
+
+import com.dayou.annotation.Excel;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+
+@Data
+public class MajorPerformanceDeductionDetailVO {
+
+    private Integer id;
+
+    /**
+     * 项目编号
+     */
+    @Excel(name = "项目编号")
+    private String orderId;
+
+    /**
+     * 是否金融(金融/非金融)
+     */
+    @Excel(name = "是否金融")
+    private String financial;
+
+    /**
+     * 项目名称
+     */
+    @Excel(name = "项目名称")
+    private String projectName;
+
+    /**
+     * 客户名称
+     */
+    @Excel(name = "银行/单位")
+    private String customerName;
+
+    /**
+     * 产品类型
+     */
+    @Excel(name = "产品类型")
+    private String productionType;
+
+    /**
+     * 产品号
+     */
+    @Excel(name = "产品号")
+    private String productionNo;
+
+
+    /**
+     * 项目负责人
+     */
+    @Excel(name = "项目负责人")
+    private String principalName;
+
+    /**
+     * 参与人
+     */
+    @Excel(name = "参与人")
+    private String members;
+
+    /**
+     * 评估金额(万元)
+     */
+    @Excel(name = "评估金额(万元)")
+    private BigDecimal evaluateAmount;
+
+    /**
+     * 评估目的
+     */
+    @Excel(name = "评估目的")
+    private String evaluateAim;
+
+    /**
+     * 扣分人
+     */
+    @Excel(name = "扣分人")
+    private String checkerName;
+
+    /**
+     * 错误个数
+     */
+    @Excel(name = "错误个数")
+    private Integer mistakeCount;
+
+    /**
+     * 加减分
+     */
+    @Excel(name = "加减分")
+    private Integer mistakeScore;
+
+    /**
+     * 扣分时间
+     */
+    @Excel(name = "扣分时间")
+    private LocalDate checkTime;
+
+    /**
+     * 扣分原因
+     */
+    @Excel(name = "扣分原因")
+    private String reason;
+
+}

domain/src/main/java/com/dayou/vo/MajorPerformanceDeductionVO.java

@@ -23,6 +23,12 @@ public class MajorPerformanceDeductionVO {
     private String userName;
 
     /**
+     * 部门名称
+     */
+    @Excel(name = "部门名称")
+    private String departmentName;
+
+    /**
      * 复审一般错误扣分
      */
     @Excel(name = "复审一般错误")

service/src/main/java/com/dayou/service/IMajorStatisticalStatementService.java

@@ -3,6 +3,7 @@ package com.dayou.service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dayou.dto.MajorStatisticalSelectDTO;
 import com.dayou.vo.MajorLedgerVO;
+import com.dayou.vo.MajorPerformanceDeductionDetailVO;
 import com.dayou.vo.MajorPerformanceDeductionVO;
 
 import java.util.List;
@@ -30,4 +31,26 @@ public interface IMajorStatisticalStatementService {
      * @return List<MajorPerformanceDeductionVO>
      */
     List<MajorPerformanceDeductionVO> getMajorPerformanceDeductionVO(MajorStatisticalSelectDTO dto);
+
+    /**
+     * 评估人员绩效扣分查询
+     * @param dto 查询dto
+     * @return List<MajorPerformanceDeductionVO>
+     */
+    List<MajorPerformanceDeductionVO> getMajorPerformanceDeductionVOByEvaluator(MajorStatisticalSelectDTO dto);
+
+    /**
+     * 查询错误详情列表
+     * @param page 分页
+     * @param dto 查询dto
+     * @return Page<MajorPerformanceDeductionDetailVO>
+     */
+    Page<MajorPerformanceDeductionDetailVO> getMajorPerformanceDeductionDetailVO(Page page, MajorStatisticalSelectDTO dto);
+
+    /**
+     * 导出错误详情列表
+     * @param dto 查询dto
+     * @return List<MajorPerformanceDeductionDetailVO>
+     */
+    List<MajorPerformanceDeductionDetailVO> exportMajorPerformanceDeductionDetailVO(MajorStatisticalSelectDTO dto);
 }

service/src/main/java/com/dayou/service/impl/AssetsStatisticalStatementServiceImpl.java

@@ -920,16 +920,22 @@ public class AssetsStatisticalStatementServiceImpl implements IAssetsStatistical
      * @return List<AssetsPerformanceDeductionDetailVO>
      */
     public List<AssetsPerformanceDeductionDetailVO> setDetailVOJSONInfo(List<AssetsPerformanceDeductionDetailVO> detailVOList) {
+        LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<User>()
+                .select(User::getId, User::getName)
+                .eq(User::getDeleted, false);
+        List<User> userList = userService.list(lambdaQueryWrapper);
         for (AssetsPerformanceDeductionDetailVO detailVO : detailVOList) {
             if (ObjectUtil.isNotNull(detailVO.getMembers())) {
                 JSONArray jsonArray = JSONArray.parseArray(detailVO.getMembers());
                 List<Long> membersId = jsonArray.toJavaList(Long.class);
                 String names = null;
-                for (Long id : membersId) {
-                    if (ObjectUtil.isNull(names)) {
-                        names = userService.getById(id).getName() + '；';
-                    } else {
-                        names += userService.getById(id).getName() + '；';
+                for (User user : userList) {
+                    if (membersId.contains(user.getId())) {
+                        if (ObjectUtil.isNull(names)) {
+                            names = user.getName() + '；';
+                        } else {
+                            names += user.getName() + '；';
+                        }
                     }
                 }
                 detailVO.setMembers(names);

service/src/main/java/com/dayou/service/impl/MajorStatisticalStatementServiceImpl.java

@@ -10,6 +10,7 @@ import com.dayou.mapper.MajorStatisticalStatementMapper;
 import com.dayou.service.IUserService;
 import com.dayou.service.IMajorStatisticalStatementService;
 import com.dayou.vo.MajorLedgerVO;
+import com.dayou.vo.MajorPerformanceDeductionDetailVO;
 import com.dayou.vo.MajorPerformanceDeductionVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -61,6 +62,41 @@ public class MajorStatisticalStatementServiceImpl implements IMajorStatisticalSt
     }
 
     /**
+     * 评估人员绩效扣分查询
+     * @param dto 查询dto
+     * @return List<MajorPerformanceDeductionVO>
+     */
+    @Override
+    public List<MajorPerformanceDeductionVO> getMajorPerformanceDeductionVOByEvaluator(MajorStatisticalSelectDTO dto) {
+        return majorStatisticalStatementMapper.getMajorPerformanceDeductionVOByEvaluator(dto);
+    }
+
+    /**
+     * 查询错误详情列表
+     * @param page 分页
+     * @param dto 查询dto
+     * @return Page<MajorPerformanceDeductionDetailVO>
+     */
+    @Override
+    public Page<MajorPerformanceDeductionDetailVO> getMajorPerformanceDeductionDetailVO(Page page, MajorStatisticalSelectDTO dto) {
+        Page<MajorPerformanceDeductionDetailVO> detailVOPage = majorStatisticalStatementMapper.getMajorPerformanceDeductionDetailVO(page, dto);
+        detailVOPage.setRecords(setDetailVOJSONInfo(detailVOPage.getRecords()));
+        return detailVOPage;
+    }
+
+    /**
+     * 导出错误详情列表
+     * @param dto 查询dto
+     * @return List<MajorPerformanceDeductionDetailVO>
+     */
+    @Override
+    public List<MajorPerformanceDeductionDetailVO> exportMajorPerformanceDeductionDetailVO(MajorStatisticalSelectDTO dto) {
+        List<MajorPerformanceDeductionDetailVO> detailVOList = majorStatisticalStatementMapper.exportMajorPerformanceDeductionDetailVO(dto);
+        detailVOList = setDetailVOJSONInfo(detailVOList);
+        return detailVOList;
+    }
+
+    /**
      * 设置项目参与人
      * @param majorLedgerVOList 台账集合
      * @return List<MajorLedgerVO>
@@ -90,4 +126,35 @@ public class MajorStatisticalStatementServiceImpl implements IMajorStatisticalSt
         }
         return majorLedgerVOList;
     }
+
+    /**
+     * 设置参与人信息
+     *
+     * @param detailVOList 查询出来的VO信息
+     * @return List<AssetsPerformanceDeductionDetailVO>
+     */
+    public List<MajorPerformanceDeductionDetailVO> setDetailVOJSONInfo(List<MajorPerformanceDeductionDetailVO> detailVOList) {
+        LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<User>()
+                .select(User::getId, User::getName)
+                .eq(User::getDeleted, false);
+        List<User> userList = userService.list(lambdaQueryWrapper);
+        for (MajorPerformanceDeductionDetailVO detailVO : detailVOList) {
+            if (ObjectUtil.isNotNull(detailVO.getMembers())) {
+                JSONArray jsonArray = JSONArray.parseArray(detailVO.getMembers());
+                List<Long> membersId = jsonArray.toJavaList(Long.class);
+                String names = null;
+                for (User user : userList) {
+                    if (membersId.contains(user.getId())) {
+                        if (ObjectUtil.isNull(names)) {
+                            names = user.getName() + '；';
+                        } else {
+                            names += user.getName() + '；';
+                        }
+                    }
+                }
+                detailVO.setMembers(names);
+            }
+        }
+        return detailVOList;
+    }
 }