修改团油统计bug

dev-discount
袁野 3 years ago
parent 4d99d9cdd6
commit c0407c0a59
  1. 10
      hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java

@ -966,7 +966,7 @@ public interface HighOrderMapperExt {
"<if test='map.companyId != null'> AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) </if> " + "<if test='map.companyId != null'> AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) </if> " +
"<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " , "<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " ,
"<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " , "<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " ,
"<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} ) </if> " , "<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} </if> " ,
") as hh; " , ") as hh; " ,
"</script>" "</script>"
}) })
@ -992,7 +992,7 @@ public interface HighOrderMapperExt {
"<if test='map.companyId != null'> AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) </if> " + "<if test='map.companyId != null'> AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) </if> " +
"<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " , "<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " ,
"<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " , "<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " ,
"<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} ) </if> " , "<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} </if> " ,
") as hh; " , ") as hh; " ,
"</script>" "</script>"
}) })
@ -1015,7 +1015,7 @@ public interface HighOrderMapperExt {
"<if test='map.companyId != null'> AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) </if> " + "<if test='map.companyId != null'> AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) </if> " +
"<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " , "<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " ,
"<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " , "<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " ,
"<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} ) </if> " , "<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} </if> " ,
") as hh; " , ") as hh; " ,
"</script>" "</script>"
}) })
@ -1035,7 +1035,7 @@ public interface HighOrderMapperExt {
"<if test='map.goodsId != null'> and hco.goods_id = #{map.goodsId} </if> " , "<if test='map.goodsId != null'> and hco.goods_id = #{map.goodsId} </if> " ,
"<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " , "<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " ,
"<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " , "<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " ,
"<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} ) </if> " , "<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} </if> " ,
"<if test='map.createTimeS != null'> <![CDATA[ and ho.create_time >= #{map.createTimeS} ]]> </if> " , "<if test='map.createTimeS != null'> <![CDATA[ and ho.create_time >= #{map.createTimeS} ]]> </if> " ,
"<if test='map.createTimeE != null'> <![CDATA[ and ho.create_time <= #{map.createTimeE} ]]> </if> " , "<if test='map.createTimeE != null'> <![CDATA[ and ho.create_time <= #{map.createTimeE} ]]> </if> " ,
"group by pay_type " , "group by pay_type " ,
@ -1058,7 +1058,7 @@ public interface HighOrderMapperExt {
"<if test='map.companyId != null'> AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) </if> " + "<if test='map.companyId != null'> AND hco.gas_org_id in (select id from bs_organization WHERE company_id = #{map.companyId} and `status` = 1) </if> " +
"<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " , "<if test='map.gasSalesmanId != null'> and hco.gas_salesman_id = #{map.gasSalesmanId} </if> " ,
"<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " , "<if test='map.orgId != null'> and hco.gas_org_id = #{map.orgId} </if> " ,
"<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} ) </if> " , "<if test='map.agentId != null'> and hco.gas_agent_id = #{map.agentId} </if> " ,
"<if test='map.createTimeS != null'> <![CDATA[ and ho.create_time >= #{map.createTimeS} ]]> </if> " , "<if test='map.createTimeS != null'> <![CDATA[ and ho.create_time >= #{map.createTimeS} ]]> </if> " ,
"<if test='map.createTimeE != null'> <![CDATA[ and ho.create_time <= #{map.createTimeE} ]]> </if> " , "<if test='map.createTimeE != null'> <![CDATA[ and ho.create_time <= #{map.createTimeE} ]]> </if> " ,
"group by hco.gas_oil_no " , "group by hco.gas_oil_no " ,

Loading…
Cancel
Save