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

fix：[试验管理][填报表单]填报

master
15881625488@163.com 4 days ago
parent
4a1d862511
commit
1a9e94ca90
3 changed files with 88 additions and 57 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -12
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java
  2. +88
    -39
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
  3. +0
    -6
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

+ 0
- 12
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java View File

@ -59,9 +59,6 @@ public class StudyFormPre extends MpBaseEntity
/** 负责人审核状态：1：未审核；5：审核中；10：已审核 */
private Integer fzrshzt;
/** 填报状态：1：未填报；10：已填报 */
private Integer tbzt;
/** 审核人员id(通知用) */
private Long shryId;
@ -138,7 +135,6 @@ public class StudyFormPre extends MpBaseEntity
this.qmrmm = qmrmm;
}
public Long getStudySubjectId() {
return studySubjectId;
}
@ -147,14 +143,6 @@ public class StudyFormPre extends MpBaseEntity
this.studySubjectId = studySubjectId;
}
public Integer getTbzt() {
return tbzt;
}
public void setTbzt(Integer tbzt) {
this.tbzt = tbzt;
}
public Integer getFzrsh() {
return fzrsh;
}

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

@ -1,9 +1,6 @@
package com.hxhq.business.service.impl;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -11,6 +8,7 @@ import com.hxhq.business.domain.*;
import com.hxhq.business.dto.mjy.DetailDto;
import com.hxhq.business.dto.study.StudyFormFillListDto;
import com.hxhq.business.enums.NormalEnum;
import com.hxhq.business.enums.study.StudyFormApplyBdztEnum;
import com.hxhq.business.enums.study.StudyFormFillBdztEnum;
import com.hxhq.business.enums.study.StudyFormFillBdztEnum;
import com.hxhq.business.enums.zykgl.JcgjlxEnum;
@ -133,7 +131,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.bj.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),studyFormFill.getQmyy(),SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), studyFormFill.getQmyy(), SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}
@ -162,7 +160,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),"申请废止",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "申请废止", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}
@ -193,7 +191,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("原因", form.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"废止通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark());
} else {
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
@ -203,7 +201,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("原因", form.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"废止拒绝",SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark());
}
@ -230,9 +228,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
}
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("新归属人",studyFormFill.getUserMc());
formData.put("原归属人",studyFormFillOld.getUserMc());
formData.put("原因",studyFormFill.getRemark());
formData.put("新归属人", studyFormFill.getUserMc());
formData.put("原归属人", studyFormFillOld.getUserMc());
formData.put("原因", studyFormFill.getRemark());
//是否验证新的归属人，是否属于该实验？ todo
studyFormFillOld.setUserId(studyFormFill.getUserId());
@ -241,7 +239,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"更换归属人",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "更换归属人", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}
@ -252,16 +250,15 @@ public class StudyFormFillServiceImpl extends ServiceImpl
*/
@Override
public void bc(StudyFormFill studyFormFill) {
if(studyFormFill.getId()!=null){
StudyFormFill studyFormFillOld=this.queryInfo(studyFormFill.getId());
if(studyFormFillOld==null){
throw new ServiceException("信息不存在或已删除");
if (studyFormFill.getId() != null) {
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
if (studyFormFillOld == null) {
throw new ServiceException("信息不存在或已删除");
}
if(!SecurityUtils.getUserId().equals(studyFormFillOld.getUserId())){
throw new ServiceException("只能操作自己的表单");
if (!SecurityUtils.getUserId().equals(studyFormFillOld.getUserId())) {
throw new ServiceException("只能操作自己的表单");
}
studyFormFillOld.setBdmc(studyFormFill.getBdmc());
studyFormFillOld.setTemplateId(studyFormFill.getTemplateId());
studyFormFillOld.setBdnr(studyFormFill.getBdnr());
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
this.updateById(studyFormFillOld);
@ -279,11 +276,15 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillJcgj.setJcmcys(JcmcysEnum.orange.getValue());
studyFormFillJcgj.setJcnr(fieldChange.toString());
studyFormFillJcgj.setQmrId(SecurityUtils.getUserId());
studyFormFillJcgj.setQmrMc( SecurityUtils.getNickName());
studyFormFillJcgj.setQmrMc(SecurityUtils.getNickName());
studyFormFillJcgjs.add(studyFormFillJcgj);
}
studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
}else{
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
} else {
studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
studyFormFill.setUserId(SecurityUtils.getUserId());
studyFormFill.setUserMc(SecurityUtils.getNickName());
@ -291,12 +292,12 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注",studyFormFill.getRemark());
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
}
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),"填写并保存记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}
@ -308,7 +309,55 @@ public class StudyFormFillServiceImpl extends ServiceImpl
*/
@Override
public void tj(StudyFormFill studyFormFill) {
//todo
//验证签名人密码 todo
if (studyFormFill.getId() != null) {
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
if (studyFormFillOld == null) {
throw new ServiceException("信息不存在或已删除");
}
if (!SecurityUtils.getUserId().equals(studyFormFillOld.getUserId())) {
throw new ServiceException("只能操作自己的表单");
}
studyFormFillOld.setBdmc(studyFormFill.getBdmc());
studyFormFillOld.setBdnr(studyFormFill.getBdnr());
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
this.updateById(studyFormFillOld);
// todo 处置，存放，用量
List<ObjectCompareUtil.FieldChange> fieldChanges = ObjectCompareUtil.compareObjects(studyFormFillOld, studyFormFill);
if (fieldChanges.size() > 0) {
//稽查轨迹
List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
StudyFormFillJcgj studyFormFillJcgj = new StudyFormFillJcgj();
studyFormFillJcgj.setFormId(studyFormFill.getId());
studyFormFillJcgj.setJcgjlx(JcgjlxEnum.xg.getValue());
studyFormFillJcgj.setJcmc("修改");
studyFormFillJcgj.setJcmcys(JcmcysEnum.orange.getValue());
studyFormFillJcgj.setJcnr(fieldChange.toString());
studyFormFillJcgj.setQmrId(SecurityUtils.getUserId());
studyFormFillJcgj.setQmrMc(SecurityUtils.getNickName());
studyFormFillJcgjs.add(studyFormFillJcgj);
}
studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
}
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
} else {
studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
studyFormFill.setUserId(SecurityUtils.getUserId());
studyFormFill.setUserMc(SecurityUtils.getNickName());
this.save(studyFormFill);
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
}
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}
@ -332,11 +381,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
}
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("生长情况",form.getQmyy());
formData.put("备注",form.getRemark());
formData.put("生长情况", form.getQmyy());
formData.put("备注", form.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),form.getQmyy(),SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), form.getQmyy(), SecurityUtils.getUserId(), SecurityUtils.getNickName(), form.getRemark());
}
@ -356,17 +405,17 @@ public class StudyFormFillServiceImpl extends ServiceImpl
if (studyFormFillOld == null) {
throw new ServiceException("表单不存在或已删除");
}
if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue()) ) {
if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue())) {
throw new ServiceException("表单不是已提交状态，不能复核");
}
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ywcfh.getValue());
this.updateById(studyFormFillOld);
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注",studyFormFill.getRemark());
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"复核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}
@ -385,17 +434,17 @@ public class StudyFormFillServiceImpl extends ServiceImpl
if (studyFormFillOld == null) {
throw new ServiceException("表单不存在或已删除");
}
if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue()) ) {
if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue())) {
throw new ServiceException("表单不是已提交状态，不能复核");
}
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
this.updateById(studyFormFillOld);
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因",studyFormFill.getRemark());
formData.put("原因", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"复核拒绝",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核拒绝", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}
@ -414,17 +463,17 @@ public class StudyFormFillServiceImpl extends ServiceImpl
if (studyFormFillOld == null) {
throw new ServiceException("表单不存在或已删除");
}
if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue()) ) {
if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue())) {
throw new ServiceException("表单不是已提交状态，不能复核");
}
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ywc.getValue());
this.updateById(studyFormFillOld);
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因",studyFormFill.getRemark());
formData.put("原因", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"免复核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "免复核通过", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}
@ -443,15 +492,15 @@ public class StudyFormFillServiceImpl extends ServiceImpl
if (studyFormFillOld == null) {
throw new ServiceException("表单不存在或已删除");
}
if (!(studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ywcfh.getValue())||studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ywc.getValue())) ) {
if (!(studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ywcfh.getValue()) || studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ywc.getValue()))) {
throw new ServiceException("表单不是已完成状态，不能审阅");
}
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注",studyFormFill.getRemark());
formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
//签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"已审阅",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "已审阅", SecurityUtils.getUserId(), SecurityUtils.getNickName(), studyFormFill.getRemark());
}

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

@ -263,12 +263,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl
if(!studyFormPreOld.getBdzt().equals(StudyFormPreBdztEnum.ytg.getValue())){
throw new ServiceException("不是已通过状态，不能填报");
}
if(!studyFormPreOld.getTbzt().equals(NormalEnum.no.getValue())){
throw new ServiceException("已经填报");
}
studyFormPreOld.setTbzt(NormalEnum.yes.getValue());
this.updateById(studyFormPreOld);
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormPre.getRemark());

Write Preview
Loading…
Cancel
Save