eln_TD
/
eln_svr
9
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

fix:[模板管理]优化

master
15881625488@163.com 2 weeks ago
parent
4fa1838e6e
commit
8334382dd5
4 changed files with 294 additions and 283 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +35
    -34
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
  2. +144
    -139
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
  3. +48
    -46
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
  4. +67
    -64
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

+ 35
- 34
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java View File

@ -124,17 +124,16 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
if (StringUtils.isNoneBlank(form.getCjsjjs())) {
queryWrapper.apply("t.create_time<{0}", form.getCjsjjs());
}
if (form.getXyssort()!=null) {
if(form.getXyssort().equals(NormalEnum.yes.getValue())){
if (form.getXyssort() != null) {
if (form.getXyssort().equals(NormalEnum.yes.getValue())) {
queryWrapper.orderByDesc("t.xysj");
}else{
} else {
queryWrapper.orderByAsc("t.xysj");
}
}
else if (form.getTjsjsort()!=null) {
if(form.getTjsjsort().equals(NormalEnum.yes.getValue())){
} else if (form.getTjsjsort() != null) {
if (form.getTjsjsort().equals(NormalEnum.yes.getValue())) {
queryWrapper.orderByDesc("t.tjsj");
}else{
} else {
queryWrapper.orderByAsc("t.tjsj");
}
}
@ -481,7 +480,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//签名信息
studyFormApplyQmxxService.saveQmxx(now, studyFormApply.getId(), "填写并提交记录", qmr, studyFormApply.getRemark());
//发送通知
if(studyFormApply.getSdId()!=null&&studyFormApply.getSdId().longValue()>0){
if (studyFormApply.getSdId() != null && studyFormApply.getSdId().longValue() > 0) {
Study study = studyService.getById(studyFormApply.getStudyId());
String url = getUrlQz(study, "sqbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下领取申请单【" + studyFormApply.getBdmc() + "】填写并提交记录";
@ -698,40 +697,42 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
} else {
baseMapper.updateBdnr(form.getId(), form.getBdnr(), bdnr.getLong("syId"), bdnr.getLong("bmId"), bdnr.getLong("sdId"), bdnr.getString("sywzmc"), bdnr.getString("xynd"), bdnr.getDate("xysj"));
}
if(StringUtils.isNoneBlank(form.getSubmittedCodes())){
if (StringUtils.isNoneBlank(form.getSubmittedCodes())) {
baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
}
//稽查轨迹
if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
if (StringUtils.isNoneBlank(form.getFiledValue()) && !"null".equals(form.getFiledValue())) {
StudyFormApply studyFormApplyOld = this.getById(form.getId());
JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
List<StudyFormApplyJcgj> studyFormApplyJcgjs = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("原值", jsonObject.getString("oldValue"));
formData.put("新值", jsonObject.getString("value"));
formData.put("原因", jsonObject.getString("reason"));
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(jsonObject.getDate("time"), studyFormApplyOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("填入值", jsonObject.getString("value"));
formData.put("填写人", qmr.getNickName());
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(jsonObject.getDate("time"), studyFormApplyOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
if (StringUtils.isNoneBlank(jsonObject.getString("type")) && !"button".equals(jsonObject.getString("type"))) {
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("原值", jsonObject.getString("oldValue"));
formData.put("新值", jsonObject.getString("value"));
formData.put("原因", jsonObject.getString("reason"));
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(jsonObject.getDate("time"), studyFormApplyOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("填入值", jsonObject.getString("value"));
formData.put("填写人", qmr.getNickName());
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(jsonObject.getDate("time"), studyFormApplyOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
}
}
studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);

+ 144
- 139
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java View File

@ -89,15 +89,15 @@ public class StudyFormFillServiceImpl extends ServiceImpl
@Override
public List<StudyFormFill> queryQxList(StudyFormFill form) {
QueryWrapper<StudyFormFill> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("f.del_flag","0");
queryWrapper.eq("f.study_id",form.getStudyId());
queryWrapper.and(q->q.eq("f.bdzt",StudyFormFillBdztEnum.ywc.getValue())
.or().eq("f.bdzt",StudyFormFillBdztEnum.ywcfh.getValue()));
if(StringUtils.isNoneBlank(form.getUserMc())){
queryWrapper.like("f.user_mc",form.getUserMc());
queryWrapper.eq("f.del_flag", "0");
queryWrapper.eq("f.study_id", form.getStudyId());
queryWrapper.and(q -> q.eq("f.bdzt", StudyFormFillBdztEnum.ywc.getValue())
.or().eq("f.bdzt", StudyFormFillBdztEnum.ywcfh.getValue()));
if (StringUtils.isNoneBlank(form.getUserMc())) {
queryWrapper.like("f.user_mc", form.getUserMc());
}
if(StringUtils.isNoneBlank(form.getBdmc())){
queryWrapper.like("f.bdmc",form.getBdmc());
if (StringUtils.isNoneBlank(form.getBdmc())) {
queryWrapper.like("f.bdmc", form.getBdmc());
}
queryWrapper.orderByDesc("f.id");
return baseMapper.queryQxbdList(queryWrapper);
@ -105,22 +105,23 @@ public class StudyFormFillServiceImpl extends ServiceImpl
/**
* 开始配置
*
* @param form
* @return
*/
@Override
public void startConfiguration(StudyFormConfigurationForm form){
StudyFormFill studyFormFill=this.getById(form.getStudyFormId());
if(studyFormFill==null){
throw new ServiceException("填报不存在或已删除");
public void startConfiguration(StudyFormConfigurationForm form) {
StudyFormFill studyFormFill = this.getById(form.getStudyFormId());
if (studyFormFill == null) {
throw new ServiceException("填报不存在或已删除");
}
Template template = templateService.getById(studyFormFill.getTemplateId());
// 试剂
if(template.getProduct().equals(ProductEnum.Sj.getValue())){
sjService.startConfiguration(form,studyFormFill);
if (template.getProduct().equals(ProductEnum.Sj.getValue())) {
sjService.startConfiguration(form, studyFormFill);
}
// 给药制剂
if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
if (template.getProduct().equals(ProductEnum.Gyzj.getValue())) {
gyzjService.startConfiguration(form);
}
}
@ -128,26 +129,27 @@ public class StudyFormFillServiceImpl extends ServiceImpl
/**
* 配置完成
*
* @param form
* @return
*/
@Override
public void configurationCompleted(StudyFormConfigurationForm form){
StudyFormFill studyFormFill=this.getById(form.getStudyFormId());
if(studyFormFill==null){
throw new ServiceException("填报不存在或已删除");
public void configurationCompleted(StudyFormConfigurationForm form) {
StudyFormFill studyFormFill = this.getById(form.getStudyFormId());
if (studyFormFill == null) {
throw new ServiceException("填报不存在或已删除");
}
Template template = templateService.getById(studyFormFill.getTemplateId());
// 试剂
if(template.getProduct().equals(ProductEnum.Sj.getValue())){
sjService.configurationCompleted(form,studyFormFill);
if (template.getProduct().equals(ProductEnum.Sj.getValue())) {
sjService.configurationCompleted(form, studyFormFill);
}
// 给药制剂
if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
if (template.getProduct().equals(ProductEnum.Gyzj.getValue())) {
gyzjService.configurationCompleted(form);
}
// 供试品
if(template.getProduct().equals(ProductEnum.none.getValue())) {
if (template.getProduct().equals(ProductEnum.none.getValue())) {
}
}
@ -155,22 +157,23 @@ public class StudyFormFillServiceImpl extends ServiceImpl
/**
* 分装
*
* @param form
* @return
*/
@Override
public void subpackage(StudyFormFillSubpackageForm form){
StudyFormFill studyFormFill=this.getById(form.getStudyFormId());
if(studyFormFill==null){
throw new ServiceException("填报不存在或已删除");
public void subpackage(StudyFormFillSubpackageForm form) {
StudyFormFill studyFormFill = this.getById(form.getStudyFormId());
if (studyFormFill == null) {
throw new ServiceException("填报不存在或已删除");
}
Template template = templateService.getById(studyFormFill.getTemplateId());
// 试剂
if(template.getProduct().equals(ProductEnum.Sj.getValue())){
sjService.subpackage(form,studyFormFill);
if (template.getProduct().equals(ProductEnum.Sj.getValue())) {
sjService.subpackage(form, studyFormFill);
}
// 给药制剂
if(template.getProduct().equals(ProductEnum.Gyzj.getValue())){
if (template.getProduct().equals(ProductEnum.Gyzj.getValue())) {
gyzjService.subpackage(form);
}
}
@ -245,7 +248,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void jq(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -260,7 +263,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.bj.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), studyFormFill.getQmyy(), qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFill.getId(), studyFormFill.getQmyy(), qmr, studyFormFill.getRemark());
}
@ -273,7 +276,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void fz(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -290,7 +293,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "申请废止", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFill.getId(), "申请废止", qmr, studyFormFill.getRemark());
}
@ -304,7 +307,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void qrfz(StudyFormFillShfzForm form) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -324,11 +327,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("原因", form.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "废止通过", qmr, form.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "废止通过", qmr, form.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】废止通过";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】废止通过";
noticeService.save(title, studyFormFillOld.getUserId(), url);
} else {
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
@ -338,11 +341,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("原因", form.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】废止拒绝";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】废止拒绝";
noticeService.save(title, studyFormFillOld.getUserId(), url);
}
@ -350,16 +353,17 @@ public class StudyFormFillServiceImpl extends ServiceImpl
/**
* 获取学科名称
*
* @param studySubjectId
* @return
*/
private String getSubjectName(Long studySubjectId){
if(studySubjectId==null || studySubjectId.longValue()<=0){
private String getSubjectName(Long studySubjectId) {
if (studySubjectId == null || studySubjectId.longValue() <= 0) {
return "";
}
try{
return "【"+studySubjectService.getById(studySubjectId).getDeptName()+"】";
}catch (Exception e){
try {
return "【" + studySubjectService.getById(studySubjectId).getDeptName() + "】";
} catch (Exception e) {
return "";
}
}
@ -374,7 +378,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void ghgsr(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -398,11 +402,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
this.updateById(studyFormFillOld);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "更换归属人", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "更换归属人", qmr, studyFormFill.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】已更换您为归属人";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】已更换您为归属人";
noticeService.save(title, studyFormFillOld.getUserId(), url);
}
@ -415,7 +419,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public StudyFormFill bc(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getQmrmm());
StudyFormFill result = null;
if (studyFormFill.getId() != null) {
@ -433,7 +437,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
this.updateById(studyFormFillOld);
result = studyFormFillOld;
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark());
@ -448,7 +452,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
this.save(studyFormFill);
result = studyFormFill;
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark());
@ -464,7 +468,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
*/
@Override
public void bcAuto(StudyFormFill studyFormFill) {
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
studyFormFill.setUserId(SecurityUtils.getUserId());
@ -476,7 +480,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, studyFormFill.getRemark(), now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
}
/**
@ -524,31 +528,31 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void yjcc(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() != null) {
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
studyFormFillOld.setResource(studyFormFill.getResource());
Template template = templateService.getById(studyFormFillOld.getTemplateId());
//只有列表有 开始配置 配置完成的时候，并且点了配置完成后 ，药剂存储才能选到配置出来的药剂，其余都只能选择使用的
mjyService.storageResource(studyFormFill,template,studyFormFill.getRemark());
gyzjService.storageResource(studyFormFill,template,studyFormFill.getRemark());
gspService.storageResource(studyFormFill,template,studyFormFill.getRemark());
mjyService.storageResource(studyFormFill, template, studyFormFill.getRemark());
gyzjService.storageResource(studyFormFill, template, studyFormFill.getRemark());
gspService.storageResource(studyFormFill, template, studyFormFill.getRemark());
String cclist = studyFormFill.getCclist();
String empty = "[]";
if (StringUtils.isNotEmpty(cclist) && !StringUtils.equals(empty, cclist)) {
List<StudyFormFillJcgj> studyFormFillJcgjList=new ArrayList<>();
List<StudyFormFillJcgj> studyFormFillJcgjList = new ArrayList<>();
List<StudyFormFillCc> studyFormFillCcList = JSONUtil.toList(cclist, StudyFormFillCc.class);
for (StudyFormFillCc studyFormFillCc : studyFormFillCcList) {
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("存储位置", studyFormFillCc.getCcwz());
formData.put("存储条件", studyFormFillCc.getCctj());
formData.put("存储药剂", String.join(",",studyFormFillCc.getList()));
studyFormFillJcgjList.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, null));
formData.put("存储药剂", String.join(",", studyFormFillCc.getList()));
studyFormFillJcgjList.add(studyFormFillJcgjService.getJcgj(now, studyFormFillOld, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, null));
}
if(studyFormFillJcgjList.size()>0){
if (studyFormFillJcgjList.size() > 0) {
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjList);
}
}
@ -563,7 +567,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
@Override
@Transactional(rollbackFor = Exception.class)
public String yjccFilter(StudyFormFill studyFormFill) {
List<StudyFormFillResource> result=new ArrayList<>();
List<StudyFormFillResource> result = new ArrayList<>();
if (studyFormFill.getId() != null) {
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
Template template = templateService.getById(studyFormFillOld.getTemplateId());
@ -571,12 +575,12 @@ public class StudyFormFillServiceImpl extends ServiceImpl
if (StringUtils.isNotEmpty(studyFormFill.getResource()) && !StringUtils.equals(empty, studyFormFill.getResource())) {
List<StudyFormFillResource> studyFormFillResourceList = JSONUtil.toList(studyFormFill.getResource(), StudyFormFillResource.class);
result = studyFormFillResourceList.stream().filter(
p -> (p.getType()!=null&&!p.getType().equals(StudyFormFillResourceTypeEnum.sj.getValue()))).collect(Collectors.toList());
p -> (p.getType() != null && !p.getType().equals(StudyFormFillResourceTypeEnum.sj.getValue()))).collect(Collectors.toList());
List<StudyFormFillResource> tmp = studyFormFillResourceList.stream().filter(
p -> (p.getType() == null)).collect(Collectors.toList());
if (tmp.size() > 0) {
List<String> bhList = tmp.stream().map(StudyFormFillResource::getBh).collect(Collectors.toList());
if(template.getProduct().equals(StudyFormFillResourceTypeEnum.mjy.getValue())){
if (template.getProduct().equals(StudyFormFillResourceTypeEnum.mjy.getValue())) {
LambdaQueryWrapper<Mjy> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Mjy::getBh, bhList);
List<Mjy> mjyList = mjyService.list(queryWrapper);
@ -586,12 +590,12 @@ public class StudyFormFillServiceImpl extends ServiceImpl
}
for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) {
Mjy mjy = mjyMap.get(studyFormFillResource.getBh());
if(mjy!=null){
if (mjy != null) {
result.add(studyFormFillResource);
}
}
}
if(template.getProduct().equals(StudyFormFillResourceTypeEnum.gyzj.getValue())){
if (template.getProduct().equals(StudyFormFillResourceTypeEnum.gyzj.getValue())) {
LambdaQueryWrapper<Gyzj> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Gyzj::getBh, bhList);
List<Gyzj> gyzjList = gyzjService.list(queryWrapper);
@ -601,7 +605,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
}
for (StudyFormFillResource studyFormFillResource : studyFormFillResourceList) {
Gyzj gyzj = gyzjMap.get(studyFormFillResource.getBh());
if(gyzj!=null){
if (gyzj != null) {
result.add(studyFormFillResource);
}
}
@ -609,7 +613,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
}
}
}
return JSONObject.toJSONString(result);
return JSONObject.toJSONString(result);
}
/**
@ -621,7 +625,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void tj(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() != null) {
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
@ -651,7 +655,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹
List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark()));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now, studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark()));
}
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
}
@ -680,12 +684,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
}
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());
}
/**
* 提交病理学家审核
*
@ -695,7 +698,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void tjblxjsh(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() != null) {
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
@ -722,7 +725,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
}
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());
}
@ -733,10 +736,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
* @param remark
*/
public void genJcbList(StudyFormFill studyFormFill, String remark) {
if(StringUtils.isNoneBlank(studyFormFill.getJcbList())){
List<Jcb> jcbList = JSONArray.parseArray(studyFormFill.getJcbList(),Jcb.class);
if(jcbList!=null && jcbList.size()>0){
for(Jcb jcb : jcbList){
if (StringUtils.isNoneBlank(studyFormFill.getJcbList())) {
List<Jcb> jcbList = JSONArray.parseArray(studyFormFill.getJcbList(), Jcb.class);
if (jcbList != null && jcbList.size() > 0) {
for (Jcb jcb : jcbList) {
jcb.setCjr(SecurityUtils.getNickName());
}
jcbService.saveBatch(jcbList);
@ -751,7 +754,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
* @param remark
*/
public void genXbxj(StudyFormFill studyFormFill, String remark) {
if(StringUtils.isNoneBlank(studyFormFill.getXbxj())){
if (StringUtils.isNoneBlank(studyFormFill.getXbxj())) {
//todo
}
}
@ -784,7 +787,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void gc(StudyFormFillGcForm form) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -801,7 +804,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("生长情况", form.getQmyy());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark());
}
@ -814,7 +817,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void blxjshtg(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -836,11 +839,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("原因", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "病理学家审核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "病理学家审核通过", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "病理学家审核通过", qmr, studyFormFill.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】病理学家审核通过";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】病理学家审核通过";
noticeService.save(title, studyFormFillOld.getUserId(), url);
}
@ -854,7 +857,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void blxjshjj(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -875,11 +878,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "病理学家审核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "病理学家审核拒绝", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "病理学家审核拒绝", qmr, studyFormFill.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】病理学家审核拒绝";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】病理学家审核拒绝";
noticeService.save(title, studyFormFillOld.getUserId(), url);
}
@ -894,7 +897,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void fhtg(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -914,11 +917,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("原因", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】复核通过";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】复核通过";
noticeService.save(title, studyFormFillOld.getUserId(), url);
}
@ -932,7 +935,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void fhjj(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -953,11 +956,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】复核拒绝";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】复核拒绝";
noticeService.save(title, studyFormFillOld.getUserId(), url);
}
@ -971,7 +974,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void tg(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -992,11 +995,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】免复核通过";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】免复核通过";
noticeService.save(title, studyFormFillOld.getUserId(), url);
}
@ -1009,7 +1012,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void sy(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -1028,11 +1031,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark());
//发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormFillOld.getStudySubjectId())+"下填报表单【" + studyFormFillOld.getBdmc() + "】已审阅";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormFillOld.getStudySubjectId()) + "下填报表单【" + studyFormFillOld.getBdmc() + "】已审阅";
noticeService.save(title, studyFormFillOld.getUserId(), url);
}
@ -1055,47 +1058,49 @@ public class StudyFormFillServiceImpl extends ServiceImpl
@Override
public void updateBdnr(StudyFormUpdateForm form) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
if(StringUtils.isNoneBlank(form.getZdxgjl())){
if (StringUtils.isNoneBlank(form.getZdxgjl())) {
baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
}else{
} else {
baseMapper.updateBdnr(form.getId(), form.getBdnr());
}
if(StringUtils.isNoneBlank(form.getSubmittedCodes())){
if (StringUtils.isNoneBlank(form.getSubmittedCodes())) {
baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
}
//稽查轨迹
if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
if (StringUtils.isNoneBlank(form.getFiledValue()) && !"null".equals(form.getFiledValue())) {
StudyFormFill studyFormFillOld = this.getById(form.getId());
JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("原值", jsonObject.getString("oldValue"));
formData.put("新值", jsonObject.getString("value"));
formData.put("原因", jsonObject.getString("reason"));
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"),studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("填入值", jsonObject.getString("value"));
formData.put("填写人", qmr.getNickName());
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"),studyFormFillOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
if (StringUtils.isNoneBlank(jsonObject.getString("type"))&&!"button".equals(jsonObject.getString("type"))) {
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("原值", jsonObject.getString("oldValue"));
formData.put("新值", jsonObject.getString("value"));
formData.put("原因", jsonObject.getString("reason"));
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"), studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("填入值", jsonObject.getString("value"));
formData.put("填写人", qmr.getNickName());
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"), studyFormFillOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
}
}
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
}
@ -1121,7 +1126,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("复核意见", jsonObject.getString("content"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"),studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"), studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())) {
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh
@ -1130,7 +1135,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"),studyFormFillOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(jsonObject.getDate("time"), studyFormFillOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
}
@ -1161,26 +1166,26 @@ public class StudyFormFillServiceImpl extends ServiceImpl
}
//学科缩写:新增配制计划表：学科简称SD；非试验表单：学科简称GG；麻精药表单：学科简称GSP
String abbr = "";
if(studyFormFill.getStudyFormPreId()==null){
if(study.getType().equals(StudyTypeEnum.sy.getValue())){
if (studyFormFill.getStudyFormPreId() == null) {
if (study.getType().equals(StudyTypeEnum.sy.getValue())) {
SysDept dep = sysDeptService.selectDeptById(studySubjectService.getById(studyFormFill.getStudySubjectId()).getDeptId());
if (dep == null) {
throw new ServiceException("学科不存在或已删除");
}
abbr = dep.getAbbr();
}
if(study.getType().equals(StudyTypeEnum.fsy.getValue())){
if (study.getType().equals(StudyTypeEnum.fsy.getValue())) {
abbr = "GG";
}
if(study.getType().equals(StudyTypeEnum.mjy.getValue())){
if (study.getType().equals(StudyTypeEnum.mjy.getValue())) {
abbr = "GSP";
}
}
// 有预填的=预填编号+流水号，没有得=模板编号+试验编号+学科缩写+01+流水号
String pre = studyFormFill.getStudyFormPreId()==null?
(template.getShowSn() + "-" + study.getSn() + "-" + abbr+"-01")
:studyFormPreService.getById(studyFormFill.getStudyFormPreId()).getBdbh();
return pre + snGenService.getNewSn(pre,SnTypeEnum.noDate.getValue());
String pre = studyFormFill.getStudyFormPreId() == null ?
(template.getShowSn() + "-" + study.getSn() + "-" + abbr + "-01")
: studyFormPreService.getById(studyFormFill.getStudyFormPreId()).getBdbh();
return pre + snGenService.getNewSn(pre, SnTypeEnum.noDate.getValue());
}
@ -1195,8 +1200,8 @@ public class StudyFormFillServiceImpl extends ServiceImpl
return study.getType().equals(StudyTypeEnum.sy.getValue()) ? ("/study/enter/" + study.getId() + "/" + tab) : study.getType().equals(StudyTypeEnum.fsy.getValue()) ? ("/nonTrial/enter/" + study.getId() + "/" + tab) : study.getType().equals(StudyTypeEnum.mjy.getValue()) ? ("/drug/enter/" + study.getId() + "/" + tab) : "";
}
private Long getDeptId(StudyFormFill form){
if(form.getStudySubjectId()!=null){
private Long getDeptId(StudyFormFill form) {
if (form.getStudySubjectId() != null) {
return studySubjectService.getById(form.getStudySubjectId()).getDeptId();
}
return SecurityUtils.getLoginUser().getSysUser().getDeptId();

+ 48
- 46
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java View File

@ -110,7 +110,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void ghgsr(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -131,7 +131,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formData.put("原因", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, now);
//签名信息
studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "更换归属人", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now, studyFormPlanOld.getId(), "更换归属人", qmr, studyFormPlan.getRemark());
//发送通知
Study study = studyService.getById(studyFormPlanOld.getStudyId());
String url = getUrlQz(study, "syxx");
@ -147,7 +147,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
*/
@Override
public StudyFormPlan bc(StudyFormPlan studyFormPlan) {
Date now =new Date();
Date now = new Date();
StudyFormPlan result = null;
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
if (studyFormPlan.getId() != null) {
@ -169,7 +169,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//稽查轨迹
List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlan, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark()));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now, studyFormPlan, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark()));
}
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
}
@ -188,7 +188,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
result = studyFormPlan;
}
//签名信息
studyFormPlanQmxxService.saveQmxx(now,studyFormPlan.getId(), "填写并保存记录", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now, studyFormPlan.getId(), "填写并保存记录", qmr, studyFormPlan.getRemark());
return baseMapper.queryInfo(result.getId());
}
@ -238,7 +238,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void tj(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null) {
studyFormPlan.setUserId(SecurityUtils.getUserId());
@ -249,7 +249,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
studyFormPlan.setTjsj(new Date());
this.saveOrUpdate(studyFormPlan);
//发送通知
if(studyFormPlan.getFhryId()!=null) {
if (studyFormPlan.getFhryId() != null) {
Study study = studyService.getById(studyFormPlan.getStudyId());
String url = getUrlQz(study, "syxx");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "】下配置计划表【" + studyFormPlan.getBdmc() + "】待审核，请及时处理。";
@ -260,7 +260,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formData.put("备注", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息
studyFormPlanQmxxService.saveQmxx(now,studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now, studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark());
}
@ -273,7 +273,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void fhtg(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -292,7 +292,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formData.put("原因", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息
studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now, studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark());
//发送通知
Study study = studyService.getById(studyFormPlanOld.getStudyId());
String url = getUrlQz(study, "syxx");
@ -310,7 +310,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void fhjj(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -329,7 +329,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formData.put("原因", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now);
//签名信息
studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now, studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark());
//发送通知
Study study = studyService.getById(studyFormPlanOld.getStudyId());
String url = getUrlQz(study, "syxx");
@ -347,7 +347,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void sy(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
Date now =new Date();
Date now = new Date();
checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
throw new ServiceException("参数id不正确");
@ -364,7 +364,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//稽查轨迹
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), now);
//签名信息
studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "已审阅", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now, studyFormPlanOld.getId(), "已审阅", qmr, studyFormPlan.getRemark());
//发送通知
Study study = studyService.getById(studyFormPlanOld.getStudyId());
String url = getUrlQz(study, "syxx");
@ -393,45 +393,47 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void updateBdnr(StudyFormUpdateForm form) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//更新表单内容
if(StringUtils.isNoneBlank(form.getZdxgjl())){
if (StringUtils.isNoneBlank(form.getZdxgjl())) {
baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
}else{
} else {
baseMapper.updateBdnr(form.getId(), form.getBdnr());
}
if(StringUtils.isNoneBlank(form.getSubmittedCodes())){
if (StringUtils.isNoneBlank(form.getSubmittedCodes())) {
baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
}
//稽查轨迹
if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
if (StringUtils.isNoneBlank(form.getFiledValue()) && !"null".equals(form.getFiledValue())) {
StudyFormPlan studyFormPlanOld = this.getById(form.getId());
JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("原值", jsonObject.getString("oldValue"));
formData.put("新值", jsonObject.getString("value"));
formData.put("原因", jsonObject.getString("reason"));
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPlanOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("填入值", jsonObject.getString("value"));
formData.put("填写人", qmr.getNickName());
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPlanOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
if (StringUtils.isNoneBlank(jsonObject.getString("type")) && !"button".equals(jsonObject.getString("type"))) {
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("原值", jsonObject.getString("oldValue"));
formData.put("新值", jsonObject.getString("value"));
formData.put("原因", jsonObject.getString("reason"));
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"), studyFormPlanOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("填入值", jsonObject.getString("value"));
formData.put("填写人", qmr.getNickName());
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"), studyFormPlanOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
}
}
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
@ -459,8 +461,8 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("复核意见", jsonObject.getString("content"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())){
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"), studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())) {
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
@ -468,7 +470,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPlanOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(jsonObject.getDate("time"), studyFormPlanOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
}
@ -500,7 +502,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//学科缩写:新增配制计划表：学科简称SD；非试验表单：学科简称GG；麻精药表单：学科简称GSP
// 有预填的=预填编号+流水号，没有得=模板编号+试验编号+学科缩写+01+流水号
String pre = template.getShowSn() + "-" + study.getSn() + "-SD-01";
return pre + snGenService.getNewSn(pre,SnTypeEnum.noDate.getValue());
return pre + snGenService.getNewSn(pre, SnTypeEnum.noDate.getValue());
}

+ 67
- 64
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java View File

@ -127,7 +127,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
@Override
public StudyFormPre bc(StudyFormPre studyFormPre) {
StudyFormPre result = null;
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
if (studyFormPre.getId() != null) {
StudyFormPre studyFormPreOld = this.getById(studyFormPre.getId());
@ -147,7 +147,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹
List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPre, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark()));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now, studyFormPre, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark()));
}
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
}
@ -166,7 +166,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
result = studyFormPre;
}
//签名信息
studyFormPreQmxxService.saveQmxx(now,studyFormPre.getId(), "制作保存预制表单", qmr, studyFormPre.getRemark());
studyFormPreQmxxService.saveQmxx(now, studyFormPre.getId(), "制作保存预制表单", qmr, studyFormPre.getRemark());
return baseMapper.queryInfo(result.getId());
}
@ -212,7 +212,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/
@Override
public void tj(StudyFormPre studyFormPre) {
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码
checkPassword(qmr, studyFormPre.getQmrmm());
@ -241,26 +241,27 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formData.put("备注", studyFormPre.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息
studyFormPreQmxxService.saveQmxx(now,studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark());
studyFormPreQmxxService.saveQmxx(now, studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark());
//发送通知
Study study = studyService.getById(studyFormPre.getStudyId());
String url = getUrlQz(study, "ytbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPre.getStudySubjectId())+"下有预填表单【" + studyFormPre.getBdmc() + "】待审核，请及时处理";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormPre.getStudySubjectId()) + "下有预填表单【" + studyFormPre.getBdmc() + "】待审核，请及时处理";
noticeService.save(title, studyFormPre.getShryId(), url);
}
/**
* 获取学科名称
*
* @param studySubjectId
* @return
*/
private String getSubjectName(Long studySubjectId){
if(studySubjectId==null || studySubjectId.longValue()<=0){
private String getSubjectName(Long studySubjectId) {
if (studySubjectId == null || studySubjectId.longValue() <= 0) {
return "";
}
try{
return "【"+studySubjectService.getById(studySubjectId).getDeptName()+"】";
}catch (Exception e){
try {
return "【" + studySubjectService.getById(studySubjectId).getDeptName() + "】";
} catch (Exception e) {
return "";
}
}
@ -273,7 +274,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/
@Override
public void tg(StudyFormPreAuditForm form) {
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码
checkPassword(qmr, form.getQmrmm());
@ -292,7 +293,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】已审核通过";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormPreOld.getStudySubjectId()) + "下预填表单【" + studyFormPreOld.getBdmc() + "】已审核通过";
noticeService.save(title, studyFormPreOld.getUserId(), url);
} else {
//权限审核
@ -303,14 +304,14 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下有预填表单【" + studyFormPreOld.getBdmc() + "】待审核，请及时处理";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormPreOld.getStudySubjectId()) + "下有预填表单【" + studyFormPreOld.getBdmc() + "】待审核，请及时处理";
noticeService.save(title, study.getLeader(), url);
} else {
studyFormPreOld.setBdzt(StudyFormPreBdztEnum.ytg.getValue());
//发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】已审核通过";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormPreOld.getStudySubjectId()) + "下预填表单【" + studyFormPreOld.getBdmc() + "】已审核通过";
noticeService.save(title, studyFormPreOld.getUserId(), url);
}
}
@ -323,7 +324,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formData.put("备注", form.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "审核通过", qmr, form.getRemark());
studyFormPreQmxxService.saveQmxx(now, studyFormPreOld.getId(), "审核通过", qmr, form.getRemark());
}
/**
@ -333,7 +334,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/
@Override
public void jj(StudyFormPreAuditForm form) {
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码
checkPassword(qmr, form.getQmrmm());
@ -352,11 +353,11 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formData.put("原因", form.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now);
//签名信息
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark());
studyFormPreQmxxService.saveQmxx(now, studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark());
//发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】审核未通过";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormPreOld.getStudySubjectId()) + "下预填表单【" + studyFormPreOld.getBdmc() + "】审核未通过";
noticeService.save(title, studyFormPreOld.getUserId(), url);
}
@ -367,7 +368,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/
@Override
public StudyFormFill tb(StudyFormPre studyFormPre) {
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码
checkPassword(qmr, studyFormPre.getQmrmm());
@ -382,7 +383,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, null, now);
//签名信息
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "创建记录", qmr, studyFormPre.getRemark());
studyFormPreQmxxService.saveQmxx(now, studyFormPreOld.getId(), "创建记录", qmr, studyFormPre.getRemark());
//生成填报表单
StudyFormFill studyFormFill = new StudyFormFill();
studyFormFill.setStudyId(studyFormPreOld.getStudyId());
@ -408,7 +409,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/
@Override
public void sqgb(StudyFormPre studyFormPre) {
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码
checkPassword(qmr, studyFormPre.getQmrmm());
@ -432,11 +433,11 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formData.put("原因", studyFormPre.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "申请关闭", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息
studyFormFillQmxxService.saveQmxx(now,studyFormPreOld.getId(), "申请关闭", qmr, studyFormPre.getRemark());
studyFormFillQmxxService.saveQmxx(now, studyFormPreOld.getId(), "申请关闭", qmr, studyFormPre.getRemark());
//发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】申请关闭";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormPreOld.getStudySubjectId()) + "下预填表单【" + studyFormPreOld.getBdmc() + "】申请关闭";
noticeService.save(title, studyFormPreOld.getSjshryId(), url);
}
@ -448,7 +449,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/
@Override
public void jjgb(StudyFormPreAuditForm form) {
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码
checkPassword(qmr, form.getQmrmm());
@ -469,11 +470,11 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formData.put("原因", form.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now);
//签名信息
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "关闭拒绝", qmr, form.getRemark());
studyFormPreQmxxService.saveQmxx(now, studyFormPreOld.getId(), "关闭拒绝", qmr, form.getRemark());
//发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】关闭拒绝";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormPreOld.getStudySubjectId()) + "下预填表单【" + studyFormPreOld.getBdmc() + "】关闭拒绝";
noticeService.save(title, studyFormPreOld.getUserId(), url);
}
@ -484,7 +485,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/
@Override
public void tygb(StudyFormPreAuditForm form) {
Date now =new Date();
Date now = new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码
checkPassword(qmr, form.getQmrmm());
@ -505,11 +506,11 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formData.put("原因", form.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭同意", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "关闭同意", qmr, form.getRemark());
studyFormPreQmxxService.saveQmxx(now, studyFormPreOld.getId(), "关闭同意", qmr, form.getRemark());
//发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd");
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName()+"（"+study.getSn()+"）" + "】"+getSubjectName(studyFormPreOld.getStudySubjectId())+"下预填表单【" + studyFormPreOld.getBdmc() + "】关闭同意";
String title = StudyTypeEnum.getEnumByValue(study.getType()).getText() + "【" + study.getName() + "（" + study.getSn() + "）" + "】" + getSubjectName(studyFormPreOld.getStudySubjectId()) + "下预填表单【" + studyFormPreOld.getBdmc() + "】关闭同意";
noticeService.save(title, studyFormPreOld.getUserId(), url);
}
@ -533,45 +534,47 @@ public class StudyFormPreServiceImpl extends ServiceImpl
public void updateBdnr(StudyFormUpdateForm form) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//更新表单内容
if(StringUtils.isNoneBlank(form.getZdxgjl())){
if (StringUtils.isNoneBlank(form.getZdxgjl())) {
baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
}else{
} else {
baseMapper.updateBdnr(form.getId(), form.getBdnr());
}
if(StringUtils.isNoneBlank(form.getSubmittedCodes())){
if (StringUtils.isNoneBlank(form.getSubmittedCodes())) {
baseMapper.updateSubmittedCodes(form.getId(), form.getSubmittedCodes());
}
//稽查轨迹
if (StringUtils.isNoneBlank(form.getFiledValue())&&!"null".equals(form.getFiledValue())) {
if (StringUtils.isNoneBlank(form.getFiledValue()) && !"null".equals(form.getFiledValue())) {
StudyFormPre studyFormPreOld = this.getById(form.getId());
JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("原值", jsonObject.getString("oldValue"));
formData.put("新值", jsonObject.getString("value"));
formData.put("原因", jsonObject.getString("reason"));
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPreOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("填入值", jsonObject.getString("value"));
formData.put("填写人", qmr.getNickName());
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPreOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
if (StringUtils.isNoneBlank(jsonObject.getString("type")) && !"button".equals(jsonObject.getString("type"))) {
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
if (StringUtils.isNoneBlank(jsonObject.getString("oldValue"))) {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("原值", jsonObject.getString("oldValue"));
formData.put("新值", jsonObject.getString("value"));
formData.put("原因", jsonObject.getString("reason"));
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"), studyFormPreOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("填入值", jsonObject.getString("value"));
formData.put("填写人", qmr.getNickName());
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"), studyFormPreOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
}
}
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
@ -599,7 +602,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("复核意见", jsonObject.getString("content"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPreOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"), studyFormPreOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())) {
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh
@ -608,7 +611,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//en
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"),studyFormPreOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(jsonObject.getDate("time"), studyFormPreOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
}
@ -640,23 +643,23 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//学科缩写:新增配制计划表：学科简称SD；非试验表单：学科简称GG；麻精药表单：学科简称GSP
String abbr = "";
if(study.getType().equals(StudyTypeEnum.sy.getValue())){
if (study.getType().equals(StudyTypeEnum.sy.getValue())) {
SysDept dep = sysDeptService.selectDeptById(studySubjectService.getById(studyFormPre.getStudySubjectId()).getDeptId());
if (dep == null) {
throw new ServiceException("学科不存在或已删除");
}
abbr = dep.getAbbr();
}
if(study.getType().equals(StudyTypeEnum.fsy.getValue())){
if (study.getType().equals(StudyTypeEnum.fsy.getValue())) {
abbr = "GG";
}
if(study.getType().equals(StudyTypeEnum.mjy.getValue())){
if (study.getType().equals(StudyTypeEnum.mjy.getValue())) {
abbr = "GSP";
}
// 模板编号+试验编号+学科缩写+流水号
String pre = template.getShowSn() + "-" + study.getSn() + "-" + abbr;
return pre + snGenService.getNewSn(pre,SnTypeEnum.noDate.getValue());
return pre + snGenService.getNewSn(pre, SnTypeEnum.noDate.getValue());
}
/**

Write Preview
Loading…
Cancel
Save