Browse Source

fix:[试验管理]填报bug

master
15881625488@163.com 3 months ago
parent
commit
2cc2a70a82
15 changed files with 105 additions and 107 deletions
  1. +3
    -3
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java
  2. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyQmxxServiceImpl.java
  3. +7
    -7
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
  4. +3
    -3
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillJcgjServiceImpl.java
  5. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillQmxxServiceImpl.java
  6. +8
    -8
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
  7. +3
    -3
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanJcgjServiceImpl.java
  8. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanQmxxServiceImpl.java
  9. +7
    -7
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
  10. +3
    -3
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java
  11. +1
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreQmxxServiceImpl.java
  12. +7
    -9
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java
  13. +0
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java
  14. +0
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java
  15. +60
    -57
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java

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

@ -67,7 +67,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
if(jcnr!=null){ if(jcnr!=null){
formJcgj.setJcnr(JctUtil.formatStr(jcnr)); formJcgj.setJcnr(JctUtil.formatStr(jcnr));
@ -102,7 +102,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
if(jcnr!=null){ if(jcnr!=null){
formJcgj.setJcnr(JctUtil.formatStr(jcnr)); formJcgj.setJcnr(JctUtil.formatStr(jcnr));
@ -134,7 +134,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
formJcgj.setJcnr(jcnr); formJcgj.setJcnr(jcnr);
formJcgj.setJcnrEn(jcnrEn); formJcgj.setJcnrEn(jcnrEn);

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

@ -53,7 +53,7 @@ public class StudyFormApplyQmxxServiceImpl extends ServiceImpl
StudyFormApplyQmxx studyFormApplyQmxx=new StudyFormApplyQmxx(); StudyFormApplyQmxx studyFormApplyQmxx=new StudyFormApplyQmxx();
studyFormApplyQmxx.setFormId(formId); studyFormApplyQmxx.setFormId(formId);
studyFormApplyQmxx.setQmyy(qmyy); studyFormApplyQmxx.setQmyy(qmyy);
studyFormApplyQmxx.setQmyyEn(StudyFormUtil.getQmyyEn(qmyy));
studyFormApplyQmxx.setQmyyEn(StudyFormUtil.getEn(qmyy));
studyFormApplyQmxx.setQmrId(qmr.getUserId()); studyFormApplyQmxx.setQmrId(qmr.getUserId());
studyFormApplyQmxx.setQmrMc(qmr.getNickName()); studyFormApplyQmxx.setQmrMc(qmr.getNickName());
studyFormApplyQmxx.setQmrMcEn(qmr.getUserName()); studyFormApplyQmxx.setQmrMcEn(qmr.getUserName());

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

@ -545,20 +545,20 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
JSONObject jsonObject = JSONObject.parseObject(form.getContent()); JSONObject jsonObject = JSONObject.parseObject(form.getContent());
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("意见回复", jsonObject.getString("content"));
formData.put("复核意见", jsonObject.getString("content"));
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
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));
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 { } else {
JSONObject jsonObject = JSONObject.parseObject(form.getReply()); JSONObject jsonObject = JSONObject.parseObject(form.getReply());
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("复核意见", jsonObject.getString("content"));
formData.put("意见回复", jsonObject.getString("reply"));
//en //en
formData.put("字段名", jsonObject.getString("fieldEn"));
formData.put("复核意见", jsonObject.getString("content"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} }
studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs); studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs);
} }

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

@ -73,7 +73,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
if(jcnr!=null){ if(jcnr!=null){
formJcgj.setJcnr(JctUtil.formatStr(jcnr)); formJcgj.setJcnr(JctUtil.formatStr(jcnr));
@ -108,7 +108,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
if(jcnr!=null){ if(jcnr!=null){
formJcgj.setJcnr(JctUtil.formatStr(jcnr)); formJcgj.setJcnr(JctUtil.formatStr(jcnr));
@ -140,7 +140,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
formJcgj.setJcnr(jcnr); formJcgj.setJcnr(jcnr);
formJcgj.setJcnrEn(jcnrEn); formJcgj.setJcnrEn(jcnrEn);

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

@ -52,7 +52,7 @@ public class StudyFormFillQmxxServiceImpl extends ServiceImpl
StudyFormFillQmxx studyFormFillQmxx=new StudyFormFillQmxx(); StudyFormFillQmxx studyFormFillQmxx=new StudyFormFillQmxx();
studyFormFillQmxx.setFormId(formId); studyFormFillQmxx.setFormId(formId);
studyFormFillQmxx.setQmyy(qmyy); studyFormFillQmxx.setQmyy(qmyy);
studyFormFillQmxx.setQmyyEn(StudyFormUtil.getQmyyEn(qmyy));
studyFormFillQmxx.setQmyyEn(StudyFormUtil.getEn(qmyy));
studyFormFillQmxx.setQmrId(qmr.getUserId()); studyFormFillQmxx.setQmrId(qmr.getUserId());
studyFormFillQmxx.setQmrMc(qmr.getNickName()); studyFormFillQmxx.setQmrMc(qmr.getNickName());
studyFormFillQmxx.setQmrMcEn(qmr.getUserName()); studyFormFillQmxx.setQmrMcEn(qmr.getUserName());

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

@ -290,7 +290,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
this.save(studyFormFill); this.save(studyFormFill);
result = studyFormFill; result = studyFormFill;
//稽查轨迹 //稽查轨迹
studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
} }
//签名信息 //签名信息
@ -608,20 +608,20 @@ public class StudyFormFillServiceImpl extends ServiceImpl
JSONObject jsonObject = JSONObject.parseObject(form.getContent()); JSONObject jsonObject = JSONObject.parseObject(form.getContent());
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("意见回复", jsonObject.getString("content"));
formData.put("复核意见", jsonObject.getString("content"));
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
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));
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 { } else {
JSONObject jsonObject = JSONObject.parseObject(form.getReply()); JSONObject jsonObject = JSONObject.parseObject(form.getReply());
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("复核意见", jsonObject.getString("content"));
formData.put("意见回复", jsonObject.getString("reply"));
//en //en
formData.put("字段名", jsonObject.getString("fieldEn"));
formData.put("复核意见", jsonObject.getString("content"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} }
studyFormFillJcgjService.saveBatch(studyFormFillJcgjs); studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
} }

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

@ -68,7 +68,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
if(jcnr!=null){ if(jcnr!=null){
formJcgj.setJcnr(JctUtil.formatStr(jcnr)); formJcgj.setJcnr(JctUtil.formatStr(jcnr));
@ -103,7 +103,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
if(jcnr!=null){ if(jcnr!=null){
formJcgj.setJcnr(JctUtil.formatStr(jcnr)); formJcgj.setJcnr(JctUtil.formatStr(jcnr));
@ -135,7 +135,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
formJcgj.setJcnr(jcnr); formJcgj.setJcnr(jcnr);
formJcgj.setJcnrEn(jcnrEn); formJcgj.setJcnrEn(jcnrEn);

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

@ -52,7 +52,7 @@ public class StudyFormPlanQmxxServiceImpl extends ServiceImpl
StudyFormPlanQmxx studyFormPlanQmxx=new StudyFormPlanQmxx(); StudyFormPlanQmxx studyFormPlanQmxx=new StudyFormPlanQmxx();
studyFormPlanQmxx.setFormId(formId); studyFormPlanQmxx.setFormId(formId);
studyFormPlanQmxx.setQmyy(qmyy); studyFormPlanQmxx.setQmyy(qmyy);
studyFormPlanQmxx.setQmyyEn(StudyFormUtil.getQmyyEn(qmyy));
studyFormPlanQmxx.setQmyyEn(StudyFormUtil.getEn(qmyy));
studyFormPlanQmxx.setQmrId(qmr.getUserId()); studyFormPlanQmxx.setQmrId(qmr.getUserId());
studyFormPlanQmxx.setQmrMc(qmr.getNickName()); studyFormPlanQmxx.setQmrMc(qmr.getNickName());
studyFormPlanQmxx.setQmrMcEn(qmr.getUserName()); studyFormPlanQmxx.setQmrMcEn(qmr.getUserName());

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

@ -375,20 +375,20 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
JSONObject jsonObject = JSONObject.parseObject(form.getContent()); JSONObject jsonObject = JSONObject.parseObject(form.getContent());
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("意见回复", jsonObject.getString("content"));
formData.put("复核意见", jsonObject.getString("content"));
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
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));
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 { } else {
JSONObject jsonObject = JSONObject.parseObject(form.getReply()); JSONObject jsonObject = JSONObject.parseObject(form.getReply());
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("复核意见", jsonObject.getString("content"));
formData.put("意见回复", jsonObject.getString("reply"));
//en //en
formData.put("字段名", jsonObject.getString("fieldEn"));
formData.put("复核意见", jsonObject.getString("content"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} }
studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs); studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs);
} }

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

@ -66,7 +66,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
if(jcnr!=null){ if(jcnr!=null){
formJcgj.setJcnr(JctUtil.formatStr(jcnr)); formJcgj.setJcnr(JctUtil.formatStr(jcnr));
@ -101,7 +101,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
if(jcnr!=null){ if(jcnr!=null){
formJcgj.setJcnr(JctUtil.formatStr(jcnr)); formJcgj.setJcnr(JctUtil.formatStr(jcnr));
@ -133,7 +133,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
formJcgj.setFormId(formId); formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx); formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc); formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getQmyyEn(jcmc));
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys); formJcgj.setJcmcys(jcmcys);
formJcgj.setJcnr(jcnr); formJcgj.setJcnr(jcnr);
formJcgj.setJcnrEn(jcnrEn); formJcgj.setJcnrEn(jcnrEn);

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

@ -51,7 +51,7 @@ public class StudyFormPreQmxxServiceImpl extends ServiceImpl
StudyFormPreQmxx studyFormPreQmxx=new StudyFormPreQmxx(); StudyFormPreQmxx studyFormPreQmxx=new StudyFormPreQmxx();
studyFormPreQmxx.setFormId(formId); studyFormPreQmxx.setFormId(formId);
studyFormPreQmxx.setQmyy(qmyy); studyFormPreQmxx.setQmyy(qmyy);
studyFormPreQmxx.setQmyyEn(StudyFormUtil.getQmyyEn(qmyy));
studyFormPreQmxx.setQmyyEn(StudyFormUtil.getEn(qmyy));
studyFormPreQmxx.setQmrId(qmr.getUserId()); studyFormPreQmxx.setQmrId(qmr.getUserId());
studyFormPreQmxx.setQmrMc(qmr.getNickName()); studyFormPreQmxx.setQmrMc(qmr.getNickName());
studyFormPreQmxx.setQmrMcEn(qmr.getUserName()); studyFormPreQmxx.setQmrMcEn(qmr.getUserName());

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

@ -291,8 +291,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl
studyFormFill.setStartDate(time); studyFormFill.setStartDate(time);
studyFormFill.setTemplateId(studyFormPreOld.getTemplateId()); studyFormFill.setTemplateId(studyFormPreOld.getTemplateId());
studyFormFillService.bc(studyFormFill); studyFormFillService.bc(studyFormFill);
//稽查轨迹
studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, studyFormFill.getRemark(), time);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark()); studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
return studyFormFill; return studyFormFill;
@ -473,20 +471,20 @@ public class StudyFormPreServiceImpl extends ServiceImpl
JSONObject jsonObject = JSONObject.parseObject(form.getContent()); JSONObject jsonObject = JSONObject.parseObject(form.getContent());
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("意见回复", jsonObject.getString("content"));
formData.put("复核意见", jsonObject.getString("content"));
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
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));
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 { } else {
JSONObject jsonObject = JSONObject.parseObject(form.getReply()); JSONObject jsonObject = JSONObject.parseObject(form.getReply());
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
formData.put("复核意见", jsonObject.getString("content"));
formData.put("意见回复", jsonObject.getString("reply"));
//en //en
formData.put("字段名", jsonObject.getString("fieldEn"));
formData.put("复核意见", jsonObject.getString("content"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} }
studyFormPreJcgjService.saveBatch(studyFormPreJcgjs); studyFormPreJcgjService.saveBatch(studyFormPreJcgjs);
} }

+ 0
- 1
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/GyzjJcnrUtil.java View File

@ -109,7 +109,6 @@ public class GyzjJcnrUtil {
} }
public static void main(String[] args) { public static void main(String[] args) {
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("申请备注", "1111"); formData.put("申请备注", "1111");

+ 0
- 2
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/MjyJcnrUtil.java View File

@ -105,8 +105,6 @@ public class MjyJcnrUtil {
mapLang.put("减少量","减少量"); mapLang.put("减少量","减少量");
} }
public static void main(String[] args) { public static void main(String[] args) {
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("申请备注", "1111"); formData.put("申请备注", "1111");

+ 60
- 57
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/lang/StudyFormUtil.java View File

@ -13,62 +13,51 @@ import java.util.Map;
*/ */
public class StudyFormUtil { public class StudyFormUtil {
private static final Logger logger = LoggerFactory.getLogger(StudyFormUtil.class.getName()); private static final Logger logger = LoggerFactory.getLogger(StudyFormUtil.class.getName());
private static HashMap<String,String> mapJcnr=new HashMap<>();
private static HashMap<String,String> mapQmyy=new HashMap<>();
private static HashMap<String,String> mapLang=new HashMap<>();
static { static {
//region 稽查内容
mapLang.put("字段名","Field");
mapLang.put("原值","Old Value");
mapLang.put("新值","New Value");
mapLang.put("原因","Reason");
mapLang.put("生长情况","Growth Status");
mapLang.put("新归属人","New Owner");
mapLang.put("原归属人","Old Owner");
mapLang.put("填入值","Input Data");
mapLang.put("填写人","Data Entry Person");
mapLang.put("更换归属人","Change Owner");
mapLang.put("良好","Good");
mapLang.put("中","Average");
mapLang.put("差","Bad");
mapLang.put("修改","Edit");
mapLang.put("修改记录","Change Data");
mapLang.put("填写","Fill in");
mapLang.put("意见回复","Reply to Remark");
mapLang.put("复核意见","Verification Remark");
mapLang.put("免复核通过","Pass (no Verification Requirement)");
mapLang.put("复核拒绝","Verification Reject");
mapLang.put("复核通过","Verification Pass");
mapLang.put("填写并提交记录","Create and Submit Record");
mapLang.put("废止拒绝","Reject Record Abolition");
mapLang.put("废止通过","Approve Record Abolition");
mapLang.put("申请废止","Apply Abolition");
mapLang.put("开始现场复核","Start on-Site Verification");
mapLang.put("结束现场复核","End on-Site Verification");
mapLang.put("申明协作","Declaration of Collaboration");
mapLang.put("已审阅","Reviewed");
mapLang.put("审核通过","Approved");
mapLang.put("补充说明","Additional Remark");
mapLang.put("审核拒绝","Reject after Review");
mapLang.put("制作保存预制表单","Save Record Preset");
mapLang.put("制作提交预制表单","Submit Record Preset");
mapLang.put("创建记录","Create Record");
mapLang.put("填写并保存记录","Create and Save Record");
mapLang.put("申请关闭","Apply Close");
mapLang.put("关闭拒绝","Close Reject");
mapLang.put("关闭同意","Close Approve");
mapJcnr.put("字段名","Field");
mapJcnr.put("原值","Old Value");
mapJcnr.put("新值","New Value");
mapJcnr.put("原因","Reason");
mapJcnr.put("生长情况","Growth Status");
mapJcnr.put("新归属人","New Owner");
mapJcnr.put("原归属人","Old Owner");
mapJcnr.put("填入值","Input Data");
mapJcnr.put("填写人","Data Entry Person");
mapJcnr.put("意见回复","意见回复");
mapJcnr.put("复核意见","复核意见");
//endregion
//region 稽查名称
mapQmyy.put("更换归属人","Change Owner");
mapQmyy.put("良好","Good");
mapQmyy.put("中","Average");
mapQmyy.put("差","Bad");
mapQmyy.put("修改","Edit");
mapQmyy.put("修改记录","Change Data");
mapQmyy.put("填写","Create Record");
mapQmyy.put("意见回复","意见回复");
mapQmyy.put("复核意见","复核意见");
mapQmyy.put("免复核通过","免复核通过");
mapQmyy.put("复核拒绝","Verification Reject");
mapQmyy.put("复核通过","Verification Pass");
mapQmyy.put("填写并提交记录","Create and Submit Record");
mapQmyy.put("废止拒绝","废止拒绝");
mapQmyy.put("废止通过","废止通过");
mapQmyy.put("申请废止","申请废止");
mapQmyy.put("开始现场复核","Start on-Site Verification");
mapQmyy.put("结束现场复核","End on-Site Verification");
mapQmyy.put("申明协作","Declaration of Collaboration");
mapQmyy.put("已审阅","Reviewed");
mapQmyy.put("审核通过","Approved");
mapQmyy.put("补充说明","Additional Remark");
mapQmyy.put("审核拒绝","Reject after Review");
mapQmyy.put("制作保存预制表单","Save Record Preset");
mapQmyy.put("制作提交预制表单","Submit Record Preset");
mapQmyy.put("创建记录","Create Record");
mapQmyy.put("填写并保存记录","Create and Save Record");
mapQmyy.put("申请关闭","Apply Close");
mapQmyy.put("关闭拒绝","Close Reject");
mapQmyy.put("关闭同意","Close Approve");
//endregion
} }
public static void main(String[] args) { public static void main(String[] args) {
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("申请备注", "1111"); formData.put("申请备注", "1111");
@ -76,25 +65,39 @@ public class StudyFormUtil {
logger.info(getJcnrEn(formData)); logger.info(getJcnrEn(formData));
} }
/** /**
* 获取签名意义英文
* 获取英文
* @param qmyy * @param qmyy
* @return * @return
*/ */
public static String getQmyyEn(String qmyy) {
return mapQmyy.get(qmyy);
public static String getEn(String qmyy) {
return mapLang.get(qmyy);
} }
/** /**
* 稽查名称英文
* 获取稽查内容英文
* @param map * @param map
* @return * @return
*/ */
public static String getJcnrEn(Map<String, String> map) { public static String getJcnrEn(Map<String, String> map) {
Map<String, String> result =new HashMap<>();
Map<String, String> result =new LinkedHashMap<>();
for (Map.Entry<String, String> entry : map.entrySet()) { for (Map.Entry<String, String> entry : map.entrySet()) {
result.put(mapJcnr.get(entry.getKey()),entry.getValue());
result.put(mapLang.get(entry.getKey()),entry.getValue());
} }
return JctUtil.formatStr(result); return JctUtil.formatStr(result);
} }
/**
* 获取稽查内容英文
* @param map
* @return
*/
public static Map<String, String> getMapEn(Map<String, String> map) {
Map<String, String> result =new LinkedHashMap<>();
for (Map.Entry<String, String> entry : map.entrySet()) {
result.put(mapLang.get(entry.getKey()),entry.getValue());
}
return result;
}
} }

Loading…
Cancel
Save