yxh
2023-05-10 ae940502b8431e4773d030bc9cb2d05f0ec6cecf
Merge branch 'master' of http://116.62.18.175:6699/r/~yxh/opo
已修改1个文件
11 ■■■■ 文件已修改
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceReimbursementController.java
@@ -859,11 +859,16 @@
            map.put("DA", s.getDeparture() == null ? "" : s.getDeparture());
            Date et = s.getEndtime();
            String year_et = null;
            String month_et = null;
            String day_et = null;
            if (et != null) {
            SimpleDateFormat formatter_et = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            String date_et = formatter_et.format(et);
            String year_et = date_et.substring(0, 4);
            String month_et = date_et.substring(5, 7);
            String day_et = date_et.substring(8, 10);
                year_et = date_et.substring(0, 4);
                month_et = date_et.substring(5, 7);
                day_et = date_et.substring(8, 10);
            }
            map.put("AY", year_et == null ? "" : year_et);
            map.put("AM", month_et == null ? "" : month_et);