luminghui
/
sdny-jxpt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ariesy 增加排序参数 v2

Browse Source
release
yefei 2 years ago
parent eb11c9414f
commit 6432870ca8
3 changed files with 44 additions and 42 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 24
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
  2. 37
      dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
  3. 25
      dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml

24
dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
Unescape View File

@ -141,9 +141,9 @@ public class BaseInvoiceController extends AbstractController {
String businessCode = (String)map.get("businessCode"); String businessCode = (String)map.get("businessCode");
String qsr = (String)map.get("qsr"); String qsr = (String)map.get("qsr");
String rzhr = (String)map.get("rzhr"); String rzhr = (String)map.get("rzhr");
String sortPzbh = String.valueOf(map.get("sortPzbh")); // String sortPzbh = String.valueOf(map.get("sortPzbh"));
String sortBzdh = String.valueOf(map.get("sortBzdh")); // String sortBzdh = String.valueOf(map.get("sortBzdh"));
String sortKprq = String.valueOf(map.get("sortKprq")); // String sortKprq = String.valueOf(map.get("sortKprq"));
String taxRate = String.valueOf(map.get("taxRate")); String taxRate = String.valueOf(map.get("taxRate"));
log.info("taxRate={}",taxRate); log.info("taxRate={}",taxRate);
String inAccountStatus = (String)map.get("inAccountStatus"); String inAccountStatus = (String)map.get("inAccountStatus");
@ -172,15 +172,15 @@ public class BaseInvoiceController extends AbstractController {
pramsMap.put("snVoucherNumber", map.get("snVoucherNumber")); pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
pramsMap.put("company", map.get("company")); pramsMap.put("company", map.get("company"));
pramsMap.put("menuId", map.get("menuId")); pramsMap.put("menuId", map.get("menuId"));
if(StringUtils.isNotEmpty(sortPzbh)) { // if(StringUtils.isNotEmpty(sortPzbh)) {
pramsMap.put("sortPzbh", sortPzbh); // pramsMap.put("sortPzbh", sortPzbh);
} // }
if(StringUtils.isNotEmpty(sortBzdh)) { // if(StringUtils.isNotEmpty(sortBzdh)) {
pramsMap.put("sortBzdh", sortBzdh); // pramsMap.put("sortBzdh", sortBzdh);
} // }
if(StringUtils.isNotEmpty(sortKprq)) { // if(StringUtils.isNotEmpty(sortKprq)) {
pramsMap.put("sortKprq", sortKprq); // pramsMap.put("sortKprq", sortKprq);
} // }
pramsMap.put("xfmc", xfmc); pramsMap.put("xfmc", xfmc);
pramsMap.put("qsr", qsr); pramsMap.put("qsr", qsr);
if (StringUtils.isNotBlank(rzhr)) { if (StringUtils.isNotBlank(rzhr)) {

37
dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
Unescape View File

@ -241,24 +241,25 @@
<if test="taxRate=='多税率'"> <if test="taxRate=='多税率'">
and t.tax_rate like '%,%' and t.tax_rate like '%,%'
</if> </if>
<if test="sortPzbh == 1"> order by t.invoice_date desc
order by t.sn_voucher_number <!-- <if test="sortPzbh == 1">-->
</if> <!-- order by t.sn_voucher_number-->
<if test="sortPzbh == 2 or sortPzbh == 0"> <!-- </if>-->
order by t.sn_voucher_number desc <!-- <if test="sortPzbh == 2 or sortPzbh == 0">-->
</if> <!-- order by t.sn_voucher_number desc-->
<if test="sortBzdh == 1"> <!-- </if>-->
order by t.bzdh <!-- <if test="sortBzdh == 1">-->
</if> <!-- order by t.bzdh-->
<if test="sortBzdh == 2 or sortBzdh == 0"> <!-- </if>-->
order by t.bzdh desc <!-- <if test="sortBzdh == 2 or sortBzdh == 0">-->
</if> <!-- order by t.bzdh desc-->
<if test="sortKprq == 1"> <!-- </if>-->
order by t.invoice_date <!-- <if test="sortKprq == 1">-->
</if> <!-- order by t.invoice_date-->
<if test="sortKprq == 2 or sortKprq == 0"> <!-- </if>-->
order by t.invoice_date desc <!-- <if test="sortKprq == 2 or sortKprq == 0">-->
</if> <!-- order by t.invoice_date desc-->
<!-- </if>-->
</select> </select>
<!-- order by t.rzh_date desc,t.invoice_date desc--> <!-- order by t.rzh_date desc,t.invoice_date desc-->
<select id="selectByPramsMap" parameterType="java.util.Map" <select id="selectByPramsMap" parameterType="java.util.Map"

25
dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
Unescape View File

@ -233,24 +233,25 @@
<if test="taxRate=='多税率'"> <if test="taxRate=='多税率'">
and t.tax_rate like '%,%' and t.tax_rate like '%,%'
</if> </if>
<if test="sortPzbh == 1"> <if test="sortKprq == 1">
order by t.sn_voucher_number order by t.invoice_date
</if> </if>
<if test="sortPzbh == 2 or sortPzbh == 0"> <if test="sortKprq == 2">
order by t.sn_voucher_number desc order by t.invoice_date desc
</if> </if>
<if test="sortBzdh == 1"> <if test="sortPzbh == 1">
order by t.bzdh ,t.sn_voucher_number
</if> </if>
<if test="sortBzdh == 2 or sortBzdh == 0"> <if test="sortPzbh == 2">
order by t.bzdh desc ,t.sn_voucher_number desc
</if> </if>
<if test="sortKprq == 1"> <if test="sortBzdh == 1">
order by t.invoice_date ,t.bzdh
</if> </if>
<if test="sortKprq == 2 or sortKprq == 0"> <if test="sortBzdh == 2">
order by t.invoice_date desc ,t.bzdh desc
</if> </if>
</select> </select>
<select id="selectDksh" parameterType="java.util.Map" <select id="selectDksh" parameterType="java.util.Map"
resultType="com.dxhy.base.entity.BaseTDxDkCount" resultType="com.dxhy.base.entity.BaseTDxDkCount"

Write Preview
Loading…
Cancel
Save