xh/kehui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.领导查询判断由角色表查询改为流程职务表

Browse Source 
2.上述sql修改
This commit is contained in:
zty 2024-08-08 13:38:00 +08:00
parent 05dc9a97de
commit 3541fba530
3 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/xqopen/kehui/mapper/SystemRoleDao.java
View File

@ -29,7 +29,7 @@ public interface SystemRoleDao extends BaseMapper<SystemRole> {
SystemRole getLeaderRoleByDeptId(@Param("orgId") Long orgId); SystemRole getLeaderRoleByDeptId(@Param("orgId") Long orgId);
/** /**
* 通过账号id拿到角色集合 * 通过账号id拿到角色集合(流程职务表)
* @param userId * @param userId
* @return * @return
*/ */

11
src/main/java/com/xqopen/kehui/mapper/xml/SystemRoleDao.xml
View File

@ -64,11 +64,12 @@
AND sor.org_id =#{orgId} AND sor.org_id =#{orgId}
</select> </select>
<select id="getRoleListMap" resultType="java.util.Map"> <select id="getRoleListMap" resultType="java.util.Map">
select distinct * from system_user_login sul select distinct *
left join personal_member pm on sul.userinfo_id=pm.id_ and sul.is_deleted=false and pm.is_deleted=false from flows_configuration fc
left join system_user_role sug on sug.user_id=pm.id_ and sug.is_deleted=false left join personal_member pm on fc.approver_id = pm.id_ and pm.is_deleted=false
left join system_role sr on sug.role_id=sr.id_ and sr.is_deleted=false left join system_user_login sul on sul.userinfo_id = pm.id_ and sul.is_deleted=false
where sul.id_=#{userId} where fc.is_deleted=false and sul.id_=#{userId}
</select> </select>
</mapper> </mapper>

21
src/main/java/com/xqopen/kehui/personal/action/PersonalEventsController.java
View File

@ -26,6 +26,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.ObjectUtils; import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import javax.xml.crypto.Data; import javax.xml.crypto.Data;
@ -133,12 +134,12 @@ public class PersonalEventsController implements PersonalEventsApi {
if(!ObjectUtils.isEmpty(roleListMap)){ if(!ObjectUtils.isEmpty(roleListMap)){
for (int i = 0; i < roleListMap.size(); i++) { for (int i = 0; i < roleListMap.size(); i++) {
Map map = roleListMap.get(i); Map map = roleListMap.get(i);
String roleName = String.valueOf(map.get("role_name")); String roleName = String.valueOf(map.get("approved_role"));
switch (roleName){ switch (roleName){
case "副所长": case "depDirector": //副所长
case "总支委员": case "generalBranch"://总支委员
case "会主席": case "unionChairman"://工会主席
case "部门主任": case "business"://部门主任
flag = true; flag = true;
break; break;
default: default:
@ -170,13 +171,15 @@ public class PersonalEventsController implements PersonalEventsApi {
case "sickLeave": //病假 case "sickLeave": //病假
LocalDate start = LocalDate.parse(formatter.format(beginDate)); LocalDate start = LocalDate.parse(formatter.format(beginDate));
LocalDate end = LocalDate.parse(formatter.format(endDate)); LocalDate end = LocalDate.parse(formatter.format(endDate));
LocalTime beginTime = LocalTime.parse(beginM); if(!StringUtils.isEmpty(beginM) & !StringUtils.isEmpty(endM)){
LocalTime endTime = LocalTime.parse(endM); LocalTime beginTime = LocalTime.parse(beginM);
LocalTime endTime = LocalTime.parse(endM);
beginDate = Date.from(LocalDateTime.of(start, beginTime).atZone(ZoneId.systemDefault()).toInstant());
endDate = Date.from(LocalDateTime.of(end,endTime).atZone(ZoneId.systemDefault()).toInstant());
}
// LocalDateTime startDateTime = LocalDateTime.of(start, beginTime); // LocalDateTime startDateTime = LocalDateTime.of(start, beginTime);
// LocalDateTime endDateTime = LocalDateTime.of(end, endTime); // LocalDateTime endDateTime = LocalDateTime.of(end, endTime);
// long days = ChronoUnit.DAYS.between(startDateTime, endDateTime); // long days = ChronoUnit.DAYS.between(startDateTime, endDateTime);
beginDate = Date.from(LocalDateTime.of(start, beginTime).atZone(ZoneId.systemDefault()).toInstant());
endDate = Date.from(LocalDateTime.of(end,endTime).atZone(ZoneId.systemDefault()).toInstant());
long msNum = endDate.getTime() - beginDate.getTime(); long msNum = endDate.getTime() - beginDate.getTime();
// long days=msNum/(24*60*60*1000); // long days=msNum/(24*60*60*1000);
long days=msNum%(24*60*60*1000)==0?msNum/(24*60*60*1000):msNum/(24*60*60*1000)+1; long days=msNum%(24*60*60*1000)==0?msNum/(24*60*60*1000):msNum/(24*60*60*1000)+1;