开票导出和筛选项修改

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

@@ -40,7 +40,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 	private String projectName;		// 项目名称
 	private String reportNumber;		// 报告号
 	private Double money;		// 价税合计
-	private String moneyStr;		// 价税合计(String)
+	private Double moneyStr;		// 价税合计(String)
 	private String invoiceType;		// 发票类型
 	private String invoiceTypeStr;		// 发票类型Str
 	private String chargeType;		// 收款类型
@@ -85,7 +85,7 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 	private Integer notifyFlag; //代办判定条件
 	private String notifyId; //代办判定条件
 	private String widNumber; //发票号
-	private String widTotalMoney; //发票金额
+	private Double widTotalMoney; //发票金额
 	private Area area = new Area();		// 对账地区
 
 
@@ -303,12 +303,12 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.money = money;
 	}
 
-	@ExcelField(title="开票总金额(元)", align=2, sort=7, fieldType=Double.class)
-	public String getMoneyStr() {
+	@ExcelField(title="开票总金额(元)", align=2, sort=7)
+	public Double getMoneyStr() {
 		return moneyStr;
 	}
 
-	public void setMoneyStr(String moneyStr) {
+	public void setMoneyStr(Double moneyStr) {
 		this.moneyStr = moneyStr;
 	}
 
@@ -607,12 +607,12 @@ public class WorkInvoiceExport extends ActEntity<WorkInvoiceExport> {
 		this.widNumber = widNumber;
 	}
 
-	@ExcelField(title="发票金额(元)", align=2, sort=10, fieldType=Double.class)
-	public String getWidTotalMoney() {
+	@ExcelField(title="发票金额(元)", align=2, sort=10)
+	public Double getWidTotalMoney() {
 		return widTotalMoney;
 	}
 
-	public void setWidTotalMoney(String widTotalMoney) {
+	public void setWidTotalMoney(Double widTotalMoney) {
 		this.widTotalMoney = widTotalMoney;
 	}
 

src/main/java/com/jeeplus/modules/workinvoice/service/WorkInvoiceService.java

@@ -262,6 +262,22 @@ public class WorkInvoiceService extends CrudService<WorkInvoiceDao, WorkInvoice>
 		return page;
 
 	}
+	public Page<WorkInvoice> findListExport(Page<WorkInvoice> page, WorkInvoice workInvoice) {
+		workInvoice.getSqlMap().put("dsf", dataScopeFilter(workInvoice.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_INVOICE.getValue()));
+		if(StringUtils.isNotBlank(workInvoice.getOfficeId())){
+			//查询该选择节点下所有的部门Id
+			List<String> officeIdList = officeService.getChildrenOffice(workInvoice.getOfficeId());
+			officeIdList.add(workInvoice.getOfficeId());
+			workInvoice.setOfficeIdList(officeIdList);
+		}
+		int count = dao.queryCount(workInvoice);
+		page.setCount(count);
+		page.setCountFlag(false);
+		workInvoice.setPage(page);
+		page.setList(dao.findListExport(workInvoice));
+		return page;
+
+	}
 	public Page<WorkInvoice> findMapPage(Page<WorkInvoice> page, WorkInvoice workInvoice) {
 		workInvoice.getSqlMap().put("dsf", dataScopeFilter(workInvoice.getCurrentUser(), "o", "u","s", MenuStatusEnum.WORK_INVOICE.getValue()));
 		if(StringUtils.isNotBlank(workInvoice.getOfficeId())){

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

@@ -47,7 +47,6 @@ import com.jeeplus.modules.workinvoice.entity.WorkInvoiceProjectRelation;
 import com.jeeplus.modules.workinvoice.service.WorkInvoiceService;
 import com.jeeplus.modules.workinvoicealter.entity.WorkInvoiceAlter;
 import com.jeeplus.modules.workinvoicealter.service.WorkInvoiceAlterService;
-import com.jeeplus.modules.workinvoicedetail.entity.WorkInvoiceDetail;
 import com.jeeplus.modules.workinvoicedetail.service.WorkInvoiceDetailService;
 import com.jeeplus.modules.workproject.service.WorkProjectService;
 import com.jeeplus.modules.workprojectnotify.entity.WorkProjectNotify;
@@ -733,14 +732,14 @@ public class WorkInvoiceTwoController extends BaseController {
     public String exportFile(WorkInvoice workInvoice, HttpServletRequest request, HttpServletResponse response, RedirectAttributes redirectAttributes) {
 		try {
             String fileName = "发票一览表"+DateUtils.getDate("yyyyMMddHHmmss")+".xlsx";
-            Page<WorkInvoice> page = workInvoiceService.findPage(new Page<WorkInvoice>(request, response, -1), workInvoice);
+            Page<WorkInvoice> page = workInvoiceService.findListExport(new Page<WorkInvoice>(request, response, -1), workInvoice);
 			List<WorkInvoice> workInvoiceList = page.getList();
-			for (WorkInvoice invoice: workInvoiceList) {
+			/*for (WorkInvoice invoice: workInvoiceList) {
 				invoice.setWorkInvoiceProjectRelationList(workInvoiceService.getProjectRelation(invoice));
 				List<String> projectNameList = workInvoiceService.getProjectNameList(invoice);
 				String projectNameStr = String.join(",", projectNameList);
 				invoice.setProjectName(projectNameStr);
-			}
+			}*/
     		new ExportExcel("发票一览表", WorkInvoiceExport.class).setDataList(page.getList()).write(response, fileName).dispose();
     		return null;
 		} catch (Exception e) {