feat：[试验管理][填报表单]

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormFillController.java

@@ -1,15 +1,16 @@
 package com.hxhq.business.controller;
 
-import java.util.Arrays;
 import java.util.List;
 
 import com.hxhq.business.domain.StudyFormFillJcgj;
 import com.hxhq.business.domain.StudyFormFillQmxx;
 import com.hxhq.business.dto.study.StudyFormFillListDto;
+import com.hxhq.business.form.study.StudyFormFillGcForm;
+import com.hxhq.business.form.study.StudyFormFillShfzForm;
 import com.hxhq.business.form.study.StudyFormFillSearchForm;
 import com.hxhq.business.service.*;
+import com.hxhq.common.security.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import com.hxhq.business.domain.StudyFormFill;
 import com.hxhq.common.core.web.controller.BaseController;
@@ -25,8 +26,7 @@ import com.hxhq.common.core.web.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/business/studyFormFill")
-public class StudyFormFillController extends BaseController
-{
+public class StudyFormFillController extends BaseController {
     @Autowired
     private IStudyFormFillService studyFormFillService;
     @Autowired
@@ -38,8 +38,7 @@ public class StudyFormFillController extends BaseController
      * 列表
      */
     @GetMapping("/list")
-    public TableDataInfo list(StudyFormFillSearchForm form)
-    {
+    public TableDataInfo list(StudyFormFillSearchForm form) {
         startPage();
         List<StudyFormFillListDto> list = studyFormFillService.queryList(form);
         return getDataTable(list);
@@ -49,8 +48,7 @@ public class StudyFormFillController extends BaseController
      * 稽查轨迹列表
      */
     @GetMapping("/jcgjList")
-    public TableDataInfo jcgjList(StudyFormFillJcgj form)
-    {
+    public TableDataInfo jcgjList(StudyFormFillJcgj form) {
         startPage();
         List<StudyFormFillJcgj> list = studyFormFillJcgjService.queryList(form);
         return getDataTable(list);
@@ -60,11 +58,133 @@ public class StudyFormFillController extends BaseController
      * 签名信息列表
      */
     @GetMapping("/qmxxList")
-    public TableDataInfo qmxxList(StudyFormFillQmxx form)
-    {
+    public TableDataInfo qmxxList(StudyFormFillQmxx form) {
         startPage();
         List<StudyFormFillQmxx> list = studyFormFillQmxxService.queryList(form);
         return getDataTable(list);
     }
 
+    /**
+     * 详细
+     */
+    @GetMapping(value = "/info")
+    public AjaxResult getInfo(Long id) {
+        return AjaxResult.success(studyFormFillService.queryInfo(id));
+    }
+
+    /**
+     * 加签
+     */
+    @RequiresPermissions("business:studyFormFill:jq")
+    @PostMapping("/jq")
+    public AjaxResult jq(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.jq(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 废止
+     */
+    @RequiresPermissions("business:studyFormFill:fz")
+    @PostMapping("/fz")
+    public AjaxResult fz(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.fz(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 审核废止
+     */
+    @RequiresPermissions("business:studyFormFill:shfz")
+    @PostMapping("/shfz")
+    public AjaxResult shfz(@RequestBody StudyFormFillShfzForm form) {
+        studyFormFillService.shfz(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 更换归属人
+     */
+    @RequiresPermissions("business:studyFormFill:ghgsr")
+    @PostMapping("/ghgsr")
+    public AjaxResult ghgsr(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.ghgsr(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 保存
+     */
+    @RequiresPermissions("business:studyFormFill:bc")
+    @PostMapping("/bc")
+    public AjaxResult bc(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.bc(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 提交
+     */
+    @RequiresPermissions("business:studyFormFill:tj")
+    @PostMapping("/tj")
+    public AjaxResult tj(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.tj(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 观察
+     */
+    @RequiresPermissions("business:studyFormFill:gc")
+    @PostMapping("/gc")
+    public AjaxResult gc(@RequestBody StudyFormFillGcForm form) {
+        studyFormFillService.gc(form);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 复核通过
+     */
+    @RequiresPermissions("business:studyFormFill:fhtg")
+    @PostMapping("/fhtg")
+    public AjaxResult fhtg(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.fhtg(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
+
+
+    /**
+     * 复核拒绝
+     */
+    @RequiresPermissions("business:studyFormFill:fhjj")
+    @PostMapping("/fhjj")
+    public AjaxResult fhjj(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.fhjj(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 通过
+     */
+    @RequiresPermissions("business:studyFormFill:tg")
+    @PostMapping("/tg")
+    public AjaxResult tg(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.tg(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 审阅
+     */
+    @RequiresPermissions("business:studyFormFill:sy")
+    @PostMapping("/sy")
+    public AjaxResult sy(@RequestBody StudyFormFill studyFormFill) {
+        studyFormFillService.sy(studyFormFill);
+        return AjaxResult.success("操作成功");
+    }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudyFormPreController.java

@@ -75,7 +75,7 @@ public class StudyFormPreController extends BaseController
     @GetMapping(value = "/info")
     public AjaxResult getInfo(Long id)
     {
-        return AjaxResult.success(studyFormPreService.getById(id));
+        return AjaxResult.success(studyFormPreService.queryInfo(id));
     }
 
     /**

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormFill.java

@@ -1,5 +1,6 @@
 package com.hxhq.business.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hxhq.common.core.annotation.Excel;
@@ -37,9 +38,6 @@ public class StudyFormFill extends MpBaseEntity
     /** 模板id */
     private Long templateId;
 
-    /** 模板名称 */
-    private String templateMc;
-
     /** 表单内容 */
     private String bdnr;
 
@@ -60,6 +58,58 @@ public class StudyFormFill extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date tjsj;
 
+    /** 签名意义 */
+    @TableField(exist = false)
+    private String qmyy;
+
+    /** 签名人密码 */
+    @TableField(exist = false)
+    private String qmrmm;
+
+    /** 模板名称 */
+    @TableField(exist = false)
+    private String templateMc;
+
+    /** 模板编号 */
+    @TableField(exist = false)
+    private String templateSn;
+
+    /** 模板所属部门/学科 */
+    @TableField(exist = false)
+    private Long templateDeptId;
+
+    public Long getTemplateDeptId() {
+        return templateDeptId;
+    }
+
+    public void setTemplateDeptId(Long templateDeptId) {
+        this.templateDeptId = templateDeptId;
+    }
+
+    public String getQmyy() {
+        return qmyy;
+    }
+
+    public void setQmyy(String qmyy) {
+        this.qmyy = qmyy;
+    }
+
+    public String getTemplateSn() {
+        return templateSn;
+    }
+
+    public void setTemplateSn(String templateSn) {
+        this.templateSn = templateSn;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+
     public Long getStudySubjectId() {
         return studySubjectId;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/domain/StudyFormPre.java

@@ -1,5 +1,6 @@
 package com.hxhq.business.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hxhq.common.core.annotation.Excel;
@@ -37,9 +38,6 @@ public class StudyFormPre extends MpBaseEntity
     /** 模板id */
     private Long templateId;
 
-    /** 模板名称 */
-    private String templateMc;
-
     /** 表单内容 */
     private String bdnr;
 
@@ -72,6 +70,47 @@ public class StudyFormPre extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date tjsj;
 
+    /** 签名人密码 */
+    @TableField(exist = false)
+    private String qmrmm;
+
+    /** 模板名称 */
+    @TableField(exist = false)
+    private String templateMc;
+
+    /** 模板编号 */
+    @TableField(exist = false)
+    private String templateSn;
+
+    /** 模板所属部门/学科 */
+    @TableField(exist = false)
+    private Long templateDeptId;
+
+    public Long getTemplateDeptId() {
+        return templateDeptId;
+    }
+
+    public void setTemplateDeptId(Long templateDeptId) {
+        this.templateDeptId = templateDeptId;
+    }
+
+    public String getTemplateSn() {
+        return templateSn;
+    }
+
+    public void setTemplateSn(String templateSn) {
+        this.templateSn = templateSn;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+
+
     public Long getStudySubjectId() {
         return studySubjectId;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/enums/study/StudyFormFillBdztEnum.java

@@ -0,0 +1,71 @@
+package com.hxhq.business.enums.study;
+
+/**
+ * 表单状态：1：填报中；3：已提交；5：已完成（经复核）；7：已完成；9：待废止；11：已废止
+ * @author tanfei
+ */
+public enum StudyFormFillBdztEnum {
+
+    /**
+     * 填报中
+     */
+    tbz(1, "填报中"),
+
+    /**
+     * 已提交
+     */
+    ytj(3, "已提交"),
+
+    /**
+     * 已完成（经复核）
+     */
+    ywcfh(5, "已完成（经复核）"),
+
+    /**
+     * 已完成
+     */
+    ywc(7, "已完成"),
+
+    /**
+     * 待废止
+     */
+    dfz(9, "待废止"),
+
+    /**
+     * 已废止
+     */
+    yfz(11, "已废止");
+
+    private int value;
+    private String text;
+
+    StudyFormFillBdztEnum(int value, String text) {
+        this.value = value;
+        this.text = text;
+    }
+
+    public int getValue() {
+        return value;
+    }
+
+    public void setValue(int value) {
+        this.value = value;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public static StudyFormFillBdztEnum getEnumByValue(int type) {
+        for (StudyFormFillBdztEnum bt : values()) {
+            if (bt.value == type) {
+                return bt;
+            }
+        }
+        return null;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillGcForm.java

@@ -0,0 +1,50 @@
+package com.hxhq.business.form.study;
+
+/**
+ * @author tanfei
+ */
+public class StudyFormFillGcForm {
+    /** 表单id */
+    private Long id;
+
+    /** 生长情况 */
+    private String qmyy;
+
+    /** 原因，备注 */
+    private String remark;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getQmyy() {
+        return qmyy;
+    }
+
+    public void setQmyy(String qmyy) {
+        this.qmyy = qmyy;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/study/StudyFormFillShfzForm.java

@@ -0,0 +1,52 @@
+package com.hxhq.business.form.study;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+
+/**
+ * @author tanfei
+ */
+public class StudyFormFillShfzForm {
+    /** 表单id */
+    private Long id;
+
+    /** 签名意义：1：废止拒绝；10：废止通过 */
+    private Integer qmyy;
+
+    /** 原因，备注 */
+    private String remark;
+
+    /** 签名人密码 */
+    private String qmrmm;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Integer getQmyy() {
+        return qmyy;
+    }
+
+    public void setQmyy(Integer qmyy) {
+        this.qmyy = qmyy;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public String getQmrmm() {
+        return qmrmm;
+    }
+
+    public void setQmrmm(String qmrmm) {
+        this.qmrmm = qmrmm;
+    }
+}

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormFillMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.hxhq.business.domain.StudyFormFill;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hxhq.business.domain.StudyFormPre;
+import com.hxhq.business.dto.mjy.DetailDto;
 import com.hxhq.business.dto.study.StudyFormFillListDto;
 import com.hxhq.business.dto.study.StudyFormPreListDto;
 import org.apache.ibatis.annotations.Param;
@@ -24,4 +25,11 @@ public interface StudyFormFillMapper extends BaseMapper
      * @return
      */
     List<StudyFormFillListDto> queryList(@Param("ew") Wrapper<StudyFormFill> queryWrapper);
+
+    /**
+     *  查询详情
+     * @param id
+     * @return
+     */
+    StudyFormFill queryInfo(@Param("id") Long id);
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/mapper/StudyFormPreMapper.java

@@ -2,6 +2,7 @@ package com.hxhq.business.mapper;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.hxhq.business.domain.Mjy;
+import com.hxhq.business.domain.StudyFormFill;
 import com.hxhq.business.domain.StudyFormPre;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hxhq.business.dto.mjy.ListDto;
@@ -24,4 +25,11 @@ public interface StudyFormPreMapper extends BaseMapper
      * @return
      */
     List<StudyFormPreListDto> queryList(@Param("ew") Wrapper<StudyFormPre> queryWrapper);
+
+    /**
+     *  查询详情
+     * @param id
+     * @return
+     */
+    StudyFormPre queryInfo(@Param("id") Long id);
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormFillService.java

@@ -3,8 +3,11 @@ package com.hxhq.business.service;
 import java.util.List;
 import com.hxhq.business.domain.StudyFormFill;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.hxhq.business.dto.mjy.DetailDto;
 import com.hxhq.business.dto.study.StudyFormFillListDto;
+import com.hxhq.business.form.study.StudyFormFillGcForm;
 import com.hxhq.business.form.study.StudyFormFillSearchForm;
+import com.hxhq.business.form.study.StudyFormFillShfzForm;
 
 /**
  * 试验-填报单Service接口
@@ -22,4 +25,83 @@ public interface IStudyFormFillService extends IService
      */
     public List<StudyFormFillListDto> queryList(StudyFormFillSearchForm form);
 
+    /**
+     * 详情
+     *
+     * @param id
+     * @return 详情
+     */
+    public StudyFormFill queryInfo(Long id);
+
+    /**
+     * 加签
+     * @param studyFormFill
+     */
+    public void jq(StudyFormFill studyFormFill);
+
+    /**
+     * 废止
+     * @param studyFormFill
+     */
+    public void fz(StudyFormFill studyFormFill);
+
+
+    /**
+     * 审核废止
+     * @param form
+     */
+    public void shfz(StudyFormFillShfzForm form);
+
+
+    /**
+     * 更换归属人
+     * @param studyFormFill
+     */
+    public void ghgsr(StudyFormFill studyFormFill);
+
+    /**
+     * 保存
+     * @param studyFormFill
+     */
+    public void bc(StudyFormFill studyFormFill);
+
+
+    /**
+     * 提交
+     * @param studyFormFill
+     */
+    public void tj(StudyFormFill studyFormFill);
+
+
+    /**
+     * 观察
+     * @param form
+     */
+    public void gc(StudyFormFillGcForm form);
+
+
+    /**
+     * 复核通过
+     * @param studyFormFill
+     */
+    public void fhtg(StudyFormFill studyFormFill);
+
+
+    /**
+     * 复核拒绝
+     * @param studyFormFill
+     */
+    public void fhjj(StudyFormFill studyFormFill);
+
+    /**
+     * 通过
+     * @param studyFormFill
+     */
+    public void tg(StudyFormFill studyFormFill);
+
+    /**
+     * 审阅
+     * @param studyFormFill
+     */
+    public void sy(StudyFormFill studyFormFill);
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudyFormPreService.java

@@ -1,6 +1,8 @@
 package com.hxhq.business.service;
 
 import java.util.List;
+
+import com.hxhq.business.domain.StudyFormFill;
 import com.hxhq.business.domain.StudyFormPre;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.business.dto.study.StudyFormPreListDto;
@@ -27,6 +29,14 @@ public interface IStudyFormPreService extends IService
     public List<StudyFormPreListDto> queryList(StudyFormPreSearchForm form);
 
     /**
+     * 详情
+     *
+     * @param id
+     * @return 详情
+     */
+    public StudyFormPre queryInfo(Long id);
+
+    /**
      * 保存
      * @param studyFormPre
      */

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjFfjlServiceImpl.java

@@ -121,7 +121,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "补充说明");
         formData.put("签名人", qmr.getNickName());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -159,7 +159,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请借阅");
         formData.put("签名人", qmr.getNickName());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -204,7 +204,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请解档");
         formData.put("签名人", qmr.getNickName());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
 
@@ -247,7 +247,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
                 formData.put("签名人", qmr.getNickName());
                 gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
                 gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId());
-                gyzjFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                gyzjFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
                 gyzjFfjlJcgjList.add(gyzjFfjlJcgj);
                 //endregion
 
@@ -285,7 +285,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请归档");
         formData.put("签名人", qmr.getNickName());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
 
@@ -328,7 +328,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
 
             gyzjFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
             gyzjFfjlJcgj.setQmrId(SecurityUtils.getUserId());
-            gyzjFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            gyzjFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
             gyzjFfjlJcgjList.add(gyzjFfjlJcgj);
             //endregion
 
@@ -365,7 +365,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "锁定发放记录");
         formData.put("签名人", qmr.getNickName());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
 
@@ -398,7 +398,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "解锁发放记录");
         formData.put("签名人", qmr.getNickName());
-        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzjFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
 
@@ -447,7 +447,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "归还");
-        gyzjFfjlJcgjService.saveJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjFfjlJcgjService.saveJcgj(gyzj.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
     }
 
@@ -495,7 +495,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         formData.put("目的", mdIds);
         formData.put("备注", remark);
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
-                SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+                SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
     }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java

@@ -124,7 +124,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -160,7 +160,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         formData.put("备注", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -198,7 +198,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 gyzjJcgj.setJcmcys(JcmcysEnum.green.getValue());
                 gyzjJcgj.setRemark(form.getRemark());
                 gyzjJcgj.setQmrId(SecurityUtils.getUserId());
-                gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                gyzjJcgj.setQmrMc(SecurityUtils.getNickName());
                 gyzjJcgjList.add(gyzjJcgj);
                 //endregion
 
@@ -234,7 +234,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
 
@@ -273,7 +273,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             formData.put("备注", form.getRemark());
             gyzjJcgj.setJcnr(JctUtil.formatStr(formData));
             gyzjJcgj.setQmrId(SecurityUtils.getUserId());
-            gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            gyzjJcgj.setQmrMc(SecurityUtils.getNickName());
             gyzjJcgjList.add(gyzjJcgj);
             //endregion
 
@@ -308,7 +308,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "锁定给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
 
@@ -338,7 +338,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "解锁给药制剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -399,7 +399,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
 
                 gyzjJcgj.setJcnr(JctUtil.formatStr(formData));
                 gyzjJcgj.setQmrId(SecurityUtils.getUserId());
-                gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                gyzjJcgj.setQmrMc(SecurityUtils.getNickName());
                 gyzjJcgjList.add(gyzjJcgj);
                 //endregion
                 //region 台账
@@ -473,7 +473,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("处置量", form.getCzl() + gyzjOld.getKcdw());
         formData.put("处置人", clr.getNickName());
 
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
 
         //region 台账
@@ -543,7 +543,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
 
                 gyzjJcgj.setJcnr(JctUtil.formatStr(formData));
                 gyzjJcgj.setQmrId(SecurityUtils.getUserId());
-                gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                gyzjJcgj.setQmrMc(SecurityUtils.getNickName());
                 gyzjJcgjList.add(gyzjJcgj);
                 //endregion
 
@@ -610,7 +610,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("复核人", fhr.getNickName());
         formData.put("监督人", jdr.getNickName());
 
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
 
         //region 台账
@@ -673,7 +673,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
 
             gyzjJcgj.setJcnr(JctUtil.formatStr(formData));
             gyzjJcgj.setQmrId(SecurityUtils.getUserId());
-            gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            gyzjJcgj.setQmrMc(SecurityUtils.getNickName());
             gyzjJcgjList.add(gyzjJcgj);
             //endregion
         }
@@ -723,7 +723,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("目的", form.getMdIds());
         formData.put("备注", form.getRemark());
         gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
-                SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+                SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
         //region 台账
         gyzjTzService.saveTz(gyzjOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "",
@@ -802,7 +802,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 formData.put("备注", plffItemFilter.get(0).getRemark());
                 gyzjJcgj.setJcnr(JctUtil.formatStr(formData));
                 gyzjJcgj.setQmrId(SecurityUtils.getUserId());
-                gyzjJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                gyzjJcgj.setQmrMc(SecurityUtils.getNickName());
                 gyzjJcgjList.add(gyzjJcgj);
                 //endregion
                 //region 台账
@@ -1137,7 +1137,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "确认归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
         gyzjOld.setKc(leftKc.toString());
         gyzjOld.setZjzt(ZjztEnum.rk.getValue());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyFfjlServiceImpl.java

@@ -121,7 +121,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "补充说明");
         formData.put("签名人", qmr.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "补充说明", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -159,7 +159,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请借阅");
         formData.put("签名人", qmr.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -204,7 +204,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请解档");
         formData.put("签名人", qmr.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
 
@@ -247,7 +247,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
                 formData.put("签名人", qmr.getNickName());
                 mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
                 mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
-                mjyFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                mjyFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
                 mjyFfjlJcgjList.add(mjyFfjlJcgj);
                 //endregion
 
@@ -285,7 +285,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "申请归档");
         formData.put("签名人", qmr.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
 
@@ -328,7 +328,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
 
             mjyFfjlJcgj.setJcnr(JctUtil.formatStr(formData));
             mjyFfjlJcgj.setQmrId(SecurityUtils.getUserId());
-            mjyFfjlJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            mjyFfjlJcgj.setQmrMc(SecurityUtils.getNickName());
             mjyFfjlJcgjList.add(mjyFfjlJcgj);
             //endregion
 
@@ -365,7 +365,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "锁定发放记录");
         formData.put("签名人", qmr.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "锁定发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
 
@@ -398,7 +398,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "解锁发放记录");
         formData.put("签名人", qmr.getNickName());
-        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjyFfjlOld.getId(), JcgjlxEnum.lc.getValue(), "解锁发放记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
 
     }
 
@@ -448,7 +448,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
         formData.put("签名意义", "归还");
-        mjyFfjlJcgjService.saveJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyFfjlJcgjService.saveJcgj(mjy.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
     }
 
@@ -496,7 +496,7 @@ public class MjyFfjlServiceImpl extends ServiceImpl impl
         formData.put("目的", mdIds);
         formData.put("备注", remark);
         mjyFfjlJcgjService.saveJcgj(mjyFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
-                SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+                SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
     }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/MjyServiceImpl.java

@@ -124,7 +124,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请解档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -160,7 +160,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("借阅开始时间", DateUtils.dateTime(form.getStartDate()));
         formData.put("借阅结束时间", DateUtils.dateTime(form.getEndDate()));
         formData.put("备注", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请借阅", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -198,7 +198,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 mjyJcgj.setJcmcys(JcmcysEnum.green.getValue());
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
                 mjyJcgj.setRemark(form.getRemark());
-                mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                mjyJcgj.setQmrMc(SecurityUtils.getNickName());
                 mjyJcgjList.add(mjyJcgj);
                 //endregion
 
@@ -234,7 +234,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "申请归档", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
 
@@ -273,7 +273,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             formData.put("备注", form.getRemark());
             mjyJcgj.setJcnr(JctUtil.formatStr(formData));
             mjyJcgj.setQmrId(SecurityUtils.getUserId());
-            mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            mjyJcgj.setQmrMc(SecurityUtils.getNickName());
             mjyJcgjList.add(mjyJcgj);
             //endregion
 
@@ -308,7 +308,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "锁定麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
 
@@ -338,7 +338,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "解锁麻精药", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
     }
 
     /**
@@ -402,7 +402,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
 
                 mjyJcgj.setJcnr(JctUtil.formatStr(formData));
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
-                mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                mjyJcgj.setQmrMc(SecurityUtils.getNickName());
                 mjyJcgjList.add(mjyJcgj);
                 //endregion
                 //region 台账
@@ -489,7 +489,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("复核人", fhr.getNickName());
         formData.put("监督人", jdr.getNickName());
 
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置药剂", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
 
         //region 台账
@@ -559,7 +559,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
 
                 mjyJcgj.setJcnr(JctUtil.formatStr(formData));
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
-                mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                mjyJcgj.setQmrMc(SecurityUtils.getNickName());
                 mjyJcgjList.add(mjyJcgj);
                 //endregion
 
@@ -626,7 +626,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("复核人", fhr.getNickName());
         formData.put("监督人", jdr.getNickName());
 
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "处置容器", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
 
         //region 台账
@@ -689,7 +689,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
 
             mjyJcgj.setJcnr(JctUtil.formatStr(formData));
             mjyJcgj.setQmrId(SecurityUtils.getUserId());
-            mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            mjyJcgj.setQmrMc(SecurityUtils.getNickName());
             mjyJcgjList.add(mjyJcgj);
             //endregion
         }
@@ -739,7 +739,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("目的", form.getMdIds());
         formData.put("备注", form.getRemark());
         mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
-                SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+                SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
         //region 台账
         mjyTzService.saveTz(mjyOld.getId(), lqr1.getNickName() + "," + lqr2.getNickName(), "",
@@ -818,7 +818,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
                 formData.put("备注", plffItemFilter.get(0).getRemark());
                 mjyJcgj.setJcnr(JctUtil.formatStr(formData));
                 mjyJcgj.setQmrId(SecurityUtils.getUserId());
-                mjyJcgj.setQmrMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+                mjyJcgj.setQmrMc(SecurityUtils.getNickName());
                 mjyJcgjList.add(mjyJcgj);
                 //endregion
                 //region 台账
@@ -1151,7 +1151,7 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
         mjyOld.setKc(leftKc.toString());
         mjyOld.setZjzt(ZjztEnum.rk.getValue());

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormFillServiceImpl.java

@@ -1,13 +1,33 @@
 package com.hxhq.business.service.impl;
 
+import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Map;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import com.hxhq.business.domain.StudyFormPre;
+import com.hxhq.business.domain.MjyFfjl;
+import com.hxhq.business.domain.StudyFormFill;
+import com.hxhq.business.dto.mjy.DetailDto;
 import com.hxhq.business.dto.study.StudyFormFillListDto;
+import com.hxhq.business.enums.NormalEnum;
+import com.hxhq.business.enums.study.StudyFormFillBdztEnum;
+import com.hxhq.business.enums.study.StudyFormFillBdztEnum;
+import com.hxhq.business.enums.zykgl.JcgjlxEnum;
+import com.hxhq.business.enums.zykgl.JcmcysEnum;
+import com.hxhq.business.enums.zykgl.JlztEnum;
+import com.hxhq.business.form.study.StudyFormFillGcForm;
 import com.hxhq.business.form.study.StudyFormFillSearchForm;
-import com.hxhq.business.form.study.StudyFormPreSearchForm;
+import com.hxhq.business.form.study.StudyFormFillShfzForm;
+import com.hxhq.business.form.study.StudyFormFillSearchForm;
+import com.hxhq.business.service.IStudyFormFillJcgjService;
+import com.hxhq.business.service.IStudyFormFillQmxxService;
+import com.hxhq.business.utils.JctUtil;
+import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.StringUtils;
+import com.hxhq.common.security.utils.SecurityUtils;
+import com.hxhq.system.api.domain.SysUser;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.hxhq.business.mapper.StudyFormFillMapper;
 import com.hxhq.business.domain.StudyFormFill;
@@ -21,8 +41,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  * @date 2025-12-29
  */
 @Service
-public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, StudyFormFill> implements IStudyFormFillService
-{
+public class StudyFormFillServiceImpl extends ServiceImpl<StudyFormFillMapper, StudyFormFill> implements IStudyFormFillService {
+
+    @Autowired
+    private IStudyFormFillJcgjService studyFormFillJcgjService;
+    @Autowired
+    private IStudyFormFillQmxxService studyFormFillQmxxService;
+
     /**
      * 查询试验-填报单列表
      *
@@ -30,8 +55,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
      * @return 试验-填报单
      */
     @Override
-    public List<StudyFormFillListDto> queryList(StudyFormFillSearchForm form)
-    {
+    public List<StudyFormFillListDto> queryList(StudyFormFillSearchForm form) {
         QueryWrapper<StudyFormFill> queryWrapper = Wrappers.query();
         queryWrapper.eq("t.del_flag", "0");
         if (form.getUserId() != null && form.getUserId().longValue() > 0) {
@@ -40,6 +64,9 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         if (form.getStudyId() != null && form.getStudyId().longValue() > 0) {
             queryWrapper.eq("t.study_id", form.getStudyId());
         }
+        if (form.getStudySubjectId() != null && form.getStudySubjectId().longValue() > 0) {
+            queryWrapper.eq("t.study_subject_id", form.getStudySubjectId());
+        }
         if (StringUtils.isNoneBlank(form.getBdbh())) {
             queryWrapper.and(p -> p.like("t.`bdbh`", form.getBdbh()));
         }
@@ -47,7 +74,7 @@ public class StudyFormFillServiceImpl extends ServiceImpl
             queryWrapper.and(p -> p.like("t.`bdmc`", form.getBdmc()));
         }
         if (StringUtils.isNoneBlank(form.getTemplateMc())) {
-            queryWrapper.and(p -> p.like("t.`template_mc`", form.getTemplateMc()));
+            queryWrapper.and(p -> p.like("tm.`name`", form.getTemplateMc()));
         }
         if (StringUtils.isNoneBlank(form.getTjsjks())) {
             queryWrapper.apply("t.tjsj>={0}", form.getTjsjks());
@@ -65,4 +92,338 @@ public class StudyFormFillServiceImpl extends ServiceImpl
         return baseMapper.queryList(queryWrapper);
     }
 
+    /**
+     * 详情
+     *
+     * @param id
+     * @return 详情
+     */
+    @Override
+    public StudyFormFill queryInfo(Long id) {
+        if (id == null || id.longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        return baseMapper.queryInfo(id);
+    }
+
+    /**
+     * 加签 ok
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void jq(StudyFormFill studyFormFill) {
+        //验证签名人密码 todo
+        if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(studyFormFill.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.tbz.getValue())) {
+            throw new ServiceException("表单不是填报状态，不能加签");
+        }
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", studyFormFill.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), studyFormFill.getQmyy(), JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),studyFormFill.getQmyy(),SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
+
+    }
+
+    /**
+     * 废止
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void fz(StudyFormFill studyFormFill) {
+        //验证签名人密码 todo
+        if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(studyFormFill.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.tbz.getValue())) {
+            throw new ServiceException("表单不是填报状态，不能废止");
+        }
+        studyFormFillOld.setBdzt(StudyFormFillBdztEnum.dfz.getValue());
+        this.updateById(studyFormFillOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注", studyFormFill.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "申请废止", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),"申请废止",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
+
+    }
+
+
+    /**
+     * 审核废止
+     *
+     * @param form
+     */
+    @Override
+    public void shfz(StudyFormFillShfzForm form) {
+        //验证签名人密码 todo 是否验证是不是sd?
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(form.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.dfz.getValue())) {
+            throw new ServiceException("表单不是填报状态，不能废止");
+        }
+        if (form.getQmyy().equals(NormalEnum.yes.getValue())) {
+            studyFormFillOld.setBdzt(StudyFormFillBdztEnum.yfz.getValue());
+            this.updateById(studyFormFillOld);
+            //稽查轨迹
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("原因", form.getRemark());
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+            //签名信息
+            studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"废止通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark());
+
+        } else {
+            studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
+            this.updateById(studyFormFillOld);
+            //稽查轨迹
+            Map<String, String> formData = new LinkedHashMap<>();
+            formData.put("原因", form.getRemark());
+            studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "废止拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+            //签名信息
+            studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"废止拒绝",SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark());
+
+        }
+
+    }
+
+
+    /**
+     * 更换归属人
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void ghgsr(StudyFormFill studyFormFill) {
+        //验证签名人密码 todo
+        if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(studyFormFill.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.dfz.getValue()) || studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.yfz.getValue())) {
+            throw new ServiceException("表单已废止或待废止，不能更换归属人");
+        }
+        //是否验证新的归属人，是否属于该实验？ todo
+        studyFormFillOld.setUserId(studyFormFill.getUserId());
+        studyFormFillOld.setUserMc(studyFormFill.getUserMc());
+        this.updateById(studyFormFillOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "更换归属人", JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"更换归属人",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
+
+    }
+
+    /**
+     * 保存
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void bc(StudyFormFill studyFormFill) {
+        if(studyFormFill.getId()!=null){
+            StudyFormFill studyFormFillOld=this.getById(studyFormFill.getId());
+            if(studyFormFillOld==null){
+                throw  new ServiceException("信息不存在或已删除");
+            }
+            if(!SecurityUtils.getUserId().equals(studyFormFillOld.getUserId())){
+                throw  new ServiceException("只能操作自己的表单");
+            }
+            studyFormFillOld.setBdmc(studyFormFill.getBdmc());
+            studyFormFillOld.setTemplateId(studyFormFill.getTemplateId());
+            studyFormFillOld.setBdnr(studyFormFill.getBdnr());
+            studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
+            this.updateById(studyFormFillOld);
+        }else{
+            studyFormFill.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
+            studyFormFill.setUserId(SecurityUtils.getUserId());
+            studyFormFill.setUserMc(SecurityUtils.getNickName());
+            this.save(studyFormFill);
+        }
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注",studyFormFill.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFill.getId(), JcgjlxEnum.bj.getValue(), "填写并保存", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFill.getId(),"填写并保存",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
+
+    }
+
+
+    /**
+     * 提交
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void tj(StudyFormFill studyFormFill) {
+       //todo
+    }
+
+
+    /**
+     * 观察
+     *
+     * @param form
+     */
+    @Override
+    public void gc(StudyFormFillGcForm form) {
+        //验证签名人密码 todo
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(form.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.tbz.getValue())) {
+            throw new ServiceException("表单不是填报状态，不能观察");
+        }
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("生长情况",form.getQmyy());
+        formData.put("备注",form.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), form.getQmyy(), JcmcysEnum.orange.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),form.getQmyy(),SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark());
+
+    }
+
+
+    /**
+     * 复核通过
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void fhtg(StudyFormFill studyFormFill) {
+        //验证签名人密码 todo
+        if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(studyFormFill.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue()) ) {
+            throw new ServiceException("表单不是已提交状态，不能复核");
+        }
+        studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ywcfh.getValue());
+        this.updateById(studyFormFillOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注",studyFormFill.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"复核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
+    }
+
+
+    /**
+     * 复核拒绝
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void fhjj(StudyFormFill studyFormFill) {
+        //验证签名人密码 todo
+        if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(studyFormFill.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue()) ) {
+            throw new ServiceException("表单不是已提交状态，不能复核");
+        }
+        studyFormFillOld.setBdzt(StudyFormFillBdztEnum.tbz.getValue());
+        this.updateById(studyFormFillOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因",studyFormFill.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "复核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"复核拒绝",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
+
+    }
+
+    /**
+     * 通过
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void tg(StudyFormFill studyFormFill) {
+        //验证签名人密码 todo
+        if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(studyFormFill.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (!studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ytj.getValue()) ) {
+            throw new ServiceException("表单不是已提交状态，不能复核");
+        }
+        studyFormFillOld.setBdzt(StudyFormFillBdztEnum.ywc.getValue());
+        this.updateById(studyFormFillOld);
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("原因",studyFormFill.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "免复核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"免复核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
+
+    }
+
+    /**
+     * 审阅
+     *
+     * @param studyFormFill
+     */
+    @Override
+    public void sy(StudyFormFill studyFormFill) {
+        //验证签名人密码 todo
+        if (studyFormFill.getId() == null || studyFormFill.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        StudyFormFill studyFormFillOld = this.getById(studyFormFill.getId());
+        if (studyFormFillOld == null) {
+            throw new ServiceException("表单不存在或已删除");
+        }
+        if (!(studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ywcfh.getValue())||studyFormFillOld.getBdzt().equals(StudyFormFillBdztEnum.ywc.getValue())) ) {
+            throw new ServiceException("表单不是已完成状态，不能审阅");
+        }
+        //稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("备注",studyFormFill.getRemark());
+        studyFormFillJcgjService.saveJcgj(studyFormFillOld.getId(), JcgjlxEnum.lc.getValue(), "已审阅", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //签名信息
+        studyFormFillQmxxService.saveQmxx(studyFormFillOld.getId(),"已审阅",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormFill.getRemark());
+
+    }
+
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudyFormPreServiceImpl.java

@@ -7,6 +7,7 @@ import java.util.Map;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.hxhq.business.domain.StudyFormFill;
 import com.hxhq.business.dto.study.StudyFormPreListDto;
 import com.hxhq.business.enums.NormalEnum;
 import com.hxhq.business.enums.study.StudyFormPreBdztEnum;
@@ -15,6 +16,7 @@ import com.hxhq.business.enums.zykgl.JcgjlxEnum;
 import com.hxhq.business.enums.zykgl.JcmcysEnum;
 import com.hxhq.business.form.study.StudyFormPreAuditForm;
 import com.hxhq.business.form.study.StudyFormPreSearchForm;
+import com.hxhq.business.service.IStudyFormFillService;
 import com.hxhq.business.service.IStudyFormPreJcgjService;
 import com.hxhq.business.service.IStudyFormPreQmxxService;
 import com.hxhq.business.utils.JctUtil;
@@ -42,6 +44,8 @@ public class StudyFormPreServiceImpl extends ServiceImpl
     private IStudyFormPreJcgjService studyFormPreJcgjService;
     @Autowired
     private IStudyFormPreQmxxService studyFormPreQmxxService;
+    @Autowired
+    private IStudyFormFillService studyFormFillService;
 
     /**
      * 查询试验-预填单列表
@@ -60,6 +64,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         if (form.getStudyId() != null && form.getStudyId().longValue() > 0) {
             queryWrapper.eq("t.study_id", form.getStudyId());
         }
+        if (form.getStudySubjectId() != null && form.getStudySubjectId().longValue() > 0) {
+            queryWrapper.eq("t.study_subject_id", form.getStudySubjectId());
+        }
         if (StringUtils.isNoneBlank(form.getBdbh())) {
             queryWrapper.and(p -> p.like("t.`bdbh`", form.getBdbh()));
         }
@@ -67,7 +74,7 @@ public class StudyFormPreServiceImpl extends ServiceImpl
             queryWrapper.and(p -> p.like("t.`bdmc`", form.getBdmc()));
         }
         if (StringUtils.isNoneBlank(form.getTemplateMc())) {
-            queryWrapper.and(p -> p.like("t.`template_mc`", form.getTemplateMc()));
+            queryWrapper.and(p -> p.like("tm.`name`", form.getTemplateMc()));
         }
         if (StringUtils.isNoneBlank(form.getStartDate())) {
             queryWrapper.apply("t.create_time>={0}", form.getStartDate());
@@ -79,6 +86,19 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         return baseMapper.queryList(queryWrapper);
     }
 
+    /**
+     * 详情
+     *
+     * @param id
+     * @return 详情
+     */
+    @Override
+    public StudyFormPre queryInfo(Long id) {
+        if (id == null || id.longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        return baseMapper.queryInfo(id);
+    }
 
     /**
      * 保存
@@ -95,22 +115,21 @@ public class StudyFormPreServiceImpl extends ServiceImpl
                 throw  new ServiceException("只能操作自己的表单");
             }
             studyFormPreOld.setBdmc(studyFormPre.getBdmc());
-            studyFormPreOld.setTemplateMc(studyFormPre.getTemplateMc());
             studyFormPreOld.setTemplateId(studyFormPre.getTemplateId());
             studyFormPreOld.setBdnr(studyFormPre.getBdnr());
             this.updateById(studyFormPreOld);
         }else{
             studyFormPre.setBdbh("todo");
             studyFormPre.setUserId(SecurityUtils.getUserId());
-            studyFormPre.setUserMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            studyFormPre.setUserMc(SecurityUtils.getNickName());
             studyFormPre.setBdzt(StudyFormPreBdztEnum.tbz.getValue());
             this.save(studyFormPre);
         }
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
-        studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.bj.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.bj.getValue(), "制作保存预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作保存预制表单",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),studyFormPre.getRemark());
+        studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作保存预制表单",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPre.getRemark());
 
     }
 
@@ -120,6 +139,8 @@ public class StudyFormPreServiceImpl extends ServiceImpl
      */
     @Override
     public void tj(StudyFormPre studyFormPre){
+        //验证密码 todo
+
         if(studyFormPre.getId()!=null){
             StudyFormPre studyFormPreOld=this.getById(studyFormPre.getId());
             if(studyFormPreOld==null){
@@ -134,16 +155,28 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         }else{
             studyFormPre.setUserId(SecurityUtils.getUserId());
             studyFormPre.setTjsj(new Date());
-            studyFormPre.setUserMc(SecurityUtils.getLoginUser().getSysUser().getNickName());
+            studyFormPre.setUserMc(SecurityUtils.getNickName());
             studyFormPre.setBdzt(StudyFormPreBdztEnum.ytj.getValue());
             this.save(studyFormPre);
         }
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormPre.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreJcgjService.saveJcgj(studyFormPre.getId(), JcgjlxEnum.lc.getValue(), "制作提交预制表单", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作提交预制表单",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),studyFormPre.getRemark());
+        studyFormPreQmxxService.saveQmxx(studyFormPre.getId(),"制作提交预制表单",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPre.getRemark());
+        //生成填报表单
+        StudyFormFill studyFormFill=new StudyFormFill();
+        studyFormFill.setStudyId(studyFormPre.getStudyId());
+        studyFormFill.setUserId(SecurityUtils.getUserId());
+        studyFormFill.setUserMc(SecurityUtils.getNickName());
+        studyFormFill.setStudySubjectId(studyFormPre.getStudySubjectId());
+        studyFormFill.setBdbh(studyFormPre.getBdbh());
+        studyFormFill.setBdmc(studyFormPre.getBdmc());
+        studyFormFill.setBdsm(studyFormPre.getBdsm());
+        studyFormFill.setBdnr(studyFormPre.getBdnr());
+        studyFormFill.setTemplateId(studyFormPre.getTemplateId());
+        studyFormFillService.bc(studyFormFill);
     }
 
     /**
@@ -177,9 +210,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", form.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核通过", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核通过",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),form.getRemark());
+        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核通过",SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark());
     }
 
     /**
@@ -200,9 +233,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("原因", form.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "审核拒绝", JcmcysEnum.red.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核拒绝",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),form.getRemark());
+        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"审核拒绝",SecurityUtils.getUserId(),SecurityUtils.getNickName(),form.getRemark());
     }
 
     /**
@@ -227,9 +260,9 @@ public class StudyFormPreServiceImpl extends ServiceImpl
         //稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("备注", studyFormPre.getRemark());
-        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getLoginUser().getSysUser().getNickName());
+        studyFormPreJcgjService.saveJcgj(studyFormPreOld.getId(), JcgjlxEnum.lc.getValue(), "创建记录", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //签名信息
-        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"创建记录",SecurityUtils.getUserId(),SecurityUtils.getLoginUser().getSysUser().getNickName(),studyFormPre.getRemark());
+        studyFormPreQmxxService.saveQmxx(studyFormPreOld.getId(),"创建记录",SecurityUtils.getUserId(),SecurityUtils.getNickName(),studyFormPre.getRemark());
     }
 
 }

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormFillMapper.xml

@@ -4,12 +4,20 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyFormFillMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormFillListDto">
-        select t.id,t.bdbh,t.bdmc,t.template_mc,t.create_time,t.user_mc,t.bdzt,t.bdzt,t.fzrsh,t.fzrshzt,t.sfbl,t.tjsj
+        select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.bdzt,t.bdzt,t.tjsj,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
         FROM `t_study_form_fill` t
+        left join t_template tm on tm.id=t.template_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
             </where>
         </if>
     </select>
+
+    <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormFill">
+        select t.*,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
+        FROM `t_study_form_fill` t
+        left join t_template tm on tm.id=t.template_id
+        where t.id=#{id}
+    </select>
 </mapper>

hxhq-modules/hxhq-system/src/main/resources/mapper/business/StudyFormPreMapper.xml

@@ -4,12 +4,20 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.StudyFormPreMapper">
     <select id="queryList" resultType="com.hxhq.business.dto.study.StudyFormPreListDto">
-        select t.id,t.bdbh,t.bdmc,t.template_mc,t.create_time,t.user_mc,t.bdzt,t.bdzt,t.fzrsh,t.fzrshzt
+        select t.id,t.bdbh,t.bdmc,t.create_time,t.user_mc,t.bdzt,t.bdzt,t.fzrsh,t.fzrshzt,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
         FROM `t_study_form_pre` t
+        left join t_template tm on tm.id=t.template_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
             </where>
         </if>
     </select>
+
+    <select id="queryInfo" resultType="com.hxhq.business.domain.StudyFormPre">
+        select t.*,tm.name as templateMc,tm.sn as templateSn,tm.dept_id as templateDeptId
+        FROM `t_study_form_pre` t
+        left join t_template tm on tm.id=t.template_id
+        where t.id=#{id}
+    </select>
 </mapper>