From d000f7afe4d954250b0e8408fad9a9e286300d1e Mon Sep 17 00:00:00 2001 From: OathK1per Date: Tue, 23 Nov 2021 21:37:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B1=87=E6=80=BB?= =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../work/service/ProjectSummaryService.java | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectSummaryService.java b/src/main/java/cn/palmte/work/service/ProjectSummaryService.java index 72103ca..b34a949 100644 --- a/src/main/java/cn/palmte/work/service/ProjectSummaryService.java +++ b/src/main/java/cn/palmte/work/service/ProjectSummaryService.java @@ -45,18 +45,13 @@ public class ProjectSummaryService { public List getList(ConcurrentHashMap searchInfo, String time, Admin admin) { List projectList = null; - if (admin.getRoleLevel() <= 2 || admin.getRoleLevel() == 4) { - 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 where psc.time = ? group by proj.id order by proj.id asc"; - projectList = pagination.find(sql, Project.class, time); - } else { - 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 where psc.time = ? and " + - " (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"; - //项目可见性，根据角色和人员id - int roleId = admin.getRoleId(); - Integer adminId = admin.getId(); - //自己创建的肯定能看见 - projectList = pagination.find(sql, Project.class, time, adminId, roleId, adminId); - } + 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 where psc.time = ? and " + + " (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"; + //项目可见性，根据角色和人员id + int roleId = admin.getRoleId(); + Integer adminId = admin.getId(); + //自己创建的肯定能看见 + projectList = pagination.find(sql, Project.class, time, adminId, roleId, adminId); List projects = new ArrayList<>(); List projectInt = new ArrayList<>(); for (Project project : projectList) { From bba18639c8e2c5c1d3b487aaecef94501976f047 Mon Sep 17 00:00:00 2001 From: OathK1per Date: Wed, 24 Nov 2021 16:30:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=BA=E5=8A=9B=E6=88=90=E6=9C=AC?= =?UTF-8?q?=E5=91=98=E5=B7=A5=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/cn/palmte/work/service/HumanCostService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/cn/palmte/work/service/HumanCostService.java b/src/main/java/cn/palmte/work/service/HumanCostService.java index 66b5859..a1518e0 100644 --- a/src/main/java/cn/palmte/work/service/HumanCostService.java +++ b/src/main/java/cn/palmte/work/service/HumanCostService.java @@ -223,7 +223,7 @@ public class HumanCostService { List admins = adminRepository.getAllEnable(); String[] headers = new String[admins.size() + 1]; headers[0] = "项目名称"; - for (int i = 1; i < admins.size(); i++) { + for (int i = 1; i <= admins.size(); i++) { headers[i] = admins.get(i - 1).getRealName(); } Admin admin = InterfaceUtil.getAdmin(); From 1af01ed249d807e91e7c1de95067688239888409 Mon Sep 17 00:00:00 2001 From: hanbo <2608504783@qq.com> Date: Wed, 24 Nov 2021 17:34:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/palmte/work/service/ProjectFinalSevice.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java index 69fd860..21ceaeb 100644 --- a/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java +++ b/src/main/java/cn/palmte/work/service/ProjectFinalSevice.java @@ -449,9 +449,9 @@ public class ProjectFinalSevice { } } - finalBean.setGrossProfitProfitMargin(finalBean.getGrossProfitFinalTotal().divide(finalBean.getIncomeTotal(),4, RoundingMode.HALF_UP).multiply(new BigDecimal(100))); - finalBean.setContributionMarginProfitMargin(finalBean.getContributionMarginFinalTotal().divide(finalBean.getIncomeTotal(),4, RoundingMode.HALF_UP).multiply(new BigDecimal(100))); - finalBean.setNetMarginProfitMargin(finalBean.getNetMarginFinalTotal().divide(finalBean.getIncomeTotal(),4, RoundingMode.HALF_UP).multiply(new BigDecimal(100))); + //finalBean.setGrossProfitProfitMargin(finalBean.getGrossProfitFinalTotal().divide(finalBean.getIncomeTotal(),4, RoundingMode.HALF_UP).multiply(new BigDecimal(100))); + //finalBean.setContributionMarginProfitMargin(finalBean.getContributionMarginFinalTotal().divide(finalBean.getIncomeTotal(),4, RoundingMode.HALF_UP).multiply(new BigDecimal(100))); + //finalBean.setNetMarginProfitMargin(finalBean.getNetMarginFinalTotal().divide(finalBean.getIncomeTotal(),4, RoundingMode.HALF_UP).multiply(new BigDecimal(100))); return finalBean; }