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

修改mapper文件

Browse Source
release
yishiqihuasheng 2 years ago
parent 27a5198a09
commit a21f37e682
12 changed files with 137 additions and 36 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. 6
      dxhy-base/src/main/java/com/dxhy/base/controller/BaseInvoiceController.java
  2. 2
      dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
  3. 2
      dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
  4. 2
      dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
  5. 17
      dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
  6. 6
      dxhy-base/src/main/resources/mapper/BaseSggxcxMapper.xml
  7. 10
      dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java
  8. 17
      dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
  9. 92
      dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
  10. 5
      dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
  11. 4
      dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java
  12. 10
      dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml

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

@ -284,11 +284,11 @@ public class BaseInvoiceController extends AbstractController {
return ResponseEntity.ok(R.error("开票结束日期不能为空！"));
}
if (StringUtils.isNotBlank(inAccountStatus)) {
pramsMap.put("inaccountStatus", inAccountStatus);
pramsMap.put("inAccountStatus", inAccountStatus);
}
if(pramsMap.get("imageNumber") != null){
pramsMap.put("imageId",pramsMap.get("imageNumber"));
pramsMap.put("imageNumber",pramsMap.get("imageNumber"));
}
if(pramsMap.get("snVoucherNumber") != null){
@ -468,7 +468,7 @@ public class BaseInvoiceController extends AbstractController {
pramsMap.put("snVoucherNumber", map.get("snVoucherNumber"));
pramsMap.put("postingTimeEnd", map.get("postingTimeEnd"));
pramsMap.put("postingTimeStart", map.get("postingTimeStart"));
pramsMap.put("imageId", map.get("imageNumber"));
pramsMap.put("imageNumber", map.get("imageNumber"));
if (map.get("accountPeriod") != null && !"".equals(map.get("accountPeriod"))) {
String accountPeriod = map.get("accountPeriod").toString().substring(0,7);
pramsMap.put("accountPeriod", accountPeriod);

2
dxhy-base/src/main/java/com/dxhy/base/entity/BaseTDxRecordInvoice.java
Unescape View File

@ -508,7 +508,7 @@ public class BaseTDxRecordInvoice implements Serializable {
//过账时间
private String postingTime;
//影像号
private String imageId;
private String imageNumber;
//报账单号
private String bzdh;
}

2
dxhy-base/src/main/java/com/dxhy/base/model/BaseSggxCxRespVO.java
Unescape View File

@ -132,7 +132,7 @@ public class BaseSggxCxRespVO {
/**
* 影像id
*/
private String imageId;
private String imageNumber;
/**
* 凭证号

2
dxhy-base/src/main/java/com/dxhy/base/service/invoicecheck/BaseInvoiceManualCheckServiceImpl.java
Unescape View File

@ -170,7 +170,7 @@ public class BaseInvoiceManualCheckServiceImpl extends MpBaseServiceImpl<BaseTDx
log.info("businessName={}",businessName);
vo.setVoucherNumber(pageList.get(i).getVoucherNumber());
vo.setSnVoucherNumber(pageList.get(i).getSnVoucherNumber());
vo.setImageId(pageList.get(i).getImageId());
vo.setImageNumber(pageList.get(i).getImageNumber());
vo.setPostingTime(pageList.get(i).getPostingTime());
vo.setAccountPeriod(pageList.get(i).getAccountPeriod());
vo.setId(String.valueOf(pageList.get(i).getId()));

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

@ -46,6 +46,7 @@
<result column="payment_date" property="paymentDate"/>
<result column="payment_status" property="paymentStatus"/>
<result column="voucher_number" property="voucherNumber"/>
<result column="sn_voucher_number" property="snVoucherNumber"/>
<result column="ele_invoice_no" property="eleInvoiceNo"/>
</resultMap>
@ -198,8 +199,8 @@
<if test="postingTimeStart != null and postingTimeEnd != null and postingTimeStart != '' and postingTimeEnd != ''">
and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
</if>
<if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
and t.image_id = #{imageId}
<if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
and t.image_id = #{imageNumber}
</if>
<if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
and t.account_period = #{accountPeriod}
@ -336,6 +337,18 @@
test="invoiceStatus != null and invoiceStatus != '' and invoiceStatus != 'null' ">
and t.invoice_status = #{invoiceStatus}
</if>
<if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
and t.sn_voucher_number = #{snVoucherNumber}
</if>
<if test="postingTimeStart != null and postingTimeEnd != null and postingTimeStart != '' and postingTimeEnd != ''">
and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
</if>
<if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
and t.image_id = #{imageNumber}
</if>
<if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
and t.account_period = #{accountPeriod}
</if>
<if test="voucherNumber != null and voucherNumber != ''">
and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
</if>

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

@ -26,6 +26,8 @@
<result column="payment_date" property="paymentDate"/>
<result column="payment_status" property="paymentStatus"/>
<result column="voucher_number" property="voucherNumber"/>
<result column="sn_voucher_number" property="snVoucherNumber"/>
<result column="image_id" property="imageNumber"/>
<result column="ele_invoice_no" property="eleInvoiceNo"/>
<result column="bzdh" property="bzdh"/>
</resultMap>
@ -167,8 +169,8 @@
<if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
and t.posting_time between #{postingTimeStart} and #{postingTimeEnd}
</if>
<if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
and t.image_id = #{imageId}
<if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
and t.image_id = #{imageNumber}
</if>
<if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
and t.account_period = #{accountPeriod}

10
dxhy-customs/src/main/java/com/dxhy/customs/model/TdxCustomsRecordModelDTO.java
Unescape View File

@ -66,7 +66,15 @@ public class TdxCustomsRecordModelDTO extends CommonDTO {
private List<Business> business;
private String bzdh;
private String inaccountStatus;
private String inAccountStatus;
private String snVoucharNumber;
private String imageNumber;
private String accountPeriod;
private String postingTime;
private String postingTimeStart;
private String postingTimeEnd;
public void setParam(Page page, UserInfo userInfo) throws Exception {
business = userInfo.getBusiness();

17
dxhy-customs/src/main/java/com/dxhy/customs/service/impl/CustomsRecordDkrzServiceImpl.java
Unescape View File

@ -96,6 +96,12 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
JSONObject tabulateMenu = tabulateRedisService.getTabulateMenu(dto.getCompany(), dto.getMenuId());
resultData.putTabulateMenu(tabulateMenu);
if (dto.getAccountPeriod() != null && !"".equals(dto.getAccountPeriod())) {
String accountPeriod = dto.getAccountPeriod().substring(0,7);
dto.setAccountPeriod(accountPeriod);
log.info("accountPeriod:{}",accountPeriod);
}
Map mapTj = null;
Page<Map<String, Object>> result = null;
if (StringUtils.isNotBlank(dto.getGfsh()) || dto.getGfTaxNo().size() > 0) {
@ -126,7 +132,7 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
map.put("qsStatus", dictdetaServcice.queryDictName(DictConstant.QS_STATUS, qsStatus));
String qsType = (String)map.get("qsType");
map.put("qsType", dictdetaServcice.queryDictName(DictConstant.QS_TYPE, qsType));
map.put("inaccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,(String)map.get("inaccountStatus")));
map.put("inAccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,(String)map.get("inAccountStatus")));
if (map.get("qsDate") != null) {
map.put("qsDate", map.get("qsDate"));
@ -1169,6 +1175,11 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
JSONObject tabulateMenu = tabulateRedisService.getTabulateMenu(userInfo.getCompany(), dto.getMenuId());
resultData.putTabulateMenu(tabulateMenu);
if (dto.getAccountPeriod() != null && !"".equals(dto.getAccountPeriod())) {
String accountPeriod = dto.getAccountPeriod().substring(0,7);
dto.setAccountPeriod(accountPeriod);
log.info("accountPeriod:{}",accountPeriod);
}
Map mapTj = null;
Page<Map<String, Object>> result = null;
if (StringUtils.isNotBlank(dto.getGfsh()) || dto.getGfTaxNo().size() > 0) {
@ -1214,8 +1225,8 @@ public class CustomsRecordDkrzServiceImpl extends MpBaseServiceImpl<CustomsRecor
map.put("bdkStatus", dictdetaServcice.queryDictName(DictConstant.BDK_STATUS, bdkStatus));
map.put("cxrzStatus", dictdetaServcice.queryDictName(DictConstant.CXRZ_STATUS, cxrzStatus));
//入账状态
String inaccountStatus = (String) map.get("inaccountStatus");
map.put("inaccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inaccountStatus));
String inAccountStatus = (String) map.get("inAccountStatus");
map.put("inAccountStatus",dictdetaServcice.queryDictName(DictConstant.INACCOUNT_STATUS,inAccountStatus));
if (map.get("qsDate") != null) {
map.put("qsDate", map.get("qsDate"));
}

92
dxhy-customs/src/main/resources/mapper/CustomsRecordMapper.xml
Unescape View File

@ -255,8 +255,12 @@
p.auth_status as authStatus,
p.check_status as checkStatus,
p.dept_name as businessName,
p.inaccount_status as inaccountStatus,
p.bzdh as bzdh
p.inaccount_status as inAccountStatus,
p.bzdh as bzdh,
p.image_id as imageNumber,
p.account_period as accountPeriod,
p.posting_time as postingTime,
p.sn_voucher_number as snVoucherNumber
FROM
t_dx_customs_record p
where
@ -278,10 +282,23 @@
</if>
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{bzdh}
and p.bzdh = #{queryParams.bzdh}
</if>
<if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
and p.inaccount_status = #{inaccountStatus}
<if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
and p.inaccount_status = #{queryParams.inAccountStatus}
</if>
<if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
and p.sn_voucher_number = #{queryParams.snVoucherNumber}
</if>
<if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
</if>
<if test="queryParams.imageNumber != null and queryParams.imageNumber != '' and queryParams.imageNumber != 'null' and queryParams.imageNumber != '99'">
and p.image_id = #{queryParams.imageNumber}
</if>
<if test="queryParams.accountPeriod != null and queryParams.accountPeriod != '' and queryParams.accountPeriod != 'null' and queryParams.accountPeriod != '99'">
and p.account_period = #{queryParams.accountPeriod}
</if>
<if test="queryParams.customsCode!=null and queryParams.customsCode!=''">
@ -365,6 +382,26 @@
</foreach>
</if>
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{queryParams.bzdh}
</if>
<if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
and p.inaccount_status = #{queryParams.inAccountStatus}
</if>
<if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
and p.sn_voucher_number = #{queryParams.snVoucherNumber}
</if>
<if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
</if>
<if test="queryParams.imageNumber != null and queryParams.imageNumber != '' and queryParams.imageNumber != 'null' and queryParams.imageNumber != '99'">
and p.image_id = #{queryParams.imageNumber}
</if>
<if test="queryParams.accountPeriod != null and queryParams.accountPeriod != '' and queryParams.accountPeriod != 'null' and queryParams.accountPeriod != '99'">
and p.account_period = #{queryParams.accountPeriod}
</if>
<if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
and p.gf_tax_no = #{queryParams.gfsh}
</if>
@ -815,8 +852,12 @@
p.cxrz_status as cxrzStatus,
p.bdk_status as bdkStatus,
p.dept_name as businessName,
p.inaccount_status as inaccountStatus,
p.bzdh bzdh
p.inaccount_status as inAccountStatus,
p.bzdh as bzdh,
p.image_id as imageNumber,
p.account_period as accountPeriod,
p.posting_time as postingTime,
p.sn_voucher_number as snVoucherNumber
FROM
t_dx_customs_record p
where
@ -832,11 +873,23 @@
</if>
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{bzdh}
and p.bzdh = #{queryParams.bzdh}
</if>
<if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
and p.inaccount_status = #{inaccountStatus}
<if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
and p.inaccount_status = #{queryParams.inAccountStatus}
</if>
<if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
and p.sn_voucher_number = #{queryParams.snVoucherNumber}
</if>
<if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
</if>
<if test="queryParams.imageNumber != null and queryParams.imageNumber != '' and queryParams.imageNumber != 'null' and queryParams.imageNumber != '99'">
and p.image_id = #{queryParams.imageNumber}
</if>
<if test="queryParams.accountPeriod != null and queryParams.accountPeriod != '' and queryParams.accountPeriod != 'null' and queryParams.accountPeriod != '99'">
and p.account_period = #{queryParams.accountPeriod}
</if>
<if test="queryParams.gfsh!=null and queryParams.gfsh!=''">
@ -1059,11 +1112,22 @@
</if>
<if test="queryParams.bzdh != null and queryParams.bzdh != '' and queryParams.bzdh != 'null'">
and p.bzdh = #{bzdh}
and p.bzdh = #{queryParams.bzdh}
</if>
<if test="queryParams.inaccountStatus != null and queryParams.inaccountStatus != '' and queryParams.inaccountStatus != 'null'">
and p.inaccount_status = #{inaccountStatus}
<if test="queryParams.inAccountStatus != null and queryParams.inAccountStatus != '' and queryParams.inAccountStatus != 'null'">
and p.inaccount_status = #{queryParams.inAccountStatus}
</if>
<if test="queryParams.snVoucherNumber != null and queryParams.snVoucherNumber != '' and queryParams.snVoucherNumber != 'null' and queryParams.snVoucherNumber != '99'">
and p.sn_voucher_number = #{queryParams.snVoucherNumber}
</if>
<if test="queryParams.postingTimeStart != null and queryParams.postingTimeStart != '' and queryParams.postingTimeStart != 'null' and queryParams.postingTimeStart != '99' and queryParams.postingTimeEnd != null and queryParams.postingTimeEnd != '' and queryParams.postingTimeEnd != 'null' and queryParams.postingTimeEnd != '99'">
and p.posting_time between #{queryParams.postingTimeStart} and #{queryParams.postingTimeEnd}
</if>
<if test="queryParams.imageNumber != null and queryParams.imageNumber != '' and queryParams.imageNumber != 'null' and queryParams.imageNumber != '99'">
and p.image_id = #{queryParams.imageNumber}
</if>
<if test="queryParams.accountPeriod != null and queryParams.accountPeriod != '' and queryParams.accountPeriod != 'null' and queryParams.accountPeriod != '99'">
and p.account_period = #{queryParams.accountPeriod}
</if>
<if test="queryParams.gfsh!=null and queryParams.gfsh!=''">

5
dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
Unescape View File

@ -148,7 +148,7 @@ public class ExtFpzhcxController extends AbstractController {
}
if(pramsMap.get("imageNumber") != null){
pramsMap.put("imageId",pramsMap.get("imageNumber"));
pramsMap.put("imageNumber",pramsMap.get("imageNumber"));
}
if(pramsMap.get("snVoucherNumber") != null){
@ -215,7 +215,7 @@ public class ExtFpzhcxController extends AbstractController {
data.put("dbName", getUserInfo().getDbName());
data.put("business", getUserInfo().getBusiness());
data.put("bzdh",pramsMap.get("bzdh"));
data.put("inaccountStatus",pramsMap.get("inaccountStatus"));
data.put("inAccountStatus",pramsMap.get("inAccountStatus"));
List<String> gfshList = new ArrayList<>();
if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
gfshList.add(pramsMap.get("gfsh").toString());
@ -265,6 +265,7 @@ public class ExtFpzhcxController extends AbstractController {
data.put("company", pramsMap.get("company"));
data.put("menuId", pramsMap.get("menuId"));
data.put("imageNumber",pramsMap.get("imageNumber"));
try {
return ResponseEntity.ok(R.ok().put("data", ycfpcxService.selectByPramsMap(data, curr, size)));
} catch (Exception e) {

4
dxhy-extend/src/main/java/com/dxhy/extend/model/ExtBbfpzhcxRespVO.java
Unescape View File

@ -182,7 +182,9 @@ public class ExtBbfpzhcxRespVO implements Serializable {
private String snVoucherNumber;
private String postingTime;
private String imageId;
private String postingTimeStart;
private String postingTimeEnd;
private String imageNumber;
private String accountPeriod;
private String compCode;
private String bzdh;

10
dxhy-extend/src/main/resources/mapper/ExtBbfpzhMapper.xml
Unescape View File

@ -43,7 +43,7 @@
<result column="total_amount" property="totalAmount"/>
<result column="sn_voucher_number" property="snVoucherNumber"/>
<result column="posting_time" property="postingTime"/>
<result column="image_id" property="imageId"/>
<result column="image_id" property="imageNumber"/>
<result column="account_period" property="accountPeriod"/>
</resultMap>
@ -181,8 +181,8 @@
<if test="postingTimeStart != null and postingTimeStart != '' and postingTimeStart != 'null' and postingTimeStart != '99' and postingTimeEnd != null and postingTimeEnd != '' and postingTimeEnd != 'null' and postingTimeEnd != '99'">
and posting_time between #{postingTimeStart} and #{postingTimeEnd}
</if>
<if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
and t.image_id = #{imageId}
<if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
and t.image_id = #{imageNumber}
</if>
<if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
and t.account_period = #{accountPeriod}
@ -435,8 +435,8 @@
<if test="postingTime != null and postingTime != '' and postingTime != 'null' and postingTime != '99'">
and t.posting_time = #{postingTime}
</if>
<if test="imageId != null and imageId != '' and imageId != 'null' and imageId != '99'">
and t.image_id = #{imageId}
<if test="imageNumber != null and imageNumber != '' and imageNumber != 'null' and imageNumber != '99'">
and t.image_id = #{imageNumber}
</if>
<if test="accountPeriod != null and accountPeriod != '' and accountPeriod != 'null' and accountPeriod != '99'">
and t.account_period = #{accountPeriod}

Write Preview
Loading…
Cancel
Save