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 1 month ago
parent
6335e32763
commit
c927b5f28e
20 changed files with 222 additions and 126 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +4
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyJcgjService.java
  2. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormApplyQmxxService.java
  3. +2
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillJcgjService.java
  4. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillQmxxService.java
  5. +4
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanJcgjService.java
  6. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPlanQmxxService.java
  7. +4
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreJcgjService.java
  8. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreQmxxService.java
  9. +10
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyJcgjServiceImpl.java
  10. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyQmxxServiceImpl.java
  11. +42
    -29
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormApplyServiceImpl.java
  12. +10
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillJcgjServiceImpl.java
  13. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillQmxxServiceImpl.java
  14. +50
    -35
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java
  15. +8
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanJcgjServiceImpl.java
  16. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanQmxxServiceImpl.java
  17. +25
    -17
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPlanServiceImpl.java
  18. +8
    -2
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreJcgjServiceImpl.java
  19. +3
    -1
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreQmxxServiceImpl.java
  20. +31
    -21
      hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

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

@ -51,6 +51,7 @@ public interface IStudyFormApplyJcgjService extends IService
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormApply 表单 * @param studyFormApply 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -60,10 +61,11 @@ public interface IStudyFormApplyJcgjService extends IService
* @param remark 备注 * @param remark 备注
* @return * @return
*/ */
public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
public StudyFormApplyJcgj getJcgj(Date time,StudyFormApply studyFormApply,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormApply 表单 * @param studyFormApply 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -74,6 +76,6 @@ public interface IStudyFormApplyJcgjService extends IService
* @param remark 备注 * @param remark 备注
* @return * @return
*/ */
public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
public StudyFormApplyJcgj getJcgj(Date time,StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
} }

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

@ -1,5 +1,6 @@
package com.hxhq.business.service; package com.hxhq.business.service;
import java.util.Date;
import java.util.List; import java.util.List;
import com.hxhq.business.domain.StudyFormApplyQmxx; import com.hxhq.business.domain.StudyFormApplyQmxx;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
@ -25,10 +26,11 @@ public interface IStudyFormApplyQmxxService extends IService
/** /**
* 新增签名信息 * 新增签名信息
* @param time
* @param formId * @param formId
* @param qmyy * @param qmyy
* @param qmr * @param qmr
* @param remark * @param remark
*/ */
public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark);
public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark);
} }

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

@ -57,7 +57,7 @@ public interface IStudyFormFillJcgjService extends IService
* @param remark 备注 * @param remark 备注
* @return * @return
*/ */
public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
public StudyFormFillJcgj getJcgj(Date time,StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
@ -71,6 +71,6 @@ public interface IStudyFormFillJcgjService extends IService
* @param remark 备注 * @param remark 备注
* @return * @return
*/ */
public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
public StudyFormFillJcgj getJcgj(Date time,StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
} }

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

@ -1,5 +1,6 @@
package com.hxhq.business.service; package com.hxhq.business.service;
import java.util.Date;
import java.util.List; import java.util.List;
import com.hxhq.business.domain.StudyFormFillQmxx; import com.hxhq.business.domain.StudyFormFillQmxx;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
@ -25,10 +26,11 @@ public interface IStudyFormFillQmxxService extends IService
/** /**
* 新增签名信息 * 新增签名信息
* @param time
* @param formId * @param formId
* @param qmyy * @param qmyy
* @param qmr * @param qmr
* @param remark * @param remark
*/ */
public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark);
public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark);
} }

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

@ -48,6 +48,7 @@ public interface IStudyFormPlanJcgjService extends IService
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormPlan 表单 * @param studyFormPlan 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -57,10 +58,11 @@ public interface IStudyFormPlanJcgjService extends IService
* @param remark 备注 * @param remark 备注
* @return * @return
*/ */
public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
public StudyFormPlanJcgj getJcgj(Date time,StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormPlan 表单 * @param studyFormPlan 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -71,7 +73,7 @@ public interface IStudyFormPlanJcgjService extends IService
* @param remark 备注 * @param remark 备注
* @return * @return
*/ */
public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
public StudyFormPlanJcgj getJcgj(Date time,StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
} }

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

@ -1,5 +1,6 @@
package com.hxhq.business.service; package com.hxhq.business.service;
import java.util.Date;
import java.util.List; import java.util.List;
import com.hxhq.business.domain.StudyFormFillQmxx; import com.hxhq.business.domain.StudyFormFillQmxx;
@ -26,10 +27,11 @@ public interface IStudyFormPlanQmxxService extends IService
/** /**
* 新增签名信息 * 新增签名信息
* @param time
* @param formId * @param formId
* @param qmyy * @param qmyy
* @param qmr * @param qmr
* @param remark * @param remark
*/ */
public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark);
public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark);
} }

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

@ -47,6 +47,7 @@ public interface IStudyFormPreJcgjService extends IService
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormPre 表单 * @param studyFormPre 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -56,10 +57,11 @@ public interface IStudyFormPreJcgjService extends IService
* @param remark 备注 * @param remark 备注
* @return * @return
*/ */
public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
public StudyFormPreJcgj getJcgj(Date time,StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark);
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormPre 表单 * @param studyFormPre 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -70,7 +72,7 @@ public interface IStudyFormPreJcgjService extends IService
* @param remark 备注 * @param remark 备注
* @return * @return
*/ */
public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
public StudyFormPreJcgj getJcgj(Date time,StudyFormPre studyFormPre, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr, String jcnrEn, SysUser qmr, String remark);
} }

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

@ -1,5 +1,6 @@
package com.hxhq.business.service; package com.hxhq.business.service;
import java.util.Date;
import java.util.List; import java.util.List;
import com.hxhq.business.domain.StudyFormPreQmxx; import com.hxhq.business.domain.StudyFormPreQmxx;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
@ -23,11 +24,12 @@ public interface IStudyFormPreQmxxService extends IService
/** /**
* 新增签名信息 * 新增签名信息
* @param time
* @param formId * @param formId
* @param qmyy * @param qmyy
* @param qmr * @param qmr
* @param remark * @param remark
*/ */
public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark);
public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark);
} }

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

@ -114,6 +114,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormApply 表单 * @param studyFormApply 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -123,7 +124,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
* @param remark 备注 * @param remark 备注
*/ */
@Override @Override
public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
public StudyFormApplyJcgj getJcgj(Date time,StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj(); StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj();
formJcgj.setFormId(studyFormApply.getId()); formJcgj.setFormId(studyFormApply.getId());
formJcgj.setFormBh(studyFormApply.getBdbh()); formJcgj.setFormBh(studyFormApply.getBdbh());
@ -140,12 +141,16 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
formJcgj.setQmrMc(qmr.getNickName()); formJcgj.setQmrMc(qmr.getNickName());
formJcgj.setQmrMcEn(qmr.getUserName()); formJcgj.setQmrMcEn(qmr.getUserName());
} }
if(time!=null){
formJcgj.setCreateTime(time);
}
formJcgj.setRemark(remark); formJcgj.setRemark(remark);
return formJcgj; return formJcgj;
} }
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormApply 表单 * @param studyFormApply 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -156,7 +161,7 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
* @param remark 备注 * @param remark 备注
*/ */
@Override @Override
public StudyFormApplyJcgj getJcgj(StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
public StudyFormApplyJcgj getJcgj(Date time,StudyFormApply studyFormApply, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj(); StudyFormApplyJcgj formJcgj = new StudyFormApplyJcgj();
formJcgj.setFormId(studyFormApply.getId()); formJcgj.setFormId(studyFormApply.getId());
formJcgj.setFormBh(studyFormApply.getBdbh()); formJcgj.setFormBh(studyFormApply.getBdbh());
@ -171,6 +176,9 @@ public class StudyFormApplyJcgjServiceImpl extends ServiceImpl
formJcgj.setQmrMc(qmr.getNickName()); formJcgj.setQmrMc(qmr.getNickName());
formJcgj.setQmrMcEn(qmr.getUserName()); formJcgj.setQmrMcEn(qmr.getUserName());
} }
if(time!=null){
formJcgj.setCreateTime(time);
}
formJcgj.setRemark(remark); formJcgj.setRemark(remark);
return formJcgj; return formJcgj;
} }

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

@ -1,5 +1,6 @@
package com.hxhq.business.service.impl; package com.hxhq.business.service.impl;
import java.util.Date;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -49,7 +50,7 @@ public class StudyFormApplyQmxxServiceImpl extends ServiceImpl
* @param remark * @param remark
*/ */
@Override @Override
public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark){
public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark){
StudyFormApplyQmxx studyFormApplyQmxx=new StudyFormApplyQmxx(); StudyFormApplyQmxx studyFormApplyQmxx=new StudyFormApplyQmxx();
studyFormApplyQmxx.setFormId(formId); studyFormApplyQmxx.setFormId(formId);
studyFormApplyQmxx.setQmyy(qmyy); studyFormApplyQmxx.setQmyy(qmyy);
@ -58,6 +59,7 @@ public class StudyFormApplyQmxxServiceImpl extends ServiceImpl
studyFormApplyQmxx.setQmrMc(qmr.getNickName()); studyFormApplyQmxx.setQmrMc(qmr.getNickName());
studyFormApplyQmxx.setQmrMcEn(qmr.getUserName()); studyFormApplyQmxx.setQmrMcEn(qmr.getUserName());
studyFormApplyQmxx.setRemark(remark); studyFormApplyQmxx.setRemark(remark);
studyFormApplyQmxx.setCreateTime(time);
this.save(studyFormApplyQmxx); this.save(studyFormApplyQmxx);
} }

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

@ -128,6 +128,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void jq(StudyFormApply studyFormApply) { public void jq(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -140,9 +141,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
throw new ServiceException("表单不是申请状态，不能加签"); throw new ServiceException("表单不是申请状态，不能加签");
} }
//稽查轨迹 //稽查轨迹
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.bj.getValue(), studyFormApply.getQmyy(), JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(), null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.bj.getValue(), studyFormApply.getQmyy(), JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(), now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), studyFormApply.getQmyy(), qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApply.getId(), studyFormApply.getQmyy(), qmr, studyFormApply.getRemark());
} }
@ -155,6 +156,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void fz(StudyFormApply studyFormApply) { public void fz(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -169,9 +171,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.dfz.getValue()); studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.dfz.getValue());
this.updateById(studyFormApplyOld); this.updateById(studyFormApplyOld);
//稽查轨迹 //稽查轨迹
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(), null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, qmr, studyFormApply.getRemark(), now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "申请废止", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApply.getId(), "申请废止", qmr, studyFormApply.getRemark());
} }
@ -185,6 +187,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void qrfz(StudyFormApplyShfzForm form) { public void qrfz(StudyFormApplyShfzForm form) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, form.getQmrmm()); checkPassword(qmr, form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) { if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -200,9 +203,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.yfz.getValue()); studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.yfz.getValue());
this.updateById(studyFormApplyOld); this.updateById(studyFormApplyOld);
//稽查轨迹 //稽查轨迹
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), null, qmr, form.getRemark(), null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), null, qmr, form.getRemark(), now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "废止通过", qmr, form.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "废止通过", qmr, form.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormApplyOld.getStudyId()); Study study = studyService.getById(studyFormApplyOld.getStudyId());
String url = getUrlQz(study, "sqbd"); String url = getUrlQz(study, "sqbd");
@ -212,9 +215,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.tbz.getValue()); studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.tbz.getValue());
this.updateById(studyFormApplyOld); this.updateById(studyFormApplyOld);
//稽查轨迹 //稽查轨迹
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), null, qmr, form.getRemark(), null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), null, qmr, form.getRemark(), now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "废止拒绝", qmr, form.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "废止拒绝", qmr, form.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormApplyOld.getStudyId()); Study study = studyService.getById(studyFormApplyOld.getStudyId());
String url = getUrlQz(study, "sqbd"); String url = getUrlQz(study, "sqbd");
@ -235,6 +238,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void ghgsr(StudyFormApply studyFormApply) { public void ghgsr(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -256,9 +260,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
formData.put("新归属人", studyFormApply.getUserMc()); formData.put("新归属人", studyFormApply.getUserMc());
formData.put("原归属人", studyFormApplyOld.getUserMc()); formData.put("原归属人", studyFormApplyOld.getUserMc());
formData.put("原因", studyFormApply.getRemark()); formData.put("原因", studyFormApply.getRemark());
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "更换归属人", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "更换归属人", qmr, studyFormApply.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormApplyOld.getStudyId()); Study study = studyService.getById(studyFormApplyOld.getStudyId());
String url = getUrlQz(study, "sqbd"); String url = getUrlQz(study, "sqbd");
@ -274,6 +278,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
@Override @Override
public StudyFormApply bc(StudyFormApply studyFormApply) { public StudyFormApply bc(StudyFormApply studyFormApply) {
StudyFormApply result = null; StudyFormApply result = null;
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
if (studyFormApply.getId() != null) { if (studyFormApply.getId() != null) {
StudyFormApply studyFormApplyOld = this.queryInfo(studyFormApply.getId()); StudyFormApply studyFormApplyOld = this.queryInfo(studyFormApply.getId());
@ -293,7 +298,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
List<StudyFormApplyJcgj> studyFormApplyJcgjs = new ArrayList<>(); List<StudyFormApplyJcgj> studyFormApplyJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApply, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormApply.getRemark()));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApply, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormApply.getRemark()));
} }
studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs); studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);
} }
@ -309,11 +314,11 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormApply.getRemark()); formData.put("备注", studyFormApply.getRemark());
studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
result = studyFormApply; result = studyFormApply;
} }
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并保存记录", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApply.getId(), "填写并保存记录", qmr, studyFormApply.getRemark());
return baseMapper.queryInfo(result.getId()); return baseMapper.queryInfo(result.getId());
} }
@ -363,6 +368,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void tj(StudyFormApply studyFormApply) { public void tj(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null) { if (studyFormApply.getId() == null) {
studyFormApply.setUserId(qmr.getUserId()); studyFormApply.setUserId(qmr.getUserId());
@ -375,9 +381,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormApply.getRemark()); formData.put("备注", studyFormApply.getRemark());
studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormApplyJcgjService.saveJcgj(studyFormApply, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApply.getId(), "填写并提交记录", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApply.getId(), "填写并提交记录", qmr, studyFormApply.getRemark());
} }
@ -390,6 +396,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void fhtg(StudyFormApply studyFormApply) { public void fhtg(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -406,9 +413,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormApply.getRemark()); formData.put("原因", studyFormApply.getRemark());
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核通过", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "复核通过", qmr, studyFormApply.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormApplyOld.getStudyId()); Study study = studyService.getById(studyFormApplyOld.getStudyId());
String url = getUrlQz(study, "sqbd"); String url = getUrlQz(study, "sqbd");
@ -426,6 +433,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void fhjj(StudyFormApply studyFormApply) { public void fhjj(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -442,9 +450,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormApply.getRemark()); formData.put("原因", studyFormApply.getRemark());
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "复核拒绝", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "复核拒绝", qmr, studyFormApply.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormApplyOld.getStudyId()); Study study = studyService.getById(studyFormApplyOld.getStudyId());
String url = getUrlQz(study, "sqbd"); String url = getUrlQz(study, "sqbd");
@ -461,6 +469,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void sy(StudyFormApply studyFormApply) { public void sy(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -477,9 +486,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormApply.getRemark()); formData.put("备注", studyFormApply.getRemark());
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "已审阅", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "已审阅", qmr, studyFormApply.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormApplyOld.getStudyId()); Study study = studyService.getById(studyFormApplyOld.getStudyId());
String url = getUrlQz(study, "sqbd"); String url = getUrlQz(study, "sqbd");
@ -497,6 +506,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void shtg(StudyFormApply studyFormApply) { public void shtg(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -511,9 +521,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.ywc.getValue()); studyFormApplyOld.setBdzt(StudyFormApplyBdztEnum.ywc.getValue());
this.updateById(studyFormApplyOld); this.updateById(studyFormApplyOld);
//稽查轨迹 //稽查轨迹
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), null, qmr, studyFormApply.getRemark(), now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核通过", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "审核通过", qmr, studyFormApply.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormApplyOld.getStudyId()); Study study = studyService.getById(studyFormApplyOld.getStudyId());
String url = getUrlQz(study, "sqbd"); String url = getUrlQz(study, "sqbd");
@ -531,6 +541,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
public void shjj(StudyFormApply studyFormApply) { public void shjj(StudyFormApply studyFormApply) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormApply.getQmrmm()); checkPassword(qmr, studyFormApply.getQmrmm());
if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) { if (studyFormApply.getId() == null || studyFormApply.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -547,9 +558,9 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormApply.getRemark()); formData.put("原因", studyFormApply.getRemark());
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(), null);
studyFormApplyJcgjService.saveJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, studyFormApply.getRemark(), now);
//签名信息 //签名信息
studyFormApplyQmxxService.saveQmxx(studyFormApplyOld.getId(), "审核拒绝", qmr, studyFormApply.getRemark());
studyFormApplyQmxxService.saveQmxx(now,studyFormApplyOld.getId(), "审核拒绝", qmr, studyFormApply.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormApplyOld.getStudyId()); Study study = studyService.getById(studyFormApplyOld.getStudyId());
String url = getUrlQz(study, "sqbd"); String url = getUrlQz(study, "sqbd");
@ -576,6 +587,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void updateBdnr(StudyFormUpdateForm form) { public void updateBdnr(StudyFormUpdateForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
JSONObject bdnr = JSONObject.parseObject(form.getBdnr()); JSONObject bdnr = JSONObject.parseObject(form.getBdnr());
if(StringUtils.isNoneBlank(form.getZdxgjl())) { if(StringUtils.isNoneBlank(form.getZdxgjl())) {
@ -603,7 +615,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
formDataEn.put("原值", jsonObject.getString("oldValue")); formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value")); formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason")); formDataEn.put("原因", jsonObject.getString("reason"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApplyOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApplyOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else { } else {
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
@ -613,7 +625,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value")); formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName()); formDataEn.put("填写人", qmr.getNickName());
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApplyOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApplyOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
} }
} }
studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs); studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);
@ -625,6 +637,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void updateFhyjjl(StudyFormUpdateForm form) { public void updateFhyjjl(StudyFormUpdateForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//更新复核意见 //更新复核意见
baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
@ -640,7 +653,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("复核意见", jsonObject.getString("content")); formDataEn.put("复核意见", jsonObject.getString("content"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApplyOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())){ } else if (StringUtils.isNoneBlank(form.getReply())){
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0); JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh //zh
@ -649,7 +662,7 @@ public class StudyFormApplyServiceImpl extends ServiceImpl
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply")); formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(studyFormApplyOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormApplyJcgjs.add(studyFormApplyJcgjService.getJcgj(now,studyFormApplyOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} }
studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs); studyFormApplyJcgjService.saveBatchWithLog(studyFormApplyJcgjs);
} }

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

@ -122,6 +122,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormFill 表单 * @param studyFormFill 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -131,7 +132,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
* @param remark 备注 * @param remark 备注
*/ */
@Override @Override
public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
public StudyFormFillJcgj getJcgj(Date time,StudyFormFill studyFormFill,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
StudyFormFillJcgj formJcgj = new StudyFormFillJcgj(); StudyFormFillJcgj formJcgj = new StudyFormFillJcgj();
formJcgj.setFormId(studyFormFill.getId()); formJcgj.setFormId(studyFormFill.getId());
formJcgj.setFormBh(studyFormFill.getBdbh()); formJcgj.setFormBh(studyFormFill.getBdbh());
@ -148,12 +149,16 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
formJcgj.setQmrMc(qmr.getNickName()); formJcgj.setQmrMc(qmr.getNickName());
formJcgj.setQmrMcEn(qmr.getUserName()); formJcgj.setQmrMcEn(qmr.getUserName());
} }
if(time!=null){
formJcgj.setCreateTime(time);
}
formJcgj.setRemark(remark); formJcgj.setRemark(remark);
return formJcgj; return formJcgj;
} }
/** /**
* 新增稽查轨迹 * 新增稽查轨迹
* @param time 时间
* @param studyFormFill 表单 * @param studyFormFill 表单
* @param jcgjlx 稽查轨迹类型:1:流程；3：编辑 * @param jcgjlx 稽查轨迹类型:1:流程；3：编辑
* @param jcmc 稽查名称 * @param jcmc 稽查名称
@ -164,7 +169,7 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
* @param remark 备注 * @param remark 备注
*/ */
@Override @Override
public StudyFormFillJcgj getJcgj(StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
public StudyFormFillJcgj getJcgj(Date time,StudyFormFill studyFormFill, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
StudyFormFillJcgj formJcgj = new StudyFormFillJcgj(); StudyFormFillJcgj formJcgj = new StudyFormFillJcgj();
formJcgj.setFormId(studyFormFill.getId()); formJcgj.setFormId(studyFormFill.getId());
formJcgj.setFormBh(studyFormFill.getBdbh()); formJcgj.setFormBh(studyFormFill.getBdbh());
@ -179,6 +184,9 @@ public class StudyFormFillJcgjServiceImpl extends ServiceImpl
formJcgj.setQmrMc(qmr.getNickName()); formJcgj.setQmrMc(qmr.getNickName());
formJcgj.setQmrMcEn(qmr.getUserName()); formJcgj.setQmrMcEn(qmr.getUserName());
} }
if(time!=null){
formJcgj.setCreateTime(time);
}
formJcgj.setRemark(remark); formJcgj.setRemark(remark);
return formJcgj; return formJcgj;
} }

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

@ -1,5 +1,6 @@
package com.hxhq.business.service.impl; package com.hxhq.business.service.impl;
import java.util.Date;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -48,7 +49,7 @@ public class StudyFormFillQmxxServiceImpl extends ServiceImpl
* @param remark * @param remark
*/ */
@Override @Override
public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark){
public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark){
StudyFormFillQmxx studyFormFillQmxx=new StudyFormFillQmxx(); StudyFormFillQmxx studyFormFillQmxx=new StudyFormFillQmxx();
studyFormFillQmxx.setFormId(formId); studyFormFillQmxx.setFormId(formId);
studyFormFillQmxx.setQmyy(qmyy); studyFormFillQmxx.setQmyy(qmyy);
@ -57,6 +58,7 @@ public class StudyFormFillQmxxServiceImpl extends ServiceImpl
studyFormFillQmxx.setQmrMc(qmr.getNickName()); studyFormFillQmxx.setQmrMc(qmr.getNickName());
studyFormFillQmxx.setQmrMcEn(qmr.getUserName()); studyFormFillQmxx.setQmrMcEn(qmr.getUserName());
studyFormFillQmxx.setRemark(remark); studyFormFillQmxx.setRemark(remark);
studyFormFillQmxx.setCreateTime(time);
this.save(studyFormFillQmxx); this.save(studyFormFillQmxx);
} }

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

@ -236,6 +236,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void jq(StudyFormFill studyFormFill) { public void jq(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) { if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -248,9 +249,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
throw new ServiceException("表单不是填报状态，不能加签"); throw new ServiceException("表单不是填报状态，不能加签");
} }
//稽查轨迹 //稽查轨迹
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.bj.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.bj.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getRemark(), now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), studyFormFill.getQmyy(), qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), studyFormFill.getQmyy(), qmr, studyFormFill.getRemark());
} }
@ -263,6 +264,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void fz(StudyFormFill studyFormFill) { public void fz(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) { if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -277,9 +279,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillOld.setBdzt(StudyFormFillBdztEnum.dfz.getValue()); studyFormFillOld.setBdzt(StudyFormFillBdztEnum.dfz.getValue());
this.updateById(studyFormFillOld); this.updateById(studyFormFillOld);
//稽查轨迹 //稽查轨迹
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "申请废止", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "申请废止", qmr, studyFormFill.getRemark());
} }
@ -293,6 +295,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void qrfz(StudyFormFillShfzForm form) { public void qrfz(StudyFormFillShfzForm form) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, form.getQmrmm()); checkPassword(qmr, form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) { if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -310,9 +313,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", form.getRemark()); formData.put("原因", form.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止通过", qmr, form.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "废止通过", qmr, form.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId()); Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd"); String url = getUrlQz(study, "tbbd");
@ -324,9 +327,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", form.getRemark()); formData.put("原因", form.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "废止拒绝", qmr, form.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId()); Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd"); String url = getUrlQz(study, "tbbd");
@ -362,6 +365,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void ghgsr(StudyFormFill studyFormFill) { public void ghgsr(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) { if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -383,9 +387,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFillOld.setUserId(studyFormFill.getUserId()); studyFormFillOld.setUserId(studyFormFill.getUserId());
studyFormFillOld.setUserMc(studyFormFill.getUserMc()); studyFormFillOld.setUserMc(studyFormFill.getUserMc());
this.updateById(studyFormFillOld); this.updateById(studyFormFillOld);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "更换归属人", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "更换归属人", qmr, studyFormFill.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId()); Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd"); String url = getUrlQz(study, "tbbd");
@ -402,6 +406,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public StudyFormFill bc(StudyFormFill studyFormFill) { public StudyFormFill bc(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getQmrmm()); checkPassword(SecurityUtils.getLoginUser().getSysUser(), studyFormFill.getQmrmm());
StudyFormFill result = null; StudyFormFill result = null;
if (studyFormFill.getId() != null) { if (studyFormFill.getId() != null) {
@ -418,11 +423,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
this.updateById(studyFormFillOld); this.updateById(studyFormFillOld);
result = studyFormFillOld; result = studyFormFillOld;
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark()); formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
} else { } else {
studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue()); studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
studyFormFill.setUserId(SecurityUtils.getUserId()); studyFormFill.setUserId(SecurityUtils.getUserId());
@ -432,11 +437,11 @@ public class StudyFormFillServiceImpl extends ServiceImpl
this.save(studyFormFill); this.save(studyFormFill);
result = studyFormFill; result = studyFormFill;
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "填写并保存记录", qmr, studyFormFill.getRemark());
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark()); formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
} }
return baseMapper.queryInfo(result.getId()); return baseMapper.queryInfo(result.getId());
} }
@ -448,6 +453,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void bcAuto(StudyFormFill studyFormFill) { public void bcAuto(StudyFormFill studyFormFill) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue()); studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
studyFormFill.setUserId(SecurityUtils.getUserId()); studyFormFill.setUserId(SecurityUtils.getUserId());
@ -456,9 +462,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
studyFormFill.setUserMc(SecurityUtils.getNickName()); studyFormFill.setUserMc(SecurityUtils.getNickName());
this.save(studyFormFill); this.save(studyFormFill);
//稽查轨迹 //稽查轨迹
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, studyFormFill.getRemark(), null);
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, studyFormFill.getRemark(), now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "创建记录", qmr, studyFormFill.getRemark());
} }
/** /**
@ -504,6 +510,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void yjcc(StudyFormFill studyFormFill) { public void yjcc(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() != null) { if (studyFormFill.getId() != null) {
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId()); StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
@ -525,7 +532,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formData.put("存储位置", studyFormFillCc.getCcwz()); formData.put("存储位置", studyFormFillCc.getCcwz());
formData.put("存储条件", studyFormFillCc.getCctj()); formData.put("存储条件", studyFormFillCc.getCctj());
formData.put("存储药剂", String.join(",",studyFormFillCc.getList())); formData.put("存储药剂", String.join(",",studyFormFillCc.getList()));
studyFormFillJcgjList.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, null));
studyFormFillJcgjList.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, null));
} }
if(studyFormFillJcgjList.size()>0){ if(studyFormFillJcgjList.size()>0){
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjList); studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjList);
@ -600,6 +607,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void tj(StudyFormFill studyFormFill) { public void tj(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() != null) { if (studyFormFill.getId() != null) {
StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId()); StudyFormFill studyFormFillOld = this.queryInfo(studyFormFill.getId());
@ -626,14 +634,14 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>(); List<StudyFormFillJcgj> studyFormFillJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark()));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), qmr, studyFormFill.getRemark()));
} }
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs); studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
} }
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark()); formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
} else { } else {
studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue()); studyFormFill.setBdzt(StudyFormFillBdztEnum.ytj.getValue());
studyFormFill.setUserId(SecurityUtils.getUserId()); studyFormFill.setUserId(SecurityUtils.getUserId());
@ -649,10 +657,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark()); formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormFillJcgjService.saveJcgj(studyFormFill, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
} }
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFill.getId(), "填写并提交记录", qmr, studyFormFill.getRemark());
} }
@ -700,6 +708,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void gc(StudyFormFillGcForm form) { public void gc(StudyFormFillGcForm form) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, form.getQmrmm()); checkPassword(qmr, form.getQmrmm());
if (form.getId() == null || form.getId().longValue() < 0) { if (form.getId() == null || form.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -714,9 +723,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("生长情况", form.getQmyy()); formData.put("生长情况", form.getQmyy());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), form.getRemark(), now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), form.getQmyy(), qmr, form.getRemark());
} }
@ -730,6 +739,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void fhtg(StudyFormFill studyFormFill) { public void fhtg(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) { if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -747,9 +757,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormFill.getRemark()); formData.put("原因", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "复核通过", qmr, studyFormFill.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId()); Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd"); String url = getUrlQz(study, "tbbd");
@ -767,6 +777,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void fhjj(StudyFormFill studyFormFill) { public void fhjj(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) { if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -784,10 +795,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormFill.getRemark()); formData.put("原因", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "复核拒绝", qmr, studyFormFill.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId()); Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd"); String url = getUrlQz(study, "tbbd");
@ -805,6 +816,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void tg(StudyFormFill studyFormFill) { public void tg(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) { if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -822,10 +834,10 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormFill.getRemark()); formData.put("原因", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), null, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "免复核通过", qmr, studyFormFill.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId()); Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd"); String url = getUrlQz(study, "tbbd");
@ -842,6 +854,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
public void sy(StudyFormFill studyFormFill) { public void sy(StudyFormFill studyFormFill) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormFill.getQmrmm()); checkPassword(qmr, studyFormFill.getQmrmm());
if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) { if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -858,9 +871,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormFill.getRemark()); formData.put("备注", studyFormFill.getRemark());
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, null);
studyFormFillJcgjService.saveJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), formData, SecurityUtils.getLoginUser().getSysUser(), null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormFillOld.getId(), "已审阅", qmr, studyFormFill.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormFillOld.getStudyId()); Study study = studyService.getById(studyFormFillOld.getStudyId());
String url = getUrlQz(study, "tbbd"); String url = getUrlQz(study, "tbbd");
@ -886,6 +899,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void updateBdnr(StudyFormUpdateForm form) { public void updateBdnr(StudyFormUpdateForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
if(StringUtils.isNoneBlank(form.getZdxgjl())){ if(StringUtils.isNoneBlank(form.getZdxgjl())){
baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl()); baseMapper.updateBdnrZdxgjl(form.getId(), form.getBdnr(), form.getZdxgjl());
@ -912,7 +926,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formDataEn.put("原值", jsonObject.getString("oldValue")); formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value")); formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason")); formDataEn.put("原因", jsonObject.getString("reason"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else { } else {
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
@ -922,7 +936,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value")); formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName()); formDataEn.put("填写人", qmr.getNickName());
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
} }
} }
@ -935,6 +949,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void updateFhyjjl(StudyFormUpdateForm form) { public void updateFhyjjl(StudyFormUpdateForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//更新复核意见 //更新复核意见
baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
@ -950,7 +965,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("复核意见", jsonObject.getString("content")); formDataEn.put("复核意见", jsonObject.getString("content"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())) { } else if (StringUtils.isNoneBlank(form.getReply())) {
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0); JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh //zh
@ -959,7 +974,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply")); formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(studyFormFillOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormFillJcgjs.add(studyFormFillJcgjService.getJcgj(now,studyFormFillOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} }
studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs); studyFormFillJcgjService.saveBatchWithLog(studyFormFillJcgjs);
} }

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

@ -124,7 +124,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
* @param remark 备注 * @param remark 备注
*/ */
@Override @Override
public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
public StudyFormPlanJcgj getJcgj(Date time,StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj(); StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj();
formJcgj.setFormId(studyFormPlan.getId()); formJcgj.setFormId(studyFormPlan.getId());
formJcgj.setFormBh(studyFormPlan.getBdbh()); formJcgj.setFormBh(studyFormPlan.getBdbh());
@ -140,6 +140,9 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
formJcgj.setQmrMc(qmr.getNickName()); formJcgj.setQmrMc(qmr.getNickName());
formJcgj.setQmrMcEn(qmr.getUserName()); formJcgj.setQmrMcEn(qmr.getUserName());
} }
if(time!=null){
formJcgj.setCreateTime(time);
}
formJcgj.setRemark(remark); formJcgj.setRemark(remark);
return formJcgj; return formJcgj;
} }
@ -156,7 +159,7 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
* @param remark 备注 * @param remark 备注
*/ */
@Override @Override
public StudyFormPlanJcgj getJcgj(StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
public StudyFormPlanJcgj getJcgj(Date time,StudyFormPlan studyFormPlan, Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj(); StudyFormPlanJcgj formJcgj = new StudyFormPlanJcgj();
formJcgj.setFormId(studyFormPlan.getId()); formJcgj.setFormId(studyFormPlan.getId());
formJcgj.setFormBh(studyFormPlan.getBdbh()); formJcgj.setFormBh(studyFormPlan.getBdbh());
@ -171,6 +174,9 @@ public class StudyFormPlanJcgjServiceImpl extends ServiceImpl
formJcgj.setQmrMc(qmr.getNickName()); formJcgj.setQmrMc(qmr.getNickName());
formJcgj.setQmrMcEn(qmr.getUserName()); formJcgj.setQmrMcEn(qmr.getUserName());
} }
if(time!=null){
formJcgj.setCreateTime(time);
}
formJcgj.setRemark(remark); formJcgj.setRemark(remark);
return formJcgj; return formJcgj;
} }

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

@ -1,5 +1,6 @@
package com.hxhq.business.service.impl; package com.hxhq.business.service.impl;
import java.util.Date;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -48,7 +49,7 @@ public class StudyFormPlanQmxxServiceImpl extends ServiceImpl
* @param remark * @param remark
*/ */
@Override @Override
public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark){
public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark){
StudyFormPlanQmxx studyFormPlanQmxx=new StudyFormPlanQmxx(); StudyFormPlanQmxx studyFormPlanQmxx=new StudyFormPlanQmxx();
studyFormPlanQmxx.setFormId(formId); studyFormPlanQmxx.setFormId(formId);
studyFormPlanQmxx.setQmyy(qmyy); studyFormPlanQmxx.setQmyy(qmyy);
@ -57,6 +58,7 @@ public class StudyFormPlanQmxxServiceImpl extends ServiceImpl
studyFormPlanQmxx.setQmrMc(qmr.getNickName()); studyFormPlanQmxx.setQmrMc(qmr.getNickName());
studyFormPlanQmxx.setQmrMcEn(qmr.getUserName()); studyFormPlanQmxx.setQmrMcEn(qmr.getUserName());
studyFormPlanQmxx.setRemark(remark); studyFormPlanQmxx.setRemark(remark);
studyFormPlanQmxx.setCreateTime(time);
this.save(studyFormPlanQmxx); this.save(studyFormPlanQmxx);
} }

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

@ -110,6 +110,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void ghgsr(StudyFormPlan studyFormPlan) { public void ghgsr(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormPlan.getQmrmm()); checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) { if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -128,9 +129,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formData.put("新归属人", studyFormPlan.getUserMc()); formData.put("新归属人", studyFormPlan.getUserMc());
formData.put("原归属人", studyFormPlanOld.getUserMc()); formData.put("原归属人", studyFormPlanOld.getUserMc());
formData.put("原因", studyFormPlan.getRemark()); formData.put("原因", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, null);
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "更换归属人", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "更换归属人", qmr, studyFormPlan.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPlanOld.getStudyId()); Study study = studyService.getById(studyFormPlanOld.getStudyId());
String url = getUrlQz(study, "syxx"); String url = getUrlQz(study, "syxx");
@ -146,6 +147,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
*/ */
@Override @Override
public StudyFormPlan bc(StudyFormPlan studyFormPlan) { public StudyFormPlan bc(StudyFormPlan studyFormPlan) {
Date now =new Date();
StudyFormPlan result = null; StudyFormPlan result = null;
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
if (studyFormPlan.getId() != null) { if (studyFormPlan.getId() != null) {
@ -166,7 +168,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>(); List<StudyFormPlanJcgj> studyFormPlanJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlan, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark()));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlan, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPlan.getRemark()));
} }
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs); studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
} }
@ -181,11 +183,11 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormPlan.getRemark()); formData.put("备注", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并保存记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
result = studyFormPlan; result = studyFormPlan;
} }
//签名信息 //签名信息
studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并保存记录", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now,studyFormPlan.getId(), "填写并保存记录", qmr, studyFormPlan.getRemark());
return baseMapper.queryInfo(result.getId()); return baseMapper.queryInfo(result.getId());
} }
@ -234,6 +236,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void tj(StudyFormPlan studyFormPlan) { public void tj(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormPlan.getQmrmm()); checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null) { if (studyFormPlan.getId() == null) {
studyFormPlan.setUserId(SecurityUtils.getUserId()); studyFormPlan.setUserId(SecurityUtils.getUserId());
@ -253,9 +256,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormPlan.getRemark()); formData.put("备注", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormPlanJcgjService.saveJcgj(studyFormPlan, JcgjlxEnum.lc.getValue(), "填写并提交记录", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPlanQmxxService.saveQmxx(studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now,studyFormPlan.getId(), "填写并提交记录", qmr, studyFormPlan.getRemark());
} }
@ -268,6 +271,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void fhtg(StudyFormPlan studyFormPlan) { public void fhtg(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormPlan.getQmrmm()); checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) { if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -284,9 +288,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormPlan.getRemark()); formData.put("原因", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "复核通过", qmr, studyFormPlan.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPlanOld.getStudyId()); Study study = studyService.getById(studyFormPlanOld.getStudyId());
String url = getUrlQz(study, "syxx"); String url = getUrlQz(study, "syxx");
@ -304,6 +308,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void fhjj(StudyFormPlan studyFormPlan) { public void fhjj(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormPlan.getQmrmm()); checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) { if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -320,9 +325,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormPlan.getRemark()); formData.put("原因", studyFormPlan.getRemark());
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "复核拒绝", qmr, studyFormPlan.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPlanOld.getStudyId()); Study study = studyService.getById(studyFormPlanOld.getStudyId());
String url = getUrlQz(study, "syxx"); String url = getUrlQz(study, "syxx");
@ -340,6 +345,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
public void sy(StudyFormPlan studyFormPlan) { public void sy(StudyFormPlan studyFormPlan) {
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
Date now =new Date();
checkPassword(qmr, studyFormPlan.getQmrmm()); checkPassword(qmr, studyFormPlan.getQmrmm());
if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) { if (studyFormPlan.getId() == null || studyFormPlan.getId().longValue() < 0) {
throw new ServiceException("参数id不正确"); throw new ServiceException("参数id不正确");
@ -354,9 +360,9 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
studyFormPlanOld.setBdnr(studyFormPlan.getBdnr()); studyFormPlanOld.setBdnr(studyFormPlan.getBdnr());
this.updateById(studyFormPlanOld); this.updateById(studyFormPlanOld);
//稽查轨迹 //稽查轨迹
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), null);
studyFormPlanJcgjService.saveJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), null, qmr, studyFormPlan.getRemark(), now);
//签名信息 //签名信息
studyFormPlanQmxxService.saveQmxx(studyFormPlanOld.getId(), "已审阅", qmr, studyFormPlan.getRemark());
studyFormPlanQmxxService.saveQmxx(now,studyFormPlanOld.getId(), "已审阅", qmr, studyFormPlan.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPlanOld.getStudyId()); Study study = studyService.getById(studyFormPlanOld.getStudyId());
String url = getUrlQz(study, "syxx"); String url = getUrlQz(study, "syxx");
@ -383,6 +389,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void updateBdnr(StudyFormUpdateForm form) { public void updateBdnr(StudyFormUpdateForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//更新表单内容 //更新表单内容
if(StringUtils.isNoneBlank(form.getZdxgjl())){ if(StringUtils.isNoneBlank(form.getZdxgjl())){
@ -410,7 +417,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formDataEn.put("原值", jsonObject.getString("oldValue")); formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value")); formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason")); formDataEn.put("原因", jsonObject.getString("reason"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlanOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlanOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else { } else {
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
@ -420,7 +427,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value")); formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName()); formDataEn.put("填写人", qmr.getNickName());
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlanOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlanOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
} }
} }
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs); studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
@ -433,6 +440,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void updateFhyjjl(StudyFormUpdateForm form) { public void updateFhyjjl(StudyFormUpdateForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//更新复核意见 //更新复核意见
baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
@ -448,7 +456,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("复核意见", jsonObject.getString("content")); formDataEn.put("复核意见", jsonObject.getString("content"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlanOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())){ } else if (StringUtils.isNoneBlank(form.getReply())){
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0); JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh //zh
@ -457,7 +465,7 @@ public class StudyFormPlanServiceImpl extends ServiceImpl
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply")); formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(studyFormPlanOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPlanJcgjs.add(studyFormPlanJcgjService.getJcgj(now,studyFormPlanOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} }
studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs); studyFormPlanJcgjService.saveBatchWithLog(studyFormPlanJcgjs);
} }

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

@ -124,7 +124,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
* @param remark 备注 * @param remark 备注
*/ */
@Override @Override
public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
public StudyFormPreJcgj getJcgj(Date time,StudyFormPre studyFormPre,Integer jcgjlx, String jcmc, Integer jcmcys, Map<String, String> jcnr, SysUser qmr, String remark){
StudyFormPreJcgj formJcgj = new StudyFormPreJcgj(); StudyFormPreJcgj formJcgj = new StudyFormPreJcgj();
formJcgj.setFormId(studyFormPre.getId()); formJcgj.setFormId(studyFormPre.getId());
formJcgj.setFormBh(studyFormPre.getBdbh()); formJcgj.setFormBh(studyFormPre.getBdbh());
@ -141,6 +141,9 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
formJcgj.setQmrMc(qmr.getNickName()); formJcgj.setQmrMc(qmr.getNickName());
formJcgj.setQmrMcEn(qmr.getUserName()); formJcgj.setQmrMcEn(qmr.getUserName());
} }
if(time!=null){
formJcgj.setCreateTime(time);
}
formJcgj.setRemark(remark); formJcgj.setRemark(remark);
return formJcgj; return formJcgj;
} }
@ -157,7 +160,7 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
* @param remark 备注 * @param remark 备注
*/ */
@Override @Override
public StudyFormPreJcgj getJcgj(StudyFormPre studyFormPre,Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
public StudyFormPreJcgj getJcgj(Date time,StudyFormPre studyFormPre,Integer jcgjlx, String jcmc, Integer jcmcys, String jcnr,String jcnrEn, SysUser qmr, String remark){
StudyFormPreJcgj formJcgj = new StudyFormPreJcgj(); StudyFormPreJcgj formJcgj = new StudyFormPreJcgj();
formJcgj.setFormId(studyFormPre.getId()); formJcgj.setFormId(studyFormPre.getId());
formJcgj.setFormBh(studyFormPre.getBdbh()); formJcgj.setFormBh(studyFormPre.getBdbh());
@ -172,6 +175,9 @@ public class StudyFormPreJcgjServiceImpl extends ServiceImpl
formJcgj.setQmrMc(qmr.getNickName()); formJcgj.setQmrMc(qmr.getNickName());
formJcgj.setQmrMcEn(qmr.getUserName()); formJcgj.setQmrMcEn(qmr.getUserName());
} }
if(time!=null){
formJcgj.setCreateTime(time);
}
formJcgj.setRemark(remark); formJcgj.setRemark(remark);
return formJcgj; return formJcgj;
} }

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

@ -1,5 +1,6 @@
package com.hxhq.business.service.impl; package com.hxhq.business.service.impl;
import java.util.Date;
import java.util.List; import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@ -47,7 +48,7 @@ public class StudyFormPreQmxxServiceImpl extends ServiceImpl
* @param remark * @param remark
*/ */
@Override @Override
public void saveQmxx(Long formId, String qmyy, SysUser qmr, String remark){
public void saveQmxx(Date time, Long formId, String qmyy, SysUser qmr, String remark){
StudyFormPreQmxx studyFormPreQmxx=new StudyFormPreQmxx(); StudyFormPreQmxx studyFormPreQmxx=new StudyFormPreQmxx();
studyFormPreQmxx.setFormId(formId); studyFormPreQmxx.setFormId(formId);
studyFormPreQmxx.setQmyy(qmyy); studyFormPreQmxx.setQmyy(qmyy);
@ -56,6 +57,7 @@ public class StudyFormPreQmxxServiceImpl extends ServiceImpl
studyFormPreQmxx.setQmrMc(qmr.getNickName()); studyFormPreQmxx.setQmrMc(qmr.getNickName());
studyFormPreQmxx.setQmrMcEn(qmr.getUserName()); studyFormPreQmxx.setQmrMcEn(qmr.getUserName());
studyFormPreQmxx.setRemark(remark); studyFormPreQmxx.setRemark(remark);
studyFormPreQmxx.setCreateTime(time);
this.save(studyFormPreQmxx); this.save(studyFormPreQmxx);
} }

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

@ -127,6 +127,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
@Override @Override
public StudyFormPre bc(StudyFormPre studyFormPre) { public StudyFormPre bc(StudyFormPre studyFormPre) {
StudyFormPre result = null; StudyFormPre result = null;
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
if (studyFormPre.getId() != null) { if (studyFormPre.getId() != null) {
StudyFormPre studyFormPreOld = this.getById(studyFormPre.getId()); StudyFormPre studyFormPreOld = this.getById(studyFormPre.getId());
@ -145,7 +146,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>(); List<StudyFormPreJcgj> studyFormPreJcgjs = new ArrayList<>();
for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) { for (ObjectCompareUtil.FieldChange fieldChange : fieldChanges) {
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPre, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark()));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPre, JcgjlxEnum.xg.getValue(), "修改", JcmcysEnum.orange.getValue(), fieldChange.toString(), fieldChange.toEnString(), SecurityUtils.getLoginUser().getSysUser(), studyFormPre.getRemark()));
} }
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs); studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
} }
@ -160,11 +161,11 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormPre.getRemark()); formData.put("备注", studyFormPre.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, now);
result = studyFormPre; result = studyFormPre;
} }
//签名信息 //签名信息
studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作保存预制表单", qmr, studyFormPre.getRemark());
studyFormPreQmxxService.saveQmxx(now,studyFormPre.getId(), "制作保存预制表单", qmr, studyFormPre.getRemark());
return baseMapper.queryInfo(result.getId()); return baseMapper.queryInfo(result.getId());
} }
@ -209,6 +210,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void tj(StudyFormPre studyFormPre) { public void tj(StudyFormPre studyFormPre) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码 //验证密码
checkPassword(qmr, studyFormPre.getQmrmm()); checkPassword(qmr, studyFormPre.getQmrmm());
@ -235,9 +237,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", studyFormPre.getRemark()); formData.put("备注", studyFormPre.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormPreJcgjService.saveJcgj(studyFormPre, JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPreQmxxService.saveQmxx(studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark());
studyFormPreQmxxService.saveQmxx(now,studyFormPre.getId(), "制作提交预制表单", qmr, studyFormPre.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPre.getStudyId()); Study study = studyService.getById(studyFormPre.getStudyId());
String url = getUrlQz(study, "ytbd"); String url = getUrlQz(study, "ytbd");
@ -269,6 +271,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void tg(StudyFormPreAuditForm form) { public void tg(StudyFormPreAuditForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码 //验证密码
checkPassword(qmr, form.getQmrmm()); checkPassword(qmr, form.getQmrmm());
@ -316,9 +319,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("备注", form.getRemark()); formData.put("备注", form.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核通过", qmr, form.getRemark());
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "审核通过", qmr, form.getRemark());
} }
/** /**
@ -328,6 +331,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void jj(StudyFormPreAuditForm form) { public void jj(StudyFormPreAuditForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码 //验证密码
checkPassword(qmr, form.getQmrmm()); checkPassword(qmr, form.getQmrmm());
@ -343,9 +347,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", form.getRemark()); formData.put("原因", form.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark());
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "审核拒绝", qmr, form.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId()); Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd"); String url = getUrlQz(study, "ytbd");
@ -360,6 +364,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public StudyFormFill tb(StudyFormPre studyFormPre) { public StudyFormFill tb(StudyFormPre studyFormPre) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码 //验证密码
checkPassword(qmr, studyFormPre.getQmrmm()); checkPassword(qmr, studyFormPre.getQmrmm());
@ -372,9 +377,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
} }
Date time = new Date(); Date time = new Date();
//稽查轨迹 //稽查轨迹
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, null, null);
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), null, qmr, null, now);
//签名信息 //签名信息
studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "创建记录", qmr, studyFormPre.getRemark());
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "创建记录", qmr, studyFormPre.getRemark());
//生成填报表单 //生成填报表单
StudyFormFill studyFormFill = new StudyFormFill(); StudyFormFill studyFormFill = new StudyFormFill();
studyFormFill.setStudyId(studyFormPreOld.getStudyId()); studyFormFill.setStudyId(studyFormPreOld.getStudyId());
@ -400,6 +405,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void sqgb(StudyFormPre studyFormPre) { public void sqgb(StudyFormPre studyFormPre) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证签名人密码 //验证签名人密码
checkPassword(qmr, studyFormPre.getQmrmm()); checkPassword(qmr, studyFormPre.getQmrmm());
@ -421,9 +427,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", studyFormPre.getRemark()); formData.put("原因", studyFormPre.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "申请关闭", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "申请关闭", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormFillQmxxService.saveQmxx(studyFormPreOld.getId(), "申请关闭", qmr, studyFormPre.getRemark());
studyFormFillQmxxService.saveQmxx(now,studyFormPreOld.getId(), "申请关闭", qmr, studyFormPre.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId()); Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd"); String url = getUrlQz(study, "ytbd");
@ -439,6 +445,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void jjgb(StudyFormPreAuditForm form) { public void jjgb(StudyFormPreAuditForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码 //验证密码
checkPassword(qmr, form.getQmrmm()); checkPassword(qmr, form.getQmrmm());
@ -457,9 +464,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", form.getRemark()); formData.put("原因", form.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, null);
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭拒绝", JcmcysEnum.red.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "关闭拒绝", qmr, form.getRemark());
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "关闭拒绝", qmr, form.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId()); Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd"); String url = getUrlQz(study, "ytbd");
@ -474,6 +481,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void tygb(StudyFormPreAuditForm form) { public void tygb(StudyFormPreAuditForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//验证密码 //验证密码
checkPassword(qmr, form.getQmrmm()); checkPassword(qmr, form.getQmrmm());
@ -492,9 +500,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//稽查轨迹 //稽查轨迹
Map<String, String> formData = new LinkedHashMap<>(); Map<String, String> formData = new LinkedHashMap<>();
formData.put("原因", form.getRemark()); formData.put("原因", form.getRemark());
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭同意", JcmcysEnum.green.getValue(), formData, qmr, null, null);
studyFormPreJcgjService.saveJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "关闭同意", JcmcysEnum.green.getValue(), formData, qmr, null, now);
//签名信息 //签名信息
studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(), "关闭同意", qmr, form.getRemark());
studyFormPreQmxxService.saveQmxx(now,studyFormPreOld.getId(), "关闭同意", qmr, form.getRemark());
//发送通知 //发送通知
Study study = studyService.getById(studyFormPreOld.getStudyId()); Study study = studyService.getById(studyFormPreOld.getStudyId());
String url = getUrlQz(study, "ytbd"); String url = getUrlQz(study, "ytbd");
@ -520,6 +528,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void updateBdnr(StudyFormUpdateForm form) { public void updateBdnr(StudyFormUpdateForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//更新表单内容 //更新表单内容
if(StringUtils.isNoneBlank(form.getZdxgjl())){ if(StringUtils.isNoneBlank(form.getZdxgjl())){
@ -548,7 +557,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formDataEn.put("原值", jsonObject.getString("oldValue")); formDataEn.put("原值", jsonObject.getString("oldValue"));
formDataEn.put("新值", jsonObject.getString("value")); formDataEn.put("新值", jsonObject.getString("value"));
formDataEn.put("原因", jsonObject.getString("reason")); formDataEn.put("原因", jsonObject.getString("reason"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPreOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPreOld, JcgjlxEnum.xg.getValue(), "修改记录", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else { } else {
//zh //zh
formData.put("字段名", jsonObject.getString("fieldCn")); formData.put("字段名", jsonObject.getString("fieldCn"));
@ -558,7 +567,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("填入值", jsonObject.getString("value")); formDataEn.put("填入值", jsonObject.getString("value"));
formDataEn.put("填写人", qmr.getNickName()); formDataEn.put("填写人", qmr.getNickName());
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPreOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPreOld, JcgjlxEnum.bj.getValue(), "填写", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), null, null));
} }
} }
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs); studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
@ -571,6 +580,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
*/ */
@Override @Override
public void updateFhyjjl(StudyFormUpdateForm form) { public void updateFhyjjl(StudyFormUpdateForm form) {
Date now =new Date();
SysUser qmr = SecurityUtils.getLoginUser().getSysUser(); SysUser qmr = SecurityUtils.getLoginUser().getSysUser();
//更新复核意见 //更新复核意见
baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl()); baseMapper.updateFhyjjl(form.getId(), form.getFhyjjl());
@ -586,7 +596,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("复核意见", jsonObject.getString("content")); formDataEn.put("复核意见", jsonObject.getString("content"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPreOld, JcgjlxEnum.lc.getValue(), "复核意见", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} else if (StringUtils.isNoneBlank(form.getReply())) { } else if (StringUtils.isNoneBlank(form.getReply())) {
JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0); JSONObject jsonObject = JSONArray.parseArray(form.getReply()).getJSONObject(0);
//zh //zh
@ -595,7 +605,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
//en //en
formDataEn.put("字段名", jsonObject.getString("fieldEn")); formDataEn.put("字段名", jsonObject.getString("fieldEn"));
formDataEn.put("意见回复", jsonObject.getString("reply")); formDataEn.put("意见回复", jsonObject.getString("reply"));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(studyFormPreOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
studyFormPreJcgjs.add(studyFormPreJcgjService.getJcgj(now,studyFormPreOld, JcgjlxEnum.lc.getValue(), "意见回复", JcmcysEnum.blue.getValue(), JctUtil.formatStr(formData), StudyFormUtil.getJcnrEn(formDataEn), qmr, null));
} }
studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs); studyFormPreJcgjService.saveBatchWithLog(studyFormPreJcgjs);
} }

Write Preview
Loading…
Cancel
Save