Commit 7e3566c6 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.7' into MVP1.7.7

parents e6c9c25f 9a4bb444
...@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute; import com.yifu.cloud.plus.v1.yifu.common.core.constant.ExcelAttribute;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
...@@ -65,6 +66,7 @@ public class TEmployeeProjectBelongDept { ...@@ -65,6 +66,7 @@ public class TEmployeeProjectBelongDept {
private String empDeptid; private String empDeptid;
// 日志确认接收时间,与项目档案日期比较 // 日志确认接收时间,与项目档案日期比较
@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss")
@TableField(exist = false) @TableField(exist = false)
private LocalDateTime logCreateTime; private LocalDateTime logCreateTime;
......
...@@ -16,8 +16,6 @@ ...@@ -16,8 +16,6 @@
*/ */
package com.yifu.cloud.plus.v1.yifu.archives.vo; package com.yifu.cloud.plus.v1.yifu.archives.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
......
...@@ -64,9 +64,9 @@ public interface TEmployeeProjectBelongDeptService extends IService<TEmployeePro ...@@ -64,9 +64,9 @@ public interface TEmployeeProjectBelongDeptService extends IService<TEmployeePro
* 根据权限获取对应部门ID下的花名册总数Map * 根据权限获取对应部门ID下的花名册总数Map
* *
* @param tEmployeeProjectBelongDept 花名册查询 * @param tEmployeeProjectBelongDept 花名册查询
* @return Map<String,Integer> 对应部门ID下的花名册总数Map * @return Map<String, Integer> 对应部门ID下的花名册总数Map
*/ */
Map<String,Integer> getDeptCountMap(TEmployeeProjectBelongDeptSearchVo tEmployeeProjectBelongDept, UserPermissionVo authority); Map<String, Integer> getDeptCountMap(TEmployeeProjectBelongDeptSearchVo tEmployeeProjectBelongDept, UserPermissionVo authority);
/** /**
* 没有关联部门的花名册总数 * 没有关联部门的花名册总数
......
...@@ -22,7 +22,6 @@ import com.alibaba.excel.write.metadata.WriteSheet; ...@@ -22,7 +22,6 @@ import com.alibaba.excel.write.metadata.WriteSheet;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.yifu.cloud.plus.v1.yifu.admin.api.vo.SysDeptVo;
import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept; import com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProjectBelongDept;
import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectBelongDeptMapper; import com.yifu.cloud.plus.v1.yifu.archives.mapper.TEmployeeProjectBelongDeptMapper;
import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectBelongDeptService; import com.yifu.cloud.plus.v1.yifu.archives.service.TEmployeeProjectBelongDeptService;
...@@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -44,7 +43,6 @@ import javax.servlet.http.HttpServletResponse;
import java.io.IOException; import java.io.IOException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* 项目档案所属部门表 * 项目档案所属部门表
......
...@@ -352,6 +352,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl ...@@ -352,6 +352,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
// 先存当前部门ID // 先存当前部门ID
allDepartIdSet.add(deptVo.getDeptId().toString()); allDepartIdSet.add(deptVo.getDeptId().toString());
String ancestors = deptVo.getAncestors(); String ancestors = deptVo.getAncestors();
if(Common.isNotNull(ancestors)){
String[] ancestorArr = ancestors.split(CommonConstants.COMMA_STRING); String[] ancestorArr = ancestors.split(CommonConstants.COMMA_STRING);
Set<String> ancestorDeptIdSet = Arrays.stream(ancestorArr).collect(Collectors.toSet()); Set<String> ancestorDeptIdSet = Arrays.stream(ancestorArr).collect(Collectors.toSet());
if(Common.isNotNull(ancestorDeptIdSet)){ if(Common.isNotNull(ancestorDeptIdSet)){
...@@ -359,6 +360,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl ...@@ -359,6 +360,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
} }
} }
} }
}
sysDeptList = baseMapper.cspDeptListByDeptIdSet(dept, allDepartIdSet); sysDeptList = baseMapper.cspDeptListByDeptIdSet(dept, allDepartIdSet);
} }
...@@ -534,6 +536,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl ...@@ -534,6 +536,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
if (Common.isEmpty(findInfo)) { if (Common.isEmpty(findInfo)) {
return R.failed("部门未找到"); return R.failed("部门未找到");
} }
if(findInfo.getName().equals(dept.getName())){
return R.failed("名称未发生变化,未做更新");
}
SysDept nameInfo = baseMapper.checkDeptNameUnique(findInfo.getProjectNo(),dept.getName(), findInfo.getParentId()); SysDept nameInfo = baseMapper.checkDeptNameUnique(findInfo.getProjectNo(),dept.getName(), findInfo.getParentId());
if (Common.isNotNull(nameInfo) && nameInfo.getDeptId().longValue() != dept.getDeptId().longValue()) { if (Common.isNotNull(nameInfo) && nameInfo.getDeptId().longValue() != dept.getDeptId().longValue()) {
return R.failed("已存在同级同名部门"); return R.failed("已存在同级同名部门");
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<mapper namespace="com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper"> <mapper namespace="com.yifu.cloud.plus.v1.yifu.admin.mapper.SysDeptMapper">
<!-- 通用查询映射结果 --> <!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept"> <resultMap id="BaseResultMap" type="com.yifu.cloud.plus.v1.yifu.admin.api.entity.SysDept">
<id column="deptId" property="deptId"/> <id column="dept_id" property="deptId"/>
<result column="name" property="name"/> <result column="name" property="name"/>
<result column="parent_id" property="parentId"/> <result column="parent_id" property="parentId"/>
<result column="dept_dn" property="deptDn"/> <result column="dept_dn" property="deptDn"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment