|
|
@@ -2,7 +2,9 @@ package com.management.platform.service.impl;
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
-import com.management.platform.entity.*;
|
|
|
+import com.management.platform.entity.AuditWorkflowTimeSetting;
|
|
|
+import com.management.platform.entity.Department;
|
|
|
+import com.management.platform.entity.User;
|
|
|
import com.management.platform.entity.vo.DepartmentMasterVO;
|
|
|
import com.management.platform.entity.vo.DepartmentVO;
|
|
|
import com.management.platform.entity.vo.SysRichFunction;
|
|
|
@@ -14,7 +16,6 @@ import com.management.platform.util.ListUtil;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
@@ -433,7 +434,7 @@ public class DepartmentServiceImpl extends ServiceImpl<DepartmentMapper, Departm
|
|
|
}
|
|
|
// Map<String, Object> finalMap = new HashMap<>();
|
|
|
// List<Map<String, Object>> finalList = new ArrayList<>();
|
|
|
- DecimalFormat df = new DecimalFormat("#.00");
|
|
|
+ DecimalFormat df = new DecimalFormat("#0.00");
|
|
|
List<List<String>> dataList = new ArrayList<List<String>>();
|
|
|
String[] titles = {"人员", "项目", "工时(h)", "成本(元)"};
|
|
|
List<String> titleList = Arrays.asList(titles.clone());
|
ggooalice