0.公共监控器修改立项分管领导方法，增加默认人为副所长
1.季度审核修复一个bug-》B表管理员当前未正确增加已办历史信息；业务部ID通过业务部名称查询改为用指定ID 2.项目预算执行率增加部门id 3.项目预算执行率dot-》ProjectBudgetImplementAddDto增加成员变量部门名称方便页面显示 4.项目预算执行率xml查询增加部门名称 5.部门周报查询增加flag判断部门/全所周报 6.项目预算执行率添加时增加当前处理人部门 7.部门周报查询将部门 7.部门周报dto-》ProjectWeeklyFindReq增加成员变量 flag
This commit is contained in:
parent
df079b2796
commit
8ca42fcb7e
@ -380,6 +380,7 @@ public class MyTaskListener implements TaskListener {
|
||||
case "办公室":
|
||||
case "人财中心":
|
||||
case "财务中心":
|
||||
default:
|
||||
return "depDirector";
|
||||
}
|
||||
}
|
||||
@ -558,7 +559,6 @@ public class MyTaskListener implements TaskListener {
|
||||
case "办公室":
|
||||
case "人财中心":
|
||||
case "财务中心":
|
||||
default:
|
||||
return "depDirector";
|
||||
}
|
||||
}
|
||||
|
||||
@ -23,8 +23,10 @@
|
||||
created_at,updated_by,updated_at
|
||||
</sql>
|
||||
<select id="getList" resultType="com.xqopen.kehui.project.dto.ProjectBudgetImplementAddDto">
|
||||
select pbi.*,pi.project_no,pi.project_name from project_budget_implement pbi left join project_info pi on pi.id_=cast(pbi.project_id as BIGINT)
|
||||
where 1=1 and pbi.is_deleted='0' and pi.is_deleted=false
|
||||
select pbi.*,pi.project_no,pi.project_name,o.org_name as "deptName" from project_budget_implement pbi
|
||||
left join project_info pi on pi.id_=cast(pbi.project_id as BIGINT)
|
||||
left join system_org o on cast(pbi.dept_id as BIGINT)=o.id_
|
||||
where 1=1 and pbi.is_deleted='0' and pi.is_deleted=false and o.is_deleted=false
|
||||
<if test="projectBudgetImplementFindReq.id!=null">
|
||||
and pbi.id_=#{projectBudgetImplementFindReq.id}
|
||||
</if>
|
||||
|
||||
@ -80,7 +80,10 @@
|
||||
<if test="projectWeekly.week!=null">
|
||||
and pw.week=#{projectWeekly.week}
|
||||
</if>
|
||||
and pw.dept_id=#{projectWeekly.deptId} and pw.weekly_type = '1'
|
||||
<if test="projectWeekly.deptId!=null">
|
||||
and pw.dept_id=#{projectWeekly.deptId}
|
||||
</if>
|
||||
and pw.weekly_type = '1'
|
||||
ORDER BY pi.created_at DESC
|
||||
</select>
|
||||
<select id="getDeptId" resultType="java.lang.String" parameterType="java.lang.String">
|
||||
|
||||
@ -475,6 +475,7 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
|
||||
boolean isOffice = (boolean) map.get("isOffice");
|
||||
if (isOffice & "管理员审核".equals(taskName)) {
|
||||
if (!ObjectUtils.isEmpty(ext.get("businessNumber")) & "3".equals(String.valueOf(map.get("businessNumber")))) {
|
||||
str=ext.get("historyExecutor").toString();
|
||||
if (!str.contains(String.valueOf(userId))) {
|
||||
historyExecutor = str + "," + userId;
|
||||
ext.put("historyExecutor", historyExecutor);
|
||||
@ -493,17 +494,27 @@ public class ProjectAssessmentIndicatorsController implements ProjectAssessmentI
|
||||
//如果节点是部门主任评级时，则当前责任人是四个业务部的部门主任
|
||||
EntityWrapper<SystemOrg> orgEntityWrapper = new EntityWrapper<>();
|
||||
orgEntityWrapper.andNew().eq("is_deleted", false);
|
||||
orgEntityWrapper.andNew().eq("org_name", "战略规划部").or()
|
||||
.eq("org_name", "平台建设部").or()
|
||||
.eq("org_name", "市场发展部").or()
|
||||
.eq("org_name", "服务产品部");
|
||||
// orgEntityWrapper.andNew().eq("org_name", "战略规划部").or()
|
||||
// .eq("org_name", "平台建设部").or()
|
||||
// .eq("org_name", "市场发展部").or()
|
||||
// .eq("org_name", "服务产品部");
|
||||
// orgEntityWrapper.andNew().eq("id_",939036815719927809L).or()
|
||||
// .eq("id_",1215550126769049601L).or()
|
||||
// .eq("id_",1496282215842058241L).or()
|
||||
// .eq("id_",1215550163188191233L);
|
||||
orgEntityWrapper.setSqlSelect("id_");
|
||||
List<Object> objectList = orgService.selectObjs(orgEntityWrapper);//先拿到部门集合ids
|
||||
// List<Object> objectList = orgService.selectObjs(orgEntityWrapper);//先拿到部门集合ids
|
||||
List<Long> objectList=new ArrayList<>();
|
||||
objectList.add(939036815719927809L);
|
||||
objectList.add(1215550126769049601L);
|
||||
objectList.add(1496282215842058241L);
|
||||
objectList.add(1215550163188191233L);
|
||||
if (!StringUtils.isEmpty(objectList)) {
|
||||
// 使用Streams将Object集合转换为Long集合
|
||||
List<Long> longs = objectList.stream()
|
||||
.map(obj -> (Long) obj) // 强制类型转换
|
||||
.collect(Collectors.toList());
|
||||
// List<Long> longs = objectList.stream()
|
||||
// .map(obj -> (Long) obj) // 强制类型转换
|
||||
// .collect(Collectors.toList());
|
||||
List<Long> longs=objectList;
|
||||
EntityWrapper<FlowsConfiguration> flowsConfigurationEntityWrapper = new EntityWrapper<>();
|
||||
flowsConfigurationEntityWrapper.eq("approved_role", "business");
|
||||
flowsConfigurationEntityWrapper.eq("is_deleted", false);
|
||||
|
||||
@ -57,6 +57,7 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
|
||||
//根据项目id获取proId和week
|
||||
EntityWrapper<ProjectWeekly> Wrapper = new EntityWrapper<>();
|
||||
Wrapper.eq("id_",id.toString());
|
||||
Wrapper.eq("is_deleted","0");
|
||||
ProjectWeekly project = projectWeeklyService.selectOne(Wrapper);
|
||||
// 根据 week proId 查询 该实例信息
|
||||
List<ProjectWeeklyDto> list = projectDepartmentService.showById(project.getWeek(),project.getProjectId());
|
||||
@ -83,15 +84,17 @@ public class ProjectDepartmentController implements ProjectDepartmentApi {
|
||||
EntityWrapper<SystemUserLogin> userLoginEntityWrapper = new EntityWrapper<>();
|
||||
userLoginEntityWrapper.eq("id_",userId);
|
||||
SystemUserLogin systemUserLogin = systemUserLoginService.selectOne(userLoginEntityWrapper);
|
||||
|
||||
Page<ProjectWeekly> page = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
|
||||
ProjectWeekly projectWeekly = new ProjectWeekly();
|
||||
if(!"1".equals(projectWeeklyFindReq.getFlag())){
|
||||
//根据用户id拿到部门信息
|
||||
EntityWrapper<PersonalMember> member = new EntityWrapper<>();
|
||||
member.eq("id_",systemUserLogin.getUserinfoId());
|
||||
PersonalMember personalMember = personalMemberService.selectOne(member);
|
||||
Object deptId = personalMember.getExt().get("deptId");
|
||||
|
||||
Page<ProjectWeekly> page = new Page<>(projectWeeklyFindReq.getPageNo(), projectWeeklyFindReq.getPageSize());
|
||||
ProjectWeekly projectWeekly = new ProjectWeekly();
|
||||
projectWeekly.setDeptId(deptId.toString());
|
||||
}
|
||||
projectWeekly.setIsDeleted("0");
|
||||
projectWeekly.setUserId(String.valueOf(userId));
|
||||
projectWeekly.setWeeklyType("0");
|
||||
|
||||
@ -98,6 +98,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
|
||||
if (project.getExt().get("openRange").equals(5)){
|
||||
ProjectBudgetImplement budgetImplement = new ProjectBudgetImplement();
|
||||
budgetImplement.setWeek(projectWeekly.getWeek());
|
||||
budgetImplement.setDeptId(projectWeekly.getDeptId());
|
||||
budgetImplement.setProjectId(projectWeekly.getProjectId());
|
||||
budgetImplement.setBudget(project.getExt().get("budget").toString());
|
||||
budgetImplement.setCreatedAt(new Timestamp(System.currentTimeMillis()));
|
||||
@ -314,6 +315,7 @@ public class ProjectWeeklyController implements ProjectWeeklyApi {
|
||||
if (project.getExt().get("openRange").equals(5)){
|
||||
ProjectBudgetImplement budgetImplement = new ProjectBudgetImplement();
|
||||
budgetImplement.setWeek(list.getWeek());
|
||||
budgetImplement.setDeptId(weekly.getDeptId());
|
||||
budgetImplement.setProjectId(projectWeekly.getProjectId());
|
||||
budgetImplement.setBudget(project.getExt().get("budget").toString());
|
||||
budgetImplement.setCreatedAt(new Timestamp(System.currentTimeMillis()));
|
||||
|
||||
@ -7,4 +7,5 @@ import lombok.Data;
|
||||
public class ProjectBudgetImplementAddDto extends ProjectBudgetImplement {
|
||||
private String projectNo;
|
||||
private String projectName;
|
||||
private String deptName;
|
||||
}
|
||||
|
||||
@ -3,13 +3,11 @@ package com.xqopen.kehui.project.dto;
|
||||
import com.xqopen.kehui.project.entity.ProjectWeekly;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class ProjectWeeklyFindReq extends ProjectWeekly {
|
||||
private Integer pageNo;
|
||||
private Integer pageSize;
|
||||
private String projectName;
|
||||
private String deptName;
|
||||
|
||||
private String flag;
|
||||
}
|
||||
|
||||
@ -65,6 +65,7 @@ public class ProjectBudgetImplement implements Serializable {
|
||||
*
|
||||
*/
|
||||
private String week;
|
||||
private String deptId;
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user