Skip to content

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

1

parent cde6fec1
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 16 deletions
science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java
View file @ ff98cb64
......@@ -412,6 +412,8 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
if (null != e.getFileExplain() && e.getFileExplain().equals(p.getName())) {
e.setShowIndex(p.getDisplayOrder());
e.setRequired(true);
if (e.getFileExplain().equals("课题组成员签名表"))
e.setIsRequired(true);
num.incrementAndGet();
}
});
......
science-admin/src/main/java/com/yiboshi/science/utils/TaskInfoToPDFUtil.java
View file @ ff98cb64
......@@ -133,7 +133,7 @@ public class TaskInfoToPDFUtil {
private static void fillInInstructions(Document document, BaseFont bfChinese, BaseFont fsChinese) throws DocumentException {
document.newPage();
Paragraph instructionTitle = new Paragraph("填写说明", new Font(fsChinese, 16, Font.BOLD));
Paragraph instructionTitle = new Paragraph("填写说明", new Font(fsChinese, 14, Font.BOLD));
instructionTitle.setAlignment(Element.ALIGN_CENTER);
document.add(instructionTitle);
// 添加填写说明内容
......@@ -146,7 +146,7 @@ public class TaskInfoToPDFUtil {
"七、“科技报告类型”，包括项目验收前撰写的全面描述研究过程和技术内容的最终科技报告、项目年度或中期检查时撰写的描述本年度研究过程和进展的年度技术进展报告以及在项目实施过程中撰写的包含科研活动细节及基础数据的专题科技报告。科技报告“公开类别及时限”分为公开或延期公开，内容需要发表论文、申请专利、出版专著或涉及技术诀窍的，可标注为延期公开需要发表论文的，延期公开时限原则上在2年（含2年）以内；需要申请专利、出版专著的，延期公开时限原则上在3年（含3年）以内；涉及技术诀窍的，延期公开时限原则上在5年（含5年）以内（涉密项目科技报告按照有关规定管理）",
"八、省财政资金支出的预算计划应按照国家及省相关规定执行。重大、重点项目的预算计划应吸纳经费评审时提出的调整意见。",
};
Font contentFont = new Font(bfChinese, 16, Font.NORMAL);
Font contentFont = new Font(bfChinese, 14, Font.NORMAL);
for (String instruction : instructions) {
Paragraph para = new Paragraph(instruction, contentFont);
para.setAlignment(Element.ALIGN_LEFT);
......@@ -241,19 +241,19 @@ public class TaskInfoToPDFUtil {
addCell(projTable, "分 工", 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, "签字", null, null, normalFont, null, null, Element.ALIGN_CENTER);
for (int i = dto.getCooperativeUnits() != null ? dto.getCooperativeUnits().size() : 0; i < 2; i++) {
if (dto.getCooperativeUnits() == null) {
for (int i = dto.getParticipateUnits() != null ? dto.getParticipateUnits().size() : 0; i < 2; i++) {
if (dto.getParticipateUnits() == null) {
List<ComProjectCooperativeUnitsDTO> list = new ArrayList<>();
dto.setCooperativeUnits(list);
dto.setParticipateUnits(list);
}
dto.getCooperativeUnits().add(new ComProjectCooperativeUnitsDTO());
dto.getParticipateUnits().add(new ComProjectCooperativeUnitsDTO());
}
for (int i = 0; i < dto.getCooperativeUnits().size(); i++) {
for (int i = 0; i < dto.getParticipateUnits().size(); i++) {
addCell(projTable, String.valueOf(i + 1), null, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, dto.getCooperativeUnits().get(i).getUnitName(), 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, dto.getCooperativeUnits().get(i).getUnitAddress(), 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, dto.getCooperativeUnits().get(i).getOrganizationCode(), 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, dto.getCooperativeUnits().get(i).getProjectWork(), 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, dto.getParticipateUnits().get(i).getUnitName(), 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, dto.getParticipateUnits().get(i).getUnitAddress(), 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, dto.getParticipateUnits().get(i).getOrganizationCode(), 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, dto.getParticipateUnits().get(i).getProjectWork(), 2, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(projTable, "", null, null, normalFont, null, null, Element.ALIGN_CENTER);
}
document.add(projTable);
......@@ -970,7 +970,7 @@ public class TaskInfoToPDFUtil {
ComFileDTO e = dto.getFileList().get(i);
addCell(fileTable, i + 1, null, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(fileTable, e.getFileExplain(), null, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(fileTable, e.getIsRequired() ? "是" : "否", null, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(fileTable, "1", null, null, normalFont, null, null, Element.ALIGN_CENTER);
addCell(fileTable, "", null, null, normalFont, null, null, Element.ALIGN_CENTER);
}
document.add(fileTable);
......@@ -980,7 +980,8 @@ public class TaskInfoToPDFUtil {
document.newPage();
Font titleFont = new Font(bfChinese, 14f, Font.BOLD);
Font normalFont = new Font(bfChinese, 10.5f, Font.NORMAL);
Font contentFont = new Font(bfChinese, 12f, Font.NORMAL);
// Font contentFont = new Font(bfChinese, 12f, Font.NORMAL);
Font contentFont = new Font(bfChinese, 14, Font.NORMAL);
// 添加标题
addSection(document, "十、共同条款", titleFont);
......@@ -1006,9 +1007,9 @@ public class TaskInfoToPDFUtil {
Paragraph para = new Paragraph(term, contentFont);
para.setAlignment(Element.ALIGN_LEFT);
para.setFirstLineIndent(28f); // 设置首行缩进
para.setLeading(24f); // 设置行间距
// para.setLeading(24f); // 设置行间距
document.add(para);
document.add(new Paragraph("\n")); // 添加段落间距
// document.add(new Paragraph("\n")); // 添加段落间距
}
}
......
science-admin/src/main/resources/mapper/ComProjectAuditDAO.xml
View file @ ff98cb64
......@@ -43,7 +43,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,d.unit_name app_unit_name,e.person_name app_person_name
FROM com_project_audit a
left join com_project_test b on a.audit_object_id=b.id
left join com_project_task b on a.audit_object_id=b.id
left join com_project c on b.proj_id=c.id
left join com_unit d on c.app_unit_id=d.id
left join com_person e on c.app_person_id=e.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