feat：[试验管理]物资列表，给药制剂，麻精药，存储，取出

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

@@ -11,6 +11,9 @@ public class ListDto {
     /** id */
     private Long id;
 
+    /** resourceId */
+    private Long resourceId;
+
     /** 名称 */
     private String mc;
 
@@ -54,6 +57,9 @@ public class ListDto {
     /** 入库申请状态：1：未申请；3：申请入库*/
     private Integer rksqzt;
 
+    /** 存储状态：1：取出；3：存储*/
+    private Integer cczt;
+
     /** 暂存柜 */
     private String zcgMc;
 
@@ -95,6 +101,22 @@ public class ListDto {
     /** 发放目的其他 */
     private String mdOther;
 
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
+    public Integer getCczt() {
+        return cczt;
+    }
+
+    public void setCczt(Integer cczt) {
+        this.cczt = cczt;
+    }
+
     public Integer getRksqzt() {
         return rksqzt;
     }

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

@@ -11,6 +11,9 @@ public class ListDto {
     /** id */
     private Long id;
 
+    /** resourceId */
+    private Long resourceId;
+
     /** 名称 */
     private String mc;
 
@@ -51,6 +54,9 @@ public class ListDto {
     /** 归还状态：1：未申请；3：申请归还 */
     private Integer ghzt;
 
+    /** 存储状态：1：取出；3：存储*/
+    private Integer cczt;
+
     /** 暂存柜 */
     private String zcgMc;
 
@@ -100,6 +106,22 @@ public class ListDto {
     /** 试验归还状态：1：未归还；10：已归还*/
     private Integer syghzt;
 
+    public Integer getCczt() {
+        return cczt;
+    }
+
+    public void setCczt(Integer cczt) {
+        this.cczt = cczt;
+    }
+
+    public Long getResourceId() {
+        return resourceId;
+    }
+
+    public void setResourceId(Long resourceId) {
+        this.resourceId = resourceId;
+    }
+
     public Integer getSyghzt() {
         return syghzt;
     }

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

@@ -1206,10 +1206,16 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         if (!gyzjOld.getZjzt().equals(ZjztEnum.yff.getValue())) {
             throw new ServiceException("给药制剂【" + gyzjOld.getMc() + "】不是已发放状态，不能解锁");
         }
+        gyzjOld.setCcwz(form.getCcwz());
+        gyzjOld.setCctj(form.getCctj());
+        gyzjOld.setCczt(CcztEnum.Cc.getValue());
         gyzjOld.setCczt(CcztEnum.Cc.getValue());
         this.updateById(gyzjOld);
         //稽查轨迹
-        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("存储位置", form.getCcwz());
+        formData.put("存储条件", form.getCctj());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
 
     }
 

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

@@ -1100,9 +1100,14 @@ public class MjyServiceImpl extends ServiceImpl implements IMjyS
             throw new ServiceException("麻精药【" + mjyOld.getMc() + "】不是已发放状态，不能解锁");
         }
         mjyOld.setCczt(CcztEnum.Cc.getValue());
+        mjyOld.setCcwz(form.getCcwz());
+        mjyOld.setCctj(form.getCctj());
         this.updateById(mjyOld);
-        //稽查轨迹
-        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), null, qmr, form.getRemark());
+        // 稽查轨迹
+        Map<String, String> formData = new LinkedHashMap<>();
+        formData.put("存储位置", form.getCcwz());
+        formData.put("存储条件", form.getCctj());
+        mjyJcgjService.saveJcgj(mjyOld.getId(), JcgjlxEnum.lc.getValue(), "存储", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
 
     }
 

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

@@ -28,7 +28,7 @@
     </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.ghzt,t.zjzt,ts.syghzt,t.rksqzt
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.ghzt,t.zjzt,t.cczt,t.rksqzt,ts.resource_id
         FROM `t_study_gyzj` ts
         join  `t_gyzj` t on t.id=ts.resource_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">

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

@@ -27,7 +27,7 @@
     </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,ts.syghzt
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.zjzt,t.cczt,ts.resource_id
         FROM `t_study_mjy` ts
         join  `t_mjy` t on t.id=ts.resource_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">