|
|
@ -632,9 +632,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl |
|
|
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue()); |
|
|
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ytj.getValue()); |
|
|
studyFormFillOld.setJcbList(studyFormFill.getJcbList()); |
|
|
studyFormFillOld.setJcbList(studyFormFill.getJcbList()); |
|
|
studyFormFillOld.setXbxj(studyFormFill.getXbxj()); |
|
|
studyFormFillOld.setXbxj(studyFormFill.getXbxj()); |
|
|
studyFormFillOld.setTjsj(new Date()); |
|
|
|
|
|
|
|
|
studyFormFillOld.setTjsj(now); |
|
|
if (studyFormFillOld.getSftb().equals(NormalEnum.no.getValue())) { |
|
|
if (studyFormFillOld.getSftb().equals(NormalEnum.no.getValue())) { |
|
|
studyFormFillOld.setEndDate(new Date()); |
|
|
|
|
|
|
|
|
studyFormFillOld.setEndDate(now); |
|
|
studyFormFillOld.setCclist(studyFormFill.getCclist()); |
|
|
studyFormFillOld.setCclist(studyFormFill.getCclist()); |
|
|
studyFormFillOld.setCzlist(studyFormFill.getCzlist()); |
|
|
studyFormFillOld.setCzlist(studyFormFill.getCzlist()); |
|
|
//生成检测板 |
|
|
//生成检测板 |
|
|
@ -665,7 +665,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl |
|
|
studyFormFill.setUserMc(SecurityUtils.getNickName()); |
|
|
studyFormFill.setUserMc(SecurityUtils.getNickName()); |
|
|
studyFormFill.setSftb(NormalEnum.yes.getValue()); |
|
|
studyFormFill.setSftb(NormalEnum.yes.getValue()); |
|
|
studyFormFill.setBdbh(getSn(studyFormFill)); |
|
|
studyFormFill.setBdbh(getSn(studyFormFill)); |
|
|
studyFormFill.setTjsj(new Date()); |
|
|
|
|
|
|
|
|
studyFormFill.setTjsj(now); |
|
|
studyFormFill.setBelongDeptId(getDeptId(studyFormFill)); |
|
|
studyFormFill.setBelongDeptId(getDeptId(studyFormFill)); |
|
|
this.save(studyFormFill); |
|
|
this.save(studyFormFill); |
|
|
//生成检测板 |
|
|
//生成检测板 |
|
|
@ -701,6 +701,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl |
|
|
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId()); |
|
|
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId()); |
|
|
studyFormFillOld.setBlxjshzt(StudyFormFillBlxjshztEnum.dsh.getValue()); |
|
|
studyFormFillOld.setBlxjshzt(StudyFormFillBlxjshztEnum.dsh.getValue()); |
|
|
studyFormFillOld.setBdnr(studyFormFill.getBdnr()); |
|
|
studyFormFillOld.setBdnr(studyFormFill.getBdnr()); |
|
|
|
|
|
studyFormFill.setTjsj(now); |
|
|
this.updateById(studyFormFillOld); |
|
|
this.updateById(studyFormFillOld); |
|
|
//稽查轨迹 |
|
|
//稽查轨迹 |
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
@ -713,6 +714,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl |
|
|
studyFormFill.setUserMc(SecurityUtils.getNickName()); |
|
|
studyFormFill.setUserMc(SecurityUtils.getNickName()); |
|
|
studyFormFill.setBdbh(getSn(studyFormFill)); |
|
|
studyFormFill.setBdbh(getSn(studyFormFill)); |
|
|
studyFormFill.setBelongDeptId(getDeptId(studyFormFill)); |
|
|
studyFormFill.setBelongDeptId(getDeptId(studyFormFill)); |
|
|
|
|
|
studyFormFill.setTjsj(now); |
|
|
this.save(studyFormFill); |
|
|
this.save(studyFormFill); |
|
|
//稽查轨迹 |
|
|
//稽查轨迹 |
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
Map<String, String> formData = new LinkedHashMap<>(); |
|
|
|