yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、解决请领单主表没设置流程节点操作人、时间 

2、解决操作人名返回不正确问题
This commit is contained in:
1378012178@qq.com 2025-11-28 16:00:42 +08:00
parent 351d27c10f
commit 6832ef42af
3 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldLogMapper.xml
View File

@ -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'
</select>

12
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/mapper/xml/NuInvoicingQldMainMapper.xml
View File

@ -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
<where>
@ -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

10
nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/qld/service/impl/QingLingServiceImpl.java
View File

@ -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);
}