发票导出信息调整

src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoice.java

@@ -87,6 +87,7 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	private String notifyId; //代办判定条件
 	private String widNumber; //发票号
 	private String widTotalMoney; //发票金额
+	private Double widTotalMoneyD; //发票金额
 	private Area area = new Area();		// 对账地区
 
 
@@ -744,4 +745,12 @@ public class WorkInvoice extends ActEntity<WorkInvoice> {
 	public void setWorkReceiptCount(Integer workReceiptCount) {
 		this.workReceiptCount = workReceiptCount;
 	}
+
+	public Double getWidTotalMoneyD() {
+		return widTotalMoneyD;
+	}
+
+	public void setWidTotalMoneyD(Double widTotalMoneyD) {
+		this.widTotalMoneyD = widTotalMoneyD;
+	}
 }

src/main/java/com/jeeplus/modules/workinvoice/entity/WorkInvoiceExport.java

@@ -86,6 +86,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 	private String notifyId; //代办判定条件
 	private String widNumber; //发票号
 	private Double widTotalMoney; //发票金额
+	private Double widTotalMoneyD; //发票金额
 	private Area area = new Area();		// 对账地区
 
 
@@ -295,6 +296,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.projectName = projectName;
 	}
 
+	@ExcelField(title="开票总金额(元)", align=2, sort=7)
 	public Double getMoney() {
 		return money;
 	}
@@ -303,7 +305,6 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.money = money;
 	}
 
-	@ExcelField(title="开票总金额(元)", align=2, sort=7)
 	public Double getMoneyStr() {
 		return moneyStr;
 	}
@@ -607,7 +608,6 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.widNumber = widNumber;
 	}
 
-	@ExcelField(title="发票金额(元)", align=2, sort=10)
 	public Double getWidTotalMoney() {
 		return widTotalMoney;
 	}
@@ -640,4 +640,13 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 	public void setReportNumber(String reportNumber) {
 		this.reportNumber = reportNumber;
 	}
+
+	@ExcelField(title="发票金额(元)", align=2, sort=10)
+	public Double getWidTotalMoneyD() {
+		return widTotalMoneyD;
+	}
+
+	public void setWidTotalMoneyD(Double widTotalMoneyD) {
+		this.widTotalMoneyD = widTotalMoneyD;
+	}
 }

src/main/java/com/jeeplus/modules/workinvoice/web/WorkInvoiceAllController.java

@@ -40,6 +40,7 @@ import com.jeeplus.modules.workclientinfo.service.WorkClientInfoService;
 import com.jeeplus.modules.workcontractinfo.entity.WorkContractInfo;
 import com.jeeplus.modules.workcontractinfo.service.WorkContractInfoService;
 import com.jeeplus.modules.workinvoice.entity.WorkInvoice;
+import com.jeeplus.modules.workinvoice.entity.WorkInvoiceExport;
 import com.jeeplus.modules.workinvoice.entity.WorkInvoiceReceipt;
 import com.jeeplus.modules.workinvoice.service.WorkInvoiceAllService;
 import com.jeeplus.modules.workinvoice.service.WorkInvoiceService;
@@ -789,7 +790,7 @@ public class WorkInvoiceAllController extends BaseController {
 				String projectNameStr = String.join(",", projectNameList);
 				invoice.setProjectName(projectNameStr);
 			}*/
-            new ExportExcel("发票管理", WorkInvoice.class).setDataList(page.getList()).write(response, fileName).dispose();
+            new ExportExcel("发票管理", WorkInvoiceExport.class).setDataList(page.getList()).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {
 			addMessage(redirectAttributes, "导出发票管理记录失败！失败信息："+e.getMessage());

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

@@ -668,10 +668,12 @@
 				AND (a.account_checking_user_id = #{accountCheckingUserId} or sua.name like concat('%',#{accountCheckingUserName},'%'))
 			</if>
 			<if test="area != null and area.id != null and area.id != ''">
-				AND a.area_parent_id LIKE
+				AND (a.area_parent_id LIKE
 				<if test="dbName == 'oracle'">'%'||#{area.id}||'%'</if>
 				<if test="dbName == 'mssql'">'%'+#{area.id}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{area.id},'%')</if>
+				or a.area_id = #{area.id}
+				)
 			</if>
 			<if test="number != null and number != ''">
 				AND a.number LIKE
@@ -895,6 +897,7 @@
 		a.actual_drawer_id as "actualDrawerId"
 		,wid.number as "widNumber"
 		,wid.total_money as "widTotalMoney",
+		wid.total_money as "widTotalMoneyD",
 		(select
 		CASE
 		WHEN RIGHT( GROUP_CONCAT(is_project),1) =2 THEN GROUP_CONCAT(concat('其他：',wipr1.details))
@@ -935,10 +938,12 @@
 				AND (a.account_checking_user_id = #{accountCheckingUserId} or sua.name like concat('%',#{accountCheckingUserName},'%'))
 			</if>
 			<if test="area != null and area.id != null and area.id != ''">
-				AND a.area_parent_id LIKE
+				AND (a.area_parent_id LIKE
 				<if test="dbName == 'oracle'">'%'||#{area.id}||'%'</if>
 				<if test="dbName == 'mssql'">'%'+#{area.id}+'%'</if>
 				<if test="dbName == 'mysql'">concat('%',#{area.id},'%')</if>
+				or a.area_id = #{area.id}
+				)
 			</if>
 			<if test="number != null and number != ''">
 				AND a.number LIKE