Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
0aef9e8f 由 康伟
选项

kangwei: 提交外协单位、外协人员、外协合同、外协证件后端接口

1 个父辈 210ce7af
全部展开
内嵌 并排
正在显示 45 个修改的文件 包含 1386 行增加 和 26 行删除
pom.xml
......@@ -72,8 +72,6 @@
</properties>
<dependencies>
<!--公司核心组件库-->
<dependency>
<groupId>com.kingtroldata</groupId>
......@@ -358,6 +356,14 @@
<version>1.1.8</version>
</dependency>
<!-- Poi-tl Word 模板引擎-->
<!-- <dependency>
<groupId>com.deepoove</groupId>
<artifactId>poi-tl</artifactId>
<version>1.12.0</version>
</dependency>-->
</dependencies>
<dependencyManagement>
......
sk-base-common/src/main/java/com/skua/common/util/ParseVideoJson.java
......@@ -12,11 +12,6 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.dom4j.Document;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import com.alibaba.fastjson.JSONObject;
import com.skua.core.util.ConvertUtils;
......
sk-base-common/src/main/java/com/skua/modules/system/datestandard/mapper/SysMonitorMetricInfoMapper.java
......@@ -57,8 +57,8 @@ public interface SysMonitorMetricInfoMapper extends BaseMapper<SysMonitorMetricI
*/
List<Map<String,Object>> equipRunStatic(String equip_id);
/**
*
* @param 设备其他指标运行状态
*设备其他指标运行状态
* @param
* @return
*/
List<Map<String,Object>> equipOutTarget(String equip_id);
......
sk-base-common/src/main/java/com/skua/modules/system/datestandard/service/impl/SysMonitorMetricInfoServiceImpl.java
......@@ -242,7 +242,7 @@ public class SysMonitorMetricInfoServiceImpl extends ServiceImpl<SysMonitorMetri
public boolean configIndex(MultipartFile multipartFile,String factoryId) throws Exception {
JdbcTemplate masterDB = (JdbcTemplate)SpringContextUtils.getBean("master");
InputStream inputStream = multipartFile.getInputStream();
Workbook wb=WorkbookFactory.create(inputStream);
Workbook wb= WorkbookFactory.create(inputStream);
try {
//构造字典数据对象
Map<String, Map<String, String>> dictMap = new HashMap<String,Map<String,String>>();
......@@ -479,7 +479,7 @@ public class SysMonitorMetricInfoServiceImpl extends ServiceImpl<SysMonitorMetri
/**
* 将excel中的工艺画面信息转换为树信息
*
* @param sysDeptUserVO
* @param dataMap
* @return
*/
private TransTreeModel convertToTreeModel(Map dataMap) {
......@@ -497,7 +497,7 @@ public class SysMonitorMetricInfoServiceImpl extends ServiceImpl<SysMonitorMetri
* <pre>
* 树递归遍历
* </pre>
* @param node
* @param pMap
* @author Li Yuanyuan, 2023年5月25日 下午5:13:55
* @Description: TODO(这里描述这个方法的需求变更情况)
*/
......
sk-module-biz/src/main/java/com/skua/modules/ajh/controller/AjhMeetingSendController.java
package com.skua.modules.ajh.controller;
import java.io.File;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.skua.core.api.vo.Result;
import com.skua.core.aspect.annotation.AutoLog;
import com.skua.core.context.BaseContextHandler;
import com.skua.core.query.QueryGenerator;
import com.skua.core.service.ISequenceService;
import com.skua.core.util.ConvertUtils;
import com.skua.modules.ajh.entity.AjhMeeting;
import com.skua.modules.ajh.entity.AjhMeetingSend;
import com.skua.modules.ajh.service.IAjhMeetingSendService;
import java.util.Date;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.skua.modules.ajh.service.IAjhMeetingService;
import com.skua.modules.ajh.vo.AjhMeetingSendVO;
import com.skua.tool.util.QRCodeUtil;
import lombok.extern.slf4j.Slf4j;
......@@ -56,6 +52,9 @@ import io.swagger.annotations.ApiOperation;
public class AjhMeetingSendController {
@Autowired
private IAjhMeetingSendService ajhMeetingSendService;
@Autowired
private IAjhMeetingService ajhMeetingService;
@Value("${skua.path.upload}")
private String upLoadPath;
@Value("${skua.web-url}")
......@@ -351,4 +350,57 @@ public class AjhMeetingSendController {
return Result.ok("文件导入失败！");
}
/**
* 导出doc文件
* @param response
* @throws IOException
*/
/*@AutoLog(value = "会议记录-下载会议纪要")
@ApiOperation(value="会议记录-下载会议纪要", notes="会议记录-下载会议纪要")
@GetMapping("/exportDoc")
public void exportDataWord4(@RequestParam(name="id",required=true) String meetsId,HttpServletResponse response) throws IOException{
try{
AjhMeetingSend meetingSend = ajhMeetingSendService.queryByMeetId( meetsId );
String meetId = meetingSend.getMeetId();
AjhMeetingVO meetingVO = ajhMeetingService.getDataById(meetId);
// .docx格式文档，设置响应内容类型为 Word 文档
response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
// .docx格式文档，设置响应头，指示浏览器将响应内容作为文件下载
//response.setHeader("Content-Disposition", "attachment; filename=sample.docx");
String newWordName = URLEncoder.encode("会议纪要.docx", "utf-8");
response.addHeader("Content-Disposition", "attachment;filename=" + newWordName);
//解析模板
//XWPFTemplate template = XWPFTemplate.compile("D://test//pl-1.docx");
//封装模型数据
HashMap<String, Object> dataMap = new HashMap<>();
//准备渲染数据
dataMap.putAll( ajhMeetingSendService.prepareRenderData( meetingSend , meetingVO , upLoadPath ) );
// 行循环实例
LoopRowTableRenderPolicy policy = new LoopRowTableRenderPolicy();
//这里可以指定一个config类，用来指定一些规则，
Configure config = Configure.builder()
.bind("meetingAttendList", policy).build();
String templateFilePath = upLoadPath + File.separator + meetingVO.getMinutesTemplate();
XWPFTemplate template = XWPFTemplate.compile(templateFilePath ,config);
//渲染数据
template.render(dataMap);
//以文件形式输出
//template.writeAndClose(new FileOutputStream("D://test//pl-1-1.docx"));
// 将文档写入响应的输出流
template.write(response.getOutputStream());
// 刷新和关闭输出流
response.getOutputStream().flush();
response.getOutputStream().close();
} catch (Exception e) {
e.printStackTrace();
}
}*/
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhMeeting.java
......@@ -118,4 +118,9 @@ public class AjhMeeting {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**附件*/
@TableField(exist = false)
@ApiModelProperty(value = "机构名称")
private java.lang.String departName;
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/entity/AjhMeetingSend.java
......@@ -130,4 +130,11 @@ public class AjhMeetingSend {
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新时间")
private Date updateTime;
/**附件*/
@TableField(exist = false)
@ApiModelProperty(value = "机构名称")
private java.lang.String departName;
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhMeetingAttendMapper.java
......@@ -15,4 +15,11 @@ public interface AjhMeetingAttendMapper extends BaseMapper<AjhMeetingAttend> {
List<SysUser> getUserListByDepartId(@Param("departId") String departId);
List<SysUser> getUserListByUserIds(@Param("userIds") String userIds);
/**
* 会议签到记录
* @param meetsId
* @return
*/
public List<AjhMeetingAttend> getListByMeetsId(String meetsId);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/AjhMeetingSendMapper.java
......@@ -17,4 +17,16 @@ public interface AjhMeetingSendMapper extends BaseMapper<AjhMeetingSend> {
String getUserByDepartId(@Param("departId") String departId);
List<LoginUser> getUsersByUserIds(@Param("userIds") String userIds);
/**
* 查询AjhMeetignSend 并关联机构名称
* @param meetId
* @return
*/
public AjhMeetingSend queryByMeetId(@Param("meetId") String meetId);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhMeetingAttendMapper.xml
......@@ -23,4 +23,10 @@
</foreach>
</select>
<!-- 根据会议记录编号查询会议签到列表 -->
<select id="getListByMeetsId" resultType="com.skua.modules.ajh.entity.AjhMeetingAttend">
select t.* from ajh_meeting_attend t where t.meets_id = #{meetsId} order by t.create_time asc
</select>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhMeetingMapper.xml
......@@ -42,8 +42,9 @@
</select>
<select id="getDataById" resultType="com.skua.modules.ajh.vo.AjhMeetingVO">
select m.*,d.depart_name from ajh_meeting m
select m.*,d.depart_name, u.realname 'senderName' from ajh_meeting m
left join sys_depart d on d.id = m.depart_id
left join sys_user u on m.sender = u.id
where m.id = #{id}
</select>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhMeetingMinutesMapper.xml
......@@ -3,7 +3,7 @@
<mapper namespace="com.skua.modules.ajh.mapper.AjhMeetingMinutesMapper">
<select id="queryByMeetId" resultType="com.skua.modules.ajh.entity.AjhMeetingMinutes">
select * from ajh_meeting_minutes where meets_id = #{meetId} limit 1
select * from ajh_meeting_minutes where meets_id = #{meetId} order by create_time desc limit 1
</select>
<select id="getDataById" resultType="com.skua.modules.ajh.entity.AjhMeetingMinutes">
......
sk-module-biz/src/main/java/com/skua/modules/ajh/mapper/xml/AjhMeetingSendMapper.xml
......@@ -21,4 +21,12 @@
#{item}
</foreach>
</select>
<!-- 根据编号查询记录 并附带机构名称-->
<select id="queryByMeetId" resultType="com.skua.modules.ajh.entity.AjhMeetingSend">
select d.depart_name , ms.* from ajh_meeting_send ms
left join sys_depart d on ms.depart_id = d.id
where ms.id =1830847037688528897 ;
</select>
</mapper>
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/IAjhMeetingSendService.java
......@@ -2,8 +2,11 @@ package com.skua.modules.ajh.service;
import com.skua.modules.ajh.entity.AjhMeetingSend;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.ajh.vo.AjhMeetingVO;
import org.springframework.scheduling.annotation.Async;
import java.util.HashMap;
/**
* 会议记录
*/
......@@ -13,4 +16,18 @@ public interface IAjhMeetingSendService extends IService<AjhMeetingSend> {
@Async
void sendMeettingNotice(AjhMeetingSend ajhMeetingSend);
/**
* 预备会议纪要的下载数据
* @param
* @return
*/
public HashMap<String, Object> prepareRenderData(AjhMeetingSend meetingSend , AjhMeetingVO meetingVO , String upLoadPath);
/**
* 查询AjhMeetignSend 并关联机构名称
* @param meetId
* @return
*/
public AjhMeetingSend queryByMeetId(String meetId);
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/service/impl/AjhMeetingSendServiceImpl.java
package com.skua.modules.ajh.service.impl;
import com.skua.core.api.ISysBaseAPI;
import com.skua.core.api.vo.LoginUser;
import com.skua.modules.ajh.entity.AjhMeetingAttend;
import com.skua.modules.ajh.entity.AjhMeetingMinutes;
import com.skua.modules.ajh.entity.AjhMeetingReceipt;
import com.skua.modules.ajh.entity.AjhMeetingSend;
import com.skua.modules.ajh.mapper.AjhMeetingAttendMapper;
import com.skua.modules.ajh.mapper.AjhMeetingMapper;
import com.skua.modules.ajh.mapper.AjhMeetingMinutesMapper;
import com.skua.modules.ajh.mapper.AjhMeetingSendMapper;
import com.skua.modules.ajh.service.IAjhMeetingReceiptService;
import com.skua.modules.ajh.service.IAjhMeetingSendService;
import com.skua.modules.ajh.vo.AjhMeetingVO;
import com.skua.modules.alarmtmp.vo.SystemNoticeVO;
import com.skua.modules.guest.util.DateUtil;
import com.skua.modules.system.entity.SysDepart;
import com.skua.modules.system.entity.SysUser;
import com.skua.modules.system.service.ISysDepartService;
import com.skua.modules.system.service.ISysUserService;
import com.skua.modules.util.SystemNoticeUtils;
import io.swagger.annotations.ApiModelProperty;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.io.File;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
......@@ -30,14 +36,24 @@ import java.util.Map;
@Service
public class AjhMeetingSendServiceImpl extends ServiceImpl<AjhMeetingSendMapper, AjhMeetingSend> implements IAjhMeetingSendService {
@Resource
private AjhMeetingAttendMapper ajhMeetingAttendMapper;
@Resource
private AjhMeetingSendMapper ajhMeetingSendMapper;
@Resource
private AjhMeetingMinutesMapper ajhMeetingMinutesMapper;
@Autowired
private SystemNoticeUtils systemNoticeUtils;
@Autowired
private IAjhMeetingReceiptService ajhMeetingReceiptService;
@Resource
private ISysDepartService sysDepartService;
@Resource
private ISysUserService sysUserService;
@Override
public AjhMeetingSend getByMeetId(String meetId) {
......@@ -89,4 +105,69 @@ public class AjhMeetingSendServiceImpl extends ServiceImpl<AjhMeetingSendMapper,
}
}
}
/**
* 预备会议纪要的下载数据
* @param meetingSend
* @return
*/
public HashMap<String, Object> prepareRenderData(AjhMeetingSend meetingSend , AjhMeetingVO meetingVO ,String upLoadPath){
HashMap<String, Object> dataMap = new HashMap<String, Object>();//渲染数据
SysDepart sysDepart = sysDepartService.getById(meetingVO.getDepartId());
//会议通知---记录
dataMap.put("departName",sysDepart.getDepartName());//集团名称
dataMap.put("meetTitile",meetingVO.getMeetTitile() );//通知--会议名称
dataMap.put("senderName" ,meetingVO.getSenderName() );//发布人名称
dataMap.put("startTime" ,meetingVO.getStartTime() );//通知会议开始时间
dataMap.put("endTime" ,meetingVO.getEndTime() );//通知会议结束时间
dataMap.put("meetContent",meetingVO.getMeetContent());//会议内容 --需要去除html代码
dataMap.put("sendTime" , DateUtil.getInstance().convertDateFormat( meetingVO.getSendTime() ,"yyyy年MM月dd日") );
//会议记录管理---记录
dataMap.put("meetLocation" ,meetingSend.getMeetLocation() );//会议地址
dataMap.put("meetStartTime" ,meetingVO.getStartTime() );//会议开始时间
//参会人员
String participantsName = "";//参会人员
List<LoginUser> userList = ajhMeetingSendMapper.getUsersByUserIds(meetingSend.getUserIds());
if(userList != null && !userList.isEmpty()){
for (LoginUser user : userList) {
if(participantsName.length() >0 ) participantsName = participantsName+"、";
participantsName = participantsName + user.getRealname() ;
}
}
dataMap.put("participantsName" ,participantsName );//参会人员
SysUser user = sysUserService.getById( meetingSend.getMeetCompere() );
String meetCompere = null;
if(user != null ){
meetCompere = user.getRealname();
}
dataMap.put("meetCompere" ,meetCompere );//主持人
dataMap.put("departMeetContent" ,meetingSend.getMeetContent() );//会议内容
//会议纪要
AjhMeetingMinutes ajhMeetingMinutes = ajhMeetingMinutesMapper.queryByMeetId(meetingSend.getId());
if(ajhMeetingMinutes != null ){
// dataMap.put("meetImage", Pictures.ofLocal(upLoadPath+ File.separator+ ajhMeetingMinutes.getImage() ).size(550, 500).create());
//dataMap.put("meetImage" ,ajhMeetingMinutes.getImage() );//会议图片 需要转化为图片
}
//签到记录记录ajh_meeting_attend
List<AjhMeetingAttend> meetingAttendList = ajhMeetingAttendMapper.getListByMeetsId( meetingSend.getId() );
dataMap.put("meetingAttendList" ,meetingAttendList );//参会人员
return dataMap;
}
/**
* 查询AjhMeetignSend 并关联机构名称
* @param meetId
* @return
*/
public AjhMeetingSend queryByMeetId(String meetId){
return ajhMeetingSendMapper.queryByMeetId( meetId );
}
}
......
sk-module-biz/src/main/java/com/skua/modules/ajh/vo/AjhMeetingVO.java
......@@ -48,6 +48,11 @@ public class AjhMeetingVO {
/**发布人*/
@ApiModelProperty(value = "发布人")
private String sender;
/**发布人*/
@ApiModelProperty(value = "发布人")
private String senderName;
/**发布状态（0未发布，1已发布，2已撤销）*/
@ApiModelProperty(value = "发布状态")
private String sendStatus;
......
sk-module-biz/src/main/java/com/skua/modules/epiboly/entity/EpibolyCertificate.java 0 → 100644
package com.skua.modules.epiboly.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 外协相关证件
*/
@Data
@TableName("epiboly_certificate")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="epiboly_certificate对象", description="外协相关证件")
public class EpibolyCertificate {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**关联外协单位编号*/
@Excel(name = "关联外协单位编号", width = 15)
@ApiModelProperty(value = "关联外协单位编号")
private java.lang.String companyId;
/**关联外协人员编号*/
@Excel(name = "关联外协人员编号", width = 15)
@ApiModelProperty(value = "关联外协人员编号")
private java.lang.String outerStaffId;
/**证件名称*/
@Excel(name = "证件名称", width = 15)
@ApiModelProperty(value = "证件名称")
private java.lang.String fileName;
/**证件文件*/
@Excel(name = "证件文件", width = 15)
@ApiModelProperty(value = "证件文件")
private java.lang.String filePath;
/**证件类型*/
@Excel(name = "证件类型", width = 15)
@ApiModelProperty(value = "证件类型")
private java.lang.String certificateType;
/**到期时间*/
@Excel(name = "到期时间", width = 15)
@ApiModelProperty(value = "到期时间")
private java.lang.String expireDate;
/**文件备注*/
@Excel(name = "文件备注", width = 15)
@ApiModelProperty(value = "文件备注")
private java.lang.String fileRemark;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建时间*/
@Excel(name = "创建时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建时间")
private java.util.Date createTime;
/**修改人*/
@Excel(name = "修改人", width = 15)
@ApiModelProperty(value = "修改人")
private java.lang.String updateBy;
/**修改时间*/
@Excel(name = "修改时间", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "修改时间")
private java.util.Date updateTime;
/**删除状态(0-正常,1-已删除*/
@Excel(name = "删除状态(0-正常,1-已删除", width = 15)
@ApiModelProperty(value = "删除状态(0-正常,1-已删除")
private java.lang.Integer delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/entity/EpibolyCompany.java 0 → 100644
package com.skua.modules.epiboly.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 外协单位表
*/
@Data
@TableName("epiboly_company")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="epiboly_company对象", description="外协单位表")
public class EpibolyCompany {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**关联部门编号*/
@Excel(name = "关联部门编号", width = 15)
@ApiModelProperty(value = "关联部门编号")
private java.lang.String departId;
/**公司名称*/
@Excel(name = "公司名称", width = 15)
@ApiModelProperty(value = "公司名称")
private java.lang.String companyName;
/**法定代表人*/
@Excel(name = "法定代表人", width = 15)
@ApiModelProperty(value = "法定代表人")
private java.lang.String legalPerson;
/**法人电话*/
@Excel(name = "法人电话", width = 15)
@ApiModelProperty(value = "法人电话")
private java.lang.String egalPhone;
/**公司地址*/
@Excel(name = "公司地址", width = 15)
@ApiModelProperty(value = "公司地址")
private java.lang.String companyAddress;
/**注册日期*/
@Excel(name = "注册日期", width = 15)
@ApiModelProperty(value = "注册日期")
private java.lang.String registerDate;
/**签订时间*/
@Excel(name = "签订时间", width = 15)
@ApiModelProperty(value = "签订时间")
private java.lang.String docuDate;
/**合同到期时间*/
@Excel(name = "合同到期时间", width = 15)
@ApiModelProperty(value = "合同到期时间")
private java.lang.String expireDate;
/**经营范围*/
@Excel(name = "经营范围", width = 15)
@ApiModelProperty(value = "经营范围")
private java.lang.String businessScope;
/**合作状态（1:首次，2：重复，9：停止合作）*/
@Excel(name = "合作状态（1:首次，2：重复，9：停止合作）", width = 15)
@ApiModelProperty(value = "合作状态（1:首次，2：重复，9：停止合作）")
private java.lang.String cooperateStatus;
/**是否购置保险*/
@Excel(name = "是否购置保险", width = 15)
@ApiModelProperty(value = "是否购置保险")
private java.lang.String buyInsure;
/**员工人数*/
@Excel(name = "员工人数", width = 15)
@ApiModelProperty(value = "员工人数")
private java.lang.Integer staffNum;
/**经纬度*/
@Excel(name = "经纬度", width = 15)
@ApiModelProperty(value = "经纬度")
private java.lang.String latitudeLongitude;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String remark;
/**创建部门*/
@Excel(name = "创建部门", width = 15)
@ApiModelProperty(value = "创建部门")
private java.lang.String createDept;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**删除状态（0，正常，1已删除）*/
@Excel(name = "删除状态（0，正常，1已删除）", width = 15)
@ApiModelProperty(value = "删除状态（0，正常，1已删除）")
private java.lang.String delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/entity/EpibolyContract.java 0 → 100644
package com.skua.modules.epiboly.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 外协合同表
*/
@Data
@TableName("epiboly_contract")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="epiboly_contract对象", description="外协合同表")
public class EpibolyContract {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**departId*/
@Excel(name = "departId", width = 15)
@ApiModelProperty(value = "departId")
private java.lang.String departId;
/**外协公司ID*/
@Excel(name = "外协公司ID", width = 15)
@ApiModelProperty(value = "外协公司ID")
private java.lang.String companyId;
/**文档名称*/
@Excel(name = "文档名称", width = 15)
@ApiModelProperty(value = "文档名称")
private java.lang.String docuName;
/**签订时间*/
@Excel(name = "签订时间", width = 15)
@ApiModelProperty(value = "签订时间")
private java.lang.String docuDate;
/**签订人*/
@Excel(name = "签订人", width = 15)
@ApiModelProperty(value = "签订人")
private java.lang.String signatory;
/**文档说明*/
@Excel(name = "文档说明", width = 15)
@ApiModelProperty(value = "文档说明")
private java.lang.String docuDesc;
/**文档地址*/
@Excel(name = "文档地址", width = 15)
@ApiModelProperty(value = "文档地址")
private java.lang.String docuAddr;
/**开始时间*/
@Excel(name = "开始时间", width = 15)
@ApiModelProperty(value = "开始时间")
private java.lang.String startDate;
/**结束时间*/
@Excel(name = "结束时间", width = 15)
@ApiModelProperty(value = "结束时间")
private java.lang.String endDate;
/**合同金额*/
@Excel(name = "合同金额", width = 15)
@ApiModelProperty(value = "合同金额")
private java.lang.String docuPrice;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String remark;
/**创建部门*/
@Excel(name = "创建部门", width = 15)
@ApiModelProperty(value = "创建部门")
private java.lang.String createDept;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**删除状态（0，正常，1已删除）*/
@Excel(name = "删除状态（0，正常，1已删除）", width = 15)
@ApiModelProperty(value = "删除状态（0，正常，1已删除）")
private java.lang.String delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/entity/EpibolyOuterStaff.java 0 → 100644
package com.skua.modules.epiboly.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 外协员工表
*/
@Data
@TableName("epiboly_outer_staff")
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@ApiModel(value="epiboly_outer_staff对象", description="外协员工表")
public class EpibolyOuterStaff {
/**主键*/
@TableId(type = IdType.ID_WORKER_STR)
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**关联部门编号*/
@Excel(name = "关联部门编号", width = 15)
@ApiModelProperty(value = "关联部门编号")
private java.lang.String departId;
/**关联外协单位ID*/
@Excel(name = "关联外协单位ID", width = 15)
@ApiModelProperty(value = "关联外协单位ID")
private java.lang.String companyId;
/**员工名称*/
@Excel(name = "员工名称", width = 15)
@ApiModelProperty(value = "员工名称")
private java.lang.String staffName;
/**性别(0-默认未知,1-男,2-女)*/
@Excel(name = "性别(0-默认未知,1-男,2-女)", width = 15)
@ApiModelProperty(value = "性别(0-默认未知,1-男,2-女)")
private java.lang.Integer sex;
/**电子邮件*/
@Excel(name = "电子邮件", width = 15)
@ApiModelProperty(value = "电子邮件")
private java.lang.String email;
/**手机号码*/
@Excel(name = "手机号码", width = 15)
@ApiModelProperty(value = "手机号码")
private java.lang.String phone;
/**年龄*/
@Excel(name = "年龄", width = 15)
@ApiModelProperty(value = "年龄")
private java.lang.String age;
/**入职时间*/
@Excel(name = "入职时间", width = 15)
@ApiModelProperty(value = "入职时间")
private java.lang.String entryDate;
/**合同开始时间*/
@Excel(name = "合同开始时间", width = 15)
@ApiModelProperty(value = "合同开始时间")
private java.lang.String startDate;
/**合同结束时间*/
@Excel(name = "合同结束时间", width = 15)
@ApiModelProperty(value = "合同结束时间")
private java.lang.String endDate;
/**头像*/
@Excel(name = "头像", width = 15)
@ApiModelProperty(value = "头像")
private java.lang.String headImg;
/**合同文件*/
@Excel(name = "合同文件", width = 15)
@ApiModelProperty(value = "合同文件")
private java.lang.String docuAddr;
/**配置交底文件*/
@Excel(name = "配置交底文件", width = 15)
@ApiModelProperty(value = "配置交底文件")
private java.lang.String trainDocAddr;
/**外协内容*/
@Excel(name = "外协内容", width = 15)
@ApiModelProperty(value = "外协内容")
private java.lang.String workContent;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String remark;
/**创建部门*/
@Excel(name = "创建部门", width = 15)
@ApiModelProperty(value = "创建部门")
private java.lang.String createDept;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**删除状态（0，正常，1已删除）*/
@Excel(name = "删除状态（0，正常，1已删除）", width = 15)
@ApiModelProperty(value = "删除状态（0，正常，1已删除）")
private java.lang.String delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/mapper/EpibolyCertificateMapper.java 0 → 100644
package com.skua.modules.epiboly.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.epiboly.entity.EpibolyCertificate;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 外协相关证件
*/
public interface EpibolyCertificateMapper extends BaseMapper<EpibolyCertificate> {
/***
* 根据外协单位编号获取外协相关证件的的集合
* @param companyId
* @return
*/
public List<EpibolyCertificate> queryByCompanyId(@Param("companyId") String companyId);
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/mapper/EpibolyCompanyMapper.java 0 → 100644
package com.skua.modules.epiboly.mapper;
import com.skua.modules.epiboly.vo.EpibolyCompanyVO;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.epiboly.entity.EpibolyCompany;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 外协单位表
*/
public interface EpibolyCompanyMapper extends BaseMapper<EpibolyCompany> {
/***
* 根据id 查询外协单位关联所有的数据
* @param id
* @return
*/
public EpibolyCompanyVO queryById( @Param("id") String id);
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/mapper/EpibolyContractMapper.java 0 → 100644
package com.skua.modules.epiboly.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.epiboly.entity.EpibolyContract;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 外协合同表
*/
public interface EpibolyContractMapper extends BaseMapper<EpibolyContract> {
/***
* 根据外协单位编号获取外协合同的的集合
* @param companyId
* @return
*/
public List<EpibolyContract> queryByCompanyId(@Param("companyId") String companyId);
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/mapper/EpibolyOuterStaffMapper.java 0 → 100644
package com.skua.modules.epiboly.mapper;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import com.skua.modules.epiboly.entity.EpibolyOuterStaff;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
/**
* 外协员工表
*/
public interface EpibolyOuterStaffMapper extends BaseMapper<EpibolyOuterStaff> {
/***
* 根据外协单位编号获取外协员工的的集合
* @param companyId
* @return
*/
public List<EpibolyOuterStaff> queryByCompanyId(@Param("companyId") String companyId);
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/mapper/xml/EpibolyCertificateMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.epiboly.mapper.EpibolyCertificateMapper">
<!-- 根据外协单位编号获取外协员工的的集合 -->
<select id="queryByCompanyId" resultType="com.skua.modules.epiboly.entity.EpibolyCertificate">
select t.* from where epiboly_certificate t where t.company_id =#{companyId}
</select>
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/epiboly/mapper/xml/EpibolyCompanyMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.epiboly.mapper.EpibolyCompanyMapper">
<select id="queryById" resultType="com.skua.modules.epiboly.vo.EpibolyCompanyVO">
select * from epiboly_company where id = #{id}
</select>
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/epiboly/mapper/xml/EpibolyContractMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.epiboly.mapper.EpibolyContractMapper">
<!-- 根据外协单位编号获取外协员工的的集合 -->
<select id="queryByCompanyId" resultType="com.skua.modules.epiboly.entity.EpibolyContract">
select t.* from where epiboly_contract t where t.company_id =#{companyId}
</select>
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/epiboly/mapper/xml/EpibolyOuterStaffMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.skua.modules.epiboly.mapper.EpibolyOuterStaffMapper">
<!-- 根据外协单位编号获取外协员工的的集合 -->
<select id="queryByCompanyId" resultType="com.skua.modules.epiboly.entity.EpibolyOuterStaff">
select t.* from where epiboly_outer_staff t where t.company_id =#{companyId}
</select>
</mapper>
\ No newline at end of file
sk-module-biz/src/main/java/com/skua/modules/epiboly/service/IEpibolyCertificateService.java 0 → 100644
package com.skua.modules.epiboly.service;
import com.skua.modules.epiboly.entity.EpibolyCertificate;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 外协相关证件
*/
public interface IEpibolyCertificateService extends IService<EpibolyCertificate> {
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/service/IEpibolyCompanyService.java 0 → 100644
package com.skua.modules.epiboly.service;
import com.skua.modules.epiboly.entity.EpibolyCompany;
import com.baomidou.mybatisplus.extension.service.IService;
import com.skua.modules.epiboly.vo.EpibolyCompanyVO;
/**
* 外协单位表
*/
public interface IEpibolyCompanyService extends IService<EpibolyCompany> {
/***
* 获取谢谢
* @param companyId 外协单位编号
* @return
*/
public EpibolyCompanyVO queryAllById(String companyId);
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/service/IEpibolyContractService.java 0 → 100644
package com.skua.modules.epiboly.service;
import com.skua.modules.epiboly.entity.EpibolyContract;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 外协合同表
*/
public interface IEpibolyContractService extends IService<EpibolyContract> {
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/service/IEpibolyOuterStaffService.java 0 → 100644
package com.skua.modules.epiboly.service;
import com.skua.modules.epiboly.entity.EpibolyOuterStaff;
import com.baomidou.mybatisplus.extension.service.IService;
/**
* 外协员工表
*/
public interface IEpibolyOuterStaffService extends IService<EpibolyOuterStaff> {
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/service/impl/EpibolyCertificateServiceImpl.java 0 → 100644
package com.skua.modules.epiboly.service.impl;
import com.skua.modules.epiboly.entity.EpibolyCertificate;
import com.skua.modules.epiboly.mapper.EpibolyCertificateMapper;
import com.skua.modules.epiboly.service.IEpibolyCertificateService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 外协相关证件
*/
@Service
public class EpibolyCertificateServiceImpl extends ServiceImpl<EpibolyCertificateMapper, EpibolyCertificate> implements IEpibolyCertificateService {
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/service/impl/EpibolyCompanyServiceImpl.java 0 → 100644
package com.skua.modules.epiboly.service.impl;
import com.skua.modules.epiboly.entity.EpibolyCertificate;
import com.skua.modules.epiboly.entity.EpibolyCompany;
import com.skua.modules.epiboly.entity.EpibolyContract;
import com.skua.modules.epiboly.entity.EpibolyOuterStaff;
import com.skua.modules.epiboly.mapper.EpibolyCertificateMapper;
import com.skua.modules.epiboly.mapper.EpibolyCompanyMapper;
import com.skua.modules.epiboly.mapper.EpibolyContractMapper;
import com.skua.modules.epiboly.mapper.EpibolyOuterStaffMapper;
import com.skua.modules.epiboly.service.IEpibolyCompanyService;
import com.skua.modules.epiboly.vo.EpibolyCompanyVO;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import javax.annotation.Resource;
import java.util.List;
/**
* 外协单位表
*/
@Service
public class EpibolyCompanyServiceImpl extends ServiceImpl<EpibolyCompanyMapper, EpibolyCompany> implements IEpibolyCompanyService {
@Resource
private EpibolyCompanyMapper companyMapper; //外协单位
@Resource
private EpibolyCertificateMapper certificateMapper; //外协相关证件
@Resource
private EpibolyContractMapper contractMapper;//外协合同
@Resource
private EpibolyOuterStaffMapper outerStaffMapper;//外协人员
/***
* 获取谢谢
* @param companyId 外协单位编号
* @return
*/
public EpibolyCompanyVO queryAllById(String companyId){
EpibolyCompanyVO epibolyCompanyVO = companyMapper.queryById(companyId);
//外协相关证件
List<EpibolyCertificate> certificateList = certificateMapper.queryByCompanyId(companyId);
//外协合同
List<EpibolyContract> contractList = contractMapper.queryByCompanyId(companyId);
//外协人员
List<EpibolyOuterStaff> outerStaffList = outerStaffMapper.queryByCompanyId(companyId);
if(epibolyCompanyVO != null ){
epibolyCompanyVO.setEpibolyCertificateList( certificateList );
epibolyCompanyVO.setEpibolyContractList( contractList );
epibolyCompanyVO.setEpibolyOuterStaffList( outerStaffList );
}
return epibolyCompanyVO;
}
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/service/impl/EpibolyContractServiceImpl.java 0 → 100644
package com.skua.modules.epiboly.service.impl;
import com.skua.modules.epiboly.entity.EpibolyContract;
import com.skua.modules.epiboly.mapper.EpibolyContractMapper;
import com.skua.modules.epiboly.service.IEpibolyContractService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 外协合同表
*/
@Service
public class EpibolyContractServiceImpl extends ServiceImpl<EpibolyContractMapper, EpibolyContract> implements IEpibolyContractService {
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/service/impl/EpibolyOuterStaffServiceImpl.java 0 → 100644
package com.skua.modules.epiboly.service.impl;
import com.skua.modules.epiboly.entity.EpibolyOuterStaff;
import com.skua.modules.epiboly.mapper.EpibolyOuterStaffMapper;
import com.skua.modules.epiboly.service.IEpibolyOuterStaffService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
/**
* 外协员工表
*/
@Service
public class EpibolyOuterStaffServiceImpl extends ServiceImpl<EpibolyOuterStaffMapper, EpibolyOuterStaff> implements IEpibolyOuterStaffService {
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/vo/EpibolyCertificateVO.java 0 → 100644
package com.skua.modules.epiboly.vo;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 外协相关证件
*/
@Data
@ApiModel(value="epiboly_certificate数据传输对象", description="外协相关证件")
public class EpibolyCertificateVO {
/**主键*/
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**关联外协单位编号*/
@Excel(name = "关联外协单位编号", width = 15)
@ApiModelProperty(value = "关联外协单位编号")
private java.lang.String companyId;
/**关联外协人员编号*/
@Excel(name = "关联外协人员编号", width = 15)
@ApiModelProperty(value = "关联外协人员编号")
private java.lang.String outerStaffId;
/**证件名称*/
@Excel(name = "证件名称", width = 15)
@ApiModelProperty(value = "证件名称")
private java.lang.String fileName;
/**证件文件*/
@Excel(name = "证件文件", width = 15)
@ApiModelProperty(value = "证件文件")
private java.lang.String filePath;
/**证件类型*/
@Excel(name = "证件类型", width = 15)
@ApiModelProperty(value = "证件类型")
private java.lang.String certificateType;
/**到期时间*/
@Excel(name = "到期时间", width = 15)
@ApiModelProperty(value = "到期时间")
private java.lang.String expireDate;
/**文件备注*/
@Excel(name = "文件备注", width = 15)
@ApiModelProperty(value = "文件备注")
private java.lang.String fileRemark;
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/vo/EpibolyCompanyVO.java 0 → 100644
package com.skua.modules.epiboly.vo;
import java.io.Serializable;
import java.util.Date;
import java.util.List;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import com.skua.modules.epiboly.entity.EpibolyCertificate;
import com.skua.modules.epiboly.entity.EpibolyContract;
import com.skua.modules.epiboly.entity.EpibolyOuterStaff;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 外协单位表
*/
@Data
@ApiModel(value="epiboly_company数据传输对象", description="外协单位表")
public class EpibolyCompanyVO {
/**主键*/
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**关联部门编号*/
@Excel(name = "关联部门编号", width = 15)
@ApiModelProperty(value = "关联部门编号")
private java.lang.String departId;
/**公司名称*/
@Excel(name = "公司名称", width = 15)
@ApiModelProperty(value = "公司名称")
private java.lang.String companyName;
/**法定代表人*/
@Excel(name = "法定代表人", width = 15)
@ApiModelProperty(value = "法定代表人")
private java.lang.String legalPerson;
/**法人电话*/
@Excel(name = "法人电话", width = 15)
@ApiModelProperty(value = "法人电话")
private java.lang.String egalPhone;
/**公司地址*/
@Excel(name = "公司地址", width = 15)
@ApiModelProperty(value = "公司地址")
private java.lang.String companyAddress;
/**注册日期*/
@Excel(name = "注册日期", width = 15)
@ApiModelProperty(value = "注册日期")
private java.lang.String registerDate;
/**签订时间*/
@Excel(name = "签订时间", width = 15)
@ApiModelProperty(value = "签订时间")
private java.lang.String docuDate;
/**合同到期时间*/
@Excel(name = "合同到期时间", width = 15)
@ApiModelProperty(value = "合同到期时间")
private java.lang.String expireDate;
/**经营范围*/
@Excel(name = "经营范围", width = 15)
@ApiModelProperty(value = "经营范围")
private java.lang.String businessScope;
/**合作状态（1:首次，2：重复，9：停止合作）*/
@Excel(name = "合作状态（1:首次，2：重复，9：停止合作）", width = 15)
@ApiModelProperty(value = "合作状态（1:首次，2：重复，9：停止合作）")
private java.lang.String cooperateStatus;
/**是否购置保险*/
@Excel(name = "是否购置保险", width = 15)
@ApiModelProperty(value = "是否购置保险")
private java.lang.String buyInsure;
/**员工人数*/
@Excel(name = "员工人数", width = 15)
@ApiModelProperty(value = "员工人数")
private java.lang.Integer staffNum;
/**经纬度*/
@Excel(name = "经纬度", width = 15)
@ApiModelProperty(value = "经纬度")
private java.lang.String latitudeLongitude;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String remark;
/**创建部门*/
@Excel(name = "创建部门", width = 15)
@ApiModelProperty(value = "创建部门")
private java.lang.String createDept;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**删除状态（0，正常，1已删除）*/
@Excel(name = "删除状态（0，正常，1已删除）", width = 15)
@ApiModelProperty(value = "删除状态（0，正常，1已删除）")
private java.lang.String delFlag;
/** 删除状态（0，正常，1已删除）*/
@ApiModelProperty(value = "外协相关证件集合")
private List<EpibolyCertificate> epibolyCertificateList ;//外协相关证件
/**删除状态（0，正常，1已删除）*/
@ApiModelProperty(value = "外协合同表")
private List<EpibolyContract> epibolyContractList ;//外协合同表
/**删除状态（0，正常，1已删除）*/
@ApiModelProperty(value = "外协员工表")
private List<EpibolyOuterStaff> epibolyOuterStaffList ;//外协员工表
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/vo/EpibolyContractVO.java 0 → 100644
package com.skua.modules.epiboly.vo;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 外协合同表
*/
@Data
@ApiModel(value="epiboly_contract数据传输对象", description="外协合同表")
public class EpibolyContractVO {
/**主键*/
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**departId*/
@Excel(name = "departId", width = 15)
@ApiModelProperty(value = "departId")
private java.lang.String departId;
/**外协公司ID*/
@Excel(name = "外协公司ID", width = 15)
@ApiModelProperty(value = "外协公司ID")
private java.lang.String companyId;
/**文档名称*/
@Excel(name = "文档名称", width = 15)
@ApiModelProperty(value = "文档名称")
private java.lang.String docuName;
/**签订时间*/
@Excel(name = "签订时间", width = 15)
@ApiModelProperty(value = "签订时间")
private java.lang.String docuDate;
/**签订人*/
@Excel(name = "签订人", width = 15)
@ApiModelProperty(value = "签订人")
private java.lang.String signatory;
/**文档说明*/
@Excel(name = "文档说明", width = 15)
@ApiModelProperty(value = "文档说明")
private java.lang.String docuDesc;
/**文档地址*/
@Excel(name = "文档地址", width = 15)
@ApiModelProperty(value = "文档地址")
private java.lang.String docuAddr;
/**开始时间*/
@Excel(name = "开始时间", width = 15)
@ApiModelProperty(value = "开始时间")
private java.lang.String startDate;
/**结束时间*/
@Excel(name = "结束时间", width = 15)
@ApiModelProperty(value = "结束时间")
private java.lang.String endDate;
/**合同金额*/
@Excel(name = "合同金额", width = 15)
@ApiModelProperty(value = "合同金额")
private java.lang.String docuPrice;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String remark;
/**创建部门*/
@Excel(name = "创建部门", width = 15)
@ApiModelProperty(value = "创建部门")
private java.lang.String createDept;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**删除状态（0，正常，1已删除）*/
@Excel(name = "删除状态（0，正常，1已删除）", width = 15)
@ApiModelProperty(value = "删除状态（0，正常，1已删除）")
private java.lang.String delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/epiboly/vo/EpibolyOuterStaffVO.java 0 → 100644
package com.skua.modules.epiboly.vo;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
import org.jeecgframework.poi.excel.annotation.Excel;
/**
* 外协员工表
*/
@Data
@ApiModel(value="epiboly_outer_staff数据传输对象", description="外协员工表")
public class EpibolyOuterStaffVO {
/**主键*/
@ApiModelProperty(value = "主键")
private java.lang.String id;
/**关联部门编号*/
@Excel(name = "关联部门编号", width = 15)
@ApiModelProperty(value = "关联部门编号")
private java.lang.String departId;
/**关联外协单位ID*/
@Excel(name = "关联外协单位ID", width = 15)
@ApiModelProperty(value = "关联外协单位ID")
private java.lang.String companyId;
/**员工名称*/
@Excel(name = "员工名称", width = 15)
@ApiModelProperty(value = "员工名称")
private java.lang.String staffName;
/**性别(0-默认未知,1-男,2-女)*/
@Excel(name = "性别(0-默认未知,1-男,2-女)", width = 15)
@ApiModelProperty(value = "性别(0-默认未知,1-男,2-女)")
private java.lang.Integer sex;
/**电子邮件*/
@Excel(name = "电子邮件", width = 15)
@ApiModelProperty(value = "电子邮件")
private java.lang.String email;
/**手机号码*/
@Excel(name = "手机号码", width = 15)
@ApiModelProperty(value = "手机号码")
private java.lang.String phone;
/**年龄*/
@Excel(name = "年龄", width = 15)
@ApiModelProperty(value = "年龄")
private java.lang.String age;
/**入职时间*/
@Excel(name = "入职时间", width = 15)
@ApiModelProperty(value = "入职时间")
private java.lang.String entryDate;
/**合同开始时间*/
@Excel(name = "合同开始时间", width = 15)
@ApiModelProperty(value = "合同开始时间")
private java.lang.String startDate;
/**合同结束时间*/
@Excel(name = "合同结束时间", width = 15)
@ApiModelProperty(value = "合同结束时间")
private java.lang.String endDate;
/**头像*/
@Excel(name = "头像", width = 15)
@ApiModelProperty(value = "头像")
private java.lang.String headImg;
/**合同文件*/
@Excel(name = "合同文件", width = 15)
@ApiModelProperty(value = "合同文件")
private java.lang.String docuAddr;
/**配置交底文件*/
@Excel(name = "配置交底文件", width = 15)
@ApiModelProperty(value = "配置交底文件")
private java.lang.String trainDocAddr;
/**外协内容*/
@Excel(name = "外协内容", width = 15)
@ApiModelProperty(value = "外协内容")
private java.lang.String workContent;
/**备注*/
@Excel(name = "备注", width = 15)
@ApiModelProperty(value = "备注")
private java.lang.String remark;
/**创建部门*/
@Excel(name = "创建部门", width = 15)
@ApiModelProperty(value = "创建部门")
private java.lang.String createDept;
/**创建人*/
@Excel(name = "创建人", width = 15)
@ApiModelProperty(value = "创建人")
private java.lang.String createBy;
/**创建日期*/
@Excel(name = "创建日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "创建日期")
private java.util.Date createTime;
/**更新人*/
@Excel(name = "更新人", width = 15)
@ApiModelProperty(value = "更新人")
private java.lang.String updateBy;
/**更新日期*/
@Excel(name = "更新日期", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "更新日期")
private java.util.Date updateTime;
/**删除状态（0，正常，1已删除）*/
@Excel(name = "删除状态（0，正常，1已删除）", width = 15)
@ApiModelProperty(value = "删除状态（0，正常，1已删除）")
private java.lang.String delFlag;
}
sk-module-biz/src/main/java/com/skua/modules/guest/util/DateUtil.java
......@@ -27,6 +27,60 @@ public class DateUtil {
}
/**
* 转化日期格式
* @param dateString 要转换的日期字符串
* @param format 转换后的格式 默认 yyyy-MM-dd
* @return
*/
public String convertDateFormat(String dateString ,String format){
// 使用 SimpleDateFormat 来定义你想要的日期格式
SimpleDateFormat formatter = null;
String formattedDate = null;
try {
if(format != null && format.length() >0 ){
formatter = new SimpleDateFormat(format);
}else{
formatter = new SimpleDateFormat("yyyy-MM-dd");
}
if(dateString != null && dateString.length() > 0){
// 将日期字符串转换为 Date 对象
Date date = formatter.parse(dateString);
// 再将 Date 对象格式化为字符串
formattedDate = formatter.format(date);
// 输出结果
System.out.println(formattedDate); // 输出: 2024-08-19
}
} catch (Exception e) {
e.printStackTrace();
}
return formattedDate;
}
public String convertDateFormat(Date date ,String format){
// 使用 SimpleDateFormat 来定义你想要的日期格式
SimpleDateFormat formatter = null;
String formattedDate = null;
try {
if(format != null && format.length() >0 ){
formatter = new SimpleDateFormat(format);
}else{
formatter = new SimpleDateFormat("yyyy-MM-dd");
}
// 将日期字符串转换为 Date 对象
// 再将 Date 对象格式化为字符串
formattedDate = formatter.format(date);
// 输出结果
System.out.println(formattedDate); // 输出: 2024-08-19
} catch (Exception e) {
e.printStackTrace();
}
return formattedDate;
}
/**
* 获取7天日期数据，并指定显示格式
* @param dateFormat
* @return
......@@ -43,8 +97,6 @@ public class DateUtil {
LocalDate date = today.minusDays(i);
dates.add(date.format(formatter));
}
//dates.forEach(System.out::println);
return dates;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!