From 3145c0755a90434912031434fb730c60edcc20d0 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 15 Jan 2026 10:21:08 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=A1=A8=E5=8D=95=E4=BC=98=E5=8C=96]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hxhq/business/domain/StudyFormApply.java | 24 ++-- .../hxhq/business/domain/StudyFormApplyJcgj.java | 32 ++++++ .../hxhq/business/domain/StudyFormApplyQmxx.java | 21 ++++ .../com/hxhq/business/domain/StudyFormFill.java | 26 +++-- .../com/hxhq/business/domain/StudyFormPlan.java | 26 ++++- .../hxhq/business/domain/StudyFormPlanJcgj.java | 32 ++++++ .../hxhq/business/domain/StudyFormPlanQmxx.java | 21 ++++ .../com/hxhq/business/domain/StudyFormPre.java | 26 ++++- .../com/hxhq/business/domain/StudyFormPreJcgj.java | 32 ++++++ .../com/hxhq/business/domain/StudyFormPreQmxx.java | 21 ++++ .../form/study/StudyFormApplySearchForm.java | 8 +- .../form/study/StudyFormFillSearchForm.java | 8 +- .../service/IStudyFormApplyJcgjService.java | 40 ++++++- .../service/IStudyFormApplyQmxxService.java | 6 +- .../service/IStudyFormPlanJcgjService.java | 40 ++++++- .../service/IStudyFormPlanQmxxService.java | 6 +- .../business/service/IStudyFormPreJcgjService.java | 39 ++++++- .../business/service/IStudyFormPreQmxxService.java | 6 +- .../impl/StudyFormApplyJcgjServiceImpl.java | 108 +++++++++++++++--- .../impl/StudyFormApplyQmxxServiceImpl.java | 15 ++- .../service/impl/StudyFormApplyServiceImpl.java | 127 +++++++++------------ .../service/impl/StudyFormFillServiceImpl.java | 2 +- .../service/impl/StudyFormPlanJcgjServiceImpl.java | 107 ++++++++++++++--- .../service/impl/StudyFormPlanQmxxServiceImpl.java | 16 ++- .../service/impl/StudyFormPlanServiceImpl.java | 73 ++++++------ .../service/impl/StudyFormPreJcgjServiceImpl.java | 107 ++++++++++++++--- .../service/impl/StudyFormPreQmxxServiceImpl.java | 14 ++- .../service/impl/StudyFormPreServiceImpl.java | 65 +++++------ .../com/hxhq/business/utils/StudyFormUtil.java | 6 + 29 files changed, 805 insertions(+), 249 deletions(-) diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java index a54431a..3185914 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApply.java @@ -30,11 +30,11 @@ public class StudyFormApply extends MpBaseEntity private String bdbh; /** 表单名称 */ - @Compare(name = "表单名称") + @Compare(name = "表单名称",nameEn = "Concentration") private String bdmc; /** 表单说明 */ - @Compare(name = "表单说明") + @Compare(name = "表单说明",nameEn = "Concentration") private String bdsm; /** 模板id */ @@ -49,9 +49,12 @@ public class StudyFormApply extends MpBaseEntity /** 表单归属人名称 */ private String userMc; - /** 是否补录：1：否；10：是 */ - @Compare(name = "是否补录") - private Integer sfbl; + /** 表单归属人名称-英文 */ + private String userMcEn; + + /** 是否补录 */ + @Compare(name = "是否补录",nameEn = "Concentration") + private String sfbl; /** 表单状态：1：填报中；3：已提交；5：已复核；6：未通过；7：已完成；9：待废止；11：已废止 */ private Integer bdzt; @@ -92,6 +95,13 @@ public class StudyFormApply extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getUserMcEn() { + return userMcEn; + } + + public void setUserMcEn(String userMcEn) { + this.userMcEn = userMcEn; + } public String getResource() { return resource; @@ -246,12 +256,12 @@ public class StudyFormApply extends MpBaseEntity return userMc; } - public void setSfbl(Integer sfbl) + public void setSfbl(String sfbl) { this.sfbl = sfbl; } - public Integer getSfbl() + public String getSfbl() { return sfbl; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyJcgj.java index 861f829..0e4c36f 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyJcgj.java @@ -24,18 +24,50 @@ public class StudyFormApplyJcgj extends MpBaseEntity /** 稽查名称 */ private String jcmc; + /** 稽查名称-英文 */ + private String jcmcEn; + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ private Integer jcmcys; /** 稽查内容 */ private String jcnr; + /** 稽查内容-英文 */ + private String jcnrEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getJcmcEn() { + return jcmcEn; + } + + public void setJcmcEn(String jcmcEn) { + this.jcmcEn = jcmcEn; + } + + public String getJcnrEn() { + return jcnrEn; + } + + public void setJcnrEn(String jcnrEn) { + this.jcnrEn = jcnrEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } public void setFormId(Long formId) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyQmxx.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyQmxx.java index 1366b9b..7dd2ea4 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyQmxx.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyQmxx.java @@ -21,12 +21,33 @@ public class StudyFormApplyQmxx extends MpBaseEntity /** 签名意义 */ private String qmyy; + /** 签名意义-英文 */ + private String qmyyEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getQmyyEn() { + return qmyyEn; + } + + public void setQmyyEn(String qmyyEn) { + this.qmyyEn = qmyyEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } public void setFormId(Long formId) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java index b9fd65d..81baf06 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java @@ -41,17 +41,18 @@ public class StudyFormFill extends MpBaseEntity /** 模板id */ private Long templateId; - /** 表单内容 */ - private String bdnr; - /** 表单归属人id */ private Long userId; /** 表单归属人名称 */ private String userMc; - /** 是否补录：1：否；10：是 */ - private Integer sfbl; + /** 表单归属人名称-英文 */ + private String userMcEn; + + /** 是否补录 */ + @Compare(name = "是否补录",nameEn = "Concentration") + private String sfbl; /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止 */ private Integer bdzt; @@ -64,6 +65,9 @@ public class StudyFormFill extends MpBaseEntity @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date tjsj; + /** 表单内容 */ + private String bdnr; + /** 物资信息 */ private String resource; @@ -121,6 +125,14 @@ public class StudyFormFill extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getUserMcEn() { + return userMcEn; + } + + public void setUserMcEn(String userMcEn) { + this.userMcEn = userMcEn; + } + public String getZdgxjl() { return zdgxjl; } @@ -347,12 +359,12 @@ public class StudyFormFill extends MpBaseEntity return userMc; } - public void setSfbl(Integer sfbl) + public void setSfbl(String sfbl) { this.sfbl = sfbl; } - public Integer getSfbl() + public String getSfbl() { return sfbl; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java index 9921a9c..ae85915 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlan.java @@ -28,11 +28,11 @@ public class StudyFormPlan extends MpBaseEntity private String bdbh; /** 表单名称 */ - @Compare(name = "表单名称") + @Compare(name = "表单名称",nameEn = "Concentration") private String bdmc; /** 表单说明 */ - @Compare(name = "表单说明") + @Compare(name = "表单说明",nameEn = "Concentration") private String bdsm; /** 模板id */ @@ -47,6 +47,9 @@ public class StudyFormPlan extends MpBaseEntity /** 表单归属人名称 */ private String userMc; + /** 表单归属人名称-英文 */ + private String userMcEn; + /** 表单状态：1：填报中；3：已提交；5：已完成（经复核）*/ private Integer bdzt; @@ -61,6 +64,9 @@ public class StudyFormPlan extends MpBaseEntity /** 复核人员名称(通知用) */ private String fhryMc; + /** 复核人员名称-英文(通知用) */ + private String fhryMcEn; + /** 物资信息 */ private String resource; @@ -90,6 +96,22 @@ public class StudyFormPlan extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getUserMcEn() { + return userMcEn; + } + + public void setUserMcEn(String userMcEn) { + this.userMcEn = userMcEn; + } + + public String getFhryMcEn() { + return fhryMcEn; + } + + public void setFhryMcEn(String fhryMcEn) { + this.fhryMcEn = fhryMcEn; + } + public String getResource() { return resource; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanJcgj.java index d7eb817..f05683e 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanJcgj.java @@ -24,18 +24,50 @@ public class StudyFormPlanJcgj extends MpBaseEntity /** 稽查名称 */ private String jcmc; + /** 稽查名称-英文 */ + private String jcmcEn; + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ private Integer jcmcys; /** 稽查内容 */ private String jcnr; + /** 稽查内容-英文 */ + private String jcnrEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getJcmcEn() { + return jcmcEn; + } + + public void setJcmcEn(String jcmcEn) { + this.jcmcEn = jcmcEn; + } + + public String getJcnrEn() { + return jcnrEn; + } + + public void setJcnrEn(String jcnrEn) { + this.jcnrEn = jcnrEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } public void setFormId(Long formId) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanQmxx.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanQmxx.java index 38df190..874f9a5 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanQmxx.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanQmxx.java @@ -21,12 +21,33 @@ public class StudyFormPlanQmxx extends MpBaseEntity /** 签名意义 */ private String qmyy; + /** 签名意义-英文 */ + private String qmyyEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getQmyyEn() { + return qmyyEn; + } + + public void setQmyyEn(String qmyyEn) { + this.qmyyEn = qmyyEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } public void setFormId(Long formId) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java index 955f50e..425ec8d 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java @@ -31,11 +31,11 @@ public class StudyFormPre extends MpBaseEntity private String bdbh; /** 表单名称 */ - @Compare(name = "表单名称") + @Compare(name = "表单名称",nameEn = "Concentration") private String bdmc; /** 表单说明 */ - @Compare(name = "表单说明") + @Compare(name = "表单说明",nameEn = "Concentration") private String bdsm; /** 模板id */ @@ -50,6 +50,9 @@ public class StudyFormPre extends MpBaseEntity /** 表单归属人名称 */ private String userMc; + /** 表单归属人名称-英文 */ + private String userMcEn; + /** 表单状态：1：填报中；3：已提交；5：已通过；7：未通过 */ private Integer bdzt; @@ -65,6 +68,9 @@ public class StudyFormPre extends MpBaseEntity /** 审核人员名称(通知用) */ private String shryMc; + /** 审核人员名称-英文(通知用) */ + private String shryMcEn; + /** 提交时间 */ @Excel(name = "提交时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -98,6 +104,22 @@ public class StudyFormPre extends MpBaseEntity @TableField(exist = false) private String studyMc; + public String getUserMcEn() { + return userMcEn; + } + + public void setUserMcEn(String userMcEn) { + this.userMcEn = userMcEn; + } + + public String getShryMcEn() { + return shryMcEn; + } + + public void setShryMcEn(String shryMcEn) { + this.shryMcEn = shryMcEn; + } + public String getResource() { return resource; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreJcgj.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreJcgj.java index da6bcfc..8070490 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreJcgj.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreJcgj.java @@ -24,18 +24,50 @@ public class StudyFormPreJcgj extends MpBaseEntity /** 稽查名称 */ private String jcmc; + /** 稽查名称-英文 */ + private String jcmcEn; + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ private Integer jcmcys; /** 稽查内容 */ private String jcnr; + /** 稽查内容-英文 */ + private String jcnrEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getJcmcEn() { + return jcmcEn; + } + + public void setJcmcEn(String jcmcEn) { + this.jcmcEn = jcmcEn; + } + + public String getJcnrEn() { + return jcnrEn; + } + + public void setJcnrEn(String jcnrEn) { + this.jcnrEn = jcnrEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } public void setFormId(Long formId) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreQmxx.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreQmxx.java index 33f2ddb..6a0629a 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreQmxx.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreQmxx.java @@ -21,12 +21,33 @@ public class StudyFormPreQmxx extends MpBaseEntity /** 签名意义 */ private String qmyy; + /** 签名意义-英文 */ + private String qmyyEn; + /** 签名人id */ private Long qmrId; /** 签名人名称 */ private String qmrMc; + /** 签名人名称-英文 */ + private String qmrMcEn; + + public String getQmyyEn() { + return qmyyEn; + } + + public void setQmyyEn(String qmyyEn) { + this.qmyyEn = qmyyEn; + } + + public String getQmrMcEn() { + return qmrMcEn; + } + + public void setQmrMcEn(String qmrMcEn) { + this.qmrMcEn = qmrMcEn; + } public void setFormId(Long formId) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java index ed34b04..5ad15cf 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormApplySearchForm.java @@ -22,8 +22,8 @@ public class StudyFormApplySearchForm { /** 模板名称 */ private String templateMc; - /** 是否补录：1：否；10：是 */ - private Integer sfbl; + /** 是否补录 */ + private String sfbl; /** 提交时间开始 */ private String tjsjks; @@ -85,11 +85,11 @@ public class StudyFormApplySearchForm { this.templateMc = templateMc; } - public Integer getSfbl() { + public String getSfbl() { return sfbl; } - public void setSfbl(Integer sfbl) { + public void setSfbl(String sfbl) { this.sfbl = sfbl; } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSearchForm.java index 5053872..3e95fff 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSearchForm.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillSearchForm.java @@ -22,8 +22,8 @@ public class StudyFormFillSearchForm { /** 模板名称 */ private String templateMc; - /** 是否补录：1：否；10：是 */ - private Integer sfbl; + /** 是否补录*/ + private String sfbl; /** 提交时间开始 */ private String tjsjks; @@ -85,11 +85,11 @@ public class StudyFormFillSearchForm { this.templateMc = templateMc; } - public Integer getSfbl() { + public String getSfbl() { return sfbl; } - public void setSfbl(Integer sfbl) { + public void setSfbl(String sfbl) { this.sfbl = sfbl; } 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 57d8dfd..fae4345 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 @@ -1,9 +1,14 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; +import java.util.Map; + import com.hxhq.business.domain.StudyFormApplyJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.business.domain.StudyFormApplyJcgj; import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.system.api.domain.SysUser; /** * 试验-申请单-稽查轨迹Service接口 @@ -23,13 +28,40 @@ public interface IStudyFormApplyJcgjService extends IService /** * 新增稽查轨迹 - * @param formId 记录id + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + * @param time 时间 + */ + public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark, Date time); + + /** + * 新增稽查轨迹 + * @param formId 表单id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 + * @param remark 备注 */ - public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + 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/IStudyFormApplyQmxxService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyQmxxService.java index a98dd4e..097af80 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyQmxxService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyQmxxService.java @@ -4,6 +4,7 @@ import java.util.List; import com.hxhq.business.domain.StudyFormApplyQmxx; import com.baomidou.mybatisplus.extension.service.IService; import com.hxhq.business.domain.StudyFormPreQmxx; +import com.hxhq.system.api.domain.SysUser; /** * 试验-申请单-签名信息Service接口 @@ -26,9 +27,8 @@ public interface IStudyFormApplyQmxxService extends IService * 新增签名信息 * @param formId * @param qmyy - * @param qmrId - * @param qmrMc + * @param qmr * @param remark */ - public void saveQmxx(Long formId, String qmyy, Long qmrId, String qmrMc,String remark); + public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark); } 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 2e6c390..45fb633 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 @@ -1,10 +1,13 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; +import java.util.Map; -import com.hxhq.business.domain.StudyFormFillJcgj; +import com.hxhq.business.domain.StudyFormPlanJcgj; import com.hxhq.business.domain.StudyFormPlanJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 试验-计划单-稽查轨迹Service接口 @@ -24,14 +27,41 @@ public interface IStudyFormPlanJcgjService extends IService /** * 新增稽查轨迹 - * @param formId 记录id + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + * @param time 时间 + */ + public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark, Date time); + + /** + * 新增稽查轨迹 + * @param formId 表单id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 + * @param remark 备注 */ - public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + 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/IStudyFormPlanQmxxService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanQmxxService.java index 907f639..b6c05bd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanQmxxService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanQmxxService.java @@ -5,6 +5,7 @@ import java.util.List; import com.hxhq.business.domain.StudyFormFillQmxx; import com.hxhq.business.domain.StudyFormPlanQmxx; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 试验-计划单-签名信息Service接口 @@ -27,9 +28,8 @@ public interface IStudyFormPlanQmxxService extends IService * 新增签名信息 * @param formId * @param qmyy - * @param qmrId - * @param qmrMc + * @param qmr * @param remark */ - public void saveQmxx(Long formId, String qmyy, Long qmrId, String qmrMc,String remark); + public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark); } 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 0591d88..0c33fae 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 @@ -1,10 +1,14 @@ package com.hxhq.business.service; +import java.util.Date; import java.util.List; +import java.util.Map; import com.hxhq.business.domain.MjyFfjlJcgj; import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.business.domain.StudyFormPreJcgj; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 试验-预填单-稽查轨迹Service接口 @@ -24,14 +28,41 @@ public interface IStudyFormPreJcgjService extends IService /** * 新增稽查轨迹 - * @param formId 记录id + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + * @param time 时间 + */ + public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark, Date time); + + /** + * 新增稽查轨迹 + * @param formId 表单id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 + * @param remark 备注 */ - public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark); + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + 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/IStudyFormPreQmxxService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java index 4119cad..d622766 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java @@ -3,6 +3,7 @@ package com.hxhq.business.service; import java.util.List; import com.hxhq.business.domain.StudyFormPreQmxx; import com.baomidou.mybatisplus.extension.service.IService; +import com.hxhq.system.api.domain.SysUser; /** * 试验-预填单-签名信息Service接口 @@ -24,10 +25,9 @@ public interface IStudyFormPreQmxxService extends IService * 新增签名信息 * @param formId * @param qmyy - * @param qmrId - * @param qmrMc + * @param qmr * @param remark */ - public void saveQmxx(Long formId, String qmyy, Long qmrId, String qmrMc,String remark); + public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java index 069d8be..88dd4b2 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java @@ -1,12 +1,19 @@ package com.hxhq.business.service.impl; +import java.util.Date; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.StudyFormApplyJcgj; import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.business.utils.JctUtil; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormApplyJcgjMapper; import com.hxhq.business.domain.StudyFormApplyJcgj; @@ -48,25 +55,100 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark, Date time){ + StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + formJcgj.setJcnr(JctUtil.formatStr(jcnr)); + formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr)); + } + if(qmr!=null){ + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + if(time!=null){ + formJcgj.setCreateTime(time); + } + formJcgj.setRemark(remark); + this.save(formJcgj); + } + + + /** + * 新增稽查轨迹 + * @param formId 表单id * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcmc 稽查名称 * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 * @param jcnr 稽查内容 - * @param jcrId 稽查人id - * @param jcrMc 稽查人名称 + * @param qmr 签名人 + * @param remark 备注 */ @Override - public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){ - StudyFormApplyJcgj studyFormApplyJcgj = new StudyFormApplyJcgj(); - studyFormApplyJcgj.setFormId(formId); - studyFormApplyJcgj.setJcgjlx(jcgjlx); - studyFormApplyJcgj.setJcmc(jcmc); - studyFormApplyJcgj.setJcmcys(jcmcys); - studyFormApplyJcgj.setJcnr(jcnr); - studyFormApplyJcgj.setQmrId(jcrId); - studyFormApplyJcgj.setQmrMc(jcrMc); - this.save(studyFormApplyJcgj); + public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ + StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + formJcgj.setJcnr(JctUtil.formatStr(jcnr)); + formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr)); + } + if(qmr!=null) { + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + formJcgj.setRemark(remark); + return formJcgj; } + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){ + StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + formJcgj.setJcnr(jcnr); + formJcgj.setJcnrEn(jcnrEn); + if(qmr!=null) { + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + formJcgj.setRemark(remark); + return formJcgj; + } + + } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyQmxxServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyQmxxServiceImpl.java index 14a768a..18a8fe0 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyQmxxServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyQmxxServiceImpl.java @@ -3,9 +3,12 @@ package com.hxhq.business.service.impl; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.StudyFormApplyQmxx; import com.hxhq.business.domain.StudyFormPreQmxx; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormApplyQmxxMapper; import com.hxhq.business.domain.StudyFormApplyQmxx; @@ -40,21 +43,23 @@ public class StudyFormApplyQmxxServiceImpl extends ServiceImpl 0) { queryWrapper.eq("t.study_subject_id", form.getStudySubjectId()); } - if (form.getSfbl() != null && form.getSfbl().intValue() > 0) { + if (StringUtils.isNoneBlank(form.getSfbl())) { queryWrapper.eq("t.sfbl", form.getSfbl()); } if (StringUtils.isNoneBlank(form.getBdbh())) { @@ -117,8 +117,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.bj.getValue(), studyFormApply.getQmyy(), JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.bj.getValue(), studyFormApply.getQmyy(), JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), studyFormApply.getQmyy(), SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), studyFormApply.getQmyy(), qmr, studyFormApply.getRemark()); } @@ -145,8 +144,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "申请废止", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "申请废止", qmr, studyFormApply.getRemark()); } @@ -176,8 +174,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("原因", form.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(),null, qmr, form.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "废止通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark()); - + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "废止通过", qmr, form.getRemark()); } else { studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.tbz.getValue()); this.updateById(studyFormApplyOld); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - formData.put("原因", form.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), null, qmr, form.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "废止拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "废止拒绝", qmr, form.getRemark()); } @@ -220,8 +214,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("新归属人", studyFormApply.getUserMc()); - formData.put("原归属人", studyFormApplyOld.getUserMc()); - formData.put("原因", studyFormApply.getRemark()); - //是否验证新的归属人，是否属于该实验？ todo studyFormApplyOld.setUserId(studyFormApply.getUserId()); studyFormApplyOld.setUserMc(studyFormApply.getUserMc()); this.updateById(studyFormApplyOld); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("新归属人", studyFormApply.getUserMc()); + formData.put("原归属人", studyFormApplyOld.getUserMc()); + formData.put("原因", studyFormApply.getRemark()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(),formData, qmr, null,null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "更换归属人", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "更换归属人", qmr, studyFormApply.getRemark()); } @@ -256,12 +250,13 @@ public class StudyFormApplyServiceImpl extends ServiceImpl studyFormApplyJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - StudyFormApplyJcgj studyFormApplyJcgj = new StudyFormApplyJcgj(); - studyFormApplyJcgj.setFormId(studyFormApply.getId()); - studyFormApplyJcgj.setJcgjlx(JcgjlxEnum.xg.getValue()); - studyFormApplyJcgj.setJcmc("修改"); - studyFormApplyJcgj.setJcmcys(JcmcysEnum.orange.getValue()); - studyFormApplyJcgj.setJcnr(fieldChange.toString()); - studyFormApplyJcgj.setQmrId(SecurityUtils.getUserId()); - studyFormApplyJcgj.setQmrMc(SecurityUtils.getNickName()); - studyFormApplyJcgjs.add(studyFormApplyJcgj); + studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApply.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormApply.getRemark())); } studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs); } } else { studyFormApply.setBdzt(StudyFormApplyBdztEnum.tbz.getValue()); - studyFormApply.setUserId(SecurityUtils.getUserId()); - studyFormApply.setUserMc(SecurityUtils.getNickName()); + studyFormApply.setUserId(qmr.getUserId()); + studyFormApply.setUserMc(qmr.getNickName()); + studyFormApply.setUserMcEn(qmr.getUserName()); this.save(studyFormApply); //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - + studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(),null); } //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并保存记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并保存记录", qmr, studyFormApply.getRemark()); } @@ -310,21 +297,20 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApply.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并提交记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并提交记录", qmr, studyFormApply.getRemark()); } @@ -335,8 +321,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核通过", qmr, studyFormApply.getRemark()); } @@ -365,8 +350,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null,null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核拒绝", qmr, studyFormApply.getRemark()); } @@ -395,8 +381,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "已审阅", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "已审阅", qmr, studyFormApply.getRemark()); } @@ -426,8 +413,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(),null, qmr, studyFormApply.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核通过", qmr, studyFormApply.getRemark()); } @@ -456,8 +442,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormApply.getRemark()); - studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormApplyJcgjService.saveJcgj(studyFormApplyOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(),null); //签名信息 - studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormApply.getRemark()); + studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核拒绝", qmr, studyFormApply.getRemark()); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java index 3e30468..a667dca 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java @@ -71,7 +71,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl 0) { queryWrapper.eq("t.study_subject_id", form.getStudySubjectId()); } - if (form.getSfbl() != null && form.getSfbl().intValue() > 0) { + if (StringUtils.isNoneBlank(form.getSfbl())) { queryWrapper.eq("t.sfbl", form.getSfbl()); } if (StringUtils.isNoneBlank(form.getBdbh())) { diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanJcgjServiceImpl.java index 72fefb9..090c4bd 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanJcgjServiceImpl.java @@ -1,12 +1,19 @@ package com.hxhq.business.service.impl; +import java.util.Date; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.StudyFormPlanJcgj; +import com.hxhq.business.domain.StudyFormPlanJcgj; +import com.hxhq.business.utils.JctUtil; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormPlanJcgjMapper; import com.hxhq.business.domain.StudyFormPlanJcgj; @@ -49,24 +56,98 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark, Date time){ + StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + formJcgj.setJcnr(JctUtil.formatStr(jcnr)); + formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr)); + } + if(qmr!=null){ + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + if(time!=null){ + formJcgj.setCreateTime(time); + } + formJcgj.setRemark(remark); + this.save(formJcgj); + } + + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ + StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + formJcgj.setJcnr(JctUtil.formatStr(jcnr)); + formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr)); + } + if(qmr!=null) { + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + formJcgj.setRemark(remark); + return formJcgj; + } + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){ + StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + formJcgj.setJcnr(jcnr); + formJcgj.setJcnrEn(jcnrEn); + if(qmr!=null) { + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + formJcgj.setRemark(remark); + return formJcgj; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanQmxxServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanQmxxServiceImpl.java index 04aeec5..3c3ab6b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanQmxxServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanQmxxServiceImpl.java @@ -4,8 +4,11 @@ import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.StudyFormPlanQmxx; +import com.hxhq.business.domain.StudyFormPlanQmxx; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormPlanQmxxMapper; import com.hxhq.business.domain.StudyFormPlanQmxx; @@ -39,23 +42,26 @@ public class StudyFormPlanQmxxServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("新归属人", studyFormPlan.getUserMc()); - formData.put("原归属人", studyFormPlanOld.getUserMc()); - formData.put("原因", studyFormPlan.getRemark()); - //是否验证新的归属人，是否属于该实验？ todo studyFormPlanOld.setUserId(studyFormPlan.getUserId()); studyFormPlanOld.setUserMc(studyFormPlan.getUserMc()); this.updateById(studyFormPlanOld); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + //稽查轨迹 + Map formData = new LinkedHashMap<>(); + formData.put("新归属人", studyFormPlan.getUserMc()); + formData.put("原归属人", studyFormPlanOld.getUserMc()); + formData.put("原因", studyFormPlan.getRemark()); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null,null); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "更换归属人", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "更换归属人", qmr, studyFormPlan.getRemark()); } @@ -132,12 +132,13 @@ public class StudyFormPlanServiceImpl extends ServiceImpl studyFormPlanJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - StudyFormPlanJcgj studyFormPlanJcgj = new StudyFormPlanJcgj(); - studyFormPlanJcgj.setFormId(studyFormPlan.getId()); - studyFormPlanJcgj.setJcgjlx(JcgjlxEnum.xg.getValue()); - studyFormPlanJcgj.setJcmc("修改"); - studyFormPlanJcgj.setJcmcys(JcmcysEnum.orange.getValue()); - studyFormPlanJcgj.setJcnr(fieldChange.toString()); - studyFormPlanJcgj.setQmrId(SecurityUtils.getUserId()); - studyFormPlanJcgj.setQmrMc(SecurityUtils.getNickName()); - studyFormPlanJcgjs.add(studyFormPlanJcgj); + studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlan.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark())); } studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs); } } else { studyFormPlan.setBdzt(StudyFormPlanBdztEnum.tbz.getValue()); - studyFormPlan.setUserId(SecurityUtils.getUserId()); - studyFormPlan.setUserMc(SecurityUtils.getNickName()); + studyFormPlan.setUserId(qmr.getUserId()); + studyFormPlan.setUserMc(qmr.getNickName()); + studyFormPlan.setUserMcEn(qmr.getUserName()); this.save(studyFormPlan); //稽查轨迹 Map formData = new LinkedHashMap<>(); formData.put("备注", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - + studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), null,qmr,studyFormPlan.getRemark(),null); } //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并保存记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并保存记录", qmr,studyFormPlan.getRemark()); } @@ -186,8 +179,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPlanJcgjService.saveJcgj(studyFormPlan.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, qmr,studyFormPlan.getRemark(),null); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", qmr,studyFormPlan.getRemark()); } @@ -213,8 +207,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(),null); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核通过", qmr,studyFormPlan.getRemark()); } @@ -243,8 +236,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null,null); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark()); } @@ -274,8 +268,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormPlan.getRemark()); - studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPlanJcgjService.saveJcgj(studyFormPlanOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(),null); //签名信息 - studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "已审阅", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPlan.getRemark()); + studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "已审阅", qmr, studyFormPlan.getRemark()); } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java index c560d1f..8ee107b 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java @@ -1,12 +1,19 @@ package com.hxhq.business.service.impl; +import java.util.Date; import java.util.List; +import java.util.Map; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.hxhq.business.domain.MjyJcgj; +import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.business.utils.JctUtil; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormPreJcgjMapper; import com.hxhq.business.domain.StudyFormPreJcgj; @@ -47,25 +54,99 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl jcnr, SysUser qmr, String remark, Date time){ + StudyFormPreJcgj formJcgj = new StudyFormPreJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + formJcgj.setJcnr(JctUtil.formatStr(jcnr)); + formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr)); + } + if(qmr!=null){ + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + if(time!=null){ + formJcgj.setCreateTime(time); + } + formJcgj.setRemark(remark); + this.save(formJcgj); + } + + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map jcnr, SysUser qmr, String remark){ + StudyFormPreJcgj formJcgj = new StudyFormPreJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + if(jcnr!=null){ + formJcgj.setJcnr(JctUtil.formatStr(jcnr)); + formJcgj.setJcnrEn(StudyFormUtil.getJcnrEn(jcnr)); + } + if(qmr!=null) { + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + formJcgj.setRemark(remark); + return formJcgj; + } + + /** + * 新增稽查轨迹 + * @param formId 表单id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcnrEn 稽查内容英文 + * @param qmr 签名人 + * @param remark 备注 + */ + @Override + public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){ + StudyFormPreJcgj formJcgj = new StudyFormPreJcgj(); + formJcgj.setFormId(formId); + formJcgj.setJcgjlx(jcgjlx); + formJcgj.setJcmc(jcmc); + formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc)); + formJcgj.setJcmcys(jcmcys); + formJcgj.setJcnr(jcnr); + formJcgj.setJcnrEn(jcnrEn); + if(qmr!=null) { + formJcgj.setQmrId(qmr.getUserId()); + formJcgj.setQmrMc(qmr.getNickName()); + formJcgj.setQmrMcEn(qmr.getUserName()); + } + formJcgj.setRemark(remark); + return formJcgj; } } diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreQmxxServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreQmxxServiceImpl.java index 88688eb..e133943 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreQmxxServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreQmxxServiceImpl.java @@ -3,10 +3,13 @@ package com.hxhq.business.service.impl; import java.util.List; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.hxhq.business.domain.StudyFormPreQmxx; import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.business.utils.StudyFormUtil; import com.hxhq.common.core.exception.ServiceException; import com.hxhq.common.core.utils.DateUtils; import com.hxhq.common.core.utils.StringUtils; +import com.hxhq.system.api.domain.SysUser; import org.springframework.stereotype.Service; import com.hxhq.business.mapper.StudyFormPreQmxxMapper; import com.hxhq.business.domain.StudyFormPreQmxx; @@ -44,17 +47,18 @@ public class StudyFormPreQmxxServiceImpl extends ServiceImpl studyFormPreJcgjs = new ArrayList<>(); for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { - StudyFormPreJcgj studyFormPreJcgj = new StudyFormPreJcgj(); - studyFormPreJcgj.setFormId(studyFormPre.getId()); - studyFormPreJcgj.setJcgjlx(JcgjlxEnum.xg.getValue()); - studyFormPreJcgj.setJcmc("修改"); - studyFormPreJcgj.setJcmcys(JcmcysEnum.orange.getValue()); - studyFormPreJcgj.setJcnr(fieldChange.toString()); - studyFormPreJcgj.setQmrId(SecurityUtils.getUserId()); - studyFormPreJcgj.setQmrMc(SecurityUtils.getNickName()); - studyFormPreJcgjs.add(studyFormPreJcgj); + studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPre.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark())); } studyFormPreJcgjService.saveBatch(studyFormPreJcgjs); } } else { studyFormPre.setBdbh("todo"); - studyFormPre.setUserId(SecurityUtils.getUserId()); - studyFormPre.setUserMc(SecurityUtils.getNickName()); + studyFormPre.setUserId(qmr.getUserId()); + studyFormPre.setUserMc(qmr.getNickName()); + studyFormPre.setUserMcEn(qmr.getNickName()); studyFormPre.setBdzt(StudyFormPreBdztEnum.tbz.getValue()); this.save(studyFormPre); //稽查轨迹 - Map formData = new LinkedHashMap<>(); - studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); - + studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), null, qmr, studyFormPre.getRemark(),null); } //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作保存预制表单", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPre.getRemark()); + studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作保存预制表单", qmr, studyFormPre.getRemark()); } @@ -163,8 +155,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPre.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), null, qmr, studyFormPre.getRemark(),null); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作提交预制表单", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPre.getRemark()); + studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark()); } @@ -199,8 +193,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", form.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), null, qmr, form.getRemark(),null); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark()); + studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核通过", qmr, form.getRemark()); } /** @@ -238,8 +231,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("原因", form.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null,null); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark()); + studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark()); } /** @@ -276,16 +270,15 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", studyFormPre.getRemark()); - studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName()); + studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, null,null); //签名信息 - studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "创建记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormPre.getRemark()); + studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "创建记录", qmr, studyFormPre.getRemark()); //生成填报表单 StudyFormFill studyFormFill = new StudyFormFill(); studyFormFill.setStudyId(studyFormPreOld.getStudyId()); - studyFormFill.setUserId(SecurityUtils.getUserId()); - studyFormFill.setUserMc(SecurityUtils.getNickName()); + studyFormFill.setUserId(qmr.getUserId()); + studyFormFill.setUserMc(qmr.getNickName()); + studyFormFill.setUserMcEn(qmr.getNickName()); studyFormFill.setStudySubjectId(studyFormPreOld.getStudySubjectId()); studyFormFill.setBdbh(studyFormPreOld.getBdbh()); studyFormFill.setBdmc(studyFormPreOld.getBdmc()); @@ -295,7 +288,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl