feat：[资源库管理]给药制剂，麻精药，台账新增表单名称

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

@@ -1,5 +1,6 @@
 package com.hxhq.business.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.hxhq.common.core.domain.MpBaseEntity;
 
@@ -57,12 +58,35 @@ public class GyzjTz extends MpBaseEntity
     /** 签名意义-英文 */
     private String qmyyEn;
 
+    /** 表单id */
+    private Long bdId;
+
+    /** 表单名称 */
+    @TableField(exist = false)
+    private String bdMc;
+
     /** 操作量 */
     private String czl;
 
     /** 操作量单位 */
     private String czldw;
 
+    public String getBdMc() {
+        return bdMc;
+    }
+
+    public void setBdMc(String bdMc) {
+        this.bdMc = bdMc;
+    }
+
+    public Long getBdId() {
+        return bdId;
+    }
+
+    public void setBdId(Long bdId) {
+        this.bdId = bdId;
+    }
+
     public String getLqrMcEn() {
         return lqrMcEn;
     }

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

@@ -1,5 +1,6 @@
 package com.hxhq.business.domain;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.hxhq.common.core.domain.MpBaseEntity;
 
@@ -57,12 +58,35 @@ public class MjyTz extends MpBaseEntity
     /** 签名意义英文 */
     private String qmyyEn;
 
+    /** 表单id */
+    private Long bdId;
+
+    /** 表单名称 */
+    @TableField(exist = false)
+    private String bdMc;
+
     /** 操作量 */
     private String czl;
 
     /** 操作量单位 */
     private String czldw;
 
+    public String getBdMc() {
+        return bdMc;
+    }
+
+    public void setBdMc(String bdMc) {
+        this.bdMc = bdMc;
+    }
+
+    public Long getBdId() {
+        return bdId;
+    }
+
+    public void setBdId(Long bdId) {
+        this.bdId = bdId;
+    }
+
     public String getLqrMcEn() {
         return lqrMcEn;
     }

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

@@ -1,7 +1,13 @@
 package com.hxhq.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.hxhq.business.domain.GyzjTz;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.domain.MjyTz;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 给药制剂-台账Mapper接口
  *
@@ -10,5 +16,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface GyzjTzMapper extends BaseMapper<GyzjTz>
 {
-
+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
+    List<GyzjTz> queryList(@Param("ew") Wrapper<GyzjTz> queryWrapper);
 }

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

@@ -1,7 +1,14 @@
 package com.hxhq.business.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.hxhq.business.domain.MjyFfjl;
 import com.hxhq.business.domain.MjyTz;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hxhq.business.dto.mjy.FfjlListDto;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
 /**
  * 麻精药-台账Mapper接口
  *
@@ -10,5 +17,10 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface MjyTzMapper extends BaseMapper<MjyTz>
 {
-
+    /**
+     * 查询列表
+     * @param queryWrapper
+     * @return
+     */
+    List<MjyTz> queryList(@Param("ew") Wrapper<MjyTz> queryWrapper);
 }

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

@@ -37,7 +37,7 @@ public class GyzjTzServiceImpl extends ServiceImpl impleme
         }
         queryWrapper.eq("gyzj_id",gyzjTz.getGyzjId());
         queryWrapper.orderByDesc("id");
-        return this.list(queryWrapper);
+        return baseMapper.queryList(queryWrapper);
     }
 
     /**

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

@@ -36,7 +36,7 @@ public class MjyTzServiceImpl extends ServiceImpl implements
         }
         queryWrapper.eq("mjy_id", mjyTz.getMjyId());
         queryWrapper.orderByDesc("id");
-        return this.list(queryWrapper);
+        return baseMapper.queryList(queryWrapper);
     }
 
     /**

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/GyzjJcnrUtil.java

@@ -97,6 +97,7 @@ public class GyzjJcnrUtil {
         mapLang.put("存储","Storage");
         mapLang.put("取出","Take Out");
 
+        mapLang.put("表单名称","Preset Name");
         mapLang.put("锁定发放记录","锁定发放记录");
         mapLang.put("解锁发放记录","解锁发放记录");
         mapLang.put("给药制剂入库","给药制剂入库");

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/MjyJcnrUtil.java

@@ -93,6 +93,7 @@ public class MjyJcnrUtil {
         mapLang.put("存储","Storage");
         mapLang.put("取出","Take Out");
 
+        mapLang.put("表单名称","Preset Name");
         mapLang.put("锁定发放记录","锁定发放记录");
         mapLang.put("解锁发放记录","解锁发放记录");
         mapLang.put("麻精药入库","麻精药入库");

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Dosage.java

@@ -109,13 +109,14 @@ public class Dosage {
         Font headerFont = new Font(bfChinese, 8, Font.NORMAL);
         Font contentFont = new Font(bfChinese, 8, Font.NORMAL);
         // 8. 创建表格
-        PdfPTable table = new PdfPTable(7);
+        PdfPTable table = new PdfPTable(8);
         table.setWidthPercentage(100);
         String[] headers = {
                 "en".equals(lang) ? GyzjJcnrUtil.getEn("使用人") : "使用人",
                 "en".equals(lang) ? GyzjJcnrUtil.getEn("领取/归还人") : "领取/归还人",
                 "en".equals(lang) ? GyzjJcnrUtil.getEn("发放/接收人") : "发放/接收人",
                 "en".equals(lang) ? GyzjJcnrUtil.getEn("操作类型") : "操作类型",
+                "en".equals(lang) ? GyzjJcnrUtil.getEn("表单名称") : "表单名称",
                 "en".equals(lang) ? GyzjJcnrUtil.getEn("操作量") : "操作量",
                 "en".equals(lang) ? GyzjJcnrUtil.getEn("备注/原因") : "备注/原因",
                 "en".equals(lang) ? GyzjJcnrUtil.getEn("操作时间") : "操作时间"
@@ -139,6 +140,7 @@ public class Dosage {
             table.addCell(PdfBaseUtil.createCell(StringUtils.isNoneBlank(gyzjTz.getLqrMc()) ? gyzjTz.getLqrMc() : "" + (StringUtils.isNoneBlank(gyzjTz.getGhrMc()) ? gyzjTz.getGhrMc() : ""), contentFont));
             table.addCell(PdfBaseUtil.createCell(StringUtils.isNoneBlank(gyzjTz.getFfrMc()) ? gyzjTz.getFfrMc() : "" + (StringUtils.isNoneBlank(gyzjTz.getJsrMc()) ? gyzjTz.getJsrMc() : ""), contentFont));
             table.addCell(PdfBaseUtil.createCell(gyzjTz.getQmyy(), contentFont));
+            table.addCell(PdfBaseUtil.createCell(gyzjTz.getBdMc(), contentFont));
             table.addCell(PdfBaseUtil.createCell(gyzjTz.getCzl() + gyzjTz.getCzldw(), contentFont));
             table.addCell(PdfBaseUtil.createCell(gyzjTz.getRemark(), contentFont));
             table.addCell(PdfBaseUtil.createCell(sdf.format(gyzjTz.getCreateTime()), contentFont));

hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/utils/pdf/resource/Drug.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.hxhq.business.domain.*;
 import com.hxhq.business.dto.mjy.DetailDto;
 import com.hxhq.business.enums.zykgl.ZjztEnum;
+import com.hxhq.business.utils.GyzjJcnrUtil;
 import com.hxhq.business.utils.MjyJcnrUtil;
 import com.hxhq.business.utils.pdf.PdfBaseUtil;
 import com.hxhq.common.core.utils.StringUtils;
@@ -109,13 +110,14 @@ public class Drug {
         Font headerFont = new Font(bfChinese, 8, Font.NORMAL);
         Font contentFont = new Font(bfChinese, 8, Font.NORMAL);
         // 8. 创建表格
-        PdfPTable table = new PdfPTable(7);
+        PdfPTable table = new PdfPTable(8);
         table.setWidthPercentage(100);
         String[] headers = {
                 "en".equals(lang) ? MjyJcnrUtil.getEn("使用人") : "使用人",
                 "en".equals(lang) ? MjyJcnrUtil.getEn("领取/归还人") : "领取/归还人",
                 "en".equals(lang) ? MjyJcnrUtil.getEn("发放/接收人") : "发放/接收人",
                 "en".equals(lang) ? MjyJcnrUtil.getEn("操作类型") : "操作类型",
+                "en".equals(lang) ? GyzjJcnrUtil.getEn("表单名称") : "表单名称",
                 "en".equals(lang) ? MjyJcnrUtil.getEn("操作量") : "操作量",
                 "en".equals(lang) ? MjyJcnrUtil.getEn("备注/原因") : "备注/原因",
                 "en".equals(lang) ? MjyJcnrUtil.getEn("操作时间") : "操作时间"
@@ -139,6 +141,7 @@ public class Drug {
             table.addCell(PdfBaseUtil.createCell(StringUtils.isNoneBlank(mjyTz.getLqrMc()) ? mjyTz.getLqrMc() : "" + (StringUtils.isNoneBlank(mjyTz.getGhrMc()) ? mjyTz.getGhrMc() : ""), contentFont));
             table.addCell(PdfBaseUtil.createCell(StringUtils.isNoneBlank(mjyTz.getFfrMc()) ? mjyTz.getFfrMc() : "" + (StringUtils.isNoneBlank(mjyTz.getJsrMc()) ? mjyTz.getJsrMc() : ""), contentFont));
             table.addCell(PdfBaseUtil.createCell(mjyTz.getQmyy(), contentFont));
+            table.addCell(PdfBaseUtil.createCell(mjyTz.getBdMc(), contentFont));
             table.addCell(PdfBaseUtil.createCell(mjyTz.getCzl() + mjyTz.getCzldw(), contentFont));
             table.addCell(PdfBaseUtil.createCell(mjyTz.getRemark(), contentFont));
             table.addCell(PdfBaseUtil.createCell(sdf.format(mjyTz.getCreateTime()), contentFont));

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

@@ -3,4 +3,14 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.GyzjTzMapper">
+    <select id="queryList" resultType="com.hxhq.business.domain.GyzjTz">
+        select t.*,sf.bdmc as bdMc
+        FROM `t_gyzj_tz` t
+        left join  `t_study_form_fill` sf on sf.id=t.bd_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
 </mapper>

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

@@ -3,4 +3,14 @@
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hxhq.business.mapper.MjyTzMapper">
+    <select id="queryList" resultType="com.hxhq.business.domain.MjyTz">
+        select t.*,sf.bdmc as bdMc
+        FROM `t_mjy_tz` t
+        left join  `t_study_form_fill` sf on sf.id=t.bd_id
+        <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
+            <where>
+                ${ew.sqlSegment}
+            </where>
+        </if>
+    </select>
 </mapper>