修改mapper文件

release
yishiqihuasheng 2 years ago
parent a12175374a
commit 39514e5392
  1. 4
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
  2. 2
      dxhy-base/src/main/java/com/dxhy/base/model/BaseFpRzRespVO.java
  3. 7
      dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
  4. 8
      dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
  5. 10
      dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml

@ -127,14 +127,14 @@ public class BaseInvoiceController extends AbstractController {
String businessCode = (String)map.get("businessCode");
String qsr = (String)map.get("qsr");
String rzhr = (String)map.get("rzhr");
String inAccountStatus = (String)map.get("inaccountStatus");
String inAccountStatus = (String)map.get("inAccountStatus");
int curr = (int)map.get("curr");
int size = (int)map.get("size");
String bzdh = (String) map.get("bzdh");
Map<String, Object> pramsMap = new HashMap<>(25);
pramsMap.put("bzdh", bzdh);
pramsMap.put("inaccountStatus", inAccountStatus);
pramsMap.put("inAccountStatus", inAccountStatus);
pramsMap.put("qszt", map.get("qszt"));
pramsMap.put("wrzfpStart", map.get("wrzfpStart"));
pramsMap.put("wrzfpEnd", map.get("wrzfpEnd"));

@ -171,7 +171,7 @@ public class BaseFpRzRespVO implements Serializable {
private String rzlx;
private String rzhBackMsg;
private String inaccountStatus;
private String inAccountStatus;
/**
* 付款状态
*/

@ -137,7 +137,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
}
pageList.get(i).setId(pageList.get(i).getId());
pageList.get(i).setInaccountStatus(pageList.get(i).getInaccountStatus());
// pageList.get(i).setInAccountStatus(pageList.get(i).getInAccountStatus());
pageList.get(i).setBzdh(pageList.get(i).getBzdh());
pageList.get(i).setXh(String.valueOf(i + start));
pageList.get(i).setTaxAmount(
@ -182,8 +182,8 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
// }
// }
// }
pageList.get(i).setInaccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS,
pageList.get(i).getInaccountStatus()));
pageList.get(i).setInAccountStatus(dictdetaServcice.queryDictName(DictConstant.DK_STATUS,
pageList.get(i).getInAccountStatus()));
pageList.get(i).setRzsj(pageList.get(i).getRzsj());
pageList.get(i).setSkssq(pageList.get(i).getSkssq());
}
@ -193,6 +193,7 @@ public class BaseRzFpxxServiceImpl extends MpBaseServiceImpl<BaseFpxxZhDao, Base
json.put("total", pageInfo.getTotal());
List<BaseFpRzRespVO> resultList = pageInfo.getList();
log.info("resultList {}",resultList);
json.put("datalist", resultList);
}

@ -42,7 +42,7 @@
<result column="bdk_current_period" property="bdkCurrentPeriod"/>
<result column="bdk_date" property="bdkDate"/>
<result column="bzdh" property="bzdh"/>
<result column="inaccount_status" property="inaccountStatus"/>
<result column="inaccount_status" property="inAccountStatus"/>
<result column="payment_date" property="paymentDate"/>
<result column="payment_status" property="paymentStatus"/>
<result column="voucher_number" property="voucherNumber"/>
@ -89,7 +89,7 @@
and t.bzdh = #{bzdh}
</if>
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
and t.inaccount_status = #{inaccountStatus}
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
and t.qs_status = #{qszt}
@ -342,8 +342,8 @@
<if test="bzdh != null and bzdh != '' and bzdh != 'null'">
and t.bzdh = #{bzdh}
</if>
<if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
and t.inaccount_status = #{inaccountStatus}
<if test="inAccountStatus != null and inAccountStatus != '' and inAccountStatus != 'null'">
and t.inaccount_status = #{inAccountStatus}
</if>
<if test="qszt != null and qszt != '' and qszt != 'null' ">
and t.qs_status = #{qszt}

@ -256,7 +256,7 @@
p.check_status as checkStatus,
p.dept_name as businessName,
p.inaccount_status as inaccountStatus,
p.bzdh
p.bzdh as bzdh
FROM
t_dx_customs_record p
where
@ -277,10 +277,10 @@
and p.gf_tax_no = #{queryParams.gfsh}
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null'">
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{bzdh}
</if>
<if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
<if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
and p.inaccount_status = #{inaccountStatus}
</if>
@ -369,10 +369,10 @@
and p.gf_tax_no = #{queryParams.gfsh}
</if>
<if test="bzdh != null and bzdh != '' and bzdh != 'null'">
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{bzdh}
</if>
<if test="inaccountStatus != null and inaccountStatus != '' and inaccountStatus != 'null'">
<if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
and p.inaccount_status = #{inaccountStatus}
</if>

Loading…
Cancel
Save