|
|
@ -574,32 +574,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl |
|
|
public void updateBdnr(StudyFormUpdateForm form) { |
|
|
public void updateBdnr(StudyFormUpdateForm form) { |
|
|
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); |
|
|
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); |
|
|
JSONObject bdnr = JSONObject.parseObject(form.getBdnr()); |
|
|
JSONObject bdnr = JSONObject.parseObject(form.getBdnr()); |
|
|
|
|
|
|
|
|
//更新表单内容 |
|
|
|
|
|
StudyFormApply studyFormApplyOld = this.queryInfo(form.getId()); |
|
|
|
|
|
if (bdnr != null) { |
|
|
|
|
|
if (bdnr.getInteger("syId") != null) { |
|
|
|
|
|
studyFormApplyOld.setSyId(bdnr.getLong("syId")); |
|
|
|
|
|
} else { |
|
|
|
|
|
studyFormApplyOld.setSyId(null); |
|
|
|
|
|
} |
|
|
|
|
|
if (bdnr.getInteger("bmId") != null) { |
|
|
|
|
|
studyFormApplyOld.setBmId(bdnr.getLong("bmId")); |
|
|
|
|
|
} else { |
|
|
|
|
|
studyFormApplyOld.setBmId(null); |
|
|
|
|
|
} |
|
|
|
|
|
if (bdnr.getInteger("sdId") != null) { |
|
|
|
|
|
studyFormApplyOld.setSdId(bdnr.getLong("sdId")); |
|
|
|
|
|
} else { |
|
|
|
|
|
studyFormApplyOld.setSdId(null); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
studyFormApplyOld.setBdnr(form.getBdnr()); |
|
|
|
|
|
studyFormApplyOld.setZdxgjl(form.getZdxgjl()); |
|
|
|
|
|
this.updateById(studyFormApplyOld); |
|
|
|
|
|
// baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl()); |
|
|
|
|
|
// {"type":"fieldChanged","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0333","title":"修改记录","time":"2026-01-14 19:44:02"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0","title":"修改记录","time":"2026-01-14 19:43:57"}]} |
|
|
|
|
|
//稽查轨迹 todo |
|
|
|
|
|
|
|
|
baseMapper.updateBdnr(form.getId(), form.getBdnr(),form.getZdxgjl(),bdnr.getLong("syId"),bdnr.getLong("bmId"),bdnr.getLong("sdId")); |
|
|
|
|
|
//稽查轨迹 |
|
|
if (StringUtils.isNoneBlank(form.getFiledValue())) { |
|
|
if (StringUtils.isNoneBlank(form.getFiledValue())) { |
|
|
JSONObject jsonObject = JSONObject.parseObject(form.getFiledValue()); |
|
|
JSONObject jsonObject = JSONObject.parseObject(form.getFiledValue()); |
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
@ -638,10 +614,8 @@ public class StudyFormApplyServiceImpl extends ServiceImpl |
|
|
@Override |
|
|
@Override |
|
|
public void updateFhyjjl(StudyFormUpdateForm form) { |
|
|
public void updateFhyjjl(StudyFormUpdateForm form) { |
|
|
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); |
|
|
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); |
|
|
// {"type":"reply","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} |
|
|
|
|
|
// {"type":"content","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","title":"复核意见","time":"2026-01-14 20:23:30","content":"qweqe"},{"userNameCn":"谭飞","userNameEn":"tf","key":"_methodCode","field":"试验基本信息-方法编号","title":"复核意见","time":"2026-01-14 20:23:28","content":"qweqw"}]} |
|
|
|
|
|
//更新复核意见 todo |
|
|
|
|
|
// baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); |
|
|
|
|
|
|
|
|
//更新复核意见 |
|
|
|
|
|
baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); |
|
|
StudyFormApply studyFormApplyOld = this.queryInfo(form.getId()); |
|
|
StudyFormApply studyFormApplyOld = this.queryInfo(form.getId()); |
|
|
studyFormApplyOld.setFhyjjl(form.getFhyjjl()); |
|
|
studyFormApplyOld.setFhyjjl(form.getFhyjjl()); |
|
|
this.updateById(studyFormApplyOld); |
|
|
this.updateById(studyFormApplyOld); |
|
|
@ -675,11 +649,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl |
|
|
*/ |
|
|
*/ |
|
|
@Override |
|
|
@Override |
|
|
public void updateZdgxjl(StudyFormUpdateForm form) { |
|
|
public void updateZdgxjl(StudyFormUpdateForm form) { |
|
|
//更新勾选记录 todo |
|
|
|
|
|
StudyFormApply studyFormApplyOld = this.queryInfo(form.getId()); |
|
|
|
|
|
studyFormApplyOld.setZdgxjl(form.getZdgxjl()); |
|
|
|
|
|
this.updateById(studyFormApplyOld); |
|
|
|
|
|
// baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl()); |
|
|
|
|
|
|
|
|
baseMapper.updateZdgxjl(form.getId(), form.getZdgxjl()); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
/** |
|
|
/** |
|
|
|