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 new file mode 100644 index 0000000..da6bcfc --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreJcgj.java @@ -0,0 +1,110 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 试验-预填单-稽查轨迹对象 t_study_form_pre_jcgj + * + * @author hxhq + * @date 2025-12-31 + */ +@TableName("t_study_form_pre_jcgj") +public class StudyFormPreJcgj extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 预填表单id */ + private Long formId; + + /** 稽查轨迹类型:1:流程；3：编辑 */ + private Integer jcgjlx; + + /** 稽查名称 */ + private String jcmc; + + /** 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 */ + private Integer jcmcys; + + /** 稽查内容 */ + private String jcnr; + + /** 签名人id */ + private Long qmrId; + + /** 签名人名称 */ + private String qmrMc; + + + public void setFormId(Long formId) + { + this.formId = formId; + } + + public Long getFormId() + { + return formId; + } + + public void setJcgjlx(Integer jcgjlx) + { + this.jcgjlx = jcgjlx; + } + + public Integer getJcgjlx() + { + return jcgjlx; + } + + public void setJcmc(String jcmc) + { + this.jcmc = jcmc; + } + + public String getJcmc() + { + return jcmc; + } + + public void setJcmcys(Integer jcmcys) + { + this.jcmcys = jcmcys; + } + + public Integer getJcmcys() + { + return jcmcys; + } + + public void setJcnr(String jcnr) + { + this.jcnr = jcnr; + } + + public String getJcnr() + { + return jcnr; + } + + public void setQmrId(Long qmrId) + { + this.qmrId = qmrId; + } + + public Long getQmrId() + { + return qmrId; + } + + public void setQmrMc(String qmrMc) + { + this.qmrMc = qmrMc; + } + + public String getQmrMc() + { + return qmrMc; + } + +} 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 new file mode 100644 index 0000000..33f2ddb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreQmxx.java @@ -0,0 +1,71 @@ +package com.hxhq.business.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.hxhq.common.core.domain.MpBaseEntity; + + +/** + * 试验-预填单-签名信息对象 t_study_form_pre_qmxx + * + * @author hxhq + * @date 2025-12-31 + */ +@TableName("t_study_form_pre_qmxx") +public class StudyFormPreQmxx extends MpBaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 预填表单id */ + private Long formId; + + /** 签名意义 */ + private String qmyy; + + /** 签名人id */ + private Long qmrId; + + /** 签名人名称 */ + private String qmrMc; + + + public void setFormId(Long formId) + { + this.formId = formId; + } + + public Long getFormId() + { + return formId; + } + + public void setQmyy(String qmyy) + { + this.qmyy = qmyy; + } + + public String getQmyy() + { + return qmyy; + } + + public void setQmrId(Long qmrId) + { + this.qmrId = qmrId; + } + + public Long getQmrId() + { + return qmrId; + } + + public void setQmrMc(String qmrMc) + { + this.qmrMc = qmrMc; + } + + public String getQmrMc() + { + return qmrMc; + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreJcgjMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreJcgjMapper.java new file mode 100644 index 0000000..9395efb --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreJcgjMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.StudyFormPreJcgj; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 试验-预填单-稽查轨迹Mapper接口 + * + * @author hxhq + * @date 2025-12-31 + */ +public interface StudyFormPreJcgjMapper extends BaseMapper +{ + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreQmxxMapper.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreQmxxMapper.java new file mode 100644 index 0000000..5c444a0 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreQmxxMapper.java @@ -0,0 +1,14 @@ +package com.hxhq.business.mapper; + +import com.hxhq.business.domain.StudyFormPreQmxx; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +/** + * 试验-预填单-签名信息Mapper接口 + * + * @author hxhq + * @date 2025-12-31 + */ +public interface StudyFormPreQmxxMapper extends BaseMapper +{ + +} 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 new file mode 100644 index 0000000..0591d88 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java @@ -0,0 +1,37 @@ +package com.hxhq.business.service; + +import java.util.List; + +import com.hxhq.business.domain.MjyFfjlJcgj; +import com.hxhq.business.domain.StudyFormPreJcgj; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 试验-预填单-稽查轨迹Service接口 + * + * @author hxhq + * @date 2025-12-31 + */ +public interface IStudyFormPreJcgjService extends IService +{ + + /** + * 轨迹列表 + * @param studyFormPreJcgj + * @return + */ + public List queryList(StudyFormPreJcgj studyFormPreJcgj); + + /** + * 新增稽查轨迹 + * @param formId 记录id + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 + */ + public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc); + +} 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 new file mode 100644 index 0000000..6b76824 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java @@ -0,0 +1,32 @@ +package com.hxhq.business.service; + +import java.util.List; +import com.hxhq.business.domain.StudyFormPreQmxx; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * 试验-预填单-签名信息Service接口 + * + * @author hxhq + * @date 2025-12-31 + */ +public interface IStudyFormPreQmxxService extends IService +{ + /** + * 查询试验-预填单-签名信息列表 + * + * @param studyFormPreQmxx + * @return 试验-预填单-签名信息集合 + */ + public List queryList(StudyFormPreQmxx studyFormPreQmxx); + + /** + * 新增签名信息 + * @param formId + * @param qmyy + * @param qmrId + * @param qmrMc + */ + public void saveQmxx(Long formId, String qmyy, Long qmrId, String qmrMc); + +} 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 new file mode 100644 index 0000000..d5c7680 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java @@ -0,0 +1,70 @@ +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.MjyJcgj; +import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.common.core.utils.StringUtils; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.StudyFormPreJcgjMapper; +import com.hxhq.business.domain.StudyFormPreJcgj; +import com.hxhq.business.service.IStudyFormPreJcgjService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 试验-预填单-稽查轨迹Service业务层处理 + * + * @author hxhq + * @date 2025-12-31 + */ +@Service +public class StudyFormPreJcgjServiceImpl extends ServiceImpl implements IStudyFormPreJcgjService +{ + /** + * 查询稽查轨迹列表 + * @param studyFormPreJcgj + * @return + */ + @Override + public List queryList(StudyFormPreJcgj studyFormPreJcgj){ + QueryWrapper queryWrapper = Wrappers.query(); + if(studyFormPreJcgj.getFormId()==null||studyFormPreJcgj.getFormId().longValue()<0){ + throw new SecurityException("表单id不能为空"); + } + queryWrapper.eq("form_id",studyFormPreJcgj.getFormId()); + if(studyFormPreJcgj.getJcgjlx()!=null&&studyFormPreJcgj.getJcgjlx().intValue()>0){ + queryWrapper.eq("jcgjlx",studyFormPreJcgj.getJcgjlx()); + } + if (StringUtils.isNoneBlank(studyFormPreJcgj.getJcmc())) { + queryWrapper.and(p -> p.like("`jcmc`", studyFormPreJcgj.getJcmc()) + .or().like("`jcnr`", studyFormPreJcgj.getJcmc())); + } + queryWrapper.orderByDesc("id"); + return this.list(queryWrapper); + } + + /** + * 新增稽查轨迹 + * @param formId + * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 + * @param jcmc 稽查名称 + * @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色 + * @param jcnr 稽查内容 + * @param jcrId 稽查人id + * @param jcrMc 稽查人名称 + */ + @Override + public void saveJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,Long jcrId,String jcrMc){ + StudyFormPreJcgj studyFormPreJcgj = new StudyFormPreJcgj(); + studyFormPreJcgj.setFormId(formId); + studyFormPreJcgj.setJcgjlx(jcgjlx); + studyFormPreJcgj.setJcmc(jcmc); + studyFormPreJcgj.setJcmcys(jcmcys); + studyFormPreJcgj.setJcnr(jcnr); + studyFormPreJcgj.setQmrId(jcrId); + studyFormPreJcgj.setQmrMc(jcrMc); + this.save(studyFormPreJcgj); + } + +} 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 new file mode 100644 index 0000000..32f0531 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreQmxxServiceImpl.java @@ -0,0 +1,59 @@ +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.StudyFormPreJcgj; +import com.hxhq.common.core.utils.DateUtils; +import com.hxhq.common.core.utils.StringUtils; +import org.springframework.stereotype.Service; +import com.hxhq.business.mapper.StudyFormPreQmxxMapper; +import com.hxhq.business.domain.StudyFormPreQmxx; +import com.hxhq.business.service.IStudyFormPreQmxxService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * 试验-预填单-签名信息Service业务层处理 + * + * @author hxhq + * @date 2025-12-31 + */ +@Service +public class StudyFormPreQmxxServiceImpl extends ServiceImpl implements IStudyFormPreQmxxService +{ + /** + * 查询试验-预填单-签名信息列表 + * + * @param studyFormPreQmxx 试验-预填单-签名信息 + * @return 试验-预填单-签名信息 + */ + @Override + public List queryList(StudyFormPreQmxx studyFormPreQmxx) + { + QueryWrapper queryWrapper = Wrappers.query(); + if(studyFormPreQmxx.getFormId()==null||studyFormPreQmxx.getFormId().longValue()<0){ + throw new SecurityException("表单id不能为空"); + } + queryWrapper.eq("form_id",studyFormPreQmxx.getFormId()); + queryWrapper.orderByDesc("id"); + return this.list(queryWrapper); + } + + /** + * 新增签名信息 + * @param formId + * @param qmyy + * @param qmrId + * @param qmrMc + */ + @Override + public void saveQmxx(Long formId, String qmyy, Long qmrId, String qmrMc){ + StudyFormPreQmxx studyFormPreQmxx=new StudyFormPreQmxx(); + studyFormPreQmxx.setFormId(formId); + studyFormPreQmxx.setQmyy(qmyy); + studyFormPreQmxx.setQmrId(qmrId); + studyFormPreQmxx.setQmrMc(qmrMc); + this.save(studyFormPreQmxx); + } + +} diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java index 5e3c3af..9d40943 100644 --- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java +++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java @@ -107,8 +107,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("签名意义", "制作保存预制表单"); - formData.put("签名人", SecurityUtils.getLoginUser().getSysUser().getNickName()); studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.bj.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //签名信息 studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作保存预制表单",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName()); @@ -142,8 +140,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", studyFormPre.getRemark()); - formData.put("签名意义", "制作提交预制表单"); - formData.put("签名人", SecurityUtils.getLoginUser().getSysUser().getNickName()); studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //签名信息 studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作提交预制表单",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName()); @@ -180,8 +176,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", form.getReason()); - formData.put("签名意义", "审核通过"); - formData.put("签名人", SecurityUtils.getLoginUser().getSysUser().getNickName()); studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //签名信息 studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核通过",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName()); @@ -204,9 +198,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); - formData.put("备注", form.getReason()); - formData.put("签名意义", "审核拒绝"); - formData.put("签名人", SecurityUtils.getLoginUser().getSysUser().getNickName()); + formData.put("原因", form.getReason()); studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //签名信息 studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核拒绝",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName()); @@ -234,8 +226,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl formData = new LinkedHashMap<>(); formData.put("备注", form.getReason()); - formData.put("签名意义", "创建记录"); - formData.put("签名人", SecurityUtils.getLoginUser().getSysUser().getNickName()); studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName()); //签名信息 studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"创建记录",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName()); diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreJcgjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreJcgjMapper.xml new file mode 100644 index 0000000..f812eb0 --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreJcgjMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreQmxxMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreQmxxMapper.xml new file mode 100644 index 0000000..aea113b --- /dev/null +++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreQmxxMapper.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file