增加专家导出

heheng

2025-04-02 059a17ed08ef946e921f538dce08bd7258a11fb3

增加专家导出

 expert-admin/src/main/java/com/gkhy/web/controller/bussiness/ProjectManagementController.java

@@ -53,6 +53,16 @@
    }


    @ApiOperation(value = "导出专家数据")
    //@PreAuthorize("@ss.hasPermi('system:management:list')")
    @GetMapping("/selectProjectData")
    public R<List<ProjectDataResp>> selectProjectData(ProjectManagement projectManagement)
    {
        return R.ok(projectManagementService.selectProjectData(projectManagement));
    }



    /**
     * 获取项目管理详细信息
     */

 expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectDataResp.java

对比新文件
@@ -0,0 +1,25 @@
package com.gkhy.system.domain.vo.response;

import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.Date;

@Data
@ApiModel(value = "导出专家汇总", description = "导出专家汇总")
public class ProjectDataResp {
    @ApiModelProperty(value = "处室")
    private String deptName;
    @ApiModelProperty(value = "专家姓名")
    private String expertName;
    @ApiModelProperty(value = "专家费")
    private BigDecimal expertFee;
    @JsonFormat(pattern = "yyyy-MM-dd")
    @ApiModelProperty(value = "申请时间")
    private Date createTime;
    @ApiModelProperty(value = "事由")
    private String projectName;
}

 expert-system/src/main/java/com/gkhy/system/mapper/ProjectManagementMapper.java

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.gkhy.system.domain.ProjectManagement;
import com.gkhy.system.domain.vo.request.ProjectExpertStateReq;
import com.gkhy.system.domain.vo.response.ProjectDataResp;
import com.gkhy.system.domain.vo.response.ProjectExpertManagementInfoRes;
import com.gkhy.system.domain.vo.response.ProjectExpertStateResp;

@@ -32,6 +33,9 @@
     */
    public List<ProjectManagement> selectProjectManagementList(ProjectManagement projectManagement);


    List<ProjectDataResp> selectProjectData(ProjectManagement projectManagement);

    /**
     * 新增项目管理
     *

 expert-system/src/main/java/com/gkhy/system/service/IProjectManagementService.java

@@ -134,4 +134,13 @@
     * @return
     */
    List<ProjectExpertExportInfoRes> projectExpertExportList(Long projectId);


    /**
     * 导出专家数据
     *
     * @param projectManagement 导出专家数据
     * @return 导出专家数据
     */
    public List<ProjectDataResp> selectProjectData(ProjectManagement projectManagement);
}

 expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java

@@ -527,6 +527,11 @@

    }

    @Override
    public List<ProjectDataResp> selectProjectData(ProjectManagement projectManagement) {
        return projectManagementMapper.selectProjectData(projectManagement);
    }

    private List<ProjectExpertDetail> dealData(List<ProjectExpertScoreSaveReq.Score> data,Long projectExpertId){
        List<ProjectExpertDetail> dealData = new ArrayList<>();
        data.forEach(dto -> {

 expert-system/src/main/resources/mapper/system/ProjectManagementMapper.xml

@@ -90,14 +90,29 @@
            <if test="version != null "> and version = #{version}</if>
            <if test="state != null "> and state = #{state}</if>
            <if test="step!= null "> and step = #{step}</if>
            <if test="projectDateStart != null "> and project_date_start = #{projectDateStart}</if>
            <if test="projectDateEnd != null "> and project_date_end = #{projectDateEnd}</if>
            <if test="projectDateStart != null "> and date_format(project_date_start,'%Y%m%d') &gt;= date_format(#{projectDateStart},'%Y%m%d')</if>
            <if test="projectDateEnd != null "> and date_format(project_date_end,'%Y%m%d') &lt;= date_format(#{projectDateEnd},'%Y%m%d')</if>
            <if test="expertCertificate != null  and expertCertificate != ''"> and expert_certificate = #{expertCertificate}</if>
            <if test="evaluationState != null "> and evaluation_state = #{evaluationState}</if>
            <if test="expertNum != null "> and expert_num = #{expertNum}</if>
        </where>
        order by create_time desc
    </select>

    <select id="selectProjectData" parameterType="ProjectManagement" resultType="com.gkhy.system.domain.vo.response.ProjectDataResp">
        select  a.dept_name deptName,c.name expertName,b.tax_expert_fee expertFee,a.create_time createTime,a.project_name projectName
        from project_management a
                 left join project_expert b on a.id = b.project_id and b.del_flag = 0 and b.evaluation_state = 1
                 left join sys_expert_info c on b.expert_id = c.id
        where a.del_flag = 0 and a.state = 4 and a.evaluation_state = 1
        <if test="projectName != null  and projectName != ''"> and a.project_name like concat('%', #{projectName}, '%')</if>
        <if test="projectCode != null  and projectCode != ''"> and a.project_code like concat('%', #{projectCode}, '%')</if>
        <if test="deptId != null "> and a.dept_id = #{deptId}</if>
        <if test="projectDateStart != null "> and date_format(a.project_date_start,'%Y%m%d') &gt;= date_format(#{projectDateStart},'%Y%m%d')</if>
        <if test="projectDateEnd != null "> and date_format(a.project_date_end,'%Y%m%d') &lt;= date_format(#{projectDateEnd},'%Y%m%d')</if>
        order BY a.dept_name asc ,c.`name` desc
    </select>

    
    <select id="selectProjectManagementById" parameterType="Long" resultMap="ProjectManagementResult">
        <include refid="selectProjectManagementVo"/>