expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertExportInfoRes.java
@@ -1,10 +1,12 @@ 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.io.Serializable; import java.util.Date; import java.util.List; @@ -31,7 +33,9 @@ @ApiModelProperty(name = "项目id") private Integer id; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @ApiModelProperty(name = "制表时间") private Date updateTime; /** * 部门名称 */ expert-system/src/main/java/com/gkhy/system/domain/vo/response/ProjectExpertExportResp.java
@@ -6,6 +6,7 @@ import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; @ApiModel(value = "项目专家审批详情", description = "项目专家审批详情") @Data @@ -64,4 +65,7 @@ @ApiModelProperty(value = "住宿费") private BigDecimal accommodationFee; @ApiModelProperty(value = "制表时间") private Date updateTime; } expert-system/src/main/java/com/gkhy/system/service/impl/ProjectManagementServiceImpl.java
@@ -787,8 +787,19 @@ if (projectManagement.getEvaluationState() == 0) { throw new ServiceException("有专家未完成评定与报销，请完善后再试"); } List<ProjectExpertExportInfoRes> projectExpertExportInfoRes = projectExpertMapper.projectExpertExportList(projectId); projectExpertExportInfoRes.forEach(projectExpertExportInfoRes1 -> { List<ProjectExpertExportResp> projectExpertExportResps = projectExpertExportInfoRes1.getProjectExpertExportResps(); Date maxUpdateTime = projectExpertExportResps.stream() .map(ProjectExpertExportResp::getUpdateTime) .max(Comparator.naturalOrder()) .orElse(null); if (maxUpdateTime != null){ projectExpertExportInfoRes1.setUpdateTime(maxUpdateTime); } }); return projectExpertMapper.projectExpertExportList(projectId); return projectExpertExportInfoRes; }
@@ -44,6 +44,7 @@ <result property="projectName" column="project_name" /> <result property="deptName" column="dept_name" /> <result property="projectCode" column="project_code" /> <result property="updateTime" column="update_time" /> <result property="id" column="id" /> <collection property="projectExpertExportResps" ofType="com.gkhy.system.domain.vo.response.ProjectExpertExportResp" javaType="java.util.List" select="projectExpertExportDataList" column="id"/> @@ -65,6 +66,7 @@ <result property="billingInstructions" column="billing_instructions" /> <result property="travelExpenses" column="travel_expenses" /> <result property="accommodationFee" column="accommodation_fee" /> <result property="updateTime" column="update_time" /> </resultMap> @@ -363,7 +365,7 @@ <select id="projectExpertExportList" parameterType="Long" resultMap="ProjectExpertExportInfoResult"> select a.project_name ,a.dept_name,a.project_code,a.id select a.project_name ,a.dept_name,a.project_code,a.id,a.update_time from project_management a where a.id = #{projectId} @@ -373,14 +375,14 @@ <select id="projectExpertExportDataList" parameterType="Long" resultMap="ExpertExport"> select c.name,c.id_card,c.job,c.title,c.company_name,b.freight_basis,b.billing_instructions, b.billing_duration, b.after_tax_amount, b.open_bank, b.bank_card,b.taxable_income,b.income_tax_payable,b.tax_expert_fee,b.travel_expenses,b.accommodation_fee ,b.team_leader,b.create_time ,b.team_leader,b.create_time,b.update_time from project_expert b left join sys_expert_info c on b.expert_id = c.id where b.project_id = #{id} and b.del_flag = 0 union all select b.name,b.id_card,'' as job, b.title,b.company_name,b.freight_basis,b.billing_instructions, b.billing_duration, b.after_tax_amount, b.open_bank, b.bank_card,b.taxable_income,b.income_tax_payable,b.tax_expert_fee,b.travel_expenses,b.accommodation_fee ,b.team_leader,b.create_time ,b.team_leader,b.create_time,b.update_time from out_project_expert b where b.project_id = #{id} and b.del_flag = 0
