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-12 15:33:37 +08:00
parent dca978a281
commit 308ed75121
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
emis-biz/src/main/resources/mapper/EmisCustomerUserMapper.xml
View File

@ -60,15 +60,12 @@
<result property="status" column="status" /> <result property="status" column="status" />
<result property="orderNum" column="order_num" /> <result property="orderNum" column="order_num" />
<result property="custNo" column="monthly_pay_code" /> <result property="custNo" column="monthly_pay_code" />
<result property="custName" column="customer_name" /> <result property="custName" column="customer_name" />
<result property="payeeName" column="payee" /> <result property="payeeName" column="payee" />
<result property="salesmenName" column="salesmen" /> <result property="salesmenName" column="salesmen" />
<association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/> <association property="countryName" column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
<association property="provinceName" column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/> <association property="provinceName" column="province" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>
<association property="cityName" column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/> <association property="cityName" column="city" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectRegionNameByCode"/>

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

@ -1913,6 +1913,7 @@
and ( a.problem_type is null or (a.problem_type is not null and (a.problem_type != 173 and a.problem_type != 170 and a.problem_type != 151) ) ) and ( a.problem_type is null or (a.problem_type is not null and (a.problem_type != 173 and a.problem_type != 170 and a.problem_type != 151) ) )
<!--
<if test="params.queryDateType != null and params.queryDateType == 1 "> <if test="params.queryDateType != null and params.queryDateType == 1 ">
and to_days(a.send_date) = to_days(now()) and to_days(a.send_date) = to_days(now())
</if> </if>
@ -1929,6 +1930,15 @@
and YEAR(a.send_date)=YEAR(NOW()) and YEAR(a.send_date)=YEAR(NOW())
</if> </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>
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and a.salesmen=#{salesmen} and a.salesmen=#{salesmen}
</if> </if>
@ -1956,6 +1966,8 @@
and a.receive_country=b.code and a.trans_line_type=c.line_code and a.receive_country=b.code and a.trans_line_type=c.line_code
and ( a.problem_type is null or (a.problem_type is not null and (a.problem_type != 173 and a.problem_type != 170 and a.problem_type != 151) ) ) and ( a.problem_type is null or (a.problem_type is not null and (a.problem_type != 173 and a.problem_type != 170 and a.problem_type != 151) ) )
<!--
<if test="params.queryDateType != null and params.queryDateType == 1 "> <if test="params.queryDateType != null and params.queryDateType == 1 ">
and to_days(a.send_date) = to_days(now()) and to_days(a.send_date) = to_days(now())
</if> </if>
@ -1975,6 +1987,15 @@
<if test="params.privSiteCode != null and params.privSiteCode != '88888'"> <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
and a.salesmen=#{salesmen} and a.salesmen=#{salesmen}
</if> </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>
</where> </where>
group by b.code group by b.code