aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-01-05 23:10:27 +08:00
parent 9216d20143
commit 2986d7d142
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java
View File

@ -363,6 +363,8 @@ public class EmisBaseService {
int hasDoNum=0;
int hasCancelNum=0;
int hasChangeToCount=0;
int hasDispatchCount=0;
int hasSignCount=0;
int statType_1_num=0;
int statType_2_num=0;
@ -376,6 +378,8 @@ public class EmisBaseService {
hasDoNum=MapUtils.getIntValue(item0,"hasDoCount",0);
hasCancelNum=MapUtils.getIntValue(item0,"hasCancelCount",0);
hasChangeToCount=MapUtils.getIntValue(item0,"hasChangeToCount",0);
hasDispatchCount=MapUtils.getIntValue(item0,"hasDispatchCount",0);
hasSignCount=MapUtils.getIntValue(item0,"hasSignCount",0);
statType_1_num=waitDoNum;
statType_2_num=hasDoNum;
@ -412,6 +416,8 @@ public class EmisBaseService {
Map<String,Object> statInfoMap = new HashMap<String,Object>();
statInfoMap.put("waitDoNum",waitDoNum);
statInfoMap.put("hasDoNum",hasDoNum);
statInfoMap.put("dispNum",hasDispatchCount);
statInfoMap.put("signedNum",hasSignCount);
statInfoMap.put("statNumList",statNumList);
return statInfoMap;

56
emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
View File

@ -2192,7 +2192,61 @@
<if test="params.endDate != null and params.endDate != ''">
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
) tbd
) tbd,
(
select count(1) as hasDispatchCount
from emis_waybill a
where a.del_flag='0'
and a.waybill_status='40'
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and a.send_site_code in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{params.privSiteCode} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION
SELECT #{params.privSiteCode} FROM dual
)
and (
a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode}
or a.register_man_code=#{params.privEmpCode}
)
</if>
<if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
) tbe,
(
select count(1) as hasSignCount
from emis_waybill a
where a.del_flag='0'
and a.bl_sign='1'
<if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and a.send_site_code in (
SELECT t1.site_code FROM (
SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
#{params.privSiteCode} ) pd
WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
UNION
SELECT #{params.privSiteCode} FROM dual
)
and (
a.operate_employee_code=#{params.privEmpCode}
or a.take_piece_employee_code=#{params.privEmpCode}
or a.register_man_code=#{params.privEmpCode}
)
</if>
<if test="params.beginDate != null and params.beginDate != ''">
and a.send_date <![CDATA[ >= ]]> #{params.beginDate}
</if>
<if test="params.endDate != null and params.endDate != ''">
and a.send_date <![CDATA[ <= ]]> #{params.endDate}
</if>
) tbf,
</select>