Commit 9a0f5829 authored by 徐俊's avatar 徐俊

xujun

parent 5c55bf76
...@@ -76,6 +76,9 @@ public class ComProjectAssignDTO extends BaseDTO { ...@@ -76,6 +76,9 @@ public class ComProjectAssignDTO extends BaseDTO {
@ApiModelProperty(value = "审核状态(0 不支持 1 支持)", position = 11) @ApiModelProperty(value = "审核状态(0 不支持 1 支持)", position = 11)
private Integer supportState; private Integer supportState;
/** 项目总经费(万元) */
@ApiModelProperty(value = "项目总经费(万元)", position = 39)
private BigDecimal totalFunding;
/** 评审状态 */ /** 评审状态 */
private String stateName; private String stateName;
......
...@@ -77,7 +77,6 @@ public class ComProjectAssignQueryVO extends PaginationVO { ...@@ -77,7 +77,6 @@ public class ComProjectAssignQueryVO extends PaginationVO {
@ApiModelProperty(value = "审核状态(0 不支持 1 支持)", position = 11) @ApiModelProperty(value = "审核状态(0 不支持 1 支持)", position = 11)
private Integer supportState; private Integer supportState;
/** 证件号 */ /** 证件号 */
@ExcelProperty("证件号") @ExcelProperty("证件号")
@ApiModelProperty(value = "证件号", position = 1) @ApiModelProperty(value = "证件号", position = 1)
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
</sql> </sql>
<select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO"> <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAssignDTO">
SELECT a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name SELECT a.*, c.person_name,c.cert_id,c.sex,c.birthday,c.mobile,c.email,c.education,c.title,g.unit_name
,d.name education_name,e.name title_name,f.proj_name,f.proj_no ,d.name education_name,e.name title_name,f.proj_name,f.proj_no,h.total_funding
FROM com_project_assign a FROM com_project_assign a
LEFT JOIN com_expert b ON a.expert_id = b.id LEFT JOIN com_expert b ON a.expert_id = b.id
LEFT JOIN com_person c ON b.person_id = c.id LEFT JOIN com_person c ON b.person_id = c.id
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
left join system_parameter d on c.education=d.id and d.type_id=8 left join system_parameter d on c.education=d.id and d.type_id=8
left join system_parameter e on c.title=e.id and e.type_id=7 left join system_parameter e on c.title=e.id and e.type_id=7
left join com_project f on a.proj_id=f.id left join com_project f on a.proj_id=f.id
left join com_project_basic h on f.id = h.proj_id
<where> <where>
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment