From c15d89e921d6e67df339e0c7082a3820607e980d Mon Sep 17 00:00:00 2001 From: tangw Date: Wed, 4 Feb 2026 17:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E6=9C=AC=E5=85=A8=E7=A8=8B=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czlis/liswork/pojo/WholeProcessVO.java | 3 +++ liswork/src/main/resources/mapper/QcGraphMapper.xml | 13 ++++++------- .../main/resources/mapper/WholeProcessMapper.xml | 4 +++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java b/liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java index ecc91d5..2c2903f 100644 --- a/liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java +++ b/liswork/src/main/java/com/czlis/liswork/pojo/WholeProcessVO.java @@ -138,6 +138,9 @@ public class WholeProcessVO { private String brlyname; private String cyrname; private String ztname; + private String yblxname; + private String yqname; + private String confirmername; @ApiModelProperty(value = "申请时间起始") private Date sqsj1; @ApiModelProperty(value = "申请时间截止") diff --git a/liswork/src/main/resources/mapper/QcGraphMapper.xml b/liswork/src/main/resources/mapper/QcGraphMapper.xml index 767fe4c..9cd30c3 100644 --- a/liswork/src/main/resources/mapper/QcGraphMapper.xml +++ b/liswork/src/main/resources/mapper/QcGraphMapper.xml @@ -11,8 +11,7 @@ and zkpph = #{zkpph} and yq = #{yq} and yq = #{yq} - and ksrq >=(select max(ksrq) from qc_sample x where x.yq=qc_sample.yq and x.xmdh=qc_sample.xmdh and x.zkph=qc_sample.zkph and #{zkrq1}>=x.ksrq) - and #{zkrq2}>= ksrq + and ksrq =(select max(ksrq) from qc_sample x where x.yq=qc_sample.yq and x.xmdh=qc_sample.xmdh and x.zkph=qc_sample.zkph and #{zkrq1}>=x.ksrq) and xmdh not in('_pj_','_skxj_') and (zkph not like '%bz' ) order by yq,xmdh,ksrq,zkph @@ -31,7 +30,7 @@ and qc_val.zkph = #{zkph} and qc_sample.zkpph = #{zkpph} and qc_val.ksrq>= #{zkrq1} - and #{zkrq2}>= qc_val.ksrq + and #{zkrq2}>= qc_val.zkrq and qc_val.cs = #{cs} order by qc_val.zkrq,qc_val.cs @@ -50,7 +49,7 @@ and qc_val.zkph = #{zkph} and qc_sample.zkpph = #{zkpph} and qc_val.ksrq>= #{zkrq1} - and #{zkrq2}>= qc_val.ksrq + and #{zkrq2}>= qc_val.zkrq and qc_val.cs =(select max(cs) from qc_val a where a.yq=qc_val.yq and a.xmdh=qc_val.xmdh and a.zkph=qc_val.zkph and a.zkrq=qc_val.zkrq) order by qc_val.zkrq,qc_val.cs @@ -69,7 +68,7 @@ and qc_val.zkph = #{zkph} and qc_sample.zkpph = #{zkpph} and qc_val.ksrq>= #{zkrq1} - and #{zkrq2}>= qc_val.ksrq + and #{zkrq2}>= qc_val.zkrq and abs(qc_sample.zkbz - qc_val.zkjg)=(select min(abs(qc_sample.zkbz - a.zkjg)) from qc_val a where a.yq=qc_val.yq and a.xmdh=qc_val.xmdh and a.zkph=qc_val.zkph and a.zkrq=qc_val.zkrq) order by qc_val.zkrq,qc_val.cs @@ -91,7 +90,7 @@ and qc_val.zkph = #{zkph} and qc_sample.zkpph = #{zkpph} and qc_val.ksrq>= #{zkrq1} - and #{zkrq2}>= qc_val.ksrq + and #{zkrq2}>= qc_val.zkrq and qc_val.cs =1 order by qc_val.zkrq,qc_val.cs @@ -119,7 +118,7 @@ and qc_val.zkph = #{zkph} and qc_sample.zkpph = #{zkpph} and qc_val.ksrq>= #{zkrq1} - and #{zkrq2}>= qc_val.ksrq + and #{zkrq2}>= qc_val.zkrq and qc_val.cs = #{cs} group by qc_val.yq,qc_val.zkph,qc_val.xmdh,xm_info.xmmc,xm_info.dyxh,qc_sample.zkbz,qc_sample.sd,qc_sample.cv diff --git a/liswork/src/main/resources/mapper/WholeProcessMapper.xml b/liswork/src/main/resources/mapper/WholeProcessMapper.xml index b683ed1..bf62263 100644 --- a/liswork/src/main/resources/mapper/WholeProcessMapper.xml +++ b/liswork/src/main/resources/mapper/WholeProcessMapper.xml @@ -9,13 +9,15 @@ (case rtrim(a.brxb) when '1' then '男' when '2' then '女' else '' end) as brxbname, isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.sqys),a.sqys) as sqysname, isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.bbsjr),a.bbsjr) as bbsjrname, - isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.zxys),a.zxys) as zxysname, + isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.zxys),isnull((select yhxm from com_usr where yhdh = a.zxys),a.zxys)) as zxysname, isnull((select yhxm from com_usr where yhdh = a.jsys),a.jsys) as jsysname, isnull((select zdmc from com_dict where zdlb = 'DP' AND zddh = a.ksdh),a.ksdh) as ksname, isnull((select zdmc from com_dict where zdlb = 'PT' AND zddh = a.brly),a.brly) as brlyname, isnull((select zdmc from com_dict where zdlb = 'SRD' AND zddh = a.cyr),a.cyr) as cyrname, isnull((select zdmc from com_dict where zdlb = 'HOS' AND zddh = a.yljg),a.yljg) as yljgname, isnull((select zdmc from com_dict where zdlb = 'BT' AND zddh = a.yblx),a.yblx) as yblxname, + isnull((select yqmc from lab_instr where yq = a.yqdh),a.yqdh) as yqname, + isnull((select yhxm from com_usr where yhdh = a.confirmer),a.confirmer) as confirmername, (case when a.zt='2' and isnull(a.yqdh,'')!='' then '检验中' else isnull((select dict_label from sys_dict_data where dict_type='lis_req_type' and dict_value=a.zt),a.zt) end ) as ztname, datediff(minute,a.cysj,a.jssj) as cp_cytojs, datediff(minute,a.jssj,a.confirmtime) as cp_jstobg,