feat：[资源库管理][给药制剂发放]

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

@@ -308,10 +308,23 @@ public class GyzjController extends BaseController
     }
 
     /**
-     * 归还
+     * 申请归还
+     */
+    @PostMapping("sqgh")
+    @RequiresPermissions({"business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"})
+    public AjaxResult sqgh(@RequestBody GhForm form)
+    {
+        form.setQmrId(SecurityUtils.getUserId());
+        form.setJsr1Id(SecurityUtils.getUserId());
+        gyzjService.sqgh(form);
+        return AjaxResult.success("操作成功");
+    }
+
+    /**
+     * 确认归还
      */
     @PostMapping("gh")
-    @RequiresPermissions({"business:resource:gyzj:gh","business:studyGyzj:gh","business:nonTrialGyzj:gh","business:drugGyzj:gh"})
+    @RequiresPermissions({"business:resource:gyzj:gh"})
     public AjaxResult gh(@RequestBody GhForm form)
     {
         form.setQmrId(SecurityUtils.getUserId());

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

@@ -95,13 +95,27 @@ public class PublicController extends BaseController
      * 查询试验列表
      */
     @GetMapping("/studyList")
-    public AjaxResult studyList()
+    public TableDataInfo studyList(Study study)
     {
+        startPage();
         QueryWrapper<Study> queryWrapper = Wrappers.query();
-//        queryWrapper.eq("status", StudyStatusEnum.dgd.getValue()); todo
-        return AjaxResult.success(studyService.list(queryWrapper));
+        if(study.getStatus()!=null&&study.getStatus().intValue()>0){
+            queryWrapper.eq("status", study.getStatus());
+        }
+        if(com.hxhq.common.core.utils.StringUtils.isNoneBlank(study.getName())){
+            queryWrapper.like("s.name",study.getName());
+        }
+        if(com.hxhq.common.core.utils.StringUtils.isNoneBlank(study.getSn())){
+            queryWrapper.like("s.sn",study.getSn());
+        }
+        if(study.getLeader()!=null&&study.getLeader().longValue()>0){
+            queryWrapper.eq("leader", study.getLeader());
+        }
+        List<Study> list = studyService.list(queryWrapper);
+        return getDataTable(list);
     }
 
+
     /**
      * 查询试验预填表单列表
      */

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

@@ -82,11 +82,11 @@ public class Gyzj extends MpBaseEntity
     @Excel(name = "存储位置")
     private String ccwz;
 
-    /** 表单id */
+    /**  所属表单id */
     private Long bdId;
 
-    /** 目的id */
-    private Long mdId;
+    /**  所属试验id */
+    private Long studyId;
 
     /** 名称编辑 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
@@ -194,6 +194,9 @@ public class Gyzj extends MpBaseEntity
     /** 发放目的ids */
     private String mdIds;
 
+    /** 发放目的其他 */
+    private String mdOther;
+
     /** 借阅开始日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyksrq;
@@ -214,6 +217,23 @@ public class Gyzj extends MpBaseEntity
     /** 归还人2名称 */
     private String ghr2Mc;
 
+    public String getMdOther() {
+        return mdOther;
+    }
+
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
+    }
+
+    public Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+
+
     public String getGhr1Mc() {
         return ghr1Mc;
     }
@@ -399,14 +419,6 @@ public class Gyzj extends MpBaseEntity
         this.ffbz = ffbz;
     }
 
-    public Long getMdId() {
-        return mdId;
-    }
-
-    public void setMdId(Long mdId) {
-        this.mdId = mdId;
-    }
-
     public Long getBjrId() {
         return bjrId;
     }

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

@@ -80,11 +80,11 @@ public class Mjy extends MpBaseEntity
     @Excel(name = "存储位置")
     private String ccwz;
 
-    /** 表单id */
+    /** 所属表单id */
     private Long bdId;
 
-    /** 目的id */
-    private Long mdId;
+    /**  所属试验id */
+    private Long studyId;
 
     /** 名称编辑 */
     @TableField(updateStrategy = FieldStrategy.IGNORED)
@@ -192,6 +192,7 @@ public class Mjy extends MpBaseEntity
     /** 发放目的ids */
     private String mdIds;
 
+
     /** 借阅开始日期 */
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyksrq;
@@ -200,6 +201,26 @@ public class Mjy extends MpBaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyjsrq;
 
+
+    /** 发放目的其他 */
+    private String mdOther;
+
+    public String getMdOther() {
+        return mdOther;
+    }
+
+    public void setMdOther(String mdOther) {
+        this.mdOther = mdOther;
+    }
+
+    public Long getStudyId() {
+        return studyId;
+    }
+
+    public void setStudyId(Long studyId) {
+        this.studyId = studyId;
+    }
+
     public Integer getGhzt() {
         return ghzt;
     }
@@ -353,13 +374,6 @@ public class Mjy extends MpBaseEntity
         this.ffbz = ffbz;
     }
 
-    public Long getMdId() {
-        return mdId;
-    }
-
-    public void setMdId(Long mdId) {
-        this.mdId = mdId;
-    }
 
     public Long getBjrId() {
         return bjrId;

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/DetailDto.java

@@ -1,5 +1,6 @@
 package com.hxhq.business.dto.gyzj;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.hxhq.business.domain.Gyzj;
 
 /**
@@ -10,11 +11,14 @@ public class DetailDto extends Gyzj {
     /** 表单名称 */
     private String bdMc;
 
-    /** 项目名称 */
-    private String xmMc;
+    /** 发放目的名称 */
+    private String mdMcs;
 
-    /** 表单所属人名称  */
-    private String bdssrMc;
+    /** 试验名称 */
+    private String studyMc;
+
+    /** 表单归属人名称 */
+    private String bdgsrMc;
 
     public String getBdMc() {
         return bdMc;
@@ -24,19 +28,27 @@ public class DetailDto extends Gyzj {
         this.bdMc = bdMc;
     }
 
-    public String getXmMc() {
-        return xmMc;
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+
+    public String getStudyMc() {
+        return studyMc;
     }
 
-    public void setXmMc(String xmMc) {
-        this.xmMc = xmMc;
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
     }
 
-    public String getBdssrMc() {
-        return bdssrMc;
+    public String getBdgsrMc() {
+        return bdgsrMc;
     }
 
-    public void setBdssrMc(String bdssrMc) {
-        this.bdssrMc = bdssrMc;
+    public void setBdgsrMc(String bdgsrMc) {
+        this.bdgsrMc = bdgsrMc;
     }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/mjy/DetailDto.java

@@ -1,5 +1,6 @@
 package com.hxhq.business.dto.mjy;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.hxhq.business.domain.Mjy;
 
@@ -13,11 +14,14 @@ public class DetailDto extends Mjy {
     /** 表单名称 */
     private String bdMc;
 
-    /** 项目名称 */
-    private String xmMc;
+    /** 发放目的名称 */
+    private String mdMcs;
 
-    /** 表单所属人名称  */
-    private String bdssrMc;
+    /** 试验名称 */
+    private String studyMc;
+
+    /** 表单归属人名称 */
+    private String bdgsrMc;
 
     public String getBdMc() {
         return bdMc;
@@ -27,19 +31,28 @@ public class DetailDto extends Mjy {
         this.bdMc = bdMc;
     }
 
-    public String getXmMc() {
-        return xmMc;
+
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+
+    public String getStudyMc() {
+        return studyMc;
     }
 
-    public void setXmMc(String xmMc) {
-        this.xmMc = xmMc;
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
     }
 
-    public String getBdssrMc() {
-        return bdssrMc;
+    public String getBdgsrMc() {
+        return bdgsrMc;
     }
 
-    public void setBdssrMc(String bdssrMc) {
-        this.bdssrMc = bdssrMc;
+    public void setBdgsrMc(String bdgsrMc) {
+        this.bdgsrMc = bdgsrMc;
     }
 }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/FfForm.java

@@ -17,6 +17,12 @@ public class FfForm {
     /** 目的ids */
     private String mdIds;
 
+    /** 目的名称 */
+    private String mdMcs;
+
+    /** 目的其他 */
+    private String mdOthers;
+
     /** 出库毛重 */
     private String ckmz;
 
@@ -47,6 +53,22 @@ public class FfForm {
     /** 发放人2密码 */
     private String ffr2mm;
 
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+
+    public String getMdOthers() {
+        return mdOthers;
+    }
+
+    public void setMdOthers(String mdOthers) {
+        this.mdOthers = mdOthers;
+    }
+
     public String getCkmzdw() {
         return ckmzdw;
     }

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/PlffItem.java

@@ -17,12 +17,34 @@ public class PlffItem {
     /** 目的ids */
     private String mdIds;
 
+    /** 目的名称 */
+    private String mdMcs;
+
+    /** 目的其他 */
+    private String mdOthers;
+
     /** 出库毛重 */
     private String ckmz;
 
     /** 出库毛重单位 */
     private String ckmzdw;
 
+    public String getMdMcs() {
+        return mdMcs;
+    }
+
+    public void setMdMcs(String mdMcs) {
+        this.mdMcs = mdMcs;
+    }
+
+    public String getMdOthers() {
+        return mdOthers;
+    }
+
+    public void setMdOthers(String mdOthers) {
+        this.mdOthers = mdOthers;
+    }
+
     public String getCkmzdw() {
         return ckmzdw;
     }

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

@@ -121,6 +121,8 @@ public interface IGyzjFfjlService extends IService {
      * @param zytj
      * @param remark
      * @param mdIds
+     * @param mdMcs
+     * @param mdOthers
      * @param gyzj
      * @param lqr1
      * @param lqr2
@@ -128,6 +130,6 @@ public interface IGyzjFfjlService extends IService {
      * @param ffr2
      * @param time
      */
-    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
+    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds,String mdMcs,String mdOthers, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time);
 
 }

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

@@ -174,7 +174,14 @@ public interface IGyzjService extends IService
     public void jy(@RequestBody JyForm form);
 
     /**
-     * 归还
+     * 申请归还
+     *
+     * @param form
+     */
+    public void sqgh(@RequestBody GhForm form);
+
+    /**
+     * 申请归还
      *
      * @param form
      */

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

@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.Gyzj;
 import com.hxhq.business.domain.GyzjFfjlJcgj;
+import com.hxhq.business.domain.StudyGyzj;
 import com.hxhq.business.dto.gyzj.FfjlDetailDto;
 import com.hxhq.business.dto.gyzj.FfjlListDto;
 import com.hxhq.business.enums.zykgl.*;
 import com.hxhq.business.enums.zykgl.JlztEnum;
 import com.hxhq.business.form.gyzj.*;
 import com.hxhq.business.service.IGyzjFfjlJcgjService;
+import com.hxhq.business.service.IStudyGyzjService;
 import com.hxhq.business.utils.JctUtil;
 import com.hxhq.common.core.exception.ServiceException;
 import com.hxhq.common.core.utils.DateUtils;
@@ -40,6 +42,8 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
     private ISysUserService sysUserService;
     @Autowired
     private IGyzjFfjlJcgjService gyzjFfjlJcgjService;
+    @Autowired
+    private IStudyGyzjService studyGyzjService;
 
     /**
      * 详情
@@ -457,7 +461,7 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
+    public void ff(String ckmz, String ckmzdw, String zytj, String remark, String mdIds,String mdMcs,String mdOthers, Gyzj gyzj, SysUser lqr1, SysUser lqr2, SysUser ffr1, SysUser ffr2, Date time) {
 
         GyzjFfjl gyzjFfjl = new GyzjFfjl();
         gyzjFfjl.setGyzjId(gyzj.getId());
@@ -486,17 +490,28 @@ public class GyzjFfjlServiceImpl extends ServiceImpl i
         gyzjFfjl.setFfbz(remark);
         gyzjFfjl.setMdIds(mdIds);
         this.save(gyzjFfjl);
-
+        //新增试验物资
+        if(StringUtils.isNoneBlank(mdIds)){
+            String [] tmp=mdIds.split(",");
+            for(String s :tmp){
+                StudyGyzj studyGyzj=new StudyGyzj();
+                studyGyzj.setStudyId(Long.parseLong(s));
+                studyGyzj.setResourceId(gyzj.getId());
+                studyGyzjService.save(studyGyzj);
+            }
+        }
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", gyzj.getKc() + gyzj.getKcdw());
         formData.put("转移条件", zytj);
         formData.put("出库净重", ckmz + gyzj.getKcdw());
-        formData.put("目的", mdIds);
+        formData.put("目的", mdMcs+mdOthers);
         formData.put("备注", remark);
         gyzjFfjlJcgjService.saveJcgj(gyzjFfjl.getId(), JcgjlxEnum.lc.getValue(), "领取发放", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData),
                 SecurityUtils.getUserId(), SecurityUtils.getNickName());
         //endregion
+
+
     }
 
     /**

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

@@ -765,7 +765,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
             throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是入库状态，不能发放");
         }
         Date now = new Date();
-        gyzjFfjlService.ff(form.getCkmz(), form.getCkmzdw(), form.getZytj(), form.getRemark(), form.getMdIds(), gyzjOld, lqr1, lqr2, ffr1, ffr2, now);
+        gyzjFfjlService.ff(form.getCkmz(), form.getCkmzdw(), form.getZytj(), form.getRemark(), form.getMdIds(),form.getMdMcs(),form.getMdOthers(),  gyzjOld, lqr1, lqr2, ffr1, ffr2, now);
         //region 稽查轨迹
         Map<String, String> formData = new LinkedHashMap<>();
         formData.put("出库量", gyzjOld.getKc() + gyzjOld.getKcdw());
@@ -799,8 +799,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setFfrq(now);
         gyzjOld.setFfbz(form.getRemark());
         gyzjOld.setMdIds(form.getMdIds());
+        gyzjOld.setMdOther(form.getMdOthers());
         gyzjOld.setZjzt(ZjztEnum.yff.getValue());
         //endregion
+
         this.updateById(gyzjOld);
     }
 
@@ -845,7 +847,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                     .filter(p -> p.getId().equals(gyzj.getId()))
                     .collect(Collectors.toList());
             if (plffItemFilter.size() > 0) {
-                gyzjFfjlService.ff(plffItemFilter.get(0).getCkmz(), plffItemFilter.get(0).getCkmzdw(), plffItemFilter.get(0).getZytj(), plffItemFilter.get(0).getRemark(), plffItemFilter.get(0).getMdIds(), gyzj, lqr1, lqr2, ffr1, ffr2, now);
+                gyzjFfjlService.ff(plffItemFilter.get(0).getCkmz(), plffItemFilter.get(0).getCkmzdw(), plffItemFilter.get(0).getZytj(), plffItemFilter.get(0).getRemark(), plffItemFilter.get(0).getMdIds(),plffItemFilter.get(0).getMdMcs(),plffItemFilter.get(0).getMdOthers(), gyzj, lqr1, lqr2, ffr1, ffr2, now);
                 //region 稽查轨迹
                 GyzjJcgj gyzjJcgj = new GyzjJcgj();
                 gyzjJcgj.setGyzjId(gyzj.getId());
@@ -892,6 +894,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
                 gyzj.setFfrq(now);
                 gyzj.setFfbz(plffItemFilter.get(0).getRemark());
                 gyzj.setMdIds(plffItemFilter.get(0).getMdIds());
+                gyzj.setMdOther(plffItemFilter.get(0).getMdOthers());
                 gyzj.setZjzt(ZjztEnum.yff.getValue());
                 //endregion
             } else {
@@ -1144,22 +1147,63 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
 
     }
 
+
     /**
-     * 归还 ok
+     * 申请归还 ok
      *
      * @param form
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void gh(GhForm form) {
-        SysUser ghr1 = sysUserService.selectUserById(form.getGhr1Id());
+    public void sqgh(GhForm form) {
         SysUser ghr2 = sysUserService.selectUserById(form.getGhr2Id());
-        SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id());
-        SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id());
         //验证归还人1密码
-        checkPassword(ghr1,form.getGhr1mm());
+        checkPassword(SecurityUtils.getLoginUser().getSysUser(),form.getGhr1mm());
         //验证归还人2密码
         checkPassword(ghr2,form.getGhr2mm());
+
+        if (form.getId() == null || form.getId().longValue() < 0) {
+            throw new ServiceException("参数id不正确");
+        }
+        Gyzj gyzjOld = this.getById(form.getId());
+        if (gyzjOld == null) {
+            throw new ServiceException("给药制剂不存在或已删除");
+        }
+        if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能归还");
+        }
+        if (!gyzjOld.getGhzt().equals(GhztEnum.wsq.getValue())) {
+            throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是未申请归还状态，不能归还");
+        }
+        //region 稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("入库位置", form.getRkwz());
+        formData.put("入库条件", form.getRktj());
+        formData.put("转移条件", form.getGhzytj());
+        formData.put("归还人1", SecurityUtils.getNickName());
+        formData.put("归还人2", ghr2.getNickName());
+        formData.put("备注", form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "归还", JcmcysEnum.green.getValue(), JctUtil.formatStr(formData), SecurityUtils.getUserId(), SecurityUtils.getNickName());
+        //endregion
+
+        gyzjOld.setGhr1Id(SecurityUtils.getUserId());
+        gyzjOld.setGhr1Mc(SecurityUtils.getNickName());
+        gyzjOld.setGhr2Id(ghr2.getUserId());
+        gyzjOld.setGhr2Mc(ghr2.getNickName());
+        gyzjOld.setGhzt(GhztEnum.sqgh.getValue());
+        this.updateById(gyzjOld);
+    }
+
+    /**
+     * 确认归还 ok
+     *
+     * @param form
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void gh(GhForm form) {
+        SysUser jsr1 = sysUserService.selectUserById(form.getJsr1Id());
+        SysUser jsr2 = sysUserService.selectUserById(form.getJsr2Id());
         //验证接收人1密码
         checkPassword(jsr1,form.getJsr1mm());
         //验证接收人2密码
@@ -1172,6 +1216,8 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         if (gyzjOld == null) {
             throw new ServiceException("给药制剂不存在或已删除");
         }
+        SysUser ghr1 = sysUserService.selectUserById(gyzjOld.getGhr1Id());
+        SysUser ghr2 = sysUserService.selectUserById(gyzjOld.getGhr2Id());
         if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
             throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能归还");
         }
@@ -1186,7 +1232,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         BigDecimal leftKc = new BigDecimal(gyzjOld.getKc()).subtract(new BigDecimal(form.getSyl()));
         gyzjFfjlService.gh(form, gyzjOld, ghr1, ghr2, jsr1, jsr2);
         //region 台账
-        gyzjTzService.saveTz(gyzjOld.getId(), "", ghr1.getNickName() + "," + ghr2.getNickName(),
+        gyzjTzService.saveTz(gyzjOld.getId(), "", gyzjOld.getGhr1Id() + "," + gyzjOld.getGhr2Id(),
                 "", jsr1.getNickName() + "," + jsr2.getNickName(), null, null,
                 "确认归还", form.getRkmz(), gyzjOld.getKcdw(), form.getRemark());
         //endregion
@@ -1197,8 +1243,6 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         formData.put("转移条件", form.getGhzytj());
         formData.put("入库净重", form.getRkmz() + gyzjOld.getKcdw());
         formData.put("使用量", form.getSyl() + gyzjOld.getKcdw());
-        formData.put("归还人1", ghr1.getNickName());
-        formData.put("归还人2", ghr2.getNickName());
         formData.put("库管员1", jsr1.getNickName());
         formData.put("库管员2", jsr2.getNickName());
         formData.put("备注", form.getRemark());
@@ -1206,6 +1250,7 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         //endregion
         gyzjOld.setKc(leftKc.toString());
         gyzjOld.setZjzt(ZjztEnum.rk.getValue());
+        gyzjOld.setGhzt(GhztEnum.wsq.getValue());
         this.updateById(gyzjOld);
     }
 

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

@@ -5,17 +5,19 @@
 <mapper namespace="com.hxhq.business.mapper.GyzjMapper">
 
     <select id="queryInfo" resultType="com.hxhq.business.dto.gyzj.DetailDto">
-        select t.*
+        select t.*,s.name as studyMc,sf.bdmc as bdMc,sf.user_mc as bdssrMc,
+               (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_gyzj` t
+        left join  `t_study` s on s.id=t.study_id
+        left join  `t_study_form_fill` sf on sf.id=t.bd_id
         where t.id=#{id}
     </select>
 
     <select id="queryList" resultType="com.hxhq.business.dto.gyzj.ListDto">
         select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt
-        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz,s.name as mdMc
+        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz
         ,z.mc as zcgMc
         FROM `t_gyzj` t
-        left join  `t_study` s on s.id=t.md_id
         left join  `t_zcg` z on z.id=t.zcg_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
@@ -25,10 +27,9 @@
     </select>
 
     <select id="queryStudyList" resultType="com.hxhq.business.dto.gyzj.ListDto">
-        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,s.name as mdMc
-        FROM `t_study_mjy` ts
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt
+        FROM `t_study_gyzj` ts
         join  `t_gyzj` t on t.id=ts.resource_id
-        join  `t_study` s on s.id=t.md_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}

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

@@ -5,18 +5,20 @@
 <mapper namespace="com.hxhq.business.mapper.MjyMapper">
 
     <select id="queryInfo" resultType="com.hxhq.business.dto.mjy.DetailDto">
-        select t.*
+        select t.*,s.name as studyMc,sf.bdmc as bdMc,sf.user_mc as bdssrMc,
+        (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_mjy` t
+        left join  `t_study` s on s.id=t.study_id
+        left join  `t_study_form_fill` sf on sf.id=t.bd_id
         where t.id=#{id}
     </select>
 
     <select id="queryList" resultType="com.hxhq.business.dto.mjy.ListDto">
         select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.jyzt,t.cctj,t.ccwz,t.create_time,t.bjzt,t.kcbjzt,t.rqzt,t.ghzt
-        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz,s.name as mdMc
+        ,t.ckl,t.ckldw,t.ffzytj,t.ckmz,t.ckmzdw,t.lqr1_mc,t.lqr2_mc,t.ffr1_mc,t.ffr2_mc,t.ffbz
         ,z.mc as zcgMc
         FROM `t_mjy` t
         left join  `t_zcg` z on z.id=t.zcg_id
-        left join  `t_study` s on s.id=t.md_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}
@@ -24,12 +26,10 @@
         </if>
     </select>
 
-
     <select id="queryStudyList" resultType="com.hxhq.business.dto.mjy.ListDto">
-        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,s.name as mdMc
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt
         FROM `t_study_mjy` ts
         join  `t_mjy` t on t.id=ts.resource_id
-        join  `t_study` s on s.id=t.md_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}