报销和发票查询方法的调整

src/main/java/com/jeeplus/modules/workreimbursement/entity/ReimbursementVATTax.java

@@ -49,6 +49,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 
 	private String remarks;
 
+	private String number;		// 报销编号
 
 	private String url;
 	private String fileName;
@@ -67,6 +68,15 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 	private String parentId;	//父节点id
 	private List<WorkClientAttachment> workAttachments = Lists.newArrayList();
 
+	@ExcelField(title="报销编号", align=2, sort=2)
+	public String getNumber() {
+		return number;
+	}
+
+	public void setNumber(String number) {
+		this.number = number;
+	}
+
 	public String getVatTaxStatus() {
 		return vatTaxStatus;
 	}
@@ -75,7 +85,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.vatTaxStatus = vatTaxStatus;
 	}
 
-	@ExcelField(title="金额", align=2, sort=7)
+	@ExcelField(title="金额", align=2, sort=8)
 	public BigDecimal getMoney() {
 		return money;
 	}
@@ -84,7 +94,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.money = money;
 	}
 
-	@ExcelField(title="合计", align=2, sort=9)
+	@ExcelField(title="合计", align=2, sort=10)
 	public BigDecimal getSumMoney() {
 		return sumMoney;
 	}
@@ -110,7 +120,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.invoiceCode = invoiceCode;
 	}
 
-	@ExcelField(title="发票号码", align=2, sort=3)
+	@ExcelField(title="发票号码", align=2, sort=4)
 	public String getInvoiceNumber() {
 		return invoiceNumber;
 	}
@@ -119,7 +129,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.invoiceNumber = invoiceNumber;
 	}
 
-	@ExcelField(title="税额", align=2, sort=8)
+	@ExcelField(title="税额", align=2, sort=9)
 	public BigDecimal getTaxAmount() {
 		return taxAmount;
 	}
@@ -136,7 +146,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.workReimbursement = workReimbursement;
 	}
 
-	@ExcelField(title="发票类型", align=2, sort=2)
+	@ExcelField(title="发票类型", align=2, sort=3)
 	public String getInvoiceType() {
 		return invoiceType;
 	}
@@ -146,7 +156,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 	}
 
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@ExcelField(title="开票日期", align=2, sort=4)
+	@ExcelField(title="开票日期", align=2, sort=5)
 	public Date getInvoiceDate() {
 		return invoiceDate;
 	}
@@ -155,7 +165,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.invoiceDate = invoiceDate;
 	}
 
-	@ExcelField(title="开票单位", align=2, sort=5)
+	@ExcelField(title="开票单位", align=2, sort=6)
 	public String getInvoiceUnit() {
 		return invoiceUnit;
 	}
@@ -188,7 +198,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.invoiceTypeStr = invoiceTypeStr;
 	}
 
-	@ExcelField(title="项目名称", align=2, sort=6)
+	@ExcelField(title="项目名称", align=2, sort=7)
 	public String getInvoiceProjectName() {
 		return invoiceProjectName;
 	}
@@ -206,7 +216,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.indexNumber = indexNumber;
 	}
 
-	@ExcelField(title="报销人", align=2, sort=10)
+	@ExcelField(title="报销人", align=2, sort=11)
 	public String getSubmitterName() {
 		return submitterName;
 	}
@@ -215,7 +225,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.submitterName = submitterName;
 	}
 
-	@ExcelField(title="报销日期", align=2, sort=11)
+	@ExcelField(title="报销日期", align=2, sort=12)
 	public String getSubmitterDate() {
 		return submitterDate;
 	}
@@ -224,7 +234,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.submitterDate = submitterDate;
 	}
 
-	@ExcelField(title="付款日期", align=2, sort=13)
+	@ExcelField(title="付款日期", align=2, sort=14)
 	public String getPaymentDate() {
 		return paymentDate;
 	}
@@ -233,7 +243,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.paymentDate = paymentDate;
 	}
 
-	@ExcelField(title="备注", align=2, sort=15)
+	@ExcelField(title="备注", align=2, sort=16)
 	@Override
 	public String getRemarks() {
 		return remarks;
@@ -244,7 +254,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.remarks = remarks;
 	}
 
-	@ExcelField(title="审核状态", dictType="reimburse_audit_state", align=2, sort=12)
+	@ExcelField(title="审核状态", dictType="reimburse_audit_state", align=2, sort=13)
 	public String getStatus() {
 		return status;
 	}
@@ -269,7 +279,7 @@ public class ReimbursementVATTax extends DataEntity<ReimbursementVATTax> {
 		this.processInstanceId = processInstanceId;
 	}
 
-	@ExcelField(title="当前节点审核人员", align=2, sort=14)
+	@ExcelField(title="当前节点审核人员", align=2, sort=15)
 	public String getHandlingPerson() {
 		return handlingPerson;
 	}

src/main/resources/mappings/modules/workinvoice/WorkInvoiceDao.xml

@@ -583,8 +583,11 @@
 			<if test="invoiceState != null and invoiceState != ''">
 				AND (a.invoice_state = #{invoiceState} or a.cancellation_state = #{invoiceState})
 			</if>
-			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
+			<if test="beginContractDate != null">
+				AND a.invoice_date &gt;= #{beginContractDate}
+			</if>
+			<if test="endContractDate != null">
+				AND a.invoice_date &lt;= #{endContractDate}
 			</if>
 
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">
@@ -1573,8 +1576,11 @@
 			<if test="invoiceState != null and invoiceState != ''">
 				AND (a.invoice_state = #{invoiceState} or a.cancellation_state = #{invoiceState})
 			</if>
-			<if test="beginContractDate != null and endContractDate != null and beginContractDate != '' and endContractDate != ''">
-				AND a.invoice_date BETWEEN #{beginContractDate} AND #{endContractDate}
+			<if test="beginContractDate != null">
+				AND a.invoice_date &gt;= #{beginContractDate}
+			</if>
+			<if test="endContractDate != null">
+				AND a.invoice_date &lt;= #{endContractDate}
 			</if>
 
 			<if test="receiptBeginDate != null and receiptBeginDate != ''">

src/main/resources/mappings/modules/workreimbursement/WorkReimbursementDao.xml

@@ -994,6 +994,7 @@
 		rvt.invoice_project_name as "invoiceProjectName",
 		rvt.remarks as "remarks",
 		su.name as "submitterName",
+		a.number as "number",
 		a.status as "status",
 		a.id as "reimbursementId",
 		a.process_instance_id as "processInstanceId",

src/main/webapp/webpage/modules/projectStatement/projectAccountsAddForm.jsp

@@ -455,7 +455,7 @@
 					</div>
 				</div>
 			</div>
-			<div class="form-group layui-row first lw14">
+			<div class="form-group layui-row first">
 				<div class="form-group-label"><h2>汇总表信息</h2></div>
 				<div class="list-form-tab contentShadow shadowLTR" id="tabDiv" style="display: none;margin-bottom: 20px">
 					<!-- 页签核心容器 -->
@@ -519,7 +519,7 @@
 					<!-- 表格整体：仅保留表头，内容区单独抽离 -->
 					<table id="substationContentTables" class="table table-bordered table-condensed can-edit no-bottom-margin details">
 						<!-- 1. 用colgroup强制定义8列宽度 -->
-						<colgroup>
+						<%--<colgroup>
 							<col width="80px"> <!-- 1.序号 -->
 							<col width="200px"> <!-- 2.项目或费用名称 -->
 							<col width="150px"> <!-- 3.金额-合计 -->
@@ -528,7 +528,7 @@
 							<col width="150px"> <!-- 6.金额-暂估价材料费 -->
 							<col width="260px"> <!-- 7.备注 -->
 							<col width="100px"> <!-- 8.操作 -->
-						</colgroup>
+						</colgroup>--%>
 
 						<!-- 2. 表头部分（固定不滚动） -->
 						<thead>
@@ -552,9 +552,9 @@
 					</table>
 
 					<!-- 3. 内容滚动区域（限制高度400px，超过显示滚动条） -->
-					<div id="substationContentScroll" style="max-height: 400px; overflow-y: auto; overflow-x: hidden;">
+					<div id="substationContentScroll" style="max-height: 400px; overflow-y: auto; overflow-x: hidden; width: 100%">
 						<table id="substationContentBody" class="table table-bordered table-condensed can-edit no-bottom-margin details">
-							<colgroup> <!-- 内容表同步列宽，确保与表头对齐 -->
+							<%--<colgroup> <!-- 内容表同步列宽，确保与表头对齐 -->
 								<col width="80px">
 								<col width="200px">
 								<col width="150px">
@@ -563,7 +563,7 @@
 								<col width="150px">
 								<col width="260px">
 								<col width="100px">
-							</colgroup>
+							</colgroup>--%>
 							<tbody id="projectSubstationList">
 							<!-- 动态生成的行将在这里显示 -->
 							</tbody>