From 50df4ecfb8f46d5c65f3dc4a3c7342618c2a37e0 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 29 Dec 2021 16:11:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=BB=E5=90=88=E5=90=8C?= =?UTF-8?q?=E5=92=8C=E4=BB=B7=E5=80=BC=E5=AD=97=E6=95=B0=EF=BC=8C=E5=88=86?= =?UTF-8?q?=E6=9C=88=E7=BB=9F=E8=AE=A1=E7=9A=84=E6=9F=A5=E7=9C=8B=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/backend/AccountController.java | 4 +-- .../controller/backend/ProjectController.java | 2 +- .../work/service/StatisticsService.java | 34 +++++++++++++++++-- .../templates/admin/account_input.ftl | 1 + .../templates/admin/account_list.ftl | 4 +-- .../templates/admin/project_budget_edit.ftl | 9 ++--- .../templates/admin/project_estimate_add.ftl | 9 ++--- .../templates/admin/project_estimate_edit.ftl | 9 ++--- .../templates/admin/project_list.ftl | 4 +-- 9 files changed, 54 insertions(+), 22 deletions(-) diff --git a/src/main/java/cn/palmte/work/controller/backend/AccountController.java b/src/main/java/cn/palmte/work/controller/backend/AccountController.java index aba1695..3036d9d 100644 --- a/src/main/java/cn/palmte/work/controller/backend/AccountController.java +++ b/src/main/java/cn/palmte/work/controller/backend/AccountController.java @@ -223,7 +223,7 @@ public class AccountController extends BaseController { public void export(@RequestParam(value = "keywords", required = false) String keywords, HttpServletResponse httpServletResponse) throws IOException { Map searchInfo = getSearchInfo(keywords); downloadHeader(httpServletResponse, Utils.generateExcelName("人员信息"), "application/octet-stream"); - String[] headers = {"工号", "手机号码", "姓名", "常驻地", "一级部门", "直接主管", "职位", "所属角色", "公司邮件地址"}; + String[] headers = {"工号", "手机号码", "姓名", "常驻地", "一级部门", "直接主管", "职位", "角色名称", "公司邮件地址"}; String[] exportColumns = {"userName", "telephone", "realName", "workLocation", "deptName", "directManager", "positionName", "roleName", "companyEmail"}; ExportUtils.exportToExcel(headers, exportColumns, 1, 10000, httpServletResponse.getOutputStream(), (pN, pS) -> accountService.list(searchInfo, pN, pS).getList()); @@ -235,7 +235,7 @@ public class AccountController extends BaseController { @RequestMapping("/template") public void template(HttpServletResponse response) throws Exception { - String[] headers = new String[]{"工号", "手机号码", "姓名", "常驻地", "一级部门", "直接主管", "职位", "所属角色", "公司邮件地址"}; + String[] headers = new String[]{"工号", "手机号码", "姓名", "常驻地", "一级部门", "直接主管", "职位", "角色名称", "公司邮件地址"}; downloadHeader(response, Utils.generateExcelName("人员信息批量导入模板")); ExportUtils exportUtils = new ExportUtils(headers); exportUtils.write(response.getOutputStream()); diff --git a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java index c571785..4b19265 100644 --- a/src/main/java/cn/palmte/work/controller/backend/ProjectController.java +++ b/src/main/java/cn/palmte/work/controller/backend/ProjectController.java @@ -551,6 +551,6 @@ public class ProjectController extends BaseController { Project project = projectRepository.findOne(id); projectService.saveApprove(project, InterfaceUtil.getAdmin()); - return ResponseMsg.buildSuccessMsg("成功"); + return ResponseMsg.buildSuccessMsg("提交成功"); } } diff --git a/src/main/java/cn/palmte/work/service/StatisticsService.java b/src/main/java/cn/palmte/work/service/StatisticsService.java index 6855bea..dda3cfc 100644 --- a/src/main/java/cn/palmte/work/service/StatisticsService.java +++ b/src/main/java/cn/palmte/work/service/StatisticsService.java @@ -8,6 +8,7 @@ import cn.palmte.work.model.*; import cn.palmte.work.utils.InterfaceUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import top.jfunc.common.db.utils.Pagination; import top.jfunc.common.utils.CollectionUtil; import java.math.BigDecimal; @@ -47,6 +48,12 @@ public class StatisticsService { @Autowired private ProjectVisibleRepository projectVisibleRepository; + @Autowired + private SysRoleRepository sysRoleRepository; + + @Autowired + private Pagination pagination; + /** * 分月项目统计 获取主要指标数据、损益表 * @@ -67,9 +74,30 @@ public class StatisticsService { include.setTitle("预算金额（含税）"); exclude.setTitle("预算金额（不含税）"); - int adminId = InterfaceUtil.getAdminId(); - List projectIds = projectVisibleRepository.findProjectIdByTypeAndTid(ProjectVisible.TYPE_USER, adminId); - + Admin admin = InterfaceUtil.getAdmin(); + List projectList = null; + //项目可见性，根据角色和人员id + int roleId = admin.getRoleId(); + Integer adminId = admin.getId(); + String sql = "select proj.id, proj.name, proj.approve_status_settle from project_settle_cost psc left join project proj on psc.project_id = proj.id "; + //自己创建的肯定能看见，配置的可以看见，系统管理员可以看见 + SysRole sysRole = sysRoleRepository.findSysRoleById(roleId); + if(SysRole.ROLE_TYPE_SYSTEM != sysRole.getType()){ + sql = sql + " where (proj.creator_id=? OR proj.id in (SELECT pv1.project_id FROM project_visible pv1 WHERE pv1.type=1 AND pv1.tid=? UNION SELECT pv2.project_id FROM project_visible pv2 WHERE pv2.type=2 AND pv2.tid=?)) group by proj.id order by proj.id asc"; + projectList = pagination.find(sql, Project.class, adminId, roleId, adminId); + } else { + sql = sql + " group by proj.id order by proj.id asc"; + projectList = pagination.find(sql, Project.class); + } + List projects = new ArrayList<>(); + List projectIds = new ArrayList<>(); + for (Project project : projectList) { + if (project.getApproveStatusSettle() == 2) { + projects.add(project); + projectIds.add(project.getId()); + continue; + } + } if(CollectionUtil.isEmpty(projectIds)){ return statisticsBean; diff --git a/src/main/resources/templates/admin/account_input.ftl b/src/main/resources/templates/admin/account_input.ftl index 8ad2a99..d2f2fb6 100644 --- a/src/main/resources/templates/admin/account_input.ftl +++ b/src/main/resources/templates/admin/account_input.ftl @@ -147,6 +147,7 @@ minlength="1" maxlength="10" required placeholder="请输入职位"/> +
diff --git a/src/main/resources/templates/admin/account_list.ftl b/src/main/resources/templates/admin/account_list.ftl index feee5c9..2085dbd 100644 --- a/src/main/resources/templates/admin/account_list.ftl +++ b/src/main/resources/templates/admin/account_list.ftl @@ -51,7 +51,7 @@
- 账号角色 + 角色名称
+
*价值及风险
- diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl index 58e7da6..83dbc13 100644 --- a/src/main/resources/templates/admin/project_estimate_add.ftl +++ b/src/main/resources/templates/admin/project_estimate_add.ftl @@ -164,16 +164,17 @@
*主合同收款条款
- +
*价值及风险
- diff --git a/src/main/resources/templates/admin/project_estimate_edit.ftl b/src/main/resources/templates/admin/project_estimate_edit.ftl index a6c4ef1..93e9a2e 100644 --- a/src/main/resources/templates/admin/project_estimate_edit.ftl +++ b/src/main/resources/templates/admin/project_estimate_edit.ftl @@ -171,16 +171,17 @@
*主合同收款条款
- +
*价值及风险
- diff --git a/src/main/resources/templates/admin/project_list.ftl b/src/main/resources/templates/admin/project_list.ftl index 6c7d33e..5d5803d 100644 --- a/src/main/resources/templates/admin/project_list.ftl +++ b/src/main/resources/templates/admin/project_list.ftl @@ -281,7 +281,7 @@ <#if list.approveStatusEstimate == 0 || list.approveStatusBudget == 0 || list.approveStatusSettle == 0 || list.approveStatusFinal == 0> @@ -358,7 +358,7 @@ var approveProject = function (id) { if (window.confirm('确定要提交审核吗？')) { $.ajax({ - url: '${base}/project/saveApprove, + url: '${base}/project/saveApprove', data: {id:id}, dataType: "json", async: false,