Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-health-science

science-admin/src/main/java/com/yiboshi/science/rest/v1/ComProjectTaskController.java

@@ -156,6 +156,7 @@ public class ComProjectTaskController extends BaseController<ComProjectTaskServi
 //          WordUtils.getHtmlContent(dto, "C:\\Users\\kylin\\Desktop\\导出Pdf\\output.docx");
 
             // 生成PDF文件字节数组
+//            byte[] pdfBytes = TaskInfoToPDFUtil.createContractPdf(dto);
             byte[] pdfBytes = TaskToPDF.createContractPdf(dto);
             // 设置响应头
             response.setContentType("application/pdf");

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

@@ -145,7 +145,7 @@ public class ComExpertSpecServiceImpl extends BaseServiceImpl<ComExpertSpecDAO,
             List<ComProjectGroupDetailDTO> finalMembers1 = members;
             list.forEach((e) -> {
                 boolean isDisabled = false;
-                String description = e.getSex() + "/" + AgeUtil.getResidentAge(e.getBirthday()) + "岁/" + e.getWorkUnit();
+                String description = e.getTreeCode() + "/"+e.getSex() + "/" + AgeUtil.getResidentAge(e.getBirthday()) + "岁/" + e.getWorkUnit();
                 isDisabled = units.contains(e.getUnitId());
                 // 检查专家的证件号是否在 members 列表中
                 if (!isDisabled)

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

@@ -1041,9 +1041,9 @@ public class TaskInfoToPDFUtil {
         valueCell.setPadding(5f);
         valueCell.setMinimumHeight(height);
         valueCell.setVerticalAlignment(vertical);
-        valueCell.setHorizontalAlignment(horizontal);
-        valueCell.setBorderWidth(0.1f); // 设置边框宽度
+        valueCell.setHorizontalAlignment(horizontal);// 设置边框宽度
         valueCell.setBorderColor(new BaseColor(0, 0, 0));
+//      valueCell.setBorderWidth(0.5f); // 设置边框宽度
         table.addCell(valueCell);
     }
 
@@ -1057,7 +1057,8 @@ public class TaskInfoToPDFUtil {
         valueCell.setMinimumHeight(height);
         valueCell.setVerticalAlignment(Element.ALIGN_TOP);
         valueCell.setHorizontalAlignment(Element.ALIGN_LEFT);
-        valueCell.setBorderWidth(0.5f); // 设置边框宽度
+        valueCell.setCellEvent(new UniformBorderEvent());
+//      valueCell.setBorderWidth(0.5f); // 设置边框宽度
         if (Objects.nonNull(valueColspan))
             valueCell.setColspan(valueColspan);
         table.addCell(valueCell);

science-admin/src/main/resources/mapper/ComExpertSpecDAO.xml

@@ -51,7 +51,7 @@
 
     <select id="getExpertListByExpertSpecIds" resultType="com.yiboshi.science.param.dto.ComExpertDTO">
         select distinct  a.expert_id id,c.person_name,c.cert_id,c.sex,c.birthday,e.id unit_id,
-                         (case when e.unit_name is null then c.work_unit else e.unit_name end) as work_unit
+                         (case when e.unit_name is null then c.work_unit else e.unit_name end) as work_unit,d.tree_code
         from com_expert_spec a
                  left join com_expert b on a.expert_id=b.id
                  left join com_person c on b.person_id=c.id