From e3472fd1c991de8da2665548e9adefc8644bdb10 Mon Sep 17 00:00:00 2001 From: tangw Date: Thu, 7 Aug 2025 10:41:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E5=8D=95=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/BackPaperMapper.java | 3 +- .../interfaceCommon/mapper/ComDictMapper.java | 8 ++--- .../pojo/entity/BackPaperDetail.java | 2 ++ .../pojo/entity/BackPaperParam.java | 1 - .../pojo/entity/LabRptgetruledetailCX.java | 20 +++++++++++ .../interfaceCommon/utils/ReportUtil.java | 36 ++++++++++++++----- .../main/resources/mapper/BackPaperMapper.xml | 17 ++++++--- 7 files changed, 68 insertions(+), 19 deletions(-) create mode 100644 lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/LabRptgetruledetailCX.java diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/BackPaperMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/BackPaperMapper.java index de8fd98..75e969a 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/BackPaperMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/BackPaperMapper.java @@ -1,12 +1,13 @@ package com.czlis.interfaceCommon.mapper; -import com.czlis.common.core.domain.entity.LabReqmain; import com.czlis.interfaceCommon.pojo.entity.BackPaperDetail; import com.czlis.interfaceCommon.pojo.entity.BackPaperParam; +import com.czlis.interfaceCommon.pojo.entity.LabRptgetruledetailCX; import java.util.List; public interface BackPaperMapper { List selectBySqhs(List sqhs); BackPaperParam selectReqmian(String sqh); + List getLabRptgetruledetail(Integer bglqdh); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComDictMapper.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComDictMapper.java index 3d3b56a..70ce5a3 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComDictMapper.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/mapper/ComDictMapper.java @@ -2,7 +2,7 @@ package com.czlis.interfaceCommon.mapper; import com.czlis.common.core.domain.entity.ComDict; - +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -14,10 +14,10 @@ public interface ComDictMapper { int delComDict(ComDict comDict); int updateComDict(ComDict comDict); //根据主键判断是否存在数据 - int getCountById(String zdlb, String zddh) ; + int getCountById(@Param("zdlb")String zdlb, @Param("zddh")String zddh) ; //根据编号查名称 - String getComDictNameById(String zdlb,String zddh); + String getComDictNameById(@Param("zdlb")String zdlb,@Param("zddh")String zddh); //根据名称查编号 - String getComDictIdByName(String zdlb,String zdmc); + String getComDictIdByName(@Param("zdlb") String zdlb,@Param("zdmc") String zdmc); List getComDictListByZdlb(String zdlb); } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/BackPaperDetail.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/BackPaperDetail.java index b2e7163..0b61a83 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/BackPaperDetail.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/BackPaperDetail.java @@ -14,4 +14,6 @@ public class BackPaperDetail { private String sqxmdh; private String sqxmmc; private String cp_msg; + private Integer bglqdh1; + private Integer bglqdh2; } diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/BackPaperParam.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/BackPaperParam.java index 695ac44..9a9ab27 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/BackPaperParam.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/BackPaperParam.java @@ -24,7 +24,6 @@ public class BackPaperParam { private String brxb; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date brsr; - private String txm; private String bgddh; private Integer nl; private String nldw; diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/LabRptgetruledetailCX.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/LabRptgetruledetailCX.java new file mode 100644 index 0000000..96ec5b3 --- /dev/null +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/pojo/entity/LabRptgetruledetailCX.java @@ -0,0 +1,20 @@ +package com.czlis.interfaceCommon.pojo.entity; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class LabRptgetruledetailCX { + private Integer bglqdh; + private Integer xh; + private String kssj; + private String jssj; + private Integer bgxss; + private String bglqsm; + private String bz; + private String weekday; + private String weekday1; +} diff --git a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java index a2fcd15..b7f6ab9 100644 --- a/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java +++ b/lis-interfaceCommon/src/main/java/com/czlis/interfaceCommon/utils/ReportUtil.java @@ -7,17 +7,14 @@ import com.czlis.common.config.RuoYiConfig; import com.czlis.interfaceCommon.mapper.BackPaperMapper; import com.czlis.interfaceCommon.pojo.entity.BackPaperDetail; import com.czlis.interfaceCommon.pojo.entity.BackPaperParam; +import com.czlis.interfaceCommon.pojo.entity.LabRptgetruledetailCX; import com.czlis.interfaceCommon.pojo.entity.MZBarCodeParam; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.stereotype.Component; -import javax.sql.DataSource; -import java.sql.Connection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -47,14 +44,37 @@ public class ReportUtil { public void printBackpaper(List sqhs) { String sqh= sqhs.get(0); BackPaperParam backPaperParam=backPaperMapper.selectReqmian(sqh); - String yljg= backPaperParam.getYljg(); ObjectMapper objectMapper = new ObjectMapper(); Map parameters = objectMapper.convertValue(backPaperParam,Map.class); - parameters.put("company",commonUtil.getCompany(yljg)); - List detail= backPaperMapper.selectBySqhs(sqhs); + parameters.put("company",commonUtil.getCompany(backPaperParam.getYljg())); + parameters.put("age",AgeUtils.getAge(backPaperParam.getBrsr())); + parameters.put("ksdh",commonUtil.getComDictNameById("DP",backPaperParam.getKsdh())); + parameters.put("brxb",commonUtil.getComDictNameById("SX",backPaperParam.getBrxb())); + parameters.put("bgds",String.valueOf(sqhs.size())); + List detailList= backPaperMapper.selectBySqhs(sqhs); + for (BackPaperDetail detail : detailList) { + Integer bglqdh1=detail.getBglqdh1(); + Integer bglqdh2=detail.getBglqdh2(); + String bglqsm=""; + if (bglqdh1 != null) { + List labRptgetruledetail = backPaperMapper.getLabRptgetruledetail(bglqdh1); + if (labRptgetruledetail.size() > 0) { + bglqsm = labRptgetruledetail.get(0).getBglqsm(); + } + } + if (bglqdh2 != null && bglqsm != null && !bglqsm.trim().equals("")) { + List labRptgetruledetail= backPaperMapper.getLabRptgetruledetail(bglqdh2); + if (labRptgetruledetail.size() > 0) { + bglqsm=labRptgetruledetail.get(0).getBglqsm(); + } + } + detail.setCp_msg(bglqsm); + } + + try { //构造数据 - JasperReportUtil.print(RuoYiConfig.getMzPrintName(),"backpaper",parameters,detail); + JasperReportUtil.print(RuoYiConfig.getMzPrintName(),"backpaper",parameters,detailList); } catch (Exception e) { e.printStackTrace(); log.error("打印回单报错,条码号：{}",sqh,e); diff --git a/lis-interfaceCommon/src/main/resources/mapper/BackPaperMapper.xml b/lis-interfaceCommon/src/main/resources/mapper/BackPaperMapper.xml index 847d1b2..ed1ea67 100644 --- a/lis-interfaceCommon/src/main/resources/mapper/BackPaperMapper.xml +++ b/lis-interfaceCommon/src/main/resources/mapper/BackPaperMapper.xml @@ -3,16 +3,23 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd" > - + SELECT sqh,lab_reqdetail.xh,sqxmdh,sqxmmc,'' as cp_msg,xm_fee.bglqdh as bglqdh1,lab_feeitemclass.bglqdh as bglqdh2 FROM lab_reqdetail + left join xm_fee on xm_fee.sfxmdh=lab_reqdetail.sqxmdh + left join lab_feeitem_vs_class on lab_feeitem_vs_class.sfxmdh=lab_reqdetail.sqxmdh + left join lab_feeitemclass on lab_feeitemclass.sflbdh=lab_feeitem_vs_class.sflbdh WHERE sqh IN #{sqh} - + select ksdh,sqys,sqsj,jsys,jssj,brly,brdh,brxm,brxb,brsr,bgddh,nl,nldw,kh,yljg from lab_reqmain where sqh = #{sqh} + + - \ No newline at end of file