1

science-admin/src/main/java/com/yiboshi/science/service/impl/ComProjectTaskServiceImpl.java

@@ -303,8 +303,11 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
 
         //附件列表
         List<ComFileDTO> fileList = ComFileService.getListByObjectId(dto.getId(), CommonEnum.fileType.projectTask.getCode());
-        if (null == fileList || fileList.size() == 0)
-            fileList = ComFileService.getListByObjectId(dto.getProjId(), CommonEnum.fileType.project.getCode());
+        if (null == fileList || fileList.size() == 0) {
+            List<ComFileDTO> projList = ComFileService.getListByObjectId(dto.getProjId(), CommonEnum.fileType.project.getCode());
+            fileList = projList.stream().filter(e -> null != e.getFileExplain()
+                    && (e.getFileExplain().equals("课题组成员签名表") || e.getFileExplain().equals("项目资金预算编制说明"))).collect(Collectors.toList());
+        }
         fileList = configureFileList(fileList);
         dto.setFileList(fileList);
 
@@ -316,24 +319,20 @@ public class ComProjectTaskServiceImpl extends BaseServiceImpl<ComProjectTaskDAO
     }
 
     private List<ComFileDTO> configureFileList(List<ComFileDTO> list) {
-        List<ComFileDTO> fileList = new ArrayList<>();
-        if (null != list && list.size() > 0) {
-            fileList = list.stream().filter(e -> null != e.getFileExplain()
-                    && (e.getFileExplain().equals("课题组成员签名表")
-                    || e.getFileExplain().equals("项目资金预算编制说明"))).collect(Collectors.toList());
-        }
-        if (null == fileList || fileList.size() == 0) {
         List<SystemParameter> parameterList = systemParameterService.getListByType(70);
-            List<ComFileDTO> finalFileList = fileList;
-            parameterList.forEach(e -> {
-                finalFileList.add(configureFile(e.getName(), e.getDisplayOrder(), e.getIsRequired()));
-            });
+        parameterList.forEach(p -> {
+            List<ComFileDTO> findList = list.stream().filter(e -> null != e.getFileExplain() && e.getFileExplain().equals(p.getName())).collect(Collectors.toList());
+            if (findList.size() == 0) {
+                ComFileDTO fileDTO = configureFile(p.getName(), p.getDisplayOrder(), p.getIsRequired());
+                list.add(0, fileDTO);
+            } else {
+                if (!p.getIsRequired().equals(null) && p.getIsRequired())
+                    findList.get(0).setRequired(true);
+                else
+                    findList.get(0).setRequired(false);
             }
-        fileList.forEach(p -> {
-            p.setRequired(true);
-            p.setIsRequired(true);
         });
-        return fileList;
+        return list;
     }
 
     private ComFileDTO configureFile(String FileExplain, int showIndex, Boolean isRequired) {

science-admin/src/main/java/com/yiboshi/science/utils/TaskInfoToPDFUtil.java

@@ -136,7 +136,7 @@ public class TaskInfoToPDFUtil {
         table.isLockedWidth();
         // 添加表格内容
         addTablePageCell(table, "项目名称:", null, dto.getProjName(), 4, labelFont);
-        addTablePageCell(table, "项目下达单位（甲方）:", 4, "", null, labelFont);
+        addTablePageCell(table, "项目下达单位（甲方）:", 4, "云南省卫生健康委员会", null, labelFont);
         addTablePageCell(table, "项目承担单位（乙方）:", 4, dto.getAppUnitName(), null, labelFont);
         addTablePageCell(table, "项目负责人:", 2, dto.getAppPersonName() + "     电话：" + dto.getMobile(), 3, labelFont);
         addTablePageCell(table, "项目起止年限:", 3, sdfM.format(dto.getStartDate()) + " 至 " + sdfM.format(dto.getEndDate()), 2, labelFont);
@@ -1294,7 +1294,7 @@ public class TaskInfoToPDFUtil {
 
 
         addCell(table, "甲方（项目下达单位）", null, null, labelFont, null, Element.ALIGN_LEFT, Element.ALIGN_MIDDLE);
-        addCell(table, "", null, null, labelFont, null, Element.ALIGN_LEFT, Element.ALIGN_MIDDLE);
+        addCell(table, "云南省卫生健康委员会", null, null, labelFont, null, Element.ALIGN_LEFT, Element.ALIGN_MIDDLE);
 
         String commonTerms = "\n\n\n\n\n\n\n"
                 + " 经办人签字:                          法定代表人（或授权代表）： \n\n"
@@ -1312,7 +1312,7 @@ public class TaskInfoToPDFUtil {
         table.addCell(timeCell);
 
         addCell(table, "乙方（项目承担单位）", null, null, labelFont, null, Element.ALIGN_LEFT, Element.ALIGN_MIDDLE);
-        addCell(table, "", null, null, labelFont, null, Element.ALIGN_LEFT, Element.ALIGN_MIDDLE);
+        addCell(table, dto.getAppUnitName(), null, null, labelFont, null, Element.ALIGN_LEFT, Element.ALIGN_MIDDLE);
 
         String terms = "\n\n\n\n\n\n"
                 + " 法定代表人（或授权代表）：    项目负责人（签字）：     财务负责人（签字）：\n\n"