修改人力成本模板
parent
5a8a41ea6e
commit
8fe0d90af6
|
@ -2,6 +2,7 @@ package cn.palmte.work.service;
|
|||
|
||||
import cn.palmte.work.bean.ResponseMsg;
|
||||
import cn.palmte.work.model.*;
|
||||
import cn.palmte.work.utils.DateKit;
|
||||
import cn.palmte.work.utils.InterfaceUtil;
|
||||
import cn.palmte.work.utils.StrKit;
|
||||
import org.slf4j.Logger;
|
||||
|
@ -70,6 +71,16 @@ public class HumanCostService {
|
|||
return list;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
String date = "2021-12";
|
||||
Date date1 = DateKit.getDate(date, DateKit.DATE_FORMAT_YEAR_MONTH2);
|
||||
if (date1.getTime() - System.currentTimeMillis() > 0) {
|
||||
System.out.println(date1.getTime() - System.currentTimeMillis());
|
||||
} else {
|
||||
System.out.println(date1.getTime());
|
||||
}
|
||||
}
|
||||
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public ResponseMsg check(Collection<Map> excelMap, Map<String, String> title, String date) {
|
||||
int successCount = 0;
|
||||
|
@ -82,6 +93,12 @@ public class HumanCostService {
|
|||
Map<String, BigDecimal> staffCost = new HashMap<>();
|
||||
List<ProjectUserTime> saveList = new ArrayList<>();
|
||||
|
||||
Date date1 = DateKit.getDate(date, DateKit.DATE_FORMAT_YEAR_MONTH2);
|
||||
if (date1.getTime() - System.currentTimeMillis() > 0) {
|
||||
ResponseMsg msg = ResponseMsg.buildFailedMsg("填写日期须小于当前日期!");
|
||||
msg.setData(errorList);
|
||||
return msg;
|
||||
}
|
||||
if(excelMap.size() == 0){
|
||||
ResponseMsg msg = ResponseMsg.buildFailedMsg("请填写人力成本数据!");
|
||||
msg.setData(errorList);
|
||||
|
@ -184,11 +201,6 @@ public class HumanCostService {
|
|||
return msg;
|
||||
}
|
||||
|
||||
public static void main(String[] args) {
|
||||
System.out.println("0.66".matches("(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){1,2})?"));
|
||||
System.out.println("0.66".matches("(([1-9]{1}\\d*)|([0]{1}))(\\.(\\d){1,2})?"));
|
||||
}
|
||||
|
||||
public String[] getHeaders(List<ProjectUserTime> staff) {
|
||||
String[] headers = new String[staff.size() + 3];
|
||||
headers[0] = "项目名称";
|
||||
|
@ -229,16 +241,16 @@ public class HumanCostService {
|
|||
Admin admin = InterfaceUtil.getAdmin();
|
||||
List<Project> projectList = null;
|
||||
if (admin.getRoleLevel() <= 2 || admin.getRoleLevel() == 4) {
|
||||
String sql = "select proj.id, proj.name from project proj where proj.status = ? order by proj.id asc";
|
||||
projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE);
|
||||
String sql = "select proj.id, proj.name from project proj where (proj.status = ? or (proj.status = ? and proj.approve_status_budget = ?)) order by proj.id asc";
|
||||
projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2);
|
||||
} else {
|
||||
String sql = "select proj.id, proj.name from project proj where proj.status = ? and " +
|
||||
String sql = "select proj.id, proj.name from project proj where (proj.status = ? or (proj.status = ? and proj.approve_status_budget = ?)) 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=?)) order by proj.id asc";
|
||||
//项目可见性,根据角色和人员id
|
||||
int roleId = admin.getRoleId();
|
||||
Integer adminId = admin.getId();
|
||||
//自己创建的肯定能看见
|
||||
projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, adminId, roleId, adminId);
|
||||
projectList = pagination.find(sql, Project.class, Project.STATUS_SETTLE, Project.STATUS_BUDGET, 2, adminId, roleId, adminId);
|
||||
}
|
||||
for (Project project : projectList) {
|
||||
data.add(project.getName());
|
||||
|
|
Loading…
Reference in New Issue