fix：[档案管理]给药制剂档案

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

@@ -99,7 +99,7 @@ public class GyzjArchiveController extends BaseController
      * 拒绝解档
      */
     @PostMapping("/jjjd")
-    @RequiresPermissions("business:resource:gyzj:jjjd")
+    @RequiresPermissions("business:archive:gyzj:jjjd")
     public AjaxResult jjjd(@RequestBody ArchiveForm form)
     {
         gyzjService.jjjd(form);

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

@@ -100,6 +100,29 @@ public class ListDto {
 
     /** 发放目的其他 */
     private String mdOther;
+    /** 借阅开始日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyksrq;
+
+    /** 借阅结束日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date jyjsrq;
+
+    public Date getJyksrq() {
+        return jyksrq;
+    }
+
+    public void setJyksrq(Date jyksrq) {
+        this.jyksrq = jyksrq;
+    }
+
+    public Date getJyjsrq() {
+        return jyjsrq;
+    }
+
+    public void setJyjsrq(Date jyjsrq) {
+        this.jyjsrq = jyjsrq;
+    }
 
     public Long getResourceId() {
         return resourceId;

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

@@ -1347,7 +1347,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setDazt(DaztEnum.wgd.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.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝归档", JcmcysEnum.green.getValue(), formData, qmr, null);
 
     }
 
@@ -1398,7 +1400,9 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setZjzt(ZjztEnum.gd.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.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝解档", JcmcysEnum.green.getValue(), formData, qmr, null);
 
     }
 
@@ -1425,7 +1429,10 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setJyjsrq(form.getJyjsrq());
         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("开始日期", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "同意借阅", JcmcysEnum.green.getValue(), formData, qmr, form.getRemark());
 
     }
 
@@ -1452,7 +1459,11 @@ public class GyzjServiceImpl extends ServiceImpl implements IG
         gyzjOld.setJyjsrq(form.getJyjsrq());
         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("开始日期", DateUtils.dateTime(form.getJyksrq()));
+        formData.put("结束日期", DateUtils.dateTime(form.getJyjsrq()));
+        formData.put("原因", form.getRemark());
+        gyzjJcgjService.saveJcgj(gyzjOld.getId(), JcgjlxEnum.lc.getValue(), "拒绝借阅", JcmcysEnum.green.getValue(), formData, qmr, null);
 
     }
 

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

@@ -15,7 +15,7 @@
 
     <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.ffbz,t.rksqzt
+        ,t.ckl,t.ckldw,t.ffzytj,t.ffbz,t.rksqzt,t.jyksrq,t.jyjsrq
         ,z.mc as zcgMc,t.md_other,
         (select GROUP_CONCAT(s.name) from t_study s where find_in_set(s.id, t.`md_ids`)) as mdMcs
         FROM `t_gyzj` t