收费明细导出修改

sp-admin/sa-view/tb-fee-statistics/tb-fee-details-list.html

@@ -99,8 +99,8 @@
 					<sa-td name="作业编号" prop="businessItemNo" width="145px" ></sa-td>
 					<sa-td name="企业名称" prop="pickCustomerName" ></sa-td>
 					<sa-td name="发票号" prop="" ></sa-td>
-					<sa-td name="生成时间" prop="createTime" width="90px" ></sa-td>
-					<sa-td name="付款时间" prop="payTime"  width="90px" ></sa-td>
+					<sa-td name="生成时间" prop="createTime" width="150px" ></sa-td>
+					<sa-td name="付款时间" prop="payTime"  width="150px" ></sa-td>
 					<sa-td name="备注" prop="remark" ></sa-td>
 
 <!--					<el-table-column label="操作" fixed="right"  width="240px">-->
@@ -114,13 +114,40 @@
 				<!-- ------------- 分页 ------------- -->
 				<sa-item type="page" :curr.sync="p.pageNo" :size.sync="p.pageSize" :total="dataCount" @change="f5()"></sa-item>
 			</div>
-			<el-dialog title="提示" :visible.sync="emodel.visible" width="30%">
-				<el-form size="mini">
-					<div class="c-item">
-						<label class="c-label">日期：</label>
-						<el-date-picker type="date" value-format="yyyy-MM-dd" v-model="emodel.form.payDay"></el-date-picker>
-					</div>
-				</el-form>
+			<el-dialog title="提示" :visible.sync="emodel.visible" width="38%">
+<!--				<el-form size="mini">-->
+<!--					<div class="c-item">-->
+<!--						<label class="c-label">日期：</label>-->
+<!--						<el-date-picker type="date" value-format="yyyy-MM-dd" v-model="emodel.form.payDay"></el-date-picker>-->
+<!--					</div>-->
+<!--				</el-form>-->
+				<div class="c-item">
+					<label class="c-label">收费项目：</label>
+					<el-select v-model="emodel.form.feeType" placeholder="请选择" filterable>
+						<el-option label="核酸检测" value="1"></el-option>
+						<el-option label="消杀作业" value="2"></el-option>
+						<el-option label="装卸作业" value="3"></el-option>
+						<el-option label="停车费" value="4"></el-option>
+						<el-option label="过磅费" value="5"></el-option>
+						<el-option label="入场管理费" value="6"> </el-option>
+						<el-option label="充电打冷作业" value="7"> </el-option>
+					</el-select>
+				</div>
+				<div class="c-item">
+					<label class="c-label">业务类型：</label>
+					<el-select v-model="emodel.form.itemTypeName" placeholder="请选择" filterable>
+						<el-option v-for="item in itemTypeList" :key="item.id"
+								   :label="item.name" :value="item.name">
+						</el-option>
+					</el-select>
+				</div>
+				<div class="c-item">
+					<label class="c-label"><span style="color: red;">*</span>日期范围：</label>
+					<el-date-picker size="mini" v-model="exportTime" type="daterange" unlink-panels="false"
+									range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+									format="yyyy 年 MM 月 dd 日" value-format="yyyy-MM-dd">
+					</el-date-picker>
+				</div>
 				<span slot="footer" class="dialog-footer">
 					<el-button @click="emodel.visible = false">取 消</el-button>
 					<el-button type="primary" @click="sureExport">确 定</el-button>
@@ -160,10 +187,15 @@
 						beginTime: '', //查询开始时间
 						endTime: '', //查询结束时间
 					},
+					exportTime:[],
 					emodel: {
 						visible: false,
 						form: {
-							payDay: ''
+							// payDay: ''
+							feeType: '',
+							itemTypeName: '',
+							beginTime: '', //查询开始时间
+							endTime: '', //查询结束时间
 						}
 					},
 				},
@@ -172,10 +204,25 @@
 						Object.assign(this.emodel, {
 							visible: true,
 						})
+						this.exportTime = [];
+						this.emodel.form.feeType = '';
+						this.emodel.form.itemTypeName = '';
+						this.emodel.form.beginTime = '';
+						this.emodel.form.endTime = '';
 					},
 					sureExport() {
-						if (this.emodel.form.payDay == '') {
-							sa.msg("请选择日期");
+						if ( this.exportTime != null && this.exportTime.length != 0) {
+							this.emodel.form.beginTime = this.exportTime[0];
+							this.emodel.form.endTime = this.exportTime[1];
+						}
+						if (this.emodel.form.beginTime == '' || this.emodel.form.endTime == '') {
+							sa.msg("请选择日期范围");
+							return;
+						}
+						const begin = new Date(this.emodel.form.beginTime);
+						const end = new Date(this.emodel.form.endTime);
+						if(end.getTime()-begin.getTime() > 3600 * 1000 * 24 * 31) {
+							sa.msg("日期范围不可超过一个月");
 							return;
 						}
 						sa.ajax('/TbFeeDetails/export/details', this.emodel.form,  function(resp) {

sp-server/src/main/java/com/pj/project/tb_fee_details/TbFeeDetailsService.java

@@ -220,8 +220,9 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
     public String export(SoMap so) throws Exception{
         Date now = new Date();
         String nowStr = DateUtil.format(now, "yyyy-MM-dd HH:mm");
+        String time = so.getString("beginTime") + "至" + so.getString("endTime");
         Map<String, String> head = new HashMap<>();
-        head.put("time", so.getString("payDay"));
+        head.put("time", time);
         head.put("exportTime", nowStr);
 	    List<ExportFeeDetailDTO> exportList = new ArrayList<>();
         List<TbFeeDetails> list = this.getList(so);
@@ -251,7 +252,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         String rootPath = UploadUtil.uploadConfig.rootFolder + separator + UploadUtil.uploadConfig.httpPrefix;
         String prefix = myConfig.getDomain() + UploadUtil.uploadConfig.httpPrefix;
         String extPath = "feeDetails" + separator + today + separator;
-        String fileName = "收费明细表_" + today + ".xlsx";
+        String fileName = "收费明细表_" + time + ".xlsx";
         String savePath = rootPath + separator + extPath;
         File saveFIle = new File(savePath);
         if (!saveFIle.exists()) {
@@ -267,7 +268,7 @@ public class TbFeeDetailsService extends ServiceImpl<TbFeeDetailsMapper, TbFeeDe
         excelWriter.fill(exportList, writeSheet);
         excelWriter.fill(head, writeSheet);
         excelWriter.finish();
-        return prefix + "/feeDetails/" + today + "/收费明细表_" + today + ".xlsx";
+        return prefix + "/feeDetails/" + today + "/收费明细表_" + time + ".xlsx";
     }
 
 }