mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

master
xxssyyyyssxx 2021-11-24 20:22:35 +08:00
parent 4aed851b31 515203f113
commit fb6d9a3c4f
3 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/service/HumanCostService.java
View File

@ -223,7 +223,7 @@ public class HumanCostService {
List<Admin> admins = adminRepository.getAllEnable(); List<Admin> admins = adminRepository.getAllEnable();
String[] headers = new String[admins.size() + 1]; String[] headers = new String[admins.size() + 1];
headers[0] = "项目名称"; 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(); headers[i] = admins.get(i - 1).getRealName();
} }
Admin admin = InterfaceUtil.getAdmin(); Admin admin = InterfaceUtil.getAdmin();

6
src/main/java/cn/palmte/work/service/ProjectFinalSevice.java
View File

@ -449,9 +449,9 @@ public class ProjectFinalSevice {
} }
} }
finalBean.setGrossProfitProfitMargin(finalBean.getGrossProfitFinalTotal().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.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.setNetMarginProfitMargin(finalBean.getNetMarginFinalTotal().divide(finalBean.getIncomeTotal(),4, RoundingMode.HALF_UP).multiply(new BigDecimal(100)));
return finalBean; return finalBean;
} }

5
src/main/java/cn/palmte/work/service/ProjectSummaryService.java
View File

@ -45,10 +45,6 @@ public class ProjectSummaryService {
public List<SettleBean> getList(ConcurrentHashMap<String, String> searchInfo, String time, Admin admin) { public List<SettleBean> getList(ConcurrentHashMap<String, String> searchInfo, String time, Admin admin) {
List<Project> projectList = null; List<Project> 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 " + 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"; " (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 //项目可见性，根据角色和人员id
@ -56,7 +52,6 @@ public class ProjectSummaryService {
Integer adminId = admin.getId(); Integer adminId = admin.getId();
//自己创建的肯定能看见 //自己创建的肯定能看见
projectList = pagination.find(sql, Project.class, time, adminId, roleId, adminId); projectList = pagination.find(sql, Project.class, time, adminId, roleId, adminId);
}
List<Project> projects = new ArrayList<>(); List<Project> projects = new ArrayList<>();
List<Integer> projectInt = new ArrayList<>(); List<Integer> projectInt = new ArrayList<>();
for (Project project : projectList) { for (Project project : projectList) {