Browse Source

fix:[试验管理]填报表单修改

master
15881625488@163.com 3 months ago
parent
commit
a817ce0a9a
5 changed files with 9 additions and 9 deletions
  1. +5
    -5
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java
  2. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
  3. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
  4. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
  5. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

+ 5
- 5
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormUpdateForm.java View File

@ -20,7 +20,7 @@ public class StudyFormUpdateForm {
private String fhyjjl;
/** 意见回复 */
private String replay;
private String reply;
/** 复核意见 */
private String content;
@ -36,12 +36,12 @@ public class StudyFormUpdateForm {
this.content = content;
}
public String getReplay() {
return replay;
public String getReply() {
return reply;
}
public void setReplay(String replay) {
this.replay = replay;
public void setReply(String reply) {
this.reply = reply;
}
public String getZdgxjl() {

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

@ -554,7 +554,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
formDataEn.put("意见回复", jsonObject.getString("content"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
JSONObject jsonObject = JSONObject.parseObject(form.getReplay());
JSONObject jsonObject = JSONObject.parseObject(form.getReply());
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("复核意见", jsonObject.getString("content"));

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

@ -614,7 +614,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formDataEn.put("意见回复", jsonObject.getString("content"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
JSONObject jsonObject = JSONObject.parseObject(form.getReplay());
JSONObject jsonObject = JSONObject.parseObject(form.getReply());
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("复核意见", jsonObject.getString("content"));

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

@ -382,7 +382,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formDataEn.put("意见回复", jsonObject.getString("content"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
JSONObject jsonObject = JSONObject.parseObject(form.getReplay());
JSONObject jsonObject = JSONObject.parseObject(form.getReply());
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("复核意见", jsonObject.getString("content"));

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

@ -385,7 +385,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formDataEn.put("意见回复", jsonObject.getString("content"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
JSONObject jsonObject = JSONObject.parseObject(form.getReplay());
JSONObject jsonObject = JSONObject.parseObject(form.getReply());
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("复核意见", jsonObject.getString("content"));

Loading…
Cancel
Save