Commit cd979acb authored by hongguangwu's avatar hongguangwu

MVP1.7.7-合同信息

parent 17254673
...@@ -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;
/** /**
* 项目档案所属部门表 * 项目档案所属部门表
......
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