From 20de85a17a67fc65dc7b70c1a35d9736abcdfb81 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 2 Feb 2026 19:00:42 +0800 Subject: [PATCH] =?UTF-8?q?fix:[=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/service/IGyzjFfjlJcgjService.java | 2 ++ .../hxhq/business/service/IGyzjFfjlService.java | 7 +++++ .../hxhq/business/service/IGyzjJcgjService.java | 3 ++ .../com/hxhq/business/service/IGyzjTzService.java | 10 ++++++ .../hxhq/business/service/IMjyFfjlJcgjService.java | 2 ++ .../com/hxhq/business/service/IMjyFfjlService.java | 8 +++++ .../com/hxhq/business/service/IMjyJcgjService.java | 3 ++ .../com/hxhq/business/service/IMjyTzService.java | 9 ++++++ .../service/IStudyFormApplyJcgjService.java | 3 ++ .../business/service/IStudyFormApplyService.java | 18 +++++++++-- .../service/IStudyFormFillJcgjService.java | 3 ++ .../business/service/IStudyFormFillService.java | 17 ++++++++++ .../service/IStudyFormPlanJcgjService.java | 3 ++ .../business/service/IStudyFormPlanService.java | 13 ++++++++ .../business/service/IStudyFormPreJcgjService.java | 3 ++ .../business/service/IStudyFormPreService.java | 15 +++++++++ .../utils/pdf/template/TemplateBaseUtil.java | 36 +++++++++++----------- 17 files changed, 135 insertions(+), 20 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java index ff66017..4c8cd94 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlJcgjService.java @@ -33,6 +33,7 @@ public interface IGyzjFfjlJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -46,6 +47,7 @@ public interface IGyzjFfjlJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public GyzjFfjlJcgj getJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java index 84bc37f..81e36a0 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjFfjlService.java @@ -142,36 +142,43 @@ public interface IGyzjFfjlService extends IService { /** * 同意归档 + * @param form */ public void tygd(ArchiveForm form); /** * 拒绝归档 + * @param form */ public void jjgd(ArchiveForm form); /** * 同意解档 + * @param form */ public void tyjd(ArchiveForm form); /** * 拒绝解档 + * @param form */ public void jjjd(ArchiveForm form); /** * 同意借阅 + * @param form */ public void tyjy(ArchiveForm form); /** * 拒绝借阅 + * @param form */ public void jjjy(ArchiveForm form); /** * 确认归还 + * @param form */ public void qrgh(ArchiveForm form); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java index 98cf19f..852aee3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjJcgjService.java @@ -33,6 +33,7 @@ public interface IGyzjJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public void saveJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -45,6 +46,7 @@ public interface IGyzjJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public GyzjJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -58,6 +60,7 @@ public interface IGyzjJcgjService extends IService * @param jcnrEn 稽查内容英文 * @param qmr 签名人 * @param remark 备注 + * @return */ public GyzjJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java index a7d9ccb..bbc5138 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjTzService.java @@ -23,6 +23,7 @@ public interface IGyzjTzService extends IService * @return */ public List queryList(GyzjTz gyzjTz); + /** * 新增台账 * @param gyzjId 给药制剂id @@ -32,11 +33,14 @@ public interface IGyzjTzService extends IService * @param ghr2 归还人2 * @param ffr1 发放人1 * @param ffr2 发放人2 + * @param jsr1 接收人1 + * @param jsr2 接收人2 * @param qmr 签名人 * @param qmyy 签名意义 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 + * @return */ public void saveTz(Long gyzjId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark); @@ -50,11 +54,14 @@ public interface IGyzjTzService extends IService * @param ghr2 归还人2 * @param ffr1 发放人1 * @param ffr2 发放人2 + * @param jsr1 接收人1 + * @param jsr2 接收人2 * @param qmr 签名人 * @param qmyy 签名意义 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 + * @return */ public GyzjTz getTz(Long gyzjId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark); @@ -68,12 +75,15 @@ public interface IGyzjTzService extends IService * @param ghr2 归还人2 * @param ffr1 发放人1 * @param ffr2 发放人2 + * @param jsr1 接收人1 + * @param jsr2 接收人2 * @param qmr 签名人 * @param qmyy 签名意义 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 * @param bdId 表单id + * @return */ public GyzjTz getTzGen(Long gyzjId, SysUser lqr1, SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1, SysUser ffr2, SysUser jsr1, SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark,Long bdId); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlJcgjService.java index 72f85bd..01f4f4f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlJcgjService.java @@ -33,6 +33,7 @@ public interface IMjyFfjlJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public void saveJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -46,6 +47,7 @@ public interface IMjyFfjlJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public MjyFfjlJcgj getJcgj(Long ffjlId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java index e89b6ae..db77258 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyFfjlService.java @@ -144,41 +144,49 @@ public interface IMjyFfjlService extends IService { /** * 同意归档 + * @param form */ public void tygd(ArchiveForm form); /** * 拒绝归档 + * @param form */ public void jjgd(ArchiveForm form); /** * 同意解档 + * @param form */ public void tyjd(ArchiveForm form); /** * 拒绝解档 + * @param form */ public void jjjd(ArchiveForm form); /** * 同意借阅 + * @param form */ public void tyjy(ArchiveForm form); /** * 拒绝借阅 + * @param form */ public void jjjy(ArchiveForm form); /** * 确认归还 + * @param form */ public void qrgh(ArchiveForm form); /** * 借阅到期自动归还 + * @param form */ public void autoJyExpireReturn(); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java index 9d21488..60411b3 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyJcgjService.java @@ -32,6 +32,7 @@ public interface IMjyJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public void saveJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -44,6 +45,7 @@ public interface IMjyJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public MjyJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); /** @@ -56,6 +58,7 @@ public interface IMjyJcgjService extends IService * @param jcnrEn 稽查内容英文 * @param qmr 签名人 * @param remark 备注 + * @return */ public MjyJcgj getJcgj(Long mjyId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java index 6a6aa6c..8702bc8 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IMjyTzService.java @@ -32,11 +32,14 @@ public interface IMjyTzService extends IService * @param ghr2 归还人2 * @param ffr1 发放人1 * @param ffr2 发放人2 + * @param jsr1 接收人1 + * @param jsr2 接收人2 * @param qmr 签名人 * @param qmyy 签名意义 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 + * @return */ public void saveTz(Long mjyId, SysUser lqr1,SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1,SysUser ffr2, SysUser jsr1,SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark); @@ -50,11 +53,14 @@ public interface IMjyTzService extends IService * @param ghr2 归还人2 * @param ffr1 发放人1 * @param ffr2 发放人2 + * @param jsr1 接收人1 + * @param jsr2 接收人2 * @param qmr 签名人 * @param qmyy 签名意义 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 + * @return */ public MjyTz getTz(Long mjyId, SysUser lqr1,SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1,SysUser ffr2, SysUser jsr1,SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark); @@ -67,12 +73,15 @@ public interface IMjyTzService extends IService * @param ghr2 归还人2 * @param ffr1 发放人1 * @param ffr2 发放人2 + * @param jsr1 接收人1 + * @param jsr2 接收人2 * @param qmr 签名人 * @param qmyy 签名意义 * @param czl 操作量 * @param czldw 操作量单位 * @param remark 备注 * @param bdId 表单id + * @return */ public MjyTz getTzGen(Long mjyId, SysUser lqr1,SysUser lqr2, SysUser ghr1, SysUser ghr2, SysUser ffr1,SysUser ffr2, SysUser jsr1,SysUser jsr2, SysUser qmr, String qmyy, String czl, String czldw, String remark,Long bdId); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java index 6d84070..7016c7d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java @@ -35,6 +35,7 @@ public interface IStudyFormApplyJcgjService extends IService * @param qmr 签名人 * @param remark 备注 * @param time 时间 + * @return */ public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark, Date time); @@ -47,6 +48,7 @@ public interface IStudyFormApplyJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -60,6 +62,7 @@ public interface IStudyFormApplyJcgjService extends IService * @param jcnrEn 稽查内容英文 * @param qmr 签名人 * @param remark 备注 + * @return */ public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java index ad8af22..37bd018 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyService.java @@ -60,66 +60,80 @@ public interface IStudyFormApplyService extends IService */ public void ghgsr(StudyFormApply studyFormApply); - /** - * 保存 + /**保存 + * * @param studyFormApply + * @return */ public StudyFormApply bc(StudyFormApply studyFormApply); /** * 仅保存 * @param studyFormApply + * @return */ public StudyFormApply bcOnly(StudyFormApply studyFormApply); /** * 提交 * @param studyFormApply + * @return */ public void tj(StudyFormApply studyFormApply); /** * 复核通过 * @param studyFormApply + * @return */ public void fhtg(StudyFormApply studyFormApply); /** * 复核拒绝 * @param studyFormApply + * @return */ public void fhjj(StudyFormApply studyFormApply); /** * 审阅 * @param studyFormApply + * @return */ public void sy(StudyFormApply studyFormApply); /** * 审核通过 * @param studyFormApply + * @return */ public void shtg(StudyFormApply studyFormApply); /** * 审核拒绝 * @param studyFormApply + * @return */ public void shjj(StudyFormApply studyFormApply); /** * 更新表单内容 + * @param form + * @return */ public void updateBdnr(StudyFormUpdateForm form); /** * 更新复核意见 + * @param form + * @return */ public void updateFhyjjl(StudyFormUpdateForm form); /** * 更新字段勾选记录 + * @param form + * @return */ public void updateZdgxjl(StudyFormUpdateForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java index 2f106a9..914481d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java @@ -36,6 +36,7 @@ public interface IStudyFormFillJcgjService extends IService * @param qmr 签名人 * @param remark 备注 * @param time 时间 + * @return */ public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark, Date time); @@ -48,6 +49,7 @@ public interface IStudyFormFillJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -61,6 +63,7 @@ public interface IStudyFormFillJcgjService extends IService * @param jcnrEn 稽查内容英文 * @param qmr 签名人 * @param remark 备注 + * @return */ public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java index 24c86da..7435a99 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java @@ -36,12 +36,14 @@ public interface IStudyFormFillService extends IService /** * 加签 * @param studyFormFill + * @return */ public void jq(StudyFormFill studyFormFill); /** * 废止 * @param studyFormFill + * @return */ public void fz(StudyFormFill studyFormFill); @@ -49,6 +51,7 @@ public interface IStudyFormFillService extends IService /** * 确认废止 * @param form + * @return */ public void qrfz(StudyFormFillShfzForm form); @@ -56,30 +59,35 @@ public interface IStudyFormFillService extends IService /** * 更换归属人 * @param studyFormFill + * @return */ public void ghgsr(StudyFormFill studyFormFill); /** * 保存 * @param studyFormFill + * @return */ public StudyFormFill bc(StudyFormFill studyFormFill); /** * 预填填报 * @param studyFormFill + * @return */ public void bcAuto(StudyFormFill studyFormFill); /** * 仅保存 * @param studyFormFill + * @return */ public StudyFormFill bcOnly(StudyFormFill studyFormFill); /** * 提交 * @param studyFormFill + * @return */ public void tj(StudyFormFill studyFormFill); @@ -87,6 +95,7 @@ public interface IStudyFormFillService extends IService /** * 观察 * @param form + * @return */ public void gc(StudyFormFillGcForm form); @@ -94,6 +103,7 @@ public interface IStudyFormFillService extends IService /** * 复核通过 * @param studyFormFill + * @return */ public void fhtg(StudyFormFill studyFormFill); @@ -113,21 +123,28 @@ public interface IStudyFormFillService extends IService /** * 审阅 * @param studyFormFill + * @return */ public void sy(StudyFormFill studyFormFill); /** * 更新表单内容 + * @param form + * @return */ public void updateBdnr(StudyFormUpdateForm form); /** * 更新复核意见 + * @param form + * @return */ public void updateFhyjjl(StudyFormUpdateForm form); /** * 更新字段勾选记录 + * @param form + * @return */ public void updateZdgxjl(StudyFormUpdateForm form); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java index 45fb633..a7794fb 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java @@ -35,6 +35,7 @@ public interface IStudyFormPlanJcgjService extends IService * @param qmr 签名人 * @param remark 备注 * @param time 时间 + * @return */ public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark, Date time); @@ -47,6 +48,7 @@ public interface IStudyFormPlanJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -60,6 +62,7 @@ public interface IStudyFormPlanJcgjService extends IService * @param jcnrEn 稽查内容英文 * @param qmr 签名人 * @param remark 备注 + * @return */ public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java index 1d70307..9e19131 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanService.java @@ -35,18 +35,21 @@ public interface IStudyFormPlanService extends IService /** * 更换归属人 * @param studyFormPlan + * @return */ public void ghgsr(StudyFormPlan studyFormPlan); /** * 保存 * @param studyFormPlan + * @return */ public StudyFormPlan bc(StudyFormPlan studyFormPlan); /** * 仅保存 * @param studyFormPlan + * @return */ public StudyFormPlan bcOnly(StudyFormPlan studyFormPlan); @@ -54,12 +57,14 @@ public interface IStudyFormPlanService extends IService /** * 提交 * @param studyFormPlan + * @return */ public void tj(StudyFormPlan studyFormPlan); /** * 复核通过 * @param studyFormPlan + * @return */ public void fhtg(StudyFormPlan studyFormPlan); @@ -67,27 +72,35 @@ public interface IStudyFormPlanService extends IService /** * 复核拒绝 * @param studyFormPlan + * @return */ public void fhjj(StudyFormPlan studyFormPlan); /** * 审阅 * @param studyFormPlan + * @return */ public void sy(StudyFormPlan studyFormPlan); /** * 更新表单内容 + * @param form + * @return */ public void updateBdnr(StudyFormUpdateForm form); /** * 更新复核意见 + * @param form + * @return */ public void updateFhyjjl(StudyFormUpdateForm form); /** * 更新字段勾选记录 + * @param form + * @return */ public void updateZdgxjl(StudyFormUpdateForm form); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java index 0c33fae..43e6578 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java @@ -36,6 +36,7 @@ public interface IStudyFormPreJcgjService extends IService * @param qmr 签名人 * @param remark 备注 * @param time 时间 + * @return */ public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark, Date time); @@ -48,6 +49,7 @@ public interface IStudyFormPreJcgjService extends IService * @param jcnr 稽查内容 * @param qmr 签名人 * @param remark 备注 + * @return */ public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); @@ -61,6 +63,7 @@ public interface IStudyFormPreJcgjService extends IService * @param jcnrEn 稽查内容英文 * @param qmr 签名人 * @param remark 备注 + * @return */ public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark); diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java index d5f53c9..eb130d4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java @@ -40,42 +40,49 @@ public interface IStudyFormPreService extends IService /** * 保存 * @param studyFormPre + * @return */ public StudyFormPre bc(StudyFormPre studyFormPre); /** * 仅保存 * @param studyFormPre + * @return */ public StudyFormPre bcOnly(StudyFormPre studyFormPre); /** * 提交 * @param studyFormPre + * @return */ public void tj(StudyFormPre studyFormPre); /** * 通过 * @param form + * @return */ public void tg(StudyFormPreAuditForm form); /** * 拒绝 * @param form + * @return */ public void jj(StudyFormPreAuditForm form); /** * 填报 * @param studyFormPre + * @return */ public StudyFormFill tb(StudyFormPre studyFormPre); /** * 申请关闭 * @param studyFormPre + * @return */ public void sqgb(StudyFormPre studyFormPre); @@ -83,27 +90,35 @@ public interface IStudyFormPreService extends IService /** * 关闭同意 * @param form + * @return */ public void tygb(StudyFormPreAuditForm form); /** * 关闭拒绝 * @param form + * @return */ public void jjgb(StudyFormPreAuditForm form); /** * 更新表单内容 + * @param form + * @return */ public void updateBdnr(StudyFormUpdateForm form); /** * 更新复核意见 + * @param form + * @return */ public void updateFhyjjl(StudyFormUpdateForm form); /** * 更新字段勾选记录 + * @param form + * @return */ public void updateZdgxjl(StudyFormUpdateForm form); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java index 207631c..b835bb1 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/template/TemplateBaseUtil.java @@ -105,24 +105,24 @@ public class TemplateBaseUtil { table.addCell(cell); } if (StringUtils.isNoneBlank(instrument)) { -// JSONArray jsonArray = JSONArray.parseArray(instrument); -// int rowNum = 0; -// for (int i = 0; i < jsonArray.size(); i++) { -// JSONObject obj = jsonArray.getJSONObject(i); -// // 交替行颜色 -// if (rowNum % 2 == 0) { -// table.getDefaultCell().setBackgroundColor(BaseColor.WHITE); -// } else { -// table.getDefaultCell().setBackgroundColor(BaseColor.WHITE); -// } -// table.addCell(PdfBaseUtil.createCell(obj.getString("mc"), contentFont)); -// table.addCell(PdfBaseUtil.createCell(obj.getString("bh"), contentFont)); -// table.addCell(PdfBaseUtil.createCell(obj.getString("ph"), contentFont)); -// table.addCell(PdfBaseUtil.createCell(obj.getString("nd"), contentFont)); -// table.addCell(PdfBaseUtil.createCell(obj.getString("source"), contentFont)); -// table.addCell(PdfBaseUtil.createCell(StringUtils.isNoneBlank(obj.getString("sxrq")) ? obj.getString("sxrq") : "", contentFont)); -// rowNum++; -// } + JSONArray jsonArray = JSONArray.parseArray(instrument); + int rowNum = 0; + for (int i = 0; i < jsonArray.size(); i++) { + JSONObject obj = jsonArray.getJSONObject(i); + // 交替行颜色 + if (rowNum % 2 == 0) { + table.getDefaultCell().setBackgroundColor(BaseColor.WHITE); + } else { + table.getDefaultCell().setBackgroundColor(BaseColor.WHITE); + } + table.addCell(PdfBaseUtil.createCell(obj.getString("mc"), contentFont)); + table.addCell(PdfBaseUtil.createCell(obj.getString("bh"), contentFont)); + table.addCell(PdfBaseUtil.createCell(obj.getString("ph"), contentFont)); + table.addCell(PdfBaseUtil.createCell(obj.getString("nd"), contentFont)); + table.addCell(PdfBaseUtil.createCell(obj.getString("source"), contentFont)); + table.addCell(PdfBaseUtil.createCell(StringUtils.isNoneBlank(obj.getString("sxrq")) ? obj.getString("sxrq") : "", contentFont)); + rowNum++; + } } document.add(table); }