字段优化

bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/controller/BmReportController.java

@@ -4,6 +4,7 @@ import cn.hutool.core.convert.Convert;
 import com.alibaba.nacos.common.utils.CollectionUtils;
 import com.bonus.common.biz.config.ListPagingUtil;
 import com.bonus.common.biz.utils.StringHelper;
+import com.bonus.common.core.utils.DateUtils;
 import com.bonus.common.core.utils.ServletUtils;
 import com.bonus.common.core.utils.poi.ExcelUtil;
 import com.bonus.common.core.web.controller.BaseController;
@@ -1028,4 +1029,38 @@ public class BmReportController extends BaseController {
         }
         return "";
     }
+
+    /**
+     * 资产占有月度报表查询
+     * @param bean
+     * @return
+     */
+    @ApiOperation(value = "资产占有月度报表查询")
+    @GetMapping("/getAssetReportList")
+    public AjaxResult getAssetReportList(AssetReportInfo bean) {
+        startPage();
+        List<AssetReportInfo> pageList = bmReportService.getAssetReportList(bean);
+        return AjaxResult.success(getDataTable(pageList));
+    }
+
+    /**
+     * 导出资产占有月度报表
+     * @param response
+     * @param bean
+     */
+    @ApiOperation("导出资产占有月度报表")
+    @PostMapping("/exportAssetReportList")
+    public void exportAssetReportList(HttpServletResponse response, AssetReportInfo bean)
+    {
+        String fileName = "资产占有月度报表";
+        List<AssetReportInfo> list = bmReportService.getAssetReportList(bean);
+        // 根据list集合数，去填充序号
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setSeq(i + 1);
+        }
+        ExcelUtil<AssetReportInfo> util = new ExcelUtil<>(AssetReportInfo.class);
+        // 获取当前年月日时分秒导出时间，用括号拼接在后面
+        String title = "资产占有月度报表" + "（" + "导出时间：" + DateUtils.getTime() + "）";
+        util.exportExcel(response, list, fileName, title);
+    }
 }

bonus-modules/bonus-material/src/main/java/com/bonus/material/settlement/controller/SltAgreementInfoController.java

@@ -614,8 +614,8 @@ public class SltAgreementInfoController extends BaseController {
                 list.add("计量单位");
                 list.add("租赁单价");
                 list.add("租赁数量");
-                list.add("租赁日期");
+                list.add("租赁开始日期");
-                list.add("归还日期");
+                list.add("租赁结束日期");
                 list.add("租赁天数");
                 list.add("租赁费用（元）");
                 list.add("备注");
@@ -625,8 +625,8 @@ public class SltAgreementInfoController extends BaseController {
                 list.add("计量单位");
                 list.add("租赁单价");
                 list.add("租赁数量");
-                list.add("租赁日期");
+                list.add("租赁开始日期");
-                list.add("归还日期");
+                list.add("租赁结束日期");
                 list.add("租赁天数");
                 list.add("租赁费用（元）");
                 list.add("备注");