Commit 00ffc516 authored by 徐俊's avatar 徐俊

xujun

parent 10b7729b
...@@ -210,7 +210,6 @@ public class ComProjectAuditDTO extends BaseDTO { ...@@ -210,7 +210,6 @@ public class ComProjectAuditDTO extends BaseDTO {
private BigDecimal defenseScore; private BigDecimal defenseScore;
/** 评分 */ /** 评分 */
@ApiModelProperty(value = "评分", position = 4) @ApiModelProperty(value = "评分", position = 4)
private String gradeScore; private String gradeScore;
......
...@@ -241,6 +241,4 @@ public class ComProjectController extends BaseController<ComProjectService, ComP ...@@ -241,6 +241,4 @@ public class ComProjectController extends BaseController<ComProjectService, ComP
return ResponseDataModel.ok(comProjectService.updateDefenseScore(e.getId(), e.getDefenseTechnologyScore(), e.getDefenseEconomyScore())); return ResponseDataModel.ok(comProjectService.updateDefenseScore(e.getId(), e.getDefenseTechnologyScore(), e.getDefenseEconomyScore()));
} }
} }
\ No newline at end of file
...@@ -1116,8 +1116,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro ...@@ -1116,8 +1116,6 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
} }
public String updateDefenseScore (String id, BigDecimal defenseTechnologyScore, BigDecimal defenseEconomyScore) { public String updateDefenseScore (String id, BigDecimal defenseTechnologyScore, BigDecimal defenseEconomyScore) {
ComProject e = new ComProject(); ComProject e = new ComProject();
e.setId(id); e.setId(id);
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
t.unit_level as unitLevel, t.com_person as comPerson, t.created as created t.unit_level as unitLevel, t.com_person as comPerson, t.created as created
</sql> </sql>
<select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO"> <select id="getListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
SELECT SELECT
a.*,d.unit_name,e.person_name a.*,d.unit_name,e.person_name
...@@ -18,6 +19,7 @@ ...@@ -18,6 +19,7 @@
${ew.sqlSegment} ${ew.sqlSegment}
</where> </where>
</select> </select>
<select id="getProjectAuditListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO"> <select id="getProjectAuditListByPage" resultType="com.yiboshi.science.param.dto.ComProjectAuditDTO">
SELECT SELECT
a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,c.start_date,c.end_date,c.proj_state,c.knowledge_id, a.*,c.id proj_id,c.proj_name,c.proj_no,c.version_no,c.app_no,c.proj_class,c.start_date,c.end_date,c.proj_state,c.knowledge_id,
......
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