Skip to content

Y
yn-health-science
Commit 3aec7293 authored by wangxl's avatar wangxl
Browse files
Options

1

parent 21a1ca21
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 12 deletions
science-admin/src/main/java/com/yiboshi/science/entity/ComProject.java
View file @ 3aec7293
......@@ -118,4 +118,7 @@ public class ComProject extends BaseEntity {
/** 项目完成状态 */
@ApiModelProperty(value = "项目完成状态", position = 38 )
private String completeStatus;
/** 是否终审返回修改 0否 1是 */
@ApiModelProperty(value = "是否终审返回修改", position = 6 )
private Integer isFinalReturned;
}
\ No newline at end of file
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectAuditDTO.java
View file @ 3aec7293
......@@ -131,6 +131,9 @@ public class ComProjectAuditDTO extends BaseDTO {
/** 项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项 */
@ApiModelProperty(value = "项目状态 -10 起草,10 待提交, 20 已提交至依托单位,25 依托单位审核通过，请打印申请书,30 返回修改,40 未批准立项,50 批准立项", position = 7)
private Integer projState;
/** 是否终审返回修改 0否 1是 */
@ApiModelProperty(value = "是否终审返回修改", position = 6 )
private Integer isFinalReturned;
/** 项目状态 */
@ApiModelProperty(value = "项目状态", position = 41)
private String projStateName;
......
science-admin/src/main/java/com/yiboshi/science/param/dto/ComProjectDTO.java
View file @ 3aec7293
......@@ -194,6 +194,10 @@ public class ComProjectDTO extends BaseDTO {
@ApiModelProperty(value = "项目完成状态", position = 38 )
private String completeStatus;
/** 是否终审返回修改 0否 1是 */
@ApiModelProperty(value = "是否终审返回修改", position = 6 )
private Integer isFinalReturned;
/** 项目步骤 */
@ApiModelProperty(value = "项目步骤", position = 38 )
private Integer step;
......
science-admin/src/main/java/com/yiboshi/science/param/query/ComProjectQueryVO.java
View file @ 3aec7293
......@@ -111,6 +111,10 @@ public class ComProjectQueryVO extends PaginationVO{
@ApiModelProperty(value = "项目完成状态", position = 38 )
private String completeStatus;
/** 是否终审返回修改 0否 1是 */
@ApiModelProperty(value = "是否终审返回修改", position = 6 )
private Integer isFinalReturned;
/** 项目Id */
@ApiModelProperty(value="项目Id")
@Length(max=36, message = "Id不能大于36")
......
science-admin/src/main/java/com/yiboshi/science/service/ComProjectService.java
View file @ 3aec7293
......@@ -29,7 +29,7 @@ public interface ComProjectService extends BaseService<ComProjectQueryVO, ComPro
*
* @return
*/
void updateStateOrNo(String id, Integer state, String versionNo, String projNo);
void updateStateOrNo(String id, Integer state, String versionNo, String projNo,Integer isFinalReturned);
/**
* 获取新的版本号
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectConclusionServiceImpl.java
View file @ 3aec7293
......@@ -192,7 +192,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
modal.setId(conclusion.getId());
modal.setState(CommonEnum.conclusionState.report.getCode());
modal.setThesisState(CommonEnum.thesisState.pass.getCode());
comProjectService.updateStateOrNo(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null, null);
comProjectService.updateStateOrNo(conclusion.getProjId(), CommonEnum.projState.report.getCode(), null, null, null);
comProjectAuditService.report(DateUtils.getYear(), conclusion.getId(), 4,null, auditUnitId, treeCode);
return this.update(modal);
}
......@@ -209,7 +209,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
Integer state = null;
if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
state = CommonEnum.conclusionState.pass.getCode();
comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null, null);
comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null, null, null);
} else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
state = CommonEnum.conclusionState.returnModify.getCode();
} else {
......@@ -235,7 +235,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
Integer state = null;
if (e.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
state = CommonEnum.thesisState.pass.getCode();
comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null, null);
comProjectService.updateStateOrNo(model.getProjId(), CommonEnum.projState.conclusion.getCode(), null, null, null);
} else if (e.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
state = CommonEnum.thesisState.returnModify.getCode();
} else {
......@@ -306,7 +306,7 @@ public class ComProjectConclusionServiceImpl extends BaseServiceImpl<ComProjectC
c.setThesisState(CommonEnum.thesisState.unFilled.getCode());
this.update(c);
}
comProjectService.updateStateOrNo(projId, CommonEnum.projState.conclusion.getCode(), null, null);
comProjectService.updateStateOrNo(projId, CommonEnum.projState.conclusion.getCode(), null, null, null);
comProjectAuditService.insertAudit(comProject.getReportYear(), 4, id, CommonEnum.auditMethod.audit.getCode(),
auditUnitId, null, CommonEnum.auditResult.pass.getCode(), new Date(), 1, 1, SecurityUserHolder.getPersonId());
......
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectServiceImpl.java
View file @ 3aec7293
......@@ -608,12 +608,13 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
*
* @return
*/
public void updateStateOrNo(String id, Integer state, String versionNo, String projNo) {
public void updateStateOrNo(String id, Integer state, String versionNo, String projNo, Integer isFinalReturned) {
ComProject comProject = new ComProject();
comProject.setId(id);
comProject.setProjState(state);
comProject.setProjNo(projNo);
comProject.setVersionNo(versionNo);
comProject.setIsFinalReturned(isFinalReturned);
this.update(comProject);
}
......@@ -651,7 +652,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
Integer auditMethod = null;
if (comProject.getProjState().equals(CommonEnum.projState.lastModify.getCode())) {
auditMethod = CommonEnum.auditMethod.last.getCode();
ComUnitDTO unit= comUnitService.getTopUnit();
ComUnitDTO unit = comUnitService.getTopUnit();
unitId = unit.getId();
treeCode = unit.getTreeCode();
}
......@@ -662,7 +663,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
else
versionNo = this.getVersionNo(comProject.getVersionNo());
// 更新项目状态
this.updateStateOrNo(model.getAuditObjectId(), CommonEnum.projState.toAudit.getCode(), versionNo, null);
this.updateStateOrNo(model.getAuditObjectId(), CommonEnum.projState.toAudit.getCode(), versionNo, null, null);
}
@Transactional
......@@ -704,6 +705,7 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
// 返回上级或下级单位Id, 最高级或个人返回 null
String unitId = comProjectAuditService.audit(audit, appUnit.getTreeCode(), auditTreeCode);
// 处理项目状态
Integer isFinalReturned = null;
Integer projState = null;
String projNo = null;
if (audit.getAuditResult().equals(CommonEnum.auditResult.pass.getCode())) {
......@@ -713,15 +715,18 @@ public class ComProjectServiceImpl extends BaseServiceImpl<ComProjectDAO, ComPro
}
} else if (audit.getAuditResult().equals(CommonEnum.auditResult.returnModify.getCode())) {
if (unitId == null)
if (audit.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode()))
if (audit.getAuditMethod().equals(CommonEnum.auditMethod.last.getCode())) {
projState = CommonEnum.projState.lastModify.getCode();
else
isFinalReturned = 1;
} else {
projState = CommonEnum.projState.returnModify.getCode();
isFinalReturned = 0;
}
} else {
projState = CommonEnum.projState.failed.getCode();
}
if (null != projState)
this.updateStateOrNo(audit.getAuditObjectId(), projState, null, projNo);
this.updateStateOrNo(audit.getAuditObjectId(), projState, null, projNo, isFinalReturned);
}
public DataStatisticsDTO getCount(ComProject e) {
......
science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml
View file @ 3aec7293
......@@ -24,7 +24,7 @@
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,
c.total_score,c.average_score,c.technology_score,c.technology_average_score,c.economy_score,c.economy_average_score,c.calculate_score,
c.defense_technology_score,c.defense_economy_score,c.defense_score,
c.defense_technology_score,c.defense_economy_score,c.defense_score,c.is_final_returned,
d.unit_name app_unit_name,e.person_name app_person_name,e.cert_id,p.name as knowledgeName,p1.name as knowledgeParentName, f.total_funding, f.gov_funding,
(case when g.unit_name = d.unit_name then '直属' else REPLACE(g.unit_name,'卫生健康局','') end) as upUnitName
FROM com_project_audit a
......
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