diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java index 1d1935db9..bba2adc87 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/EmisBaseService.java @@ -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 statInfoMap = new HashMap(); statInfoMap.put("waitDoNum",waitDoNum); statInfoMap.put("hasDoNum",hasDoNum); + statInfoMap.put("dispNum",hasDispatchCount); + statInfoMap.put("signedNum",hasSignCount); statInfoMap.put("statNumList",statNumList); return statInfoMap; diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index 7b4e071ec..a771f5a2e 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -2192,7 +2192,61 @@ and a.send_date #{params.endDate} - ) tbd + ) tbd, + ( + select count(1) as hasDispatchCount + from emis_waybill a + where a.del_flag='0' + and a.waybill_status='40' + + 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} + ) + + + and a.send_date = ]]> #{params.beginDate} + + + and a.send_date #{params.endDate} + + ) tbe, + ( + select count(1) as hasSignCount + from emis_waybill a + where a.del_flag='0' + and a.bl_sign='1' + + 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} + ) + + + and a.send_date = ]]> #{params.beginDate} + + + and a.send_date #{params.endDate} + + ) tbf,