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

fix:[表单管理]日志

master
15881625488@163.com 2 months ago
parent
5363b5d3d3
commit
95f4a57a64
16 changed files with 147 additions and 101 deletions
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +11
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormApplyJcgj.java
  2. +11
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFillJcgj.java
  3. +11
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPlanJcgj.java
  4. +11
    -0
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPreJcgj.java
  5. +5
    -6
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java
  6. +5
    -6
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java
  7. +5
    -6
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java
  8. +5
    -6
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java
  9. +11
    -9
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java
  10. +9
    -10
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
  11. +11
    -9
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillJcgjServiceImpl.java
  12. +12
    -10
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
  13. +11
    -10
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanJcgjServiceImpl.java
  14. +9
    -10
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
  15. +11
    -9
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java
  16. +9
    -10
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

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

@ -19,6 +19,9 @@ public class StudyFormApplyJcgj extends MpBaseEntity
/** 申请表单id */
private Long formId;
/** 申请表单编号 */
private String formBh;
/** 稽查轨迹类型:1:流程；3：编辑 */
private Integer jcgjlx;
@ -50,6 +53,14 @@ public class StudyFormApplyJcgj extends MpBaseEntity
@TableField(exist = false)
private String lang;
public String getFormBh() {
return formBh;
}
public void setFormBh(String formBh) {
this.formBh = formBh;
}
public String getLang() {
return lang;
}

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

@ -19,6 +19,9 @@ public class StudyFormFillJcgj extends MpBaseEntity
/** 填报表单id */
private Long formId;
/** 填报表单编号 */
private String formBh;
/** 稽查轨迹类型:1:流程；3：编辑 */
private Integer jcgjlx;
@ -50,6 +53,14 @@ public class StudyFormFillJcgj extends MpBaseEntity
@TableField(exist = false)
private String lang;
public String getFormBh() {
return formBh;
}
public void setFormBh(String formBh) {
this.formBh = formBh;
}
public String getLang() {
return lang;
}

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

@ -19,6 +19,9 @@ public class StudyFormPlanJcgj extends MpBaseEntity
/** 计划表单id */
private Long formId;
/** 计划表单编号 */
private String formBh;
/** 稽查轨迹类型:1:流程；3：编辑 */
private Integer jcgjlx;
@ -50,6 +53,14 @@ public class StudyFormPlanJcgj extends MpBaseEntity
@TableField(exist = false)
private String lang;
public String getFormBh() {
return formBh;
}
public void setFormBh(String formBh) {
this.formBh = formBh;
}
public String getLang() {
return lang;
}

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

@ -18,6 +18,9 @@ public class StudyFormPreJcgj extends MpBaseEntity
/** 预填表单id */
private Long formId;
/** 预填表单编号 */
private String formBh;
/** 稽查轨迹类型:1:流程；3：编辑 */
private Integer jcgjlx;
@ -45,6 +48,14 @@ public class StudyFormPreJcgj extends MpBaseEntity
/** 签名人名称-英文 */
private String qmrMcEn;
public String getFormBh() {
return formBh;
}
public void setFormBh(String formBh) {
this.formBh = formBh;
}
public String getJcmcEn() {
return jcmcEn;
}

+ 5
- 6
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java View File

@ -31,10 +31,9 @@ public interface IStudyFormApplyJcgjService extends IService
/**
* 批量保存稽查轨迹-并保留日志
* @param studyFormApply
* @param jcgjList
*/
void saveBatchWithLog(StudyFormApply studyFormApply, List<StudyFormApplyJcgj> jcgjList);
void saveBatchWithLog(List<StudyFormApplyJcgj> jcgjList);
/**
* 新增稽查轨迹
@ -52,7 +51,7 @@ public interface IStudyFormApplyJcgjService extends IService
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormApply 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -61,11 +60,11 @@ public interface IStudyFormApplyJcgjService extends IService
* @param remark 备注
* @return
*/
public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormApply 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -75,6 +74,6 @@ public interface IStudyFormApplyJcgjService extends IService
* @param remark 备注
* @return
*/
public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
}

+ 5
- 6
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java View File

@ -27,10 +27,9 @@ public interface IStudyFormFillJcgjService extends IService
/**
* 批量保存稽查轨迹-并保留日志
* @param studyFormFill
* @param jcgjList
*/
void saveBatchWithLog(StudyFormFill studyFormFill, List<StudyFormFillJcgj> jcgjList);
void saveBatchWithLog(List<StudyFormFillJcgj> jcgjList);
/**
@ -49,7 +48,7 @@ public interface IStudyFormFillJcgjService extends IService
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormFill 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -58,11 +57,11 @@ public interface IStudyFormFillJcgjService extends IService
* @param remark 备注
* @return
*/
public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormFill 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -72,6 +71,6 @@ public interface IStudyFormFillJcgjService extends IService
* @param remark 备注
* @return
*/
public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
}

+ 5
- 6
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java View File

@ -28,10 +28,9 @@ public interface IStudyFormPlanJcgjService extends IService
/**
* 批量保存稽查轨迹-并保留日志
* @param studyFormPlan
* @param jcgjList
*/
void saveBatchWithLog(StudyFormPlan studyFormPlan, List<StudyFormPlanJcgj> jcgjList);
void saveBatchWithLog(List<StudyFormPlanJcgj> jcgjList);
/**
* 新增稽查轨迹
@ -49,7 +48,7 @@ public interface IStudyFormPlanJcgjService extends IService
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormPlan 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -58,11 +57,11 @@ public interface IStudyFormPlanJcgjService extends IService
* @param remark 备注
* @return
*/
public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormPlan 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -72,7 +71,7 @@ public interface IStudyFormPlanJcgjService extends IService
* @param remark 备注
* @return
*/
public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
}

+ 5
- 6
hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java View File

@ -27,10 +27,9 @@ public interface IStudyFormPreJcgjService extends IService
/**
* 批量保存稽查轨迹-并保留日志
* @param studyFormPre
* @param jcgjList
*/
void saveBatchWithLog(StudyFormPre studyFormPre, List<StudyFormPreJcgj> jcgjList);
void saveBatchWithLog( List<StudyFormPreJcgj> jcgjList);
/**
* 新增稽查轨迹
@ -48,7 +47,7 @@ public interface IStudyFormPreJcgjService extends IService
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormPre 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -57,11 +56,11 @@ public interface IStudyFormPreJcgjService extends IService
* @param remark 备注
* @return
*/
public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormPre 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -71,7 +70,7 @@ public interface IStudyFormPreJcgjService extends IService
* @param remark 备注
* @return
*/
public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
}

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

@ -61,15 +61,14 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
/**
* 批量保存稽查轨迹-并保留日志
* @param studyFormApply
* @param jcgjList
*/
@Override
@Async
public void saveBatchWithLog(StudyFormApply studyFormApply, List<StudyFormApplyJcgj> jcgjList) {
public void saveBatchWithLog( List<StudyFormApplyJcgj> jcgjList) {
this.saveBatch(jcgjList);
for (StudyFormApplyJcgj jcgj : jcgjList) {
systemLogService.saveInfo(studyFormApply.getBdbh(), studyFormApply.getBdbh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
systemLogService.saveInfo(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
}
@ -89,6 +88,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
public void saveJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj();
formJcgj.setFormId(studyFormApply.getId());
formJcgj.setFormBh(studyFormApply.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@ -114,7 +114,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormApply 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -123,9 +123,10 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
* @param remark 备注
*/
@Override
public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj();
formJcgj.setFormId(formId);
formJcgj.setFormId(studyFormApply.getId());
formJcgj.setFormBh(studyFormApply.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@ -145,7 +146,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormApply 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -155,9 +156,10 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
* @param remark 备注
*/
@Override
public StudyFormApplyJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj();
formJcgj.setFormId(formId);
formJcgj.setFormId(studyFormApply.getId());
formJcgj.setFormBh(studyFormApply.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));

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

@ -293,9 +293,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//稽查轨迹
List<StudyFormApplyJcgj> studyFormApplyJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApply.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormApply.getRemark()));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApply, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormApply.getRemark()));
}
studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs);
studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);
}
result = studyFormApplyOld;
} else {
@ -585,6 +585,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
}
//稽查轨迹
if (StringUtils.isNoneBlank(form.getFiledValue())) {
StudyFormApply studyFormApplyOld = this.getById(form.getId());
JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
List<StudyFormApplyJcgj> studyFormApplyJcgjs = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@ -602,7 +603,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApplyOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
@ -612,10 +613,10 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(form.getId(), JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApplyOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
}
}
studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs);
studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);
}
}
@ -628,8 +629,6 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//更新复核意见
baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
StudyFormApply studyFormApplyOld = this.queryInfo(form.getId());
studyFormApplyOld.setFhyjjl(form.getFhyjjl());
this.updateById(studyFormApplyOld);
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
List<StudyFormApplyJcgj> studyFormApplyJcgjs = new ArrayList<>();
@ -641,7 +640,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//en
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));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())){
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh
@ -650,9 +649,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//en
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));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
studyFormApplyJcgjService.saveBatch(studyFormApplyJcgjs);
studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);
}
/**

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

@ -67,15 +67,14 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
/**
* 批量保存稽查轨迹-并保留日志
* @param studyFormFill
* @param jcgjList
*/
@Override
@Async
public void saveBatchWithLog(StudyFormFill studyFormFill, List<StudyFormFillJcgj> jcgjList) {
public void saveBatchWithLog( List<StudyFormFillJcgj> jcgjList) {
this.saveBatch(jcgjList);
for (StudyFormFillJcgj jcgj : jcgjList) {
systemLogService.saveInfo(studyFormFill.getBdbh(), studyFormFill.getBdbh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
systemLogService.saveInfo(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
}
@ -96,6 +95,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
public void saveJcgj(StudyFormFill studyFormFill,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
StudyFormFillJcgj formJcgj = new StudyFormFillJcgj();
formJcgj.setFormId(studyFormFill.getId());
formJcgj.setFormBh(studyFormFill.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@ -122,7 +122,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormFill 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -131,9 +131,10 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
* @param remark 备注
*/
@Override
public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
StudyFormFillJcgj formJcgj = new StudyFormFillJcgj();
formJcgj.setFormId(formId);
formJcgj.setFormId(studyFormFill.getId());
formJcgj.setFormBh(studyFormFill.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@ -153,7 +154,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormFill 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -163,9 +164,10 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
* @param remark 备注
*/
@Override
public StudyFormFillJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
StudyFormFillJcgj formJcgj = new StudyFormFillJcgj();
formJcgj.setFormId(formId);
formJcgj.setFormId(studyFormFill.getId());
formJcgj.setFormBh(studyFormFill.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));

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

@ -509,10 +509,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("存储位置", studyFormFillCc.getCcwz());
formData.put("存储条件", studyFormFillCc.getCctj());
formData.put("存储药剂", String.join(",",studyFormFillCc.getList()));
studyFormFillJcgjList.add(studyFormFillJcgjService.getJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, null));
studyFormFillJcgjList.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, null));
}
if(studyFormFillJcgjList.size()>0){
studyFormFillJcgjService.saveBatch(studyFormFillJcgjList);
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjList);
}
}
}
@ -610,9 +610,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹
List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark()));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark()));
}
studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
}
//稽查轨迹
Map<String, String> formData = new LinkedHashMap<>();
@ -878,6 +878,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
}
//稽查轨迹
if (StringUtils.isNoneBlank(form.getFiledValue())) {
StudyFormFill studyFormFillOld = this.getById(form.getId());
JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@ -895,7 +896,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
@ -905,11 +906,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(form.getId(), JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
}
}
studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
}
}
@ -924,6 +925,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
StudyFormFill studyFormFillOld = this.getById(form.getId());
if (StringUtils.isNoneBlank(form.getContent())) {
JSONObject jsonObject = JSONArray.parseArray(form.getContent()).getJSONObject(0);
//zh
@ -932,7 +934,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//en
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));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())) {
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh
@ -941,9 +943,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//en
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));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
studyFormFillJcgjService.saveBatch(studyFormFillJcgjs);
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
}
/**

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

@ -62,15 +62,14 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
/**
* 批量保存稽查轨迹-并保留日志
* @param studyFormPlan
* @param jcgjList
*/
@Override
@Async
public void saveBatchWithLog(StudyFormPlan studyFormPlan, List<StudyFormPlanJcgj> jcgjList) {
public void saveBatchWithLog( List<StudyFormPlanJcgj> jcgjList) {
this.saveBatch(jcgjList);
for (StudyFormPlanJcgj jcgj : jcgjList) {
systemLogService.saveInfo(studyFormPlan.getBdbh(), studyFormPlan.getBdbh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
systemLogService.saveInfo(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
}
@ -90,6 +89,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
public void saveJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj();
formJcgj.setFormId(studyFormPlan.getId());
formJcgj.setFormBh(studyFormPlan.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@ -115,7 +115,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormPlan 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -124,10 +124,10 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
* @param remark 备注
*/
@Override
public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj();
formJcgj.setFormId(formId);
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setFormId(studyFormPlan.getId());
formJcgj.setFormBh(studyFormPlan.getBdbh());
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
formJcgj.setJcmcys(jcmcys);
@ -146,7 +146,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormPlan 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -156,9 +156,10 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
* @param remark 备注
*/
@Override
public StudyFormPlanJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj();
formJcgj.setFormId(formId);
formJcgj.setFormId(studyFormPlan.getId());
formJcgj.setFormBh(studyFormPlan.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));

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

@ -166,9 +166,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//稽查轨迹
List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlan.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark()));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlan, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark()));
}
studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs);
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
}
result = studyFormPlanOld;
} else {
@ -392,6 +392,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
}
//稽查轨迹
if (StringUtils.isNoneBlank(form.getFiledValue())) {
StudyFormPlan studyFormPlanOld = this.getById(form.getId());
JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@ -409,7 +410,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlanOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
@ -419,10 +420,10 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(form.getId(), JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlanOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
}
}
studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs);
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
}
}
@ -436,8 +437,6 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//更新复核意见
baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
StudyFormPlan studyFormPlanOld = this.queryInfo(form.getId());
studyFormPlanOld.setFhyjjl(form.getFhyjjl());
this.updateById(studyFormPlanOld);
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>();
@ -449,7 +448,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//en
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));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())){
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh
@ -458,9 +457,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//en
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));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
studyFormPlanJcgjService.saveBatch(studyFormPlanJcgjs);
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
}
/**

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

@ -62,15 +62,14 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
/**
* 批量保存稽查轨迹-并保留日志
* @param studyFormPre
* @param jcgjList
*/
@Override
@Async
public void saveBatchWithLog(StudyFormPre studyFormPre, List<StudyFormPreJcgj> jcgjList) {
public void saveBatchWithLog( List<StudyFormPreJcgj> jcgjList) {
this.saveBatch(jcgjList);
for (StudyFormPreJcgj jcgj : jcgjList) {
systemLogService.saveInfo(studyFormPre.getBdbh(), studyFormPre.getBdbh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
systemLogService.saveInfo(jcgj.getFormBh(), jcgj.getFormBh(), jcgj.getJcmc(), jcgj.getJcmcEn(),
jcgj.getJcnr(), jcgj.getJcnrEn(), jcgj.getQmrId(), jcgj.getQmrMc(), jcgj.getQmrMcEn(), jcgj.getRemark());
}
}
@ -90,6 +89,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
public void saveJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark, Date time){
StudyFormPreJcgj formJcgj = new StudyFormPreJcgj();
formJcgj.setFormId(studyFormPre.getId());
formJcgj.setFormBh(studyFormPre.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@ -115,7 +115,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormPre 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -124,9 +124,10 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
* @param remark 备注
*/
@Override
public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
StudyFormPreJcgj formJcgj = new StudyFormPreJcgj();
formJcgj.setFormId(formId);
formJcgj.setFormId(studyFormPre.getId());
formJcgj.setFormBh(studyFormPre.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));
@ -146,7 +147,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
/**
* 新增稽查轨迹
* @param formId 表单id
* @param studyFormPre 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称
* @param jcmcys 稽查名称颜色：1：蓝色；3：红色；5：绿色；7：橙色
@ -156,9 +157,10 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
* @param remark 备注
*/
@Override
public StudyFormPreJcgj getJcgj(Long formId, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre,Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
StudyFormPreJcgj formJcgj = new StudyFormPreJcgj();
formJcgj.setFormId(formId);
formJcgj.setFormId(studyFormPre.getId());
formJcgj.setFormBh(studyFormPre.getBdbh());
formJcgj.setJcgjlx(jcgjlx);
formJcgj.setJcmc(jcmc);
formJcgj.setJcmcEn(StudyFormUtil.getEn(jcmc));

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

@ -145,9 +145,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹
List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPre.getId(), JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark()));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPre, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark()));
}
studyFormPreJcgjService.saveBatch(studyFormPreJcgjs);
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
}
result = studyFormPreOld;
} else {
@ -530,6 +530,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹
if (StringUtils.isNoneBlank(form.getFiledValue())) {
StudyFormPre studyFormPreOld = this.getById(form.getId());
JSONArray jsonArray = JSONArray.parseArray(form.getFiledValue());
List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>();
for (int i = 0; i < jsonArray.size(); i++) {
@ -547,7 +548,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPreOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else {
//zh
formData.put("字段名", jsonObject.getString("fieldCn"));
@ -557,10 +558,10 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName());
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(form.getId(), JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPreOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
}
}
studyFormPreJcgjService.saveBatch(studyFormPreJcgjs);
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
}
}
@ -574,8 +575,6 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//更新复核意见
baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
StudyFormPre studyFormPreOld = this.queryInfo(form.getId());
studyFormPreOld.setFhyjjl(form.getFhyjjl());
this.updateById(studyFormPreOld);
Map<String, String> formData = new LinkedHashMap<>();
Map<String, String> formDataEn = new LinkedHashMap<>();
List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>();
@ -587,7 +586,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//en
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));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())) {
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh
@ -596,9 +595,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//en
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));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
}
studyFormPreJcgjService.saveBatch(studyFormPreJcgjs);
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
}
/**

Write Preview
Loading…
Cancel
Save