修改mapper文件

release
yishiqihuasheng 2 years ago
parent 0d17ddcb89
commit 55f9501834
  1. 3
      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. 2
      dxhy-base/src/main/java/com/dxhy/base/service/fpxxrz/BaseRzFpxxServiceImpl.java
  4. 27
      dxhy-base/src/main/resources/mapper/BaseFpZhMapper.xml
  5. 16
      dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java
  6. 3
      dxhy-sign/src/main/java/com/dxhy/sign/entity/QsExcelEntity.java
  7. 10
      dxhy-sign/src/main/resources/mapper/SignRecordInvoiceMapper.xml

@ -130,8 +130,11 @@ public class BaseInvoiceController extends AbstractController {
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("qszt", map.get("qszt"));
pramsMap.put("wrzfpStart", map.get("wrzfpStart"));
pramsMap.put("wrzfpEnd", map.get("wrzfpEnd"));

@ -203,6 +203,8 @@ public class BaseFpRzRespVO implements Serializable {
//影像号 SN
private String imageNumber;
private String imageId;
//报账单号
private String bzdh;
}

@ -137,6 +137,8 @@ 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).setBzdh(pageList.get(i).getBzdh());
pageList.get(i).setXh(String.valueOf(i + start));
pageList.get(i).setTaxAmount(
AmountFormatUtil.fmtMicrometer(MathUtil.round(pageList.get(i).getTaxAmount())));

@ -41,7 +41,8 @@
<result column="bdk_status" property="bdkStatus"/>
<result column="bdk_current_period" property="bdkCurrentPeriod"/>
<result column="bdk_date" property="bdkDate"/>
<result column="in_account_status" property="inAccountStatus"/>
<result column="bzdh" property="bzdh"/>
<result column="inaccount_status" property="inAccountStatus"/>
<result column="payment_date" property="paymentDate"/>
<result column="payment_status" property="paymentStatus"/>
<result column="voucher_number" property="voucherNumber"/>
@ -84,6 +85,12 @@
<if test="voucherNumber != null and voucherNumber != ''">
and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
</if>
<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>
<if test="qszt != null and qszt != '' and qszt != 'null' and qszt != '99'">
and t.qs_status = #{qszt}
</if>
@ -182,9 +189,9 @@
</foreach>
) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
</if>
<if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
and t.in_account_status = #{inAccountStatus}
</if>
<!-- <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
<!-- and t.in_account_status = #{inAccountStatus}-->
<!-- </if>-->
<if test="snVoucherNumber != null and snVoucherNumber != '' and snVoucherNumber != 'null' and snVoucherNumber != '99'">
and t.sn_voucher_number = #{snVoucherNumber}
</if>
@ -332,6 +339,12 @@
<if test="voucherNumber != null and voucherNumber != ''">
and t.voucher_number like concat('%',concat(#{voucherNumber},'%'))
</if>
<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>
<if test="qszt != null and qszt != '' and qszt != 'null' ">
and t.qs_status = #{qszt}
</if>
@ -408,9 +421,9 @@
</foreach>
) or (t.dept_id is null or t.dept_id='' or t.dept_id='99'))
</if>
<if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>
and t.in_account_status = #{inAccountStatus}
</if>
<!-- <if test='inAccountStatus!=null and inAccountStatus!="" and inAccountStatus !="99"'>-->
<!-- and t.in_account_status = #{inAccountStatus}-->
<!-- </if>-->
<if test="eleInvoiceNo!=null and eleInvoiceNo!='' and eleInvoiceNo!='null'">
and t.ele_invoice_no = #{eleInvoiceNo}
</if>

@ -469,17 +469,17 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
snDetailMap.put("specificationModel", detail.getString("ggxh"));
snDetailMap.put("unit", detail.getString("jldw"));
String quantity = detail.getString("spsl");
if (quantity.length() > 3) {
int index = quantity.indexOf(".");
quantity = quantity.substring(0, index + 2);
}
// if (quantity.length() > 3) {
// int index = quantity.indexOf(".");
// quantity = quantity.substring(0, index + 2);
// }
snDetailMap.put("quantity", quantity);
String unitPrice = detail.getString("bhsdj");
if (unitPrice.length() > 3) {
int index = unitPrice.indexOf(".");
unitPrice = unitPrice.substring(0, index + 3);
}
// if (unitPrice.length() > 3) {
// int index = unitPrice.indexOf(".");
// unitPrice = unitPrice.substring(0, index + 3);
// }
snDetailMap.put("unitPrice", unitPrice);

@ -19,7 +19,7 @@ import java.util.List;
@Data
@ColumnWidth(11)
@ColumnWidth(30)
@ContentFontStyle(fontHeightInPoints = 10)
@HeadFontStyle(fontHeightInPoints = 12,fontName = "等线")
@HeadStyle(borderTop = BorderStyleEnum.THIN,borderBottom = BorderStyleEnum.THIN,borderLeft = BorderStyleEnum.THIN,
@ -32,6 +32,7 @@ public class QsExcelEntity {
/**
* 开票日期
*/
@ExcelProperty("开票日期")
private Date invoiceDate;
/**

@ -91,11 +91,11 @@
#{item}
</foreach>
</if>
<if test="company !=null and company != ''">
and t.company = #{company}
</if>
and t.qs_status = '0'
and t.source_system='0'
<!-- <if test="company !=null and company != ''">-->
<!-- and t.company = #{company}-->
<!-- </if>-->
<!-- and t.qs_status = '0'-->
<!-- and t.source_system='0'-->
</select>
<select id="selectWqsfp" parameterType="java.util.Map"

Loading…
Cancel
Save