From 6a85929efb22d83839d466ad1934a10585b994fa Mon Sep 17 00:00:00 2001 From: WendyYang Date: Tue, 25 Jul 2023 10:52:31 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E8=B4=B9=E7=94=A8=E5=8D=95=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/common/util/FreemarkerWordUtil.java | 2 +- .../pmapi/meeting/manage/ExpertExportManage.java | 28 +- .../resources/template/meeting/专家抽取表.ftl | 1348 ++++++++++ .../resources/template/meeting/专家评审单.ftl | 786 ++++++ .../main/resources/template/meeting/专家费.ftl | 1230 +++++++++ .../resources/template/meeting/劳务费发放.ftl | 2657 ++++++++++++++++++++ .../main/resources/template/专家抽取表.ftl | 1361 ---------- .../main/resources/template/专家评审单.ftl | 799 ------ pmapi/src/main/resources/template/专家费.ftl | 1243 --------- .../main/resources/template/劳务费发放.ftl | 885 ------- 10 files changed, 6038 insertions(+), 4301 deletions(-) create mode 100644 pmapi/src/main/resources/template/meeting/专家抽取表.ftl create mode 100644 pmapi/src/main/resources/template/meeting/专家评审单.ftl create mode 100644 pmapi/src/main/resources/template/meeting/专家费.ftl create mode 100644 pmapi/src/main/resources/template/meeting/劳务费发放.ftl delete mode 100644 pmapi/src/main/resources/template/专家抽取表.ftl delete mode 100644 pmapi/src/main/resources/template/专家评审单.ftl delete mode 100644 pmapi/src/main/resources/template/专家费.ftl delete mode 100644 pmapi/src/main/resources/template/劳务费发放.ftl diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/FreemarkerWordUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/FreemarkerWordUtil.java index dca4042..8fa62f0 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/FreemarkerWordUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/FreemarkerWordUtil.java @@ -106,7 +106,7 @@ public class FreemarkerWordUtil { expert.setIdcard("1212121211212121"); dto.getExperts().add(expert); } - create(dto, "专家费.ftl", "/Users/wendy/Desktop/", "专家费.doc"); + create(dto, "meeting/专家费.ftl", "/Users/wendy/Desktop/", "专家费.doc"); } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java index 8752cf6..8455cfe 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/ExpertExportManage.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Function; +import java.util.function.Supplier; /** *

@@ -56,6 +57,15 @@ public class ExpertExportManage { //================================================================================================================== + private static final String EXPERT_REVIEW = "meeting/专家评审单.ftl"; + + private static final String EXPERT_FEE = "meeting/专家费.ftl"; + + private static final String LABOR_FEE = "meeting/劳务费发放.ftl"; + + private static final String EXPERT_INVITE = "meeting/专家抽取表.ftl"; + + //================================================================================================================== static Function meetingUsageTime = (type) -> { if (1 == type) { return "半天"; @@ -66,11 +76,11 @@ public class ExpertExportManage { return StrUtil.EMPTY; }; + static Supplier wordName = () -> UUID.randomUUID().toString(true) + ".doc"; + //================================================================================================================== public void exportFeeForExpert(Long meetingId, HttpServletResponse response) { - final String template = "专家费.ftl"; - String fileName = UUID.randomUUID().toString(true) + ".doc"; try { Meeting meeting = meetingService.getById(meetingId); ExpertFeeExportDTO data = new ExpertFeeExportDTO(); @@ -110,7 +120,7 @@ public class ExpertExportManage { } data.getExperts().add(expert); }); - FreemarkerWordUtil.export(fileName, data, response, template); + FreemarkerWordUtil.export(wordName.get(), data, response, EXPERT_FEE); } catch (TemplateException | IOException e) { log.error("专家费用单导出异常：{}", meetingId, e); throw BizException.wrap("专家费用单导出失败"); @@ -118,8 +128,6 @@ public class ExpertExportManage { } public void expertReviewTable(Long meetingId, HttpServletResponse response) { - final String template = "专家评审单.ftl"; - String fileName = UUID.randomUUID().toString(true) + ".doc"; try { Meeting meeting = meetingService.getById(meetingId); ExpertReviewTableDTO data = new ExpertReviewTableDTO(); @@ -137,7 +145,7 @@ public class ExpertExportManage { inners.forEach(w -> projectNames.add(w.getProjectName())); } data.setProjectName(StrUtil.join("、", projectNames)); - FreemarkerWordUtil.export(fileName, data, response, template); + FreemarkerWordUtil.export(wordName.get(), data, response, EXPERT_REVIEW); } catch (TemplateException | IOException e) { log.error("专家评审单导出异常：{}", meetingId, e); throw BizException.wrap("专家评审单导出失败"); @@ -145,8 +153,6 @@ public class ExpertExportManage { } public void laborFeeAuditTable(Long meetingId, HttpServletResponse response) { - final String template = "劳务费发放.ftl"; - String fileName = UUID.randomUUID().toString(true) + ".doc"; try { Meeting meeting = meetingService.getById(meetingId); LaborFeeAuditTableDTO data = new LaborFeeAuditTableDTO(); @@ -180,7 +186,7 @@ public class ExpertExportManage { data.getExperts().add(expert); }); data.setExpertCount(experts.size()); - FreemarkerWordUtil.export(fileName, data, response, template); + FreemarkerWordUtil.export(wordName.get(), data, response, LABOR_FEE); } catch (TemplateException | IOException e) { log.error("劳务费发放审批单导出异常：{}", meetingId, e); throw BizException.wrap("劳务费发放审批单导出失败"); @@ -188,7 +194,6 @@ public class ExpertExportManage { } public void expertInviteTable(Long meetingId, HttpServletResponse response) { - final String template = "专家抽取表.ftl"; try { Meeting meeting = meetingService.getById(meetingId); ExpertInviteTableDTO data = new ExpertInviteTableDTO(); @@ -228,8 +233,7 @@ public class ExpertExportManage { } data.getExperts().add(expert); }); - String fileName = UUID.randomUUID().toString(true) + ".doc"; - FreemarkerWordUtil.export(fileName, data, response, template); + FreemarkerWordUtil.export(wordName.get(), data, response, EXPERT_INVITE); } catch (Exception e) { log.error("专家抽取表导出异常：{}", meetingId, e); throw BizException.wrap("专家抽取表导出失败"); diff --git a/pmapi/src/main/resources/template/meeting/专家抽取表.ftl b/pmapi/src/main/resources/template/meeting/专家抽取表.ftl new file mode 100644 index 0000000..2ff318e --- /dev/null +++ b/pmapi/src/main/resources/template/meeting/专家抽取表.ftl @@ -0,0 +1,1348 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 信息化项目专家抽取表 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 项目编码 + + + + + + + + + + + + + + + + + + + + + + + + + + ${projectCode} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 项目名称 + + + + + + + + + + + + + + + + + + + + + + + + + ${projectName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 建设单位 + + + + + + + + + + + + + + + + + + + + + + + + ${buildOrg} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 评审地点 + + + + + + + + + + + + + + + + + + + + + + + + ${meetingAddress} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 评审时间 + + + + + + + + + + + + + + + + + + + + + + + + ${meetingTime} + + + + + + + + + + + + + + + + + + + + 评审耗时 + + + + + + + + + + + + + + + + + + + + + + + ${meetingUsageTime} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 抽取人 + + + + + + + + + + + + + + + + + + + + + + ${meetingCreateBy} + + + + + + + + + + + + + + + + + + + + 监督人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序号 + + + + + + + + + + + + + + + + + + + + + 姓名 + + + + + + + + + + + + + + + + + + + + + 电话 + + + + + + + + + + + + + + + + + + + + 工作单位 + + + + + + + + + + + + + + + + + + + + + 签名 + + + + + <#list experts as expert> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${expert.no} + + + + + + + + + + + + + + + + + + + + + + + ${expert.name} + + + + + + + + + + + + + + + + + + + + + + + ${expert.mobile} + + + + + + + + + + + + + + + + + + + + + + + ${expert.company} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pmapi/src/main/resources/template/meeting/专家评审单.ftl b/pmapi/src/main/resources/template/meeting/专家评审单.ftl new file mode 100644 index 0000000..0981b1b --- /dev/null +++ b/pmapi/src/main/resources/template/meeting/专家评审单.ftl @@ -0,0 +1,786 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${projectName} + + + + + + + + + + 专家评审意见 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${meetingTime}，${holdOrg}组织专家在${meetingAddress}对${projectName}进行评审。专家组认真听取了项目业主方、建设方的情况汇报，审阅了项目材料，实地查看了设备及平台演示，专家组织质询、讨论后提出以下意见： + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 专家组 + + + + + + + + + + + + + + + + + + （签名 + + + + + + + + + ）： + + + + + + + + + \ No newline at end of file diff --git a/pmapi/src/main/resources/template/meeting/专家费.ftl b/pmapi/src/main/resources/template/meeting/专家费.ftl new file mode 100644 index 0000000..f156c2f --- /dev/null +++ b/pmapi/src/main/resources/template/meeting/专家费.ftl @@ -0,0 +1,1230 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 丽水市大数据局信息化项目专家费 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 项目名称： + + + + + + + + ${projectName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 验收地点： + + + + + + + + ${meetingAddress} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 日 期： + + + + + + + + ${meetingTime} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 序 + + + + + + + + + + + + 号 + + + + + + + + + + + + + + + + + + + + + 姓名 + + + + + + + + + + + + + + + + + + + + + + 性 + + + + + + + + + + + + + 别 + + + + + + + + + + + + + + + + + + + + 身份证号 + + + + + + + + + + + + + + + + + + + + 单位 + + + + + + + + + + + + + + + + + + + + 联系电话 + + + + + + + + + + + + + + + + + + + + 评审费 + + + + + + + + + + + + + + + + + + + + 开户行 + + + + + + + + + + + + + + + + + + + + + 账号 + + + + + + + + + + + + + + + + + + + + + 签名 + + + + + <#list experts as rowData> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${rowData.no} + + + + + + + + + + + + + + + + + + + + + + + + + ${rowData.name} + + + + + + + + + + + + + + + + + + + + + + + + ${rowData.sex} + + + + + + + + + + + + + + + + + + + + + + + + ${rowData.idcard} + + + + + + + + + + + + + + + + + + + + + + + + ${rowData.company} + + + + + + + + + + + + + + + + + + + + + + + + ${rowData.mobile} + + + + + + + + + + + + + + + + + + + + + + + + ${rowData.fee} + + + + + + + + + + + + + + + + + + + + + + + + + ${(rowData.bank)!} + + + + + + + + + + + + + + + + + + + + + + + ${rowData.bankNo} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 经办人 + + + + + + + + + + + + （签字 + + + + + + ）： + + + + + + + + + \ No newline at end of file diff --git a/pmapi/src/main/resources/template/meeting/劳务费发放.ftl b/pmapi/src/main/resources/template/meeting/劳务费发放.ftl new file mode 100644 index 0000000..a02e8e5 --- /dev/null +++ b/pmapi/src/main/resources/template/meeting/劳务费发放.ftl @@ -0,0 +1,2657 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 劳务费发放审批单 + + + + + + + + + + + + + + + + + + + + + + 制表单位(盖章): + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 劳务活动项目 + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${projectName} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 活动时间 + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${meetingTime} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 劳务费类别 + + + + + + + + + + + + + + + + + + + + + + + + + + + + □讲课费□稿费□考务(监考费) + + + + + + + + + + + + + + + + + + □评审费□其他项目 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发放标准 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 500元/人 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 有关情况说明 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 通过市信息化专家库系统抽取 + + + + + + + + + ${expertCount} + + + + + + + + + 名专家。 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发放清单 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 姓名 + + + + + + + + + + + + + + + + + + + + + + + + + + + 工作单位 + + + + + + + + + + + + + + + + + + + + + + + + + + + 职务(职称) + + + + + + + + + + + + + + + + + + + + + + + + + + + 标准 + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发放金额 + + + + + + + + + + + + + + + + + + + + (元) + + + + + + + + + + + + + + + + + + + + + + + + + + + 签字 + + + + + <#list experts as expert> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${expert.name} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${expert.company} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${(expert.job)!} + + + + + + + + + + + + + + + + + + + + + + + + + + + ${meetingUsageTime} + + + + + + + + + + + + + + + + + + + + + + + + + + + 500 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 发放单位审批意见 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 业务部门意见 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 分管领导意见 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 单位负责人 + + + + + + + + + + + + + + + + + + + + (财务审批人)意见 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 经办人意见 + + + + + + + + + + + + + + + + + + + + + + + + + + + 部门负责人意见 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (签字) + + + + + + + + + + + + + + + + + + + + 年 + + + + + + + + + + + + + + + + + + 月 + + + + + + + + + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + (签字): + + + + + + + + + + + + + + + + + + + + 年 + + + + + + + + + + + + + + + + + + 月 + + + + + + + + + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 分管领导(签字): + + + + + + + + + + + + + + + + + + + + 年 + + + + + + + + + + + + + + + + + + 月 + + + + + + + + + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 负责人(财务审批人) + + + + + + + + + + + + + + + + + + + + (签字): + + + + + + + + + + + + + + + + + + + + 年 + + + + + + + + + + + + + + + + + + 月 + + + + + + + + + + + + + + + + + + 日 + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pmapi/src/main/resources/template/专家抽取表.ftl b/pmapi/src/main/resources/template/专家抽取表.ftl deleted file mode 100644 index 9514b14..0000000 --- a/pmapi/src/main/resources/template/专家抽取表.ftl +++ /dev/null @@ -1,1361 +0,0 @@ - - - - Data - 潦草迷茫 - 2023-07-21T00:04:00Z - 2023-07-24T23:54:20Z - 1440 - 14 - - - wqlLaW5nc29mdCBQREYgdG8gV1BTIDkw - 2023-07-24T17:28:04Z - 2052-5.5.1.7991 - BB348C58014F7E88AC9EBE649F4580AC_43 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 信息化项目专家抽取表 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 项目编码 - - - - - - - - - - - - - - - - - - - - - - - - - - ${projectCode} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 项目名称 - - - - - - - - - - - - - - - - - - - - - - - - - ${projectName} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 建设单位 - - - - - - - - - - - - - - - - - - - - - - - - ${buildOrg} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 评审地点 - - - - - - - - - - - - - - - - - - - - - - - - ${meetingAddress} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 评审时间 - - - - - - - - - - - - - - - - - - - - - - - - ${meetingTime} - - - - - - - - - - - - - - - - - - - - 评审耗时 - - - - - - - - - - - - - - - - - - - - - - - ${meetingUsageTime} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 抽取人 - - - - - - - - - - - - - - - - - - - - - - ${meetingCreateBy} - - - - - - - - - - - - - - - - - - - - 监督人 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 序号 - - - - - - - - - - - - - - - - - - - - - 姓名 - - - - - - - - - - - - - - - - - - - - - 电话 - - - - - - - - - - - - - - - - - - - - 工作单位 - - - - - - - - - - - - - - - - - - - - - 签名 - - - - - <#list experts as expert> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${expert.no} - - - - - - - - - - - - - - - - - - - - - - - ${expert.name} - - - - - - - - - - - - - - - - - - - - - - - ${expert.mobile} - - - - - - - - - - - - - - - - - - - - - - - ${expert.company} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/pmapi/src/main/resources/template/专家评审单.ftl b/pmapi/src/main/resources/template/专家评审单.ftl deleted file mode 100644 index 849cb3c..0000000 --- a/pmapi/src/main/resources/template/专家评审单.ftl +++ /dev/null @@ -1,799 +0,0 @@ - - - - Data - 潦草迷茫 - 2023-07-21T08:04:00Z - 2023-07-24T20:44:34Z - 12960 - 14 - - - wqlLaW5nc29mdCBQREYgdG8gV1BTIDkw - 2023-07-24T17:28:04Z - 2052-5.5.1.7991 - 1DC93F630FB80A5D3272BE6472F2ECEB_43 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${projectName} - - - - - - - - - - 专家评审意见 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${meetingTime}，${holdOrg}组织专家在${meetingAddress}对${projectName}进行评审。专家组认真听取了项目业主方、建设方的情况汇报，审阅了项目材料，实地查看了设备及平台演示，专家组织质询、讨论后提出以下意见： - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 专家组 - - - - - - - - - - - - - - - - - - （签名 - - - - - - - - - ）： - - - - - - - - - \ No newline at end of file diff --git a/pmapi/src/main/resources/template/专家费.ftl b/pmapi/src/main/resources/template/专家费.ftl deleted file mode 100644 index 8d1786b..0000000 --- a/pmapi/src/main/resources/template/专家费.ftl +++ /dev/null @@ -1,1243 +0,0 @@ - - - - Data - 潦草迷茫 - 2023-07-21T08:03:00Z - 2023-07-24T19:10:05Z - 14400 - 14 - - - wqlLaW5nc29mdCBQREYgdG8gV1BTIDkw - 2023-07-24T17:28:04Z - 2052-5.5.1.7991 - 29D84B9F4F9152F50D5CBE647D58FE28_43 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 丽水市大数据局信息化项目专家费 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 项目名称： - - - - - - - - ${projectName} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 验收地点： - - - - - - - - ${meetingAddress} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 日 期： - - - - - - - - ${meetingTime} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 序 - - - - - - - - - - - - 号 - - - - - - - - - - - - - - - - - - - - - 姓名 - - - - - - - - - - - - - - - - - - - - - - 性 - - - - - - - - - - - - - 别 - - - - - - - - - - - - - - - - - - - - 身份证号 - - - - - - - - - - - - - - - - - - - - 单位 - - - - - - - - - - - - - - - - - - - - 联系电话 - - - - - - - - - - - - - - - - - - - - 评审费 - - - - - - - - - - - - - - - - - - - - 开户行 - - - - - - - - - - - - - - - - - - - - - 账号 - - - - - - - - - - - - - - - - - - - - - 签名 - - - - - <#list experts as rowData> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${rowData.no} - - - - - - - - - - - - - - - - - - - - - - - - - ${rowData.name} - - - - - - - - - - - - - - - - - - - - - - - - ${rowData.sex} - - - - - - - - - - - - - - - - - - - - - - - - ${rowData.idcard} - - - - - - - - - - - - - - - - - - - - - - - - ${rowData.company} - - - - - - - - - - - - - - - - - - - - - - - - ${rowData.mobile} - - - - - - - - - - - - - - - - - - - - - - - - ${rowData.fee} - - - - - - - - - - - - - - - - - - - - - - - - - ${(rowData.bank)!} - - - - - - - - - - - - - - - - - - - - - - - ${rowData.bankNo} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 经办人 - - - - - - - - - - - - （签字 - - - - - - ）： - - - - - - - - - \ No newline at end of file diff --git a/pmapi/src/main/resources/template/劳务费发放.ftl b/pmapi/src/main/resources/template/劳务费发放.ftl deleted file mode 100644 index af6bcc0..0000000 --- a/pmapi/src/main/resources/template/劳务费发放.ftl +++ /dev/null @@ -1,885 +0,0 @@ - - -pdfbuilderKingsoft-PDF潦草迷茫2023-07-25T01:28:00Z2023-07-24T20:57:44Z864014 - wqlLaW5nc29mdCBQREYgdG8gV1BTIDg1 - 2023-07-24T17:28:23Z - 64be4428423552001fc57fc5 - 2052-5.5.1.7991 - FAEC9044C61332E24875BE64CD024754_43 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 劳务费发放审批单 - - - - 制表单位(盖章): - - - - - - - - - - - - - - - - - - - - - - - - - - 劳务活动项目 - - - - - - ${projectName} - - - - - - - - - - - 活动时间 - - - - - - ${meetingTime} - - - - - - - - - - - 劳务费类别 - - - - - - □讲课费□稿费□考务(监考费) - - - - □评审费□其他项目 - - - - - - - - - - - 发放标准 - - - - - - 500元/人 - - - - - - - - - - - 有关情况说明 - - - - - - 通过市信息化专家库系统抽取 - - ${expertCount} - - 名专家。 - - - - - - - - - - - 发放清单 - - - - - - - - - - - 姓名 - - - - - - 工作单位 - - - - - - 职务(职称) - - - - - - 标准 - - - - - - 发放金额 - - - - - (元) - - - - - - 签字 - <#list experts as expert> - - - - - - - - - - - ${expert.name} - - - - - - ${expert.company} - - - - - - ${(expert.job)!} - - - - - - ${meetingUsageTime} - - - - - - 500 - - - - - - - - - - - - - - - - 发放单位审批意见 - - - - - - - - - - - 业务部门意见 - - - - - - - - 分管领导意见 - - - - - - 单位负责人 - - - - - (财务审批人)意见 - - - - - - - - - - - 经办人意见 - - - - - - 部门负责人意见 - - - - - - - - - - - - - - - - - - - - - - - (签字) - - - - - 年 - - - - 月 - - - - 日 - - - - - - - - - - - - - - (签字): - - - - - 年 - - - - 月 - - - - 日 - - - - - - - - - - - - - - 分管领导(签字): - - - - - 年 - - - - 月 - - - - 日 - - - - - - - - - - - - 负责人(财务审批人) - - - - - (签字): - - - - - 年 - - - - 月 - - - - 日 - - \ No newline at end of file From dce1aecd5bbddae3751d1e400f863c0579165678 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Tue, 25 Jul 2023 16:06:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E5=B1=A5=E8=81=8C=E6=84=8F=E5=90=91=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/expert/manage/ExpertMetaApplyManage.java | 22 ++++------- .../expert/service/impl/ExpertInfoServiceImpl.java | 45 +++++----------------- 2 files changed, 17 insertions(+), 50 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertMetaApplyManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertMetaApplyManage.java index db37cc7..d4975d0 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertMetaApplyManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/manage/ExpertMetaApplyManage.java @@ -142,7 +142,7 @@ public class ExpertMetaApplyManage { Long userId = LoginUserUtil.getUserId(); // 校验专家管理员区域权限，是否可以审核当前专家申请 -// permissionCheckHelper.operationPermissionsCheck(userId, expertMetaApply.getUserId()); + // permissionCheckHelper.operationPermissionsCheck(userId, expertMetaApply.getUserId()); String applyStatus = expertMetaApply.getApplyStatus(); if (!ExpertApplyStatusEnum.PENDING_REVIEW.getKey().equals(applyStatus)) { throw BizException.wrap("apply is already processed"); @@ -158,18 +158,12 @@ public class ExpertMetaApplyManage { // 专家入库时，需要先审核专家入库，入库成功后，再履职意向审核，如果履职意向跟专家层级是同一层级的，就直接同意不需要审核 if (applyResult) { Long expertUserId = expertMetaApply.getUserId(); - ExpertRegionInfo expertRegionInfo = expertUserInfoHelper.getExpertRegionInfo(expertUserId); - Integer regionLevel = expertRegionInfo.getRegionLevel(); - String regionCode = expertRegionInfo.getRegionCode(); - - List expertJoinApplyList = iMetaApplyService.list(Wrappers.lambdaQuery(ExpertMetaApply.class) + List joinApplyList = iMetaApplyService.list(Wrappers.lambdaQuery(ExpertMetaApply.class) .eq(ExpertMetaApply::getUserId, expertUserId) .eq(ExpertMetaApply::getApplyStatus, ExpertApplyStatusEnum.PENDING_REVIEW.getKey()) .eq(ExpertMetaApply::getApplyType, ExpertApplyTypeEnum.EXPERT_INTENTION_JOIN.getKey()) - .eq(ExpertMetaApply::getDisplayEnable, BoolDisplayEnum.Y.name()) - .eq(ExpertMetaApply::getRegionLevel, regionLevel) - .eq(ExpertMetaApply::getRegionCode, regionCode)); - BizUtils.notEmpty(expertJoinApplyList, list -> list.forEach(r -> { + .eq(ExpertMetaApply::getDisplayEnable, BoolDisplayEnum.N.name())); + BizUtils.notEmpty(joinApplyList, list -> list.forEach(r -> { MetaApplyResultRequest resultRequest = new MetaApplyResultRequest(); resultRequest.setApplyId(r.getId()); resultRequest.setApplyResult(true); @@ -181,12 +175,12 @@ public class ExpertMetaApplyManage { break; // 专家出库 case EXPERT_DELIVERY: -// ExpertDeliveryDealCmd expertDeliveryDealCmd = buildExpertDeliveryDealCmd(req, expertMetaApply.getUserId()); -// expertInfoService.expertDeliveryDeal(expertDeliveryDealCmd); + // ExpertDeliveryDealCmd expertDeliveryDealCmd = buildExpertDeliveryDealCmd(req, expertMetaApply.getUserId()); + // expertInfoService.expertDeliveryDeal(expertDeliveryDealCmd); break; // 长期请假 case LONG_TERM_LEAVE: -// leaveManage.leaveAuditCallback(req.getApplyResult(), applyId); + // leaveManage.leaveAuditCallback(req.getApplyResult(), applyId); break; // 专家信息审核 case EXPERT_INFO_MODIFY: @@ -206,7 +200,7 @@ public class ExpertMetaApplyManage { Long expertUserId = expertMetaApply.getUserId(); String auditOpinion = req.getAuditOpinion(); // 发送审核结果短信 -// sendApplyResultNotify(applyType, applyResult, auditOpinion, expertUserId); + // sendApplyResultNotify(applyType, applyResult, auditOpinion, expertUserId); // 更新申请结果 expertMetaApply.setApproverUserId(userId); String adminUserName = userInfoHelper.getUserName(userId); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertInfoServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertInfoServiceImpl.java index 2ec31c5..b3e1b80 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertInfoServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/service/impl/ExpertInfoServiceImpl.java @@ -341,23 +341,23 @@ public class ExpertInfoServiceImpl implements ExpertInfoService { .eq(ExpertIntentionWorkRegion::getRegionLevel, expertRegionLevel); ExpertIntentionWorkRegion one = iExpertIntentionWorkRegionService.getOne(query); if (Objects.isNull(one)) { - ExpertIntentionWorkRegion expertIntentionWorkRegion = new ExpertIntentionWorkRegion(); - expertIntentionWorkRegion.setCreateOn(LocalDateTime.now()); - expertIntentionWorkRegion.setUpdateOn(LocalDateTime.now()); - expertIntentionWorkRegion.setRegionCode(expertRegionCode); - expertIntentionWorkRegion.setRegionLevel(expertRegionLevel); - expertIntentionWorkRegion.setUserId(expertUserId); - iExpertIntentionWorkRegionService.save(expertIntentionWorkRegion); + ExpertIntentionWorkRegion intentionWorkRegion = new ExpertIntentionWorkRegion(); + intentionWorkRegion.setCreateOn(LocalDateTime.now()); + intentionWorkRegion.setUpdateOn(LocalDateTime.now()); + intentionWorkRegion.setRegionCode(expertRegionCode); + intentionWorkRegion.setRegionLevel(expertRegionLevel); + intentionWorkRegion.setUserId(expertUserId); + iExpertIntentionWorkRegionService.save(intentionWorkRegion); } } break; case EXPERT_INTENTION_LEAVE: { // 删除履职意向地 - LambdaUpdateWrapper expertIntentionWorkRegionQuery = Wrappers.lambdaUpdate(ExpertIntentionWorkRegion.class) + LambdaUpdateWrapper query = Wrappers.lambdaUpdate(ExpertIntentionWorkRegion.class) .eq(ExpertIntentionWorkRegion::getUserId, expertUserId) .eq(ExpertIntentionWorkRegion::getRegionCode, expertRegionCode) .eq(ExpertIntentionWorkRegion::getRegionLevel, expertRegionLevel); - iExpertIntentionWorkRegionService.remove(expertIntentionWorkRegionQuery); + iExpertIntentionWorkRegionService.remove(query); } break; default: @@ -395,36 +395,9 @@ public class ExpertInfoServiceImpl implements ExpertInfoService { List saveExpertDictionaryList = buildSaveExpertDictionaryList(expertUserId, expertType); iExpertDictionaryService.saveBatch(saveExpertDictionaryList); } - - // 修改履职意向申请状态 - LambdaUpdateWrapper set = Wrappers.lambdaUpdate(ExpertMetaApply.class).eq(ExpertMetaApply::getUserId, expertUserId) - .eq(ExpertMetaApply::getApplyType, ExpertApplyTypeEnum.EXPERT_INTENTION_JOIN.getKey()) - .eq(ExpertMetaApply::getApplyStatus, ExpertApplyStatusEnum.PENDING_REVIEW.getKey()) - .eq(ExpertMetaApply::getDisplayEnable, BoolDisplayEnum.N.name()) - .set(ExpertMetaApply::getDisplayEnable, BoolDisplayEnum.Y.name()); - iExpertMetaApplyService.update(set); - } else { expertUserFullInfo.setUserInfoStep(ExpertUserInfoStepEnum.INFORMATION_TO_BE_SUBMITTED.getKey()); } - if (applyResult) { - // 补充专家 专家角色 TODO -// SysRole sysRole = roleService.getOne(Wrappers.lambdaQuery(SysRole.class) -// .eq(SysRole::getCode, SysRoleEnum.EXPERT.getKey())); -// if (Objects.nonNull(sysRole)) { -// Long roleId = sysRole.getRoleId(); -// LambdaQueryWrapper eq = Wrappers.lambdaQuery(SysUsersRoles.class) -// .eq(SysUsersRoles::getUserId, expertUserFullInfo.getUserId()) -// .eq(SysUsersRoles::getRoleId, sysRole.getRoleId()); -// SysUsersRoles one = userRoleService.getOne(eq); -// if (Objects.isNull(one)) { -// SysUsersRoles sysUsersRolesSaveRecord = new SysUsersRoles(); -// sysUsersRolesSaveRecord.setUserId(expertUserFullInfo.getUserId()); -// sysUsersRolesSaveRecord.setRoleId(roleId); -// userRoleService.saveAndReloadRoleListForToken(Collections.singletonList(sysUsersRolesSaveRecord), false); -// } -// } - } iExpertUserFullInfoService.saveOrUpdate(expertUserFullInfo); } From 18f6107607e6fe5e0ec3f33636945d34451ced94 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Tue, 25 Jul 2023 16:21:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=B1=A5=E8=81=8C=E6=84=8F=E5=90=91=E4=B8=8D?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../expert/assembler/ExpertUserInfoAssembler.java | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java index ea4f355..78e04e6 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/expert/assembler/ExpertUserInfoAssembler.java @@ -1,6 +1,7 @@ package com.ningdatech.pmapi.expert.assembler; +import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSONObject; import com.ningdatech.file.entity.vo.result.AttachFileVo; import com.ningdatech.pmapi.common.enumeration.BoolDisplayEnum; @@ -80,7 +81,7 @@ public class ExpertUserInfoAssembler { otherInfo.setRemark(expertUserInfoDTO.getRemark()); // 专家申请履职意向展示列表 - List expertApplyIntentionWorkRegions = expertUserFullInfoAll.getExpertApplyIntentionWorkRegionInfo().stream().map(r -> { + List applyIntentionWorkRegions = expertUserFullInfoAll.getExpertApplyIntentionWorkRegionInfo().stream().map(r -> { ExpertRegionInfo expertApplyIntentionWorkRegion = new ExpertRegionInfo(); expertApplyIntentionWorkRegion.setRegionLevel(r.getRegionLevel()); expertApplyIntentionWorkRegion.setRegionCode(r.getRegionCode()); @@ -88,7 +89,9 @@ public class ExpertUserInfoAssembler { return expertApplyIntentionWorkRegion; }).collect(Collectors.toList()); - + if (CollUtil.isEmpty(basicInfo.getExpertIntentionWorkRegions())) { + basicInfo.setExpertIntentionWorkRegions(applyIntentionWorkRegions); + } ExpertFullInfoVO expertFullInfoVO = new ExpertFullInfoVO(); expertFullInfoVO.setUserId(expertUserInfoDTO.getUserId()); expertFullInfoVO.setBasicInfo(basicInfo); @@ -97,7 +100,7 @@ public class ExpertUserInfoAssembler { expertFullInfoVO.setProfessionalInfo(professionalInfo); expertFullInfoVO.setRecommendInfo(recommendInfo); expertFullInfoVO.setExpertOtherInfo(otherInfo); - expertFullInfoVO.setExpertApplyIntentionWorkRegions(expertApplyIntentionWorkRegions); + expertFullInfoVO.setExpertApplyIntentionWorkRegions(applyIntentionWorkRegions); return expertFullInfoVO; } @@ -208,8 +211,7 @@ public class ExpertUserInfoAssembler { if (Objects.isNull(fileId)) { return null; } - FileBasicInfo fileBasicInfo = fileBasicInfoMap.get(fileId); - return fileBasicInfo; + return fileBasicInfoMap.get(fileId); } public ExpertBasicInfo buildExpertBasicInfo(ExpertUserFullInfoDTO expertUserInfoDTO @@ -239,10 +241,8 @@ public class ExpertUserInfoAssembler { basicInfo.setHometown(expertUserInfoDTO.getHometown()); basicInfo.setNationality(expertUserInfoDTO.getNationality()); basicInfo.setExpertSource(tagFieldInfoMap.get(ExpertTagEnum.EXPERT_SOURCE.getKey())); - if (Objects.nonNull(expertRegionInfo)) { - expertRegionInfo.setRegionName(regionCacheHelper.getUnionPathStr(expertRegionInfo.getRegionCode(), expertRegionInfo.getRegionLevel())); - basicInfo.setExpertRegionInfo(expertRegionInfo); - } + expertRegionInfo.setRegionName(regionCacheHelper.getUnionPathStr(expertRegionInfo.getRegionCode(), expertRegionInfo.getRegionLevel())); + basicInfo.setExpertRegionInfo(expertRegionInfo); basicInfo.setExpertIntentionWorkRegions(expertIntentionWorkRegionInfo.stream().map(r -> { ExpertRegionInfo expertIntentionWorkRegion = new ExpertRegionInfo(); @@ -282,7 +282,7 @@ public class ExpertUserInfoAssembler { private static List buildExpertApplyIntentionWorkRegionInfo(List expertIntentionWorkRegionList , List expertMetaApplyList) { - HashSet set = new HashSet(); + Set set = new HashSet<>(); for (ExpertIntentionWorkRegion expertIntentionWorkRegion : expertIntentionWorkRegionList) { RegionDtoMapKey regionDtoMapKey = new RegionDtoMapKey(); regionDtoMapKey.setRegionCode(expertIntentionWorkRegion.getRegionCode());