From 6832ef42af5eb5cc134938ec26365f700413fe51 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Fri, 28 Nov 2025 16:00:42 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=A7=A3=E5=86=B3=E8=AF=B7=E9=A2=86?= =?UTF-8?q?=E5=8D=95=E4=B8=BB=E8=A1=A8=E6=B2=A1=E8=AE=BE=E7=BD=AE=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=8A=82=E7=82=B9=E6=93=8D=E4=BD=9C=E4=BA=BA=E3=80=81?= =?UTF-8?q?=E6=97=B6=E9=97=B4=202=E3=80=81=E8=A7=A3=E5=86=B3=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E4=BA=BA=E5=90=8D=E8=BF=94=E5=9B=9E=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qld/mapper/xml/NuInvoicingQldLogMapper.xml | 2 +- .../qld/mapper/xml/NuInvoicingQldMainMapper.xml | 12 ++++++------ .../qld/service/impl/QingLingServiceImpl.java | 10 +++++++++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldLogMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldLogMapper.xml index a27cfa4..4218759 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldLogMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldLogMapper.xml @@ -6,7 +6,7 @@ select log.*,emp.name AS empName,info.ql_num AS qlNum,minfo.material_units AS materialUnits from nu_invoicing_qld_log log left join nu_invoicing_qld_info info on log.qld_no = info.qld_no - left join nu_biz_employees_info emp on log.ope_by = emp.id + left join sys_user emp on log.ope_by = emp.id left join nu_config_material_info minfo on info.wl_id = minfo.id where log.nu_id = #{dto.nuId} and log.elder_id = #{dto.elderId} and info.wl_id = #{dto.wlId} and log.status = '5' diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml index 0d1e4a1..4381962 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml @@ -24,11 +24,11 @@ mainStatus.item_text AS statusText FROM nu_invoicing_qld_main main LEFT JOIN nu_base_info baseInfo ON main.nu_id = baseInfo.nu_id - LEFT JOIN nu_biz_employees_info tjEmp ON main.tj_by = tjEmp.id - LEFT JOIN nu_biz_employees_info zfEmp ON main.zf_by = zfEmp.id - LEFT JOIN nu_biz_employees_info htEmp ON main.ht_by = htEmp.id - LEFT JOIN nu_biz_employees_info ckEmp ON main.ck_by = ckEmp.id - LEFT JOIN nu_biz_employees_info shEmp ON main.sh_by = shEmp.id + LEFT JOIN sys_user tjEmp ON main.tj_by = tjEmp.id + LEFT JOIN sys_user zfEmp ON main.zf_by = zfEmp.id + LEFT JOIN sys_user htEmp ON main.ht_by = htEmp.id + LEFT JOIN sys_user ckEmp ON main.ck_by = ckEmp.id + LEFT JOIN sys_user shEmp ON main.sh_by = shEmp.id LEFT JOIN sys_dict dict ON dict.dict_code = 'qld_status' LEFT JOIN sys_dict_item mainStatus ON mainStatus.dict_id = dict.id AND mainStatus.item_value = main.status @@ -54,7 +54,7 @@ emp.name AS opeByName, logStatus.item_text AS statusText FROM nu_invoicing_qld_log log - LEFT JOIN nu_biz_employees_info emp ON log.ope_by = emp.id + LEFT JOIN sys_user emp ON log.ope_by = emp.id LEFT JOIN sys_dict dict ON dict.dict_code = 'qld_status' LEFT JOIN sys_dict_item logStatus ON logStatus.dict_id = dict.id AND logStatus.item_value = log.status WHERE log.qld_no IN diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java index a94f6a2..ca06e18 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java @@ -512,6 +512,8 @@ public class QingLingServiceImpl implements IQinglingApi { //更新单子为作废 one.setStatus(status); one.setIzKgRead("N");//库管改为未读 + one.setZfBy(sysUser.getId());//作废人 + one.setZfTime(new Date());//作废时间 return invoicingQldMainService.updateById(one); } @@ -552,6 +554,8 @@ public class QingLingServiceImpl implements IQinglingApi { mainUW.eq("qld_no", dto.getQldNo()); NuInvoicingQldMain mainData = new NuInvoicingQldMain(); mainData.setStatus(status); + mainData.setShBy(sysUser.getId()); + mainData.setShTime(new Date()); invoicingQldMainService.update(mainData, mainUW); //请领单操作日志表增加操作记录 @@ -707,6 +711,8 @@ public class QingLingServiceImpl implements IQinglingApi { //更新单子为作废 one.setStatus(status); one.setIzYgRead("N");//员工改为未读 + one.setHtBy(sysUser.getId());//回退人 + one.setHtTime(new Date());//回退时间 return invoicingQldMainService.updateById(one); } @@ -738,10 +744,12 @@ public class QingLingServiceImpl implements IQinglingApi { } invoicingQldLogService.saveBatch(logList); - //更新单子为作废 + //更新单子为出库 NuInvoicingQldMain qldData = new NuInvoicingQldMain(); qldData.setStatus(status); qldData.setIzYgRead("N");//员工改为未读 + qldData.setCkBy(sysUser.getId());//出库人 + qldData.setCkTime(new Date());//出库时间 return invoicingQldMainService.update(qldData, qw); }