计量中心项目
This commit is contained in:
72
jlzx-single/yxt-single-attend/yxt-single-attend-api/pom.xml
Normal file
72
jlzx-single/yxt-single-attend/yxt-single-attend-api/pom.xml
Normal file
@@ -0,0 +1,72 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<parent>
|
||||
<groupId>com.yxt</groupId>
|
||||
<artifactId>yxt-parent</artifactId>
|
||||
<version>0.0.1</version>
|
||||
<relativePath/>
|
||||
</parent>
|
||||
|
||||
<groupId>com.yxt.attend</groupId>
|
||||
<artifactId>yxt-single-attend-api</artifactId>
|
||||
<version>0.0.1</version>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.yxt</groupId>
|
||||
<artifactId>yxt-common-core</artifactId>
|
||||
<version>0.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.yxt.jlzx</groupId>
|
||||
<artifactId>jlzx-single-oa-api</artifactId>
|
||||
<version>0.0.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.yxt</groupId>
|
||||
<artifactId>yxt-common-base</artifactId>
|
||||
<version>0.0.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-openfeign</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.projectlombok</groupId>
|
||||
<artifactId>lombok</artifactId>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.alibaba</groupId>
|
||||
<artifactId>fastjson</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.hibernate.validator</groupId>
|
||||
<artifactId>hibernate-validator</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.baomidou</groupId>
|
||||
<artifactId>mybatis-plus-annotation</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.baomidou</groupId>
|
||||
<artifactId>mybatis-plus-boot-starter</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>javax.servlet</groupId>
|
||||
<artifactId>javax.servlet-api</artifactId>
|
||||
<version>4.0.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.github.xiaoymin</groupId>
|
||||
<artifactId>knife4j-annotations</artifactId>
|
||||
<version>2.0.4</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
|
||||
</dependencies>
|
||||
</project>
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2021/7/31 21:38
|
||||
* @description
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-App2Attend",
|
||||
name = "yxt-attend",
|
||||
path = "v2/appattends",
|
||||
fallback = App2AttendApiFallback.class)
|
||||
public interface App2AttendApi {
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/normalRecord")
|
||||
@ApiOperation(value = "首页打卡扫码")
|
||||
public ResultBean normalRecord(@RequestBody AppAttendTwoQuery appAttendTwoQuery);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2021/7/31 21:38
|
||||
* @description
|
||||
*/
|
||||
@Component
|
||||
public class App2AttendApiFallback {
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import com.yxt.attend.api.attendance.Attendance;
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2021/8/3 10:07
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class App2AttendQuery implements Query {
|
||||
private static final long serialVersionUID = 8173853859208332747L;
|
||||
@ApiModelProperty(value = "单位sid")
|
||||
private String dwSid;
|
||||
@ApiModelProperty(value = "用户sid")
|
||||
private String userSid;
|
||||
@ApiModelProperty(value = "年")
|
||||
private String year;
|
||||
@ApiModelProperty(value = "月")
|
||||
private String month;
|
||||
private String date;
|
||||
private int qdlx;
|
||||
private Attendance attendance;
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/23 10:57
|
||||
* @description app考勤
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-AppAttend",
|
||||
name = "yxt-attend",
|
||||
path = "v1/appattends",
|
||||
fallback = AppAttendApiFallback.class)
|
||||
public interface AppAttendApi {
|
||||
|
||||
/**
|
||||
* 待审批申请单数量
|
||||
*
|
||||
* @param usersid 用户sid
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@PostMapping("/getDbAttendErrandCount/{usersid}")
|
||||
@ApiOperation(value = "待审批申请单数量")
|
||||
public ResultBean getDbAttendErrandCount(@ApiParam(value = "用户sid", required = true) @PathVariable("usersid") String usersid);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/getYbAttendErrandCount/{usersid}")
|
||||
@ApiOperation(value = "待审批申请单数量")
|
||||
public ResultBean getYbAttendErrandCount(@ApiParam(value = "用户sid", required = true) @PathVariable("usersid") String usersid);
|
||||
|
||||
|
||||
/**
|
||||
* 获取考勤设置信息
|
||||
*
|
||||
* @param dwsid 单位sid
|
||||
* @param usersid 用户sid
|
||||
* @return
|
||||
*/
|
||||
@ResponseBody
|
||||
@PostMapping("/getAttendanceInfo/{dwsid}/{usersid}")
|
||||
@ApiOperation(value = "获取考勤设置信息")
|
||||
public ResultBean<Map<String, Object>> getAttendanceInfo(@ApiParam(value = "单位sid", required = true) @PathVariable("dwsid") String dwsid,
|
||||
@ApiParam(value = "用户sid", required = true) @PathVariable("usersid") String usersid);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/getKqjwd")
|
||||
@ApiOperation(value = "获取考勤二维码的经纬度")
|
||||
public ResultBean getKqjwd(@RequestBody AppAttendQuery appAttendQuery);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/getSignBtnState")
|
||||
@ApiOperation(value = "查看上午、下午按钮签到状态")
|
||||
public ResultBean getSignBtnState(@RequestBody AppAttendOnQuery appAttendOnQuery);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/getSbBySbsidAndWbdwsid")
|
||||
@ApiOperation(value = "传递用户所选经纬度")
|
||||
public ResultBean getSbBySbsidAndWbdwsid(@RequestBody AppAttendTwoQuery appAttendTwoQuery);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/appPunch")
|
||||
@ApiOperation(value = "app首页扫码打卡")
|
||||
public ResultBean appPunch(@RequestBody AppAttendTwoQuery appAttendTwoQuery);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/delCurAttendance/{qdxxendsid}")
|
||||
@ApiOperation(value = "删除当次签到")
|
||||
public ResultBean delCurAttendance(@ApiParam(value = "sid", required = true) @PathVariable("qdxxendsid") String qdxxendsid);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/getAttendErrandCount/{dwSid}/{userSid}")
|
||||
@ApiOperation(value = "获取申请数量")
|
||||
public ResultBean getAttendErrandCount(@ApiParam(value = "单位sid", required = true) @PathVariable("dwSid") String dwSid, @ApiParam(value = "用户sid", required = true) @PathVariable("userSid") String userSid);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/getAttendErrandInfo")
|
||||
@ApiOperation(value = " 获取单位除自己外的所有人员(可申请的审批人列表)")
|
||||
public ResultBean getAttendErrandInfo(@RequestBody AppAttendThreeQuery appAttendThreeQuery);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/attendErrandList")
|
||||
@ApiOperation(value = "获取待审批的人员列表")
|
||||
public ResultBean attendErrandList(@RequestBody AppAttendFourQuery appAttendFourQuery);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/showAttendErrand/{sid}")
|
||||
@ApiOperation(value = "获取申请单详情")
|
||||
public ResultBean showAttendErrand(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/approveAttendErrand/{sid}/{type}")
|
||||
@ApiOperation(value = "审批差旅、外勤、休假")
|
||||
public ResultBean approveAttendErrand(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @ApiParam(value = "type", required = true) @PathVariable("type") String state);
|
||||
|
||||
@ResponseBody
|
||||
@PostMapping("/cancelAttendErrand/{sid}")
|
||||
@ApiOperation(value = " 撤销申请")
|
||||
public ResultBean cancelAttendErrand(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid, @RequestBody AppAttendTwoQuery appAttendTwoQuery);
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/23 10:58
|
||||
* @description
|
||||
*/
|
||||
@Component
|
||||
public class AppAttendApiFallback {
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/27 14:40
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AppAttendFourQuery implements Query {
|
||||
|
||||
private String type;
|
||||
private String usersid;
|
||||
private String month;
|
||||
@ApiModelProperty(value = "1:审批人列表,2待审批人列表")
|
||||
private String lx;
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/24 16:14
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AppAttendOnQuery implements Query {
|
||||
|
||||
private String usersid;
|
||||
|
||||
private String dwsid;
|
||||
@ApiModelProperty(value = "签到次数")
|
||||
private String qdfs;
|
||||
@ApiModelProperty(value = "上午、下午、加班")
|
||||
private String btn;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/23 15:51
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AppAttendQuery implements Query {
|
||||
|
||||
private String type;
|
||||
private String usersid;
|
||||
private String dwsid;
|
||||
private String bmid;
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/27 9:50
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AppAttendThreeQuery implements Query {
|
||||
|
||||
private String usersid;
|
||||
private String dwsid;
|
||||
private String name;
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.yxt.attend.api.appattend;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/24 16:41
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AppAttendTwoQuery implements Query {
|
||||
|
||||
@ApiModelProperty(value = "设备sid")
|
||||
private String sbsid;
|
||||
@ApiModelProperty(value = "单位sid")
|
||||
private String dwsid;
|
||||
@ApiModelProperty(value = "地理位置")
|
||||
private String dlwz;
|
||||
@ApiModelProperty(value = "用户sid")
|
||||
private String usersid;
|
||||
private String name;
|
||||
@ApiModelProperty(value = "打卡次数类型:v2扫码接口不需要传这个值")
|
||||
private String qdlx;
|
||||
@ApiModelProperty(value = "经纬度")
|
||||
private String jwd;
|
||||
|
||||
private String xuhao;
|
||||
|
||||
private String type;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,106 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import com.yxt.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/18 13:50
|
||||
* @description 考勤签到表(日考勤)
|
||||
*/
|
||||
@Data
|
||||
public class Attendance extends BaseEntity {
|
||||
private static final long serialVersionUID = 3630444632560623291L;
|
||||
/**
|
||||
* 姓名
|
||||
*/
|
||||
private String xm;
|
||||
/**
|
||||
* 单位sid
|
||||
*/
|
||||
private String dwSid;
|
||||
/**
|
||||
* 单位名称
|
||||
*/
|
||||
private String dwmc;
|
||||
/**
|
||||
* 单位类别
|
||||
*/
|
||||
private String dwlb;
|
||||
/**
|
||||
* 用户sid
|
||||
*/
|
||||
private String userSid;
|
||||
/**
|
||||
* 年
|
||||
*/
|
||||
private String year;
|
||||
/**
|
||||
* 月
|
||||
*/
|
||||
private String month;
|
||||
/**
|
||||
* 打卡日期
|
||||
*/
|
||||
private String day;
|
||||
/**
|
||||
* 类型:0、正常1、外勤2、差旅3、休假4、离职5、入职
|
||||
*/
|
||||
private Integer type;
|
||||
/**
|
||||
* 打卡类型:1:2次,2:4次
|
||||
*/
|
||||
private Integer signType;
|
||||
/**
|
||||
* 打卡时间
|
||||
*/
|
||||
private String signTime;
|
||||
/**
|
||||
* 打卡地点
|
||||
*/
|
||||
private String signDlwz;
|
||||
/**
|
||||
* 打卡去向:1、单位2、外勤3、差旅4、休假5、离职6、入职
|
||||
*/
|
||||
private Integer signDest;
|
||||
/**
|
||||
* 打卡状态:1、正常2、迟到3、早退4、外勤5、差旅6、加班7、休假8、公休9、离职10、入职
|
||||
*/
|
||||
private Integer signState;
|
||||
/**
|
||||
* 打卡次数类型:1、上午签到,2、上午签退,3、下午签到,4、下午签退5、加班签到6、加班签退
|
||||
*/
|
||||
private Integer signNumType;
|
||||
/**
|
||||
* 地理位置经纬度
|
||||
*/
|
||||
private String dlxx;
|
||||
/**
|
||||
* 版本:查询考勤信息
|
||||
*/
|
||||
private Integer version;
|
||||
/**
|
||||
* 1、自动默认2、手动签卡
|
||||
*/
|
||||
private String isAuto;
|
||||
/**
|
||||
* 部门路径
|
||||
*/
|
||||
private String deptPath;
|
||||
/**
|
||||
* 加班有无结束打卡:0、未结束1、结束
|
||||
*/
|
||||
private Integer ovTimeIsEnd;
|
||||
/**
|
||||
* 当次加班时长
|
||||
*/
|
||||
private Double ovTimeThis;
|
||||
/**
|
||||
* 当日加班总时长
|
||||
*/
|
||||
private Double ovTimeSum;
|
||||
/**
|
||||
* 申请单目的地
|
||||
*/
|
||||
private String signDestDlwz;
|
||||
}
|
||||
@@ -0,0 +1,162 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import com.yxt.attend.api.attendance.parameter.ParameterQuery;
|
||||
import com.yxt.attend.api.attendance.parameter.ParameterQuery2;
|
||||
import com.yxt.attend.api.attendance.parameter.ParameterQuery4;
|
||||
import com.yxt.attend.api.attenderrand.AttendErrand;
|
||||
import com.yxt.attend.api.attenderrand.AttendErrandQuery;
|
||||
import com.yxt.attend.api.attenderrand.AttendErrandVo;
|
||||
import com.yxt.attend.api.attendstatistics.AttendStatisticsVo;
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/19 15:24
|
||||
* @description
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-Attendance",
|
||||
name = "yxt-attend",
|
||||
path = "v1/attendances",
|
||||
fallback = AttendanceApiFallback.class)
|
||||
public interface AttendanceApi {
|
||||
|
||||
public ResultBean selectList();
|
||||
|
||||
@PostMapping(value = "/selectOvTime/{dwSid}/{day}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "检查传入年月后有无签卡方式的设置")
|
||||
public ResultBean<List<Attendance>> selectOvTime(@ApiParam(value = "单位sid", required = true) @PathVariable("dwSid") String dwSid,
|
||||
@ApiParam(value = "day", required = true) @PathVariable("day") String day);
|
||||
|
||||
@PostMapping(value = "/updateBySidOne/{sid}/{ovTimeIsEnd}")
|
||||
@ResponseBody
|
||||
public ResultBean updateBySidOne(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid,
|
||||
@ApiParam(value = "ovTimeIsEnd", required = true) @PathVariable("ovTimeIsEnd") Integer ovTimeIsEnd);
|
||||
|
||||
|
||||
@PostMapping(value = "/index")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "日考勤页面初始化")
|
||||
public ResultBean<Map<String, Object>> index();
|
||||
|
||||
|
||||
@PostMapping(value = "/userList/{year}/{month}/{userSid}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "打卡数据")
|
||||
ResultBean<List<AttendanceVo2>> userList(@ApiParam(value = "year", required = true) @PathVariable("year") String year,
|
||||
@ApiParam(value = "month", required = true) @PathVariable("month") String month,@ApiParam(value = "userSid", required = true) @PathVariable("userSid") String userSid);
|
||||
|
||||
|
||||
/**获取考勤信息
|
||||
* @param request
|
||||
* @return
|
||||
*/
|
||||
@PostMapping(value = "/list")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "获取日考勤列表")
|
||||
ResultBean<PagerVo<AttendanceListOneVo>> list(@Valid @RequestBody PagerQuery<AttendanceQuery> pagerQuery);
|
||||
|
||||
|
||||
|
||||
@PostMapping(value = "/selectOverTime")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "单日加班详情-和app共用")
|
||||
ResultBean<Map<String, Object>> selectOverTime(@Valid @RequestBody ParameterQuery q);
|
||||
|
||||
|
||||
@PostMapping(value = "/overTimeList")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "加班详情签退列表")
|
||||
ResultBean<List<Attendance>> overTimeList(@Valid @RequestBody ParameterQuery q);
|
||||
|
||||
/**
|
||||
* 申请单记录页面
|
||||
* @param request
|
||||
*/
|
||||
@PostMapping(value = "/errandRecord")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "申请单记录页面")
|
||||
ResultBean<Map<String, Object>> errandRecord();
|
||||
|
||||
|
||||
/**
|
||||
* 查询差旅、外勤、休假申请
|
||||
* @param request
|
||||
*/
|
||||
@PostMapping(value = "/errandList")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "查询差旅、外勤、休假申请")
|
||||
ResultBean<PagerVo<AttendErrandVo>> errandList(@Valid @RequestBody PagerQuery<AttendErrandQuery> pagerQuery);
|
||||
|
||||
|
||||
/**
|
||||
* 申请单详情
|
||||
* @param request
|
||||
*/
|
||||
@PostMapping(value = "/errendDetail")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "申请单详情")
|
||||
ResultBean<AttendErrandVo> errendDetail(@Valid @RequestBody ParameterQuery2 q);
|
||||
|
||||
/**
|
||||
* 申请单详情
|
||||
* @param request
|
||||
*/
|
||||
@PostMapping(value = "/appErrendDetail")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "app申请单详情")
|
||||
ResultBean<AttendErrandVo> appErrendDetail(@Valid @RequestBody ParameterQuery2 q);
|
||||
|
||||
/**
|
||||
* 详情
|
||||
* @param request
|
||||
*/
|
||||
@PostMapping(value = "/appShow")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "详情")
|
||||
ResultBean<Map<String, Object>> appShow();
|
||||
|
||||
|
||||
@PostMapping(value = "/appAttendanceDetail")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "手机端正常打卡详情页")
|
||||
ResultBean<Attendance> appAttendanceDetail(@Valid @RequestBody ParameterQuery q);
|
||||
|
||||
|
||||
/**
|
||||
* 详情
|
||||
* @param request
|
||||
*/
|
||||
@PostMapping(value = "/show")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "详情")
|
||||
ResultBean<Map<String, Object>> show(@Valid @RequestBody AttendanceOneQuery q);
|
||||
|
||||
|
||||
/**
|
||||
* 详情
|
||||
* @param request
|
||||
*/
|
||||
@PostMapping(value = "/getDayCount")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "获取当月考勤记录")
|
||||
ResultBean<List<AttendStatisticsVo>> getDayCount(@Valid @RequestBody ParameterQuery4 p);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,126 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.servlet.http.HttpServletRequest;
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.yxt.attend.api.attendance.parameter.ParameterQuery;
|
||||
import com.yxt.attend.api.attendance.parameter.ParameterQuery2;
|
||||
import com.yxt.attend.api.attendance.parameter.ParameterQuery4;
|
||||
import com.yxt.attend.api.attenderrand.AttendErrand;
|
||||
import com.yxt.attend.api.attenderrand.AttendErrandQuery;
|
||||
import com.yxt.attend.api.attenderrand.AttendErrandVo;
|
||||
import com.yxt.attend.api.attendstatistics.AttendStatisticsVo;
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/19 15:25
|
||||
* @description
|
||||
*/
|
||||
@Component
|
||||
public class AttendanceApiFallback implements AttendanceApi{
|
||||
|
||||
@Override
|
||||
public ResultBean selectList() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<List<Attendance>> selectOvTime(String dwSid, String day) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean updateBySidOne(String sid, Integer ovTimeIsEnd) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Map<String, Object>> index() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<AttendanceListOneVo>> list(@Valid PagerQuery<AttendanceQuery> pagerQuery) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Map<String, Object>> selectOverTime(@Valid ParameterQuery q) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<List<Attendance>> overTimeList(@Valid ParameterQuery q) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Map<String, Object>> errandRecord() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<AttendErrandVo>> errandList(@Valid PagerQuery<AttendErrandQuery> pagerQuery) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<AttendErrandVo> errendDetail(@Valid ParameterQuery2 q) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<AttendErrandVo> appErrendDetail(@Valid ParameterQuery2 q) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Map<String, Object>> appShow() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Attendance> appAttendanceDetail(@Valid ParameterQuery q) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Map<String, Object>> show(@Valid AttendanceOneQuery q) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<List<AttendanceVo2>> userList(String year, String month, String userSid) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<List<AttendStatisticsVo>> getDayCount(@Valid ParameterQuery4 p) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/25 17:10
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendanceListOneVo implements Vo {
|
||||
|
||||
|
||||
@ApiModelProperty("姓名")
|
||||
private String staffSid;
|
||||
|
||||
private String usid;
|
||||
|
||||
private String name;
|
||||
private String deptName;
|
||||
private String signTime1;
|
||||
private String signDlwz1;
|
||||
private String signDest1;
|
||||
|
||||
private String signState1;
|
||||
private String day1;
|
||||
private String signDestDlwz1;
|
||||
|
||||
private String signTime4;
|
||||
|
||||
private String signDlwz4;
|
||||
private String signDest4;
|
||||
|
||||
private String signState4;
|
||||
private String day4;
|
||||
private String signDestDlwz4;
|
||||
private String adDeptPath;
|
||||
|
||||
|
||||
private String signTime2;
|
||||
private String signDlwz2;
|
||||
private String signDest2;
|
||||
private String signState2;
|
||||
private String day2;
|
||||
private String signDestDlwz2;
|
||||
|
||||
private String signTime3;
|
||||
private String signDlwz3;
|
||||
private String signDest3;
|
||||
private String signState3;
|
||||
private String day3;
|
||||
private String signDestDlwz3;
|
||||
private String OTNum;
|
||||
private String startTime;
|
||||
private String endTime;
|
||||
private String errendType;
|
||||
private String aeVacationType;
|
||||
private String errendDlwz;
|
||||
private String ovTimeSum;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/25 17:20
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendanceListQuery implements Query {
|
||||
|
||||
|
||||
@ApiModelProperty("部门")
|
||||
private String dept;
|
||||
|
||||
@ApiModelProperty("人员姓名")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty("考勤日期")
|
||||
private String date;
|
||||
}
|
||||
@@ -0,0 +1,90 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/25 17:10
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendanceListVo implements Vo {
|
||||
|
||||
|
||||
@ApiModelProperty("单位sid")
|
||||
private String dwSid;
|
||||
|
||||
@ApiModelProperty("姓名")
|
||||
private String name;
|
||||
|
||||
@ApiModelProperty("所在部门")
|
||||
private String deptPath;
|
||||
|
||||
@ApiModelProperty("出勤天数")
|
||||
private int attendanceDay;
|
||||
|
||||
@ApiModelProperty("加班天数")
|
||||
private int overtimeDay;
|
||||
|
||||
@ApiModelProperty("差旅天数")
|
||||
private int tripDay;
|
||||
|
||||
@ApiModelProperty("休假天数 ")
|
||||
private int vacationDay;
|
||||
|
||||
@ApiModelProperty("缺勤天数")
|
||||
private int absenceDay;
|
||||
|
||||
@ApiModelProperty("打卡应签次数")
|
||||
private int supposedNum;
|
||||
|
||||
@ApiModelProperty("打卡正常次数")
|
||||
private int normalNum;
|
||||
|
||||
@ApiModelProperty("加班次数")
|
||||
private int ovTimeNum;
|
||||
|
||||
@ApiModelProperty("迟到次数")
|
||||
private int lateNum;
|
||||
|
||||
@ApiModelProperty("早退次数")
|
||||
private int earlyNum;
|
||||
|
||||
@ApiModelProperty("漏签次数")
|
||||
private int missNum;
|
||||
|
||||
|
||||
|
||||
@ApiModelProperty("用户sid")
|
||||
private String userSid;
|
||||
|
||||
@ApiModelProperty("年")
|
||||
private String year;
|
||||
|
||||
@ApiModelProperty("月")
|
||||
private String month;
|
||||
|
||||
@ApiModelProperty("全月天数")
|
||||
private Double allDay;
|
||||
|
||||
@ApiModelProperty("全勤天数")
|
||||
private Double allAttendanceDay;
|
||||
|
||||
|
||||
@ApiModelProperty("差旅次数")
|
||||
private Integer tripNum;
|
||||
|
||||
@ApiModelProperty("外出次数")
|
||||
private Integer outNum;
|
||||
|
||||
|
||||
@ApiModelProperty("休假次数")
|
||||
private Integer vacationNum;
|
||||
|
||||
@ApiModelProperty("部门名称")
|
||||
private String deptName;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,24 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 14:40
|
||||
* @description 日考勤查询条件
|
||||
*/
|
||||
@Data
|
||||
public class AttendanceOneQuery implements Query {
|
||||
@ApiModelProperty(value = "年份")
|
||||
private String year;
|
||||
@ApiModelProperty("月份")
|
||||
private String month;
|
||||
|
||||
@ApiModelProperty("姓名")
|
||||
private String name;
|
||||
@ApiModelProperty("用户sid")
|
||||
private String userSid;
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 14:40
|
||||
* @description 日考勤查询条件
|
||||
*/
|
||||
@Data
|
||||
public class AttendanceQuery implements Query {
|
||||
@ApiModelProperty(value = "部门")
|
||||
private String dept;
|
||||
@ApiModelProperty("姓名")
|
||||
private String xm;
|
||||
|
||||
@ApiModelProperty("考勤日期")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
|
||||
private String day;
|
||||
|
||||
@ApiModelProperty("签到方式")
|
||||
private String signType;
|
||||
|
||||
private String userSid;
|
||||
|
||||
private String userType;
|
||||
|
||||
private String dwSid;
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/23 9:31
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendanceVo implements Vo {
|
||||
//姓名
|
||||
private String name;
|
||||
//所在部门
|
||||
private String deptName;
|
||||
//上午签到(打卡时间)
|
||||
private String signTime1;
|
||||
//位置(打卡地点)
|
||||
private String signDlwz1;
|
||||
//下午签退
|
||||
//位置
|
||||
//去向
|
||||
//加班天数
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
package com.yxt.attend.api.attendance;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/23 9:31
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendanceVo2 implements Vo {
|
||||
/**
|
||||
* 姓名
|
||||
*/
|
||||
private String xm;
|
||||
/**
|
||||
* 单位sid
|
||||
*/
|
||||
private String dwSid;
|
||||
/**
|
||||
* 单位名称
|
||||
*/
|
||||
private String dwmc;
|
||||
/**
|
||||
* 单位类别
|
||||
*/
|
||||
private String dwlb;
|
||||
/**
|
||||
* 用户sid
|
||||
*/
|
||||
private String userSid;
|
||||
/**
|
||||
* 年
|
||||
*/
|
||||
private String year;
|
||||
/**
|
||||
* 月
|
||||
*/
|
||||
private String month;
|
||||
/**
|
||||
* 打卡日期
|
||||
*/
|
||||
private String day;
|
||||
/**
|
||||
* 类型:0、正常1、外勤2、差旅3、休假4、离职5、入职
|
||||
*/
|
||||
private Integer type;
|
||||
/**
|
||||
* 打卡类型:1:2次,2:4次
|
||||
*/
|
||||
private Integer signType;
|
||||
/**
|
||||
* 打卡时间
|
||||
*/
|
||||
private String signTime;
|
||||
/**
|
||||
* 打卡地点
|
||||
*/
|
||||
private String signDlwz;
|
||||
/**
|
||||
* 打卡去向:1、单位2、外勤3、差旅4、休假5、离职6、入职
|
||||
*/
|
||||
private Integer signDest;
|
||||
/**
|
||||
* 打卡状态:1、正常2、迟到3、早退4、外勤5、差旅6、加班7、休假8、公休9、离职10、入职
|
||||
*/
|
||||
private Integer signState;
|
||||
/**
|
||||
* 打卡次数类型:1、上午签到,2、上午签退,3、下午签到,4、下午签退5、加班签到6、加班签退
|
||||
*/
|
||||
private Integer signNumType;
|
||||
/**
|
||||
* 地理位置经纬度
|
||||
*/
|
||||
private String dlxx;
|
||||
/**
|
||||
* 版本:查询考勤信息
|
||||
*/
|
||||
private Integer version;
|
||||
/**
|
||||
* 1、自动默认2、手动签卡
|
||||
*/
|
||||
private String isAuto;
|
||||
/**
|
||||
* 部门路径
|
||||
*/
|
||||
private String deptPath;
|
||||
/**
|
||||
* 加班有无结束打卡:0、未结束1、结束
|
||||
*/
|
||||
private Integer ovTimeIsEnd;
|
||||
/**
|
||||
* 当次加班时长
|
||||
*/
|
||||
private Double ovTimeThis;
|
||||
/**
|
||||
* 当日加班总时长
|
||||
*/
|
||||
private Double ovTimeSum;
|
||||
/**
|
||||
* 申请单目的地
|
||||
*/
|
||||
private String signDestDlwz;
|
||||
|
||||
private String sid;
|
||||
|
||||
private String sum;//加班天数
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.attend.api.attendance.parameter;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 14:40
|
||||
* @description 日考勤查询条件
|
||||
*/
|
||||
@Data
|
||||
public class ParameterQuery implements Query {
|
||||
@ApiModelProperty(value = "用户sid")
|
||||
private String usid;
|
||||
@ApiModelProperty(value = "考勤日期")
|
||||
@NotBlank(message = "考勤日期不能为空")
|
||||
private String date;
|
||||
@ApiModelProperty(value = "签到方式/两次、四次")
|
||||
private String signNumType;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
package com.yxt.attend.api.attendance.parameter;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 14:40
|
||||
* @description 日考勤查询条件
|
||||
*/
|
||||
@Data
|
||||
public class ParameterQuery2 implements Query {
|
||||
|
||||
@ApiModelProperty(value = "用户sid")
|
||||
private String usid;
|
||||
|
||||
@ApiModelProperty(value = "考勤日期")
|
||||
private String date;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.attend.api.attendance.parameter;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 14:40
|
||||
* @description 日考勤查询条件
|
||||
*/
|
||||
@Data
|
||||
public class ParameterQuery3 implements Query {
|
||||
|
||||
@ApiModelProperty(value = "用户sid")
|
||||
private String usid;
|
||||
|
||||
@ApiModelProperty(value = "考勤日期")
|
||||
private String date;
|
||||
|
||||
@ApiModelProperty(value = "签到方式/两次、四次")
|
||||
private String signNumType;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,49 @@
|
||||
package com.yxt.attend.api.attendance.parameter;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 14:40
|
||||
* @description 日考勤查询条件
|
||||
*/
|
||||
@Data
|
||||
public class ParameterQuery4 implements Query {
|
||||
@ApiModelProperty(value = "用户sid")
|
||||
@NotBlank(message = "用户sid不能为空")
|
||||
private String usid;
|
||||
|
||||
@ApiModelProperty(value = "考勤日期 年份",required = true)
|
||||
@NotBlank(message = "考勤日期 年份不能为空")
|
||||
private String year;
|
||||
|
||||
@ApiModelProperty(value = "考勤日期 月份",required = true)
|
||||
@NotBlank(message = "考勤日期 月份不能为空")
|
||||
private String month;
|
||||
|
||||
@ApiModelProperty(value = "签到方式/两次、四次",required = true)
|
||||
@NotBlank(message = "签到方式不能为空")
|
||||
private String signNumType;
|
||||
|
||||
@ApiModelProperty(value = "上午签到设置时间")
|
||||
private String amSignIn;
|
||||
|
||||
@ApiModelProperty(value = "上午签退设置时间")
|
||||
private String amSignOut;
|
||||
|
||||
@ApiModelProperty(value = "下午签到设置时间")
|
||||
private String pmSignIn;
|
||||
|
||||
@ApiModelProperty(value = "下午签退设置时间")
|
||||
private String pmSignOut;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
package com.yxt.attend.api.attenderrand;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.yxt.common.core.domain.BaseEntity;
|
||||
import com.yxt.jlzx.oa.api.form.Form;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
/**
|
||||
* @author hanwiejia
|
||||
* 考勤申请
|
||||
*/
|
||||
@Data
|
||||
@TableName("attend_errand")
|
||||
public class AttendErrand extends Form {
|
||||
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private String userSid;//申请人sid
|
||||
|
||||
private String applicant;//申请人
|
||||
|
||||
private String dwSid;//单位sid
|
||||
|
||||
private String currentTime;//申请时间
|
||||
|
||||
private String submitTime;//提交时间
|
||||
|
||||
private String currentDlwz;//当前位置
|
||||
|
||||
private String destDlwz;//外出地点、目的地
|
||||
|
||||
private String startTime;//起始时间
|
||||
|
||||
private String endTime;//结束时间
|
||||
|
||||
private double dayCount;//差旅、外勤、休假天数
|
||||
|
||||
private String approverSid;//审批人sid
|
||||
|
||||
private String approver;//审批人
|
||||
|
||||
private String reason;//事由
|
||||
|
||||
private String approverTime;//审批、撤销时间
|
||||
|
||||
private int type;//类型:1、差旅2、外勤3、休假
|
||||
|
||||
private int vacationType;//休假类型:1、事假2、病假3、婚假4、产假5、丧假6、年假7、排休
|
||||
|
||||
private String vacationCategory;//请假类别:1、日假2、时假
|
||||
|
||||
private String deptPath;//部门路径
|
||||
|
||||
private String orderSid;//流程实例sid
|
||||
|
||||
}
|
||||
@@ -0,0 +1,38 @@
|
||||
package com.yxt.attend.api.attenderrand;
|
||||
|
||||
import com.yxt.common.core.api.BaseApi;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
/**
|
||||
* @author hanweijia
|
||||
* @date 2020/11/19 15:24
|
||||
* @description 考勤申请表
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-AttendErrand",
|
||||
name = "yxt-attend",
|
||||
path = "v1/attenderrands",
|
||||
fallback = AttendErrandApiFallback.class)
|
||||
public interface AttendErrandApi extends BaseApi<AttendErrandVo, AttendErrandDto, AttendErrandQuery>{
|
||||
|
||||
@PutMapping("updates/{sid}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "根据sid修改")
|
||||
public ResultBean updates(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid) throws Exception;
|
||||
|
||||
@PutMapping("getHanld/{sid}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "查询自己的待办")
|
||||
public ResultBean getHanld(@ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
package com.yxt.attend.api.attenderrand;
|
||||
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/19 15:25
|
||||
* @description
|
||||
*/
|
||||
@Component
|
||||
public class AttendErrandApiFallback implements AttendErrandApi{
|
||||
|
||||
@Override
|
||||
public ResultBean<List<AttendErrandVo>> list(@Valid AttendErrandQuery query) {
|
||||
return new ResultBean().fail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<AttendErrandVo>> pageList(@Valid PagerQuery<AttendErrandQuery> pagerQuery) {
|
||||
return new ResultBean().fail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean save(@Valid AttendErrandDto dto) {
|
||||
return new ResultBean().fail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean update(@Valid AttendErrandDto dto, String sid) throws Exception {
|
||||
return new ResultBean().fail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean delete(String sid) {
|
||||
return new ResultBean().fail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<AttendErrandVo> getVo(String sid) {
|
||||
return new ResultBean().fail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean updates(String sid) throws Exception {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean getHanld(String sid) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,94 @@
|
||||
package com.yxt.attend.api.attenderrand;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.yxt.jlzx.oa.api.form.FormDto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/10/13 14:10
|
||||
* @description 新建申请dto参数
|
||||
*/
|
||||
@Data
|
||||
public class AttendErrandDto extends FormDto{
|
||||
|
||||
|
||||
|
||||
/**
|
||||
*
|
||||
*/
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@ApiModelProperty(value = "申请人sid", required = true)
|
||||
@NotBlank(message = "申请人sid不能为空")
|
||||
private String userSid;//申请人sid
|
||||
|
||||
@ApiModelProperty(value = "申请人", required = false)
|
||||
private String applicant;//申请人
|
||||
|
||||
@ApiModelProperty(value = "单位sid", required = false)
|
||||
private String dwSid;//单位sid
|
||||
|
||||
@ApiModelProperty(value = "申请时间", required = true)
|
||||
@NotBlank(message = "申请时间不能为空")
|
||||
private String currentTime;//申请时间
|
||||
|
||||
@ApiModelProperty(value = "提交时间", required = false)
|
||||
private String submitTime;//提交时间
|
||||
|
||||
@ApiModelProperty(value = "当前位置", required = true)
|
||||
@NotBlank(message = "当前位置不能为空")
|
||||
private String currentDlwz;//当前位置
|
||||
|
||||
@ApiModelProperty(value = "外出地点", required = true)
|
||||
private String destDlwz;//外出地点、目的地
|
||||
|
||||
@ApiModelProperty(value = "起始时间", required = true)
|
||||
@NotBlank(message = "起始时间不能为空")
|
||||
private String startTime;//起始时间
|
||||
|
||||
@ApiModelProperty(value = "结束时间", required = true)
|
||||
@NotBlank(message = "结束时间不能为空")
|
||||
private String endTime;//结束时间
|
||||
|
||||
@ApiModelProperty(value = "差旅、外勤、休假天数", required = true)
|
||||
@NotNull(message = "差旅、外勤、休假天数不能为空")
|
||||
private double dayCount;//差旅、外勤、休假天数
|
||||
|
||||
@ApiModelProperty(value = "审批人sid", required = false)
|
||||
private String approverSid;//审批人sid
|
||||
|
||||
@ApiModelProperty(value = "审批人", required = false)
|
||||
private String approver;//审批人
|
||||
|
||||
@ApiModelProperty(value = "请假事由", required = false)
|
||||
private String reason;//事由
|
||||
|
||||
@ApiModelProperty(value = "审批、撤销时间", required = false)
|
||||
private String approverTime;//审批、撤销时间
|
||||
|
||||
|
||||
@ApiModelProperty(value = "请假类型", required = true)
|
||||
private int type;//类型:1、差旅2、外勤3、休假
|
||||
|
||||
@ApiModelProperty(value = "休假类型", required = true)
|
||||
private int vacationType;//休假类型:1、事假2、病假3、婚假4、产假5、丧假6、年假7、排休
|
||||
|
||||
|
||||
@ApiModelProperty(value = "请假类别", required = true)
|
||||
private String vacationCategory;//请假类别:1、日假2、时假
|
||||
|
||||
@ApiModelProperty(value = "所在部门", required = false)
|
||||
// @NotBlank(message = "所在部门不能为空")
|
||||
private String deptPath;//部门路径
|
||||
|
||||
@ApiModelProperty(value = "流程实例sid", required = false)
|
||||
private String orderSid;//流程实例sid
|
||||
|
||||
@ApiModelProperty(value = "提交状态", required = false)
|
||||
private String state;//提交时间
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.yxt.attend.api.attenderrand;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 14:40
|
||||
* @description 日考勤查询条件
|
||||
*/
|
||||
@Data
|
||||
public class AttendErrandQuery implements Query {
|
||||
@ApiModelProperty(value = "单位sid")
|
||||
@NotBlank(message = "用户单位sid不能为空")
|
||||
private String dwSid;
|
||||
|
||||
@ApiModelProperty("用户sid")
|
||||
@NotBlank(message = "用户sid不能为空")
|
||||
private String userSid;
|
||||
|
||||
@ApiModelProperty("用户表isadmin字段,是否为管理员(1为管理员)")
|
||||
private String isadmin;
|
||||
|
||||
@ApiModelProperty("用户所在部门 路径")
|
||||
private String dept;
|
||||
|
||||
@ApiModelProperty("申请人")
|
||||
private String applicant;
|
||||
|
||||
@ApiModelProperty("审批人")
|
||||
private String approver;
|
||||
|
||||
@ApiModelProperty("审核状态")
|
||||
private String state;
|
||||
|
||||
@ApiModelProperty("开始时间")
|
||||
private String startTime;
|
||||
|
||||
@ApiModelProperty("结束时间")
|
||||
private String endTime;
|
||||
|
||||
@ApiModelProperty("申请类型")
|
||||
private String type;
|
||||
|
||||
@ApiModelProperty("休假类型")
|
||||
private String vacationType;
|
||||
}
|
||||
@@ -0,0 +1,243 @@
|
||||
package com.yxt.attend.api.attenderrand;
|
||||
|
||||
import com.yxt.common.base.utils.DateUtils;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import com.yxt.jlzx.oa.api.form.FormItem;
|
||||
import com.yxt.jlzx.oa.api.form.FormItems;
|
||||
import com.yxt.jlzx.oa.api.form.FormVo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/23 9:31
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendErrandVo extends FormVo {
|
||||
@ApiModelProperty(value = "申请人sid")
|
||||
private String userSid;//申请人sid
|
||||
|
||||
@ApiModelProperty(value = "申请人")
|
||||
private String applicant;//申请人
|
||||
|
||||
@ApiModelProperty(value = "单位sid")
|
||||
@NotBlank(message = "单位sid不能为空")
|
||||
private String dwSid;//单位sid
|
||||
|
||||
@ApiModelProperty(value = "申请时间")
|
||||
private String currentTime;//申请时间
|
||||
|
||||
@ApiModelProperty(value = "提交时间")
|
||||
private String submitTime;//提交时间
|
||||
|
||||
@ApiModelProperty(value = "当前位置")
|
||||
private String currentDlwz;//当前位置
|
||||
|
||||
@ApiModelProperty(value = "外出地点")
|
||||
private String destDlwz;//外出地点、目的地
|
||||
|
||||
@ApiModelProperty(value = "起始时间")
|
||||
private String startTime;//起始时间
|
||||
|
||||
@ApiModelProperty(value = "结束时间")
|
||||
private String endTime;//结束时间
|
||||
|
||||
@ApiModelProperty(value = "差旅、外勤、休假天数")
|
||||
private double dayCount;//差旅、外勤、休假天数
|
||||
|
||||
@ApiModelProperty(value = "审批人sid")
|
||||
private String approverSid;//审批人sid
|
||||
|
||||
@ApiModelProperty(value = "审批人")
|
||||
private String approver;//审批人
|
||||
|
||||
@ApiModelProperty(value = "请假事由")
|
||||
private String reason;//事由
|
||||
|
||||
@ApiModelProperty(value = "审批、撤销时间")
|
||||
private String approverTime;//审批、撤销时间
|
||||
|
||||
|
||||
@ApiModelProperty(value = "请假类型key")
|
||||
private int type;//类型:1、差旅2、外勤3、休假
|
||||
|
||||
@ApiModelProperty(value = "请假类型value")
|
||||
private String typeVal;//类型:1、差旅2、外勤3、休假
|
||||
|
||||
@ApiModelProperty(value = "休假类型")
|
||||
private int vacationType;//休假类型:1、事假2、病假3、婚假4、产假5、丧假6、年假7、排休
|
||||
|
||||
|
||||
@ApiModelProperty(value = "请假类别")
|
||||
private String vacationCategory;//请假类别:1、日假2、时假
|
||||
|
||||
@ApiModelProperty(value = "所在部门")
|
||||
private String deptPath;//部门路径
|
||||
|
||||
|
||||
@ApiModelProperty(value = "流程实例sid")
|
||||
private String orderSid;//流程实例sid
|
||||
|
||||
|
||||
@ApiModelProperty(value = "审批状态")
|
||||
private String state;//流程实例sid
|
||||
|
||||
|
||||
@ApiModelProperty(value = "申请单sid")
|
||||
private String sid;//流程实例sid
|
||||
|
||||
@Override
|
||||
public Map toFormItemsMap()
|
||||
{
|
||||
|
||||
Map<String,Object> map=super.toFormItemsMap();
|
||||
List<FormItem> formList=(List<FormItem>)map.get("formItems");
|
||||
|
||||
FormItem item=new FormItem();
|
||||
item.setLeft_title("请假类型");
|
||||
item.setRight_text(this.typeVal);
|
||||
formList.add(item);
|
||||
|
||||
FormItem item1=new FormItem();
|
||||
item1.setLeft_title("申请人员");
|
||||
item1.setRight_text(this.applicant );
|
||||
formList.add(item1);
|
||||
|
||||
FormItem item2=new FormItem();
|
||||
item2.setLeft_title("所在部门");
|
||||
item2.setRight_text(this.deptPath );
|
||||
formList.add(item2);
|
||||
|
||||
|
||||
FormItem item3=new FormItem();
|
||||
item3.setLeft_title("申请时间");
|
||||
item3.setRight_text(this.currentTime);
|
||||
formList.add(item3);
|
||||
|
||||
FormItem item4=new FormItem();
|
||||
item4.setLeft_title("申请位置");
|
||||
item4.setRight_text(this.currentDlwz);
|
||||
formList.add(item4);
|
||||
|
||||
FormItem item7=new FormItem();
|
||||
item7.setLeft_title("目的地");
|
||||
item7.setRight_text(this.destDlwz);
|
||||
formList.add(item7);
|
||||
|
||||
FormItem item8=new FormItem();
|
||||
item8.setLeft_title("开始时间");
|
||||
item8.setRight_text(this.startTime);
|
||||
formList.add(item8);
|
||||
|
||||
FormItem item9=new FormItem();
|
||||
item9.setLeft_title("结束时间");
|
||||
item9.setRight_text(this.endTime);
|
||||
formList.add(item9);
|
||||
return map;
|
||||
}
|
||||
|
||||
/**
|
||||
* 动态生成表单项目(填报时)
|
||||
*/
|
||||
@Override
|
||||
public Map<String,Object> getFormItemsMap() {
|
||||
|
||||
Map<String, Object> map = super.getFormItemsMap();
|
||||
List<FormItems> formList = (List<FormItems>) map.get("formItems");
|
||||
|
||||
|
||||
FormItems item1 = new FormItems();
|
||||
item1.setLeft_title("请假类型");
|
||||
item1.getRight_text().setControlId("type");
|
||||
item1.getRight_text().setDataType("int");
|
||||
item1.getRight_text().setDefaultText("");
|
||||
item1.getRight_text().setReadOnly(0);
|
||||
item1.getRight_text().setList_key(Collections.emptyList());
|
||||
item1.getRight_text().setList_value(Collections.emptyList());
|
||||
formList.add(item1);
|
||||
|
||||
|
||||
FormItems item2 = new FormItems();
|
||||
item2.setLeft_title("申请人员");
|
||||
item2.getRight_text().setControlId("applicant");
|
||||
item2.getRight_text().setDataType("String");
|
||||
item2.getRight_text().setDefaultText("");
|
||||
item2.getRight_text().setReadOnly(0);
|
||||
item2.getRight_text().setList_key(Collections.emptyList());
|
||||
item2.getRight_text().setList_value(Collections.emptyList());
|
||||
formList.add(item2);
|
||||
|
||||
FormItems item3 = new FormItems();
|
||||
item3.setLeft_title("所在部门 ");
|
||||
item3.getRight_text().setControlId("deptPath");
|
||||
item3.getRight_text().setDataType("String");
|
||||
item3.getRight_text().setDefaultText("");
|
||||
item3.getRight_text().setReadOnly(0);
|
||||
item3.getRight_text().setList_key(Collections.emptyList());
|
||||
item3.getRight_text().setList_value(Collections.emptyList());
|
||||
formList.add(item3);
|
||||
|
||||
FormItems item4 = new FormItems();
|
||||
item4.setLeft_title("申请时间");
|
||||
item4.getRight_text().setControlId("currentTime");
|
||||
item4.getRight_text().setDataType("String");
|
||||
item4.getRight_text().setDefaultText("");
|
||||
item4.getRight_text().setReadOnly(0);
|
||||
item4.getRight_text().setList_key(Collections.emptyList());
|
||||
item4.getRight_text().setList_value(Collections.emptyList());
|
||||
formList.add(item4);
|
||||
|
||||
FormItems item5 = new FormItems();
|
||||
item5.setLeft_title("申请位置");
|
||||
item5.getRight_text().setControlId("currentDlwz");
|
||||
item5.getRight_text().setDataType("String");
|
||||
item5.getRight_text().setDefaultText("");
|
||||
item5.getRight_text().setReadOnly(0);
|
||||
item5.getRight_text().setList_key(Collections.emptyList());
|
||||
item5.getRight_text().setList_value(Collections.emptyList());
|
||||
formList.add(item5);
|
||||
|
||||
FormItems item6 = new FormItems();
|
||||
item6.setLeft_title("目的地");
|
||||
item6.getRight_text().setControlId("destDlwz");
|
||||
item6.getRight_text().setDataType("String");
|
||||
item6.getRight_text().setDefaultText("");
|
||||
item6.getRight_text().setReadOnly(0);
|
||||
item6.getRight_text().setList_key(Collections.emptyList());
|
||||
item6.getRight_text().setList_value(Collections.emptyList());
|
||||
formList.add(item6);
|
||||
|
||||
FormItems item7 = new FormItems();
|
||||
item7.setLeft_title("开始时间");
|
||||
item7.getRight_text().setControlId("startTime");
|
||||
item7.getRight_text().setDataType("String");
|
||||
item7.getRight_text().setDefaultText("");
|
||||
item7.getRight_text().setReadOnly(0);
|
||||
item7.getRight_text().setList_key(Collections.emptyList());
|
||||
item7.getRight_text().setList_value(Collections.emptyList());
|
||||
formList.add(item7);
|
||||
|
||||
FormItems item8 = new FormItems();
|
||||
item8.setLeft_title("结束时间");
|
||||
item8.getRight_text().setControlId("endTime");
|
||||
item8.getRight_text().setDataType("String");
|
||||
item8.getRight_text().setDefaultText("");
|
||||
item8.getRight_text().setReadOnly(0);
|
||||
item8.getRight_text().setList_key(Collections.emptyList());
|
||||
item8.getRight_text().setList_value(Collections.emptyList());
|
||||
formList.add(item8);
|
||||
|
||||
map.put("formItems", formList);
|
||||
|
||||
return map;
|
||||
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.yxt.attend.api.attenderrand;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/10/16 09:38
|
||||
* @description 表单保存时返回的数据
|
||||
*/
|
||||
@Data
|
||||
public class FormResultVo implements Vo {
|
||||
/**
|
||||
* 任务sid
|
||||
*/
|
||||
@ApiModelProperty(value = "taskSid")
|
||||
private String taskSid;
|
||||
/**
|
||||
* 表单sid
|
||||
*/
|
||||
@ApiModelProperty(value = "formSid")
|
||||
private String formSid;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.yxt.attend.api.attendholiday;
|
||||
|
||||
import com.yxt.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/18 10:56
|
||||
* @description 休假日期设置
|
||||
*/
|
||||
@Data
|
||||
public class AttendHolidaySet extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 单位sid
|
||||
*/
|
||||
private String dwSid;
|
||||
/**
|
||||
* 年
|
||||
*/
|
||||
private String year;
|
||||
/**
|
||||
* 月
|
||||
*/
|
||||
private String month;
|
||||
/**
|
||||
* 日
|
||||
*/
|
||||
private String day;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package com.yxt.attend.api.attendholiday;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/19 15:17
|
||||
* @description 休假日期设置
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-AttendHolidaySet",
|
||||
name = "yxt-attend",
|
||||
path = "v1/attendholidaysets",
|
||||
fallback = AttendHolidaySetApiFallback.class)
|
||||
public interface AttendHolidaySetApi {
|
||||
|
||||
@PostMapping(value = "/save", headers = "token")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "休息日设置保存")
|
||||
public ResultBean save(@RequestBody AttendHolidaySetDto attendHolidaySetDto);
|
||||
|
||||
@PostMapping(value = "/list/{year}", headers = "token")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "公休日列表")
|
||||
public ResultBean<List<AttendHolidaySetVo>> list(@ApiParam(value = "年", required = true) @PathVariable("year") String year);
|
||||
|
||||
@PostMapping(value = "checkIsHoliDay")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "根据日期判断是否为公休")
|
||||
public boolean checkIsHoliDay(@RequestBody AttendHolidaySetQuery attendHolidaySetQuery);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package com.yxt.attend.api.attendholiday;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/19 15:20
|
||||
* @description 休息日设置容错处理
|
||||
*/
|
||||
@Component
|
||||
public class AttendHolidaySetApiFallback implements AttendHolidaySetApi {
|
||||
@Override
|
||||
public ResultBean save(AttendHolidaySetDto attendHolidaySetDto) {
|
||||
return ResultBean.fireFail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<List<AttendHolidaySetVo>> list(String year) {
|
||||
return new ResultBean<List<AttendHolidaySetVo>>().fail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean checkIsHoliDay(AttendHolidaySetQuery attendHolidaySetQuery) {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
package com.yxt.attend.api.attendholiday;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/19 15:33
|
||||
* @description 休息日设置
|
||||
*/
|
||||
@Data
|
||||
public class AttendHolidaySetDto {
|
||||
@ApiModelProperty(value = "要设置的年份")
|
||||
private String year;
|
||||
@ApiModelProperty(value = "1月公休日,休假日期")
|
||||
private String janDays;
|
||||
@ApiModelProperty(value = "2月公休日,休假日期")
|
||||
private String febDays;
|
||||
@ApiModelProperty(value = "3月公休日,休假日期")
|
||||
private String marDays;
|
||||
@ApiModelProperty(value = "4月公休日,休假日期")
|
||||
private String aprDays;
|
||||
@ApiModelProperty(value = "5月公休日,休假日期")
|
||||
private String mayDays;
|
||||
@ApiModelProperty(value = "6月公休日,休假日期")
|
||||
private String junDays;
|
||||
@ApiModelProperty(value = "7月公休日,休假日期")
|
||||
private String julDays;
|
||||
@ApiModelProperty(value = "8月公休日,休假日期")
|
||||
private String augDays;
|
||||
@ApiModelProperty(value = "9月公休日,休假日期")
|
||||
private String sepDays;
|
||||
@ApiModelProperty(value = "10月公休日,休假日期")
|
||||
private String octDays;
|
||||
@ApiModelProperty(value = "11月公休日,休假日期")
|
||||
private String novDays;
|
||||
@ApiModelProperty(value = "12月公休日,休假日期")
|
||||
private String decDays;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,22 @@
|
||||
package com.yxt.attend.api.attendholiday;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/20 15:23
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendHolidaySetQuery implements Query {
|
||||
@ApiModelProperty(value = "单位sid")
|
||||
private String dwSid;
|
||||
@ApiModelProperty(value = "年")
|
||||
private String year;
|
||||
@ApiModelProperty(value = "月")
|
||||
private String month;
|
||||
@ApiModelProperty(value = "日期")
|
||||
private String day;
|
||||
}
|
||||
@@ -0,0 +1,18 @@
|
||||
package com.yxt.attend.api.attendholiday;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/20 14:49
|
||||
* @description 公休日列表
|
||||
*/
|
||||
@Data
|
||||
public class AttendHolidaySetVo implements Vo {
|
||||
@ApiModelProperty(value = "月份")
|
||||
private String month;
|
||||
@ApiModelProperty(value = "休假日期")
|
||||
private String day;
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package com.yxt.attend.api.attendschedule;
|
||||
|
||||
import com.yxt.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/18 11:30
|
||||
* @description 考勤表定时任务
|
||||
*/
|
||||
@Data
|
||||
public class AttendSchedule extends BaseEntity {
|
||||
|
||||
/**
|
||||
* 单位sid
|
||||
*/
|
||||
private String dwSid;
|
||||
/**
|
||||
* 上午签到定时器
|
||||
*/
|
||||
private String amSignInCron;
|
||||
/**
|
||||
* 上午签退定时器
|
||||
*/
|
||||
private String amSignOutCron;
|
||||
/**
|
||||
* 下午签到定时器
|
||||
*/
|
||||
private String pmSignInCron;
|
||||
/**
|
||||
* 下午签退定时器
|
||||
*/
|
||||
private String pmSignOutCron;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.yxt.attend.api.attendschedule;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 10:45
|
||||
* @description
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-AttendSchedule",
|
||||
name = "yxt-attend",
|
||||
path = "v1/attendschedules",
|
||||
fallback = AttendScheduleApiFallback.class)
|
||||
public interface AttendScheduleApi {
|
||||
|
||||
public ResultBean<List<AttendSchedule>> listOne();
|
||||
}
|
||||
@@ -0,0 +1,19 @@
|
||||
package com.yxt.attend.api.attendschedule;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 10:45
|
||||
* @description
|
||||
*/
|
||||
@Component
|
||||
public class AttendScheduleApiFallback implements AttendScheduleApi {
|
||||
@Override
|
||||
public ResultBean<List<AttendSchedule>> listOne() {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.yxt.attend.api.attendsigntype;
|
||||
|
||||
import com.yxt.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/18 11:45
|
||||
* @description 签卡方式设置
|
||||
*/
|
||||
@Data
|
||||
public class AttendSignType extends BaseEntity {
|
||||
/**
|
||||
* 单位sid
|
||||
*/
|
||||
private String dwSid;
|
||||
/**
|
||||
* 类型:1、每日两次签卡2、每日4次签卡
|
||||
*/
|
||||
private Integer type;
|
||||
/**
|
||||
* 起始年月
|
||||
*/
|
||||
private String startDate;
|
||||
/**
|
||||
* 结束年月
|
||||
*/
|
||||
private String endDate;
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.yxt.attend.api.attendsigntype;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import java.text.ParseException;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 10:46
|
||||
* @description
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-AttendSignType",
|
||||
name = "yxt-attend",
|
||||
path = "v1/attendsigntypes",
|
||||
fallback = AttendSignTypeApiFallback.class)
|
||||
public interface AttendSignTypeApi {
|
||||
|
||||
@PostMapping(value = "/saveSignType")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "保存签到信息设置")
|
||||
public ResultBean saveSignType(@Valid @RequestBody AttendSignTypeDto attendSignTypeDto) throws ParseException;
|
||||
|
||||
@PostMapping(value = "/checkSignTypeAfterDate/{dwSid}/{startDate}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "检查传入年月后有无签卡方式的设置")
|
||||
public ResultBean checkSignTypeAfterDate(@ApiParam(value = "单位sid", required = true) @PathVariable("dwSid") String dwSid,
|
||||
@ApiParam(value = "起始年月", required = true) @PathVariable("startDate") String startDate);
|
||||
|
||||
@PostMapping(value = "/checkByDate/{dwSid}/{startDate}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "根据日期查询是否设置签卡方式")
|
||||
public ResultBean checkByDate(@ApiParam(value = "单位sid", required = true) @PathVariable("dwSid") String dwSid,
|
||||
@ApiParam(value = "起始年月", required = true) @PathVariable("startDate") String startDate);
|
||||
|
||||
|
||||
@PostMapping(value = "/getAttendnceSetDate/{dwSid}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "考勤信息回显")
|
||||
public ResultBean getAttendnceSetDate(@ApiParam(value = "单位sid", required = true) @PathVariable("dwSid") String dwSid);
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package com.yxt.attend.api.attendsigntype;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 10:47
|
||||
* @description
|
||||
*/
|
||||
@Component
|
||||
public class AttendSignTypeApiFallback {
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package com.yxt.attend.api.attendsigntype;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/23 17:35
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendSignTypeDto implements Dto {
|
||||
|
||||
private String dwSid;
|
||||
@ApiModelProperty(value = "类型:1、每日两次签卡2、每日4次签卡")
|
||||
private String type;
|
||||
|
||||
@ApiModelProperty(value = "起始年月", required = true)
|
||||
@NotBlank(message = "请选择起始年月")
|
||||
private String startDate;
|
||||
}
|
||||
@@ -0,0 +1,97 @@
|
||||
package com.yxt.attend.api.attendstatistics;
|
||||
|
||||
import com.yxt.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/18 11:50
|
||||
* @description 考勤统计表(月考勤)
|
||||
*/
|
||||
@Data
|
||||
public class AttendStatistics extends BaseEntity {
|
||||
/**
|
||||
* 单位sid
|
||||
*/
|
||||
private String dwSid;
|
||||
/**
|
||||
* 用户sid
|
||||
*/
|
||||
private String userSid;
|
||||
/**
|
||||
* 年
|
||||
*/
|
||||
private String year;
|
||||
/**
|
||||
* 月
|
||||
*/
|
||||
private String month;
|
||||
/**
|
||||
* 全月天数
|
||||
*/
|
||||
private Double allDay;
|
||||
/**
|
||||
* 全勤天数
|
||||
*/
|
||||
private Double allAttendanceDay;
|
||||
/**
|
||||
* 出勤天数
|
||||
*/
|
||||
private Double attendanceDay;
|
||||
/**
|
||||
* 差旅天数
|
||||
*/
|
||||
private Double tripDay;
|
||||
/**
|
||||
* 加班天数
|
||||
*/
|
||||
private Double overtimeDay;
|
||||
/**
|
||||
* 休假天数
|
||||
*/
|
||||
private Double vacationDay;
|
||||
/**
|
||||
* 缺勤天数
|
||||
*/
|
||||
private Double absenceDay;
|
||||
/**
|
||||
* 应签次数
|
||||
*/
|
||||
private Integer supposedNum;
|
||||
/**
|
||||
* 正常次数
|
||||
*/
|
||||
private Integer normalNum;
|
||||
/**
|
||||
* 迟到次数
|
||||
*/
|
||||
private Integer lateNum;
|
||||
/**
|
||||
* 早退次数
|
||||
*/
|
||||
private Integer earlyNum;
|
||||
/**
|
||||
* 差旅次数
|
||||
*/
|
||||
private Integer tripNum;
|
||||
/**
|
||||
* 外出次数
|
||||
*/
|
||||
private Integer outNum;
|
||||
/**
|
||||
* 休假次数
|
||||
*/
|
||||
private Integer vacationNum;
|
||||
/**
|
||||
* 漏签次数
|
||||
*/
|
||||
private Integer missNum;
|
||||
/**
|
||||
* 加班次数
|
||||
*/
|
||||
private Integer ovTimeNum;
|
||||
/**
|
||||
* 部门路径
|
||||
*/
|
||||
private String deptPath;
|
||||
}
|
||||
@@ -0,0 +1,53 @@
|
||||
package com.yxt.attend.api.attendstatistics;
|
||||
|
||||
import com.yxt.attend.api.attendance.AttendanceListQuery;
|
||||
import com.yxt.attend.api.attendance.AttendanceListVo;
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 10:48
|
||||
* @description
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-AttendStatistics",
|
||||
name = "yxt-attend",
|
||||
path = "v1/attendstatistics",
|
||||
fallback = AttendStatisticsApiFallback.class)
|
||||
public interface AttendStatisticsApi {
|
||||
|
||||
@PostMapping(value = "/pagerList")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "月考勤列表")
|
||||
public ResultBean<PagerVo<AttendanceListVo>> pagerList(@Valid @RequestBody PagerQuery<AttendanceListQuery> pagerQuery);
|
||||
|
||||
@PostMapping(value = "/userList")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "月考勤列表-历史记录列表")
|
||||
public ResultBean userList(@Valid @RequestBody AttendStatisticsOneQuery attendStatisticsOneQuery);
|
||||
|
||||
|
||||
@PostMapping(value = "/monthIndex")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "月考勤页面初始化")
|
||||
public ResultBean<Map<String, Object>> monthIndex();
|
||||
|
||||
@PostMapping(value = "/getAttendHolidayNum")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "根据年月获取公休日、缺勤天数、应签次数、漏签次数")
|
||||
public ResultBean<Map<String, Object>> getAttendHolidayNum(@Valid @RequestBody AttendStatisticsOneQuery attendStatisticsOneQuery);
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
package com.yxt.attend.api.attendstatistics;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.yxt.attend.api.attendance.AttendanceListQuery;
|
||||
import com.yxt.attend.api.attendance.AttendanceListVo;
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 10:48
|
||||
* @description
|
||||
*/
|
||||
@Component
|
||||
public class AttendStatisticsApiFallback implements AttendStatisticsApi{
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<AttendanceListVo>> pagerList(@Valid PagerQuery<AttendanceListQuery> pagerQuery) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean userList(@Valid AttendStatisticsOneQuery attendStatisticsOneQuery) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Map<String, Object>> monthIndex() {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Map<String, Object>> getAttendHolidayNum(
|
||||
@Valid AttendStatisticsOneQuery attendStatisticsOneQuery) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
package com.yxt.attend.api.attendstatistics;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/25 11:39
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendStatisticsDto implements Dto {
|
||||
|
||||
/**
|
||||
* 单位sid
|
||||
*/
|
||||
private String dwSid;
|
||||
/**
|
||||
* 用户sid
|
||||
*/
|
||||
private String userSid;
|
||||
/**
|
||||
* 年
|
||||
*/
|
||||
private String year;
|
||||
/**
|
||||
* 月
|
||||
*/
|
||||
private String month;
|
||||
/**
|
||||
* 全月天数
|
||||
*/
|
||||
private Double allDay;
|
||||
/**
|
||||
* 全勤天数
|
||||
*/
|
||||
private Double allAttendanceDay;
|
||||
/**
|
||||
* 出勤天数
|
||||
*/
|
||||
private Double attendanceDay;
|
||||
/**
|
||||
* 差旅天数
|
||||
*/
|
||||
private Double tripDay;
|
||||
/**
|
||||
* 加班天数
|
||||
*/
|
||||
private Double overtimeDay;
|
||||
/**
|
||||
* 休假天数
|
||||
*/
|
||||
private Double vacationDay;
|
||||
/**
|
||||
* 缺勤天数
|
||||
*/
|
||||
private Double absenceDay;
|
||||
/**
|
||||
* 应签次数
|
||||
*/
|
||||
private Integer supposedNum;
|
||||
/**
|
||||
* 正常次数
|
||||
*/
|
||||
private Integer normalNum;
|
||||
/**
|
||||
* 迟到次数
|
||||
*/
|
||||
private Integer lateNum;
|
||||
/**
|
||||
* 早退次数
|
||||
*/
|
||||
private Integer earlyNum;
|
||||
/**
|
||||
* 差旅次数
|
||||
*/
|
||||
private Integer tripNum;
|
||||
/**
|
||||
* 外出次数
|
||||
*/
|
||||
private Integer outNum;
|
||||
/**
|
||||
* 休假次数
|
||||
*/
|
||||
private Integer vacationNum;
|
||||
/**
|
||||
* 漏签次数
|
||||
*/
|
||||
private Integer missNum;
|
||||
/**
|
||||
* 部门路径
|
||||
*/
|
||||
private String deptPath;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.yxt.attend.api.attendstatistics;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/28 11:00
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendStatisticsOneQuery {
|
||||
|
||||
private String year;
|
||||
private String month;
|
||||
private String userSid;
|
||||
private String dwSid;
|
||||
}
|
||||
@@ -0,0 +1,13 @@
|
||||
package com.yxt.attend.api.attendstatistics;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 14:25
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendStatisticsQuery implements Query {
|
||||
}
|
||||
@@ -0,0 +1,98 @@
|
||||
package com.yxt.attend.api.attendstatistics;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/23 9:31
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendStatisticsVo implements Vo {
|
||||
//考勤统计列表字段
|
||||
@ApiModelProperty("序号")
|
||||
private Integer col;
|
||||
|
||||
@ApiModelProperty("星期")
|
||||
private String week;
|
||||
|
||||
@ApiModelProperty("上午签到")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private String amSignIn;
|
||||
|
||||
@ApiModelProperty("上午签到位置")
|
||||
private String signDlwz1;
|
||||
|
||||
@ApiModelProperty("上午打卡去向:1、单位2、外勤3、差旅4、休假5、离职6、入职")
|
||||
private String signDest1;
|
||||
|
||||
@ApiModelProperty("上午申请去向目的地")
|
||||
private String signDestDlwz1;
|
||||
|
||||
@ApiModelProperty("上午签退")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private String amSignOut;
|
||||
|
||||
@ApiModelProperty("上午签退位置")
|
||||
private String signDlwz2;
|
||||
|
||||
@ApiModelProperty("上午签退去向:1、单位2、外勤3、差旅4、休假5、离职6、入职")
|
||||
private String signDest2;
|
||||
|
||||
@ApiModelProperty("上午签退申请目的地")
|
||||
private String signDestDlwz2;
|
||||
|
||||
@ApiModelProperty("下午上班打卡")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private String pmSignIn;
|
||||
|
||||
@ApiModelProperty("下午打卡位置")
|
||||
private String signDlwz3;
|
||||
|
||||
@ApiModelProperty("下午打卡去向")
|
||||
private String signDest3;
|
||||
|
||||
@ApiModelProperty("下午签退申请目的地")
|
||||
private String signDestDlwz3;
|
||||
|
||||
@ApiModelProperty("下午下班打卡")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private String pmSignOut;
|
||||
|
||||
@ApiModelProperty("下午打卡位置")
|
||||
private String signDlwz4;
|
||||
|
||||
@ApiModelProperty("下午打卡去向")
|
||||
private String signDest4;
|
||||
|
||||
@ApiModelProperty("下午签退申请目的地")
|
||||
private String signDestDlwz4;
|
||||
|
||||
@ApiModelProperty("加班天数")
|
||||
private String tdNum;
|
||||
|
||||
@ApiModelProperty("打卡状态:1、正常2、迟到3、早退4、外勤5、差旅6、加班7、休假8、公休9、离职10、入职")
|
||||
private String signState1;
|
||||
|
||||
@ApiModelProperty("打卡状态:1、正常2、迟到3、早退4、外勤5、差旅6、加班7、休假8、公休9、离职10、入职")
|
||||
private String signState2;
|
||||
|
||||
@ApiModelProperty("打卡状态:1、正常2、迟到3、早退4、外勤5、差旅6、加班7、休假8、公休9、离职10、入职")
|
||||
private String signState3;
|
||||
|
||||
@ApiModelProperty("打卡状态:1、正常2、迟到3、早退4、外勤5、差旅6、加班7、休假8、公休9、离职10、入职")
|
||||
private String signState4;
|
||||
|
||||
@ApiModelProperty("用户sid")
|
||||
private String userSid;
|
||||
|
||||
@ApiModelProperty("打卡时间")
|
||||
private String signTime;
|
||||
|
||||
@ApiModelProperty("当前天")
|
||||
private String day;
|
||||
}
|
||||
@@ -0,0 +1,74 @@
|
||||
package com.yxt.attend.api.attendtimetable;
|
||||
|
||||
import com.yxt.common.core.domain.BaseEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/18 13:47
|
||||
* @description 工作日作息时间表
|
||||
*/
|
||||
@Data
|
||||
public class AttendTimetable extends BaseEntity {
|
||||
/**
|
||||
* 单位sid
|
||||
*/
|
||||
private String dwSid;
|
||||
/**
|
||||
* 起始年月
|
||||
*/
|
||||
private String startDate;
|
||||
/**
|
||||
* 结束年月
|
||||
*/
|
||||
private String endDate;
|
||||
/**
|
||||
* 上午签到时间
|
||||
*/
|
||||
private String amSignIn;
|
||||
/**
|
||||
* 上午签到前期限
|
||||
*/
|
||||
private String amSignInFrontTerm;
|
||||
/**
|
||||
* 上午签到后期限
|
||||
*/
|
||||
private String amSignInAfterTerm;
|
||||
/**
|
||||
* 上午签退时间
|
||||
*/
|
||||
private String amSignOut;
|
||||
/**
|
||||
* 上午签退前期限
|
||||
*/
|
||||
private String amSignOutFrontTerm;
|
||||
/**
|
||||
* 上午签退后期限
|
||||
*/
|
||||
private String amSignOutAfterTerm;
|
||||
/**
|
||||
* 下午签到时间
|
||||
*/
|
||||
private String pmSignIn;
|
||||
/**
|
||||
* 下午签到前期限
|
||||
*/
|
||||
private String pmSignInFrontTerm;
|
||||
/**
|
||||
* 下午签到后期限
|
||||
*/
|
||||
private String pmSignInAfterTerm;
|
||||
/**
|
||||
* 下午签退时间
|
||||
*/
|
||||
private String pmSignOut;
|
||||
|
||||
/**
|
||||
* 下午签退前期限
|
||||
*/
|
||||
private String pmSignOutFrontTerm;
|
||||
/**
|
||||
* 下午签退后期限
|
||||
*/
|
||||
private String pmSignOutAfterTerm;
|
||||
}
|
||||
@@ -0,0 +1,42 @@
|
||||
package com.yxt.attend.api.attendtimetable;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import java.text.ParseException;
|
||||
import java.util.List;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 11:53
|
||||
* @description 工作日作息时间
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-AttendTimetable",
|
||||
name = "yxt-attend",
|
||||
path = "v1/attendtimetables",
|
||||
fallback = AttendTimetableApiFallback.class)
|
||||
public interface AttendTimetableApi {
|
||||
|
||||
@PostMapping(value = "/checkTimetableAfterDate/{dwSid}/{startDate}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "检查传入年月后有无考勤作息时间的设置")
|
||||
public ResultBean checkTimetableAfterDate(@ApiParam(value = "单位sid", required = true) @PathVariable("dwSid") String dwSid,
|
||||
@ApiParam(value = "起始年月", required = true) @PathVariable("startDate") String startDate);
|
||||
|
||||
@PostMapping(value = "/save")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "保存作息时间设置")
|
||||
public ResultBean save(@RequestBody AttendTimetableDto attendTimetableDto) throws ParseException;
|
||||
|
||||
@PostMapping(value = "/list")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "作息时间设置回显")
|
||||
public ResultBean list(@RequestBody AttendTimetableQuery attendTimetableQuery);
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.yxt.attend.api.attendtimetable;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/21 11:54
|
||||
* @description 工作日作息时间容错处理
|
||||
*/
|
||||
@Component
|
||||
public class AttendTimetableApiFallback implements AttendTimetableApi {
|
||||
@Override
|
||||
public ResultBean checkTimetableAfterDate(String dwSid, String startDate) {
|
||||
return ResultBean.fireFail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean save(AttendTimetableDto attendTimetableDto) {
|
||||
return ResultBean.fireFail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean list(AttendTimetableQuery attendTimetableQuery) {
|
||||
return ResultBean.fireFail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package com.yxt.attend.api.attendtimetable;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/24 9:30
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendTimetableDto implements Dto {
|
||||
@ApiModelProperty(value = "单位sid")
|
||||
private String dwSid;
|
||||
@ApiModelProperty(value = "起始年月")
|
||||
private String startDate;
|
||||
@ApiModelProperty(value = "上午签到时间")
|
||||
private String amSignIn;
|
||||
@ApiModelProperty(value = "上午签到前期限")
|
||||
private String amSignInFrontTerm;
|
||||
@ApiModelProperty(value = "上午签到后期限")
|
||||
private String amSignInAfterTerm;
|
||||
@ApiModelProperty(value = "上午签退时间")
|
||||
private String amSignOut;
|
||||
@ApiModelProperty(value = "上午签退前期限")
|
||||
private String amSignOutFrontTerm;
|
||||
@ApiModelProperty(value = "上午签退后期限")
|
||||
private String amSignOutAfterTerm;
|
||||
@ApiModelProperty(value = "下午签到时间")
|
||||
private String pmSignIn;
|
||||
@ApiModelProperty(value = "下午签到前期限")
|
||||
private String pmSignInFrontTerm;
|
||||
@ApiModelProperty(value = "下午签到后期限")
|
||||
private String pmSignInAfterTerm;
|
||||
@ApiModelProperty(value = "下午签退时间")
|
||||
private String pmSignOut;
|
||||
@ApiModelProperty(value = "下午签退前期限")
|
||||
private String pmSignOutFrontTerm;
|
||||
@ApiModelProperty(value = "下午签退后期限")
|
||||
private String pmSignOutAfterTerm;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,17 @@
|
||||
package com.yxt.attend.api.attendtimetable;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/28 14:47
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class AttendTimetableQuery implements Query {
|
||||
|
||||
private String dwSid;
|
||||
private String year;
|
||||
private String month;
|
||||
}
|
||||
@@ -0,0 +1,145 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiImplicitParam;
|
||||
import io.swagger.annotations.ApiImplicitParams;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/2 16:59
|
||||
* @description App我的工作接口
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-AppWork",
|
||||
name = "yxt-jlzx-attend",
|
||||
path = "v1/appwork",
|
||||
fallback = AppWorkApiFallBack.class)
|
||||
public interface AppWorkApi {
|
||||
|
||||
@PostMapping("/doingworksCount")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "待办工作分页列表数量")
|
||||
ResultBean doingWorksCount(PagerQuery<WorkQuery> pagerQuery);
|
||||
/**
|
||||
* 待办工作列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
@PostMapping("/doingworks")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "待办工作分页列表")
|
||||
ResultBean<PagerVo<WorkDoAppVo>> doingWorks(@Valid @RequestBody PagerQuery<WorkQuery> query);
|
||||
|
||||
/**
|
||||
* 已办工作列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
@PostMapping("/didworks")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "已办工作分页列表")
|
||||
ResultBean<PagerVo<WorkDidAppVo>> didWorks(@Valid @RequestBody PagerQuery<WorkQuery> query);
|
||||
|
||||
|
||||
|
||||
@PostMapping("/myAttenderrand")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "我的申请列表")
|
||||
ResultBean<PagerVo<WorkDidAppVo>> myAttenderrand(@Valid @RequestBody PagerQuery<WorkQuery> query);
|
||||
/**
|
||||
* 审批记录列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
@PostMapping("/recordlist")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "审批记录列表(不分页)")
|
||||
ResultBean<WorkRecordOneVo> recordList(@Valid @RequestBody WorkRecordQuery query);
|
||||
|
||||
|
||||
//待阅工作
|
||||
//ResultBean<PagerVo<WfTaskVo>> unreadWorks(PagerQuery<WfTaskQuery> query);
|
||||
|
||||
//已阅工作
|
||||
//ResultBean<PagerVo<WfHistTaskDidVo>> didWorks(PagerQuery<WfHistTaskQuery> query);
|
||||
|
||||
/**
|
||||
* 流工作类别列表及筛选条件
|
||||
*
|
||||
* @param pagerQuery 查询条件
|
||||
* @return 工作类别列表及筛选条件
|
||||
*/
|
||||
@PostMapping("/WorkTypeTree")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "工作类别列表及筛选条件")
|
||||
// @ApiImplicitParams({
|
||||
// @ApiImplicitParam(name = "state", value = "状态:0已办,1待办", required = true),
|
||||
// @ApiImplicitParam(name = "usersid", value = "用户sid", required = true)
|
||||
//
|
||||
// })
|
||||
ResultBean<List<WorkTypeTreeVo>> getWorkTypeTree(
|
||||
// @ApiParam(value = "usersid", required = true) @PathVariable("usersid") String userSid,
|
||||
// @ApiParam(value = "state", required = true) @PathVariable("state") Integer state
|
||||
@RequestBody WorkQuery workQuery
|
||||
);
|
||||
|
||||
@GetMapping("/selectNum/{userSid}/{sid}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "查询流程数量")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "sid", value = "流程sid", required = true),
|
||||
@ApiImplicitParam(name = "userSid", value = "用户sid", required = true)
|
||||
|
||||
})
|
||||
public ResultBean selectNum(@ApiParam(value = "userSid", required = true) @PathVariable("userSid") String userSid, @ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
|
||||
|
||||
@GetMapping("/selectReadNum/{userSid}/{sid}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "查询待阅数量")
|
||||
@ApiImplicitParams({
|
||||
@ApiImplicitParam(name = "sid", value = "流程sid", required = true),
|
||||
@ApiImplicitParam(name = "userSid", value = "用户sid", required = true)
|
||||
|
||||
})
|
||||
public ResultBean selectReadNum(@ApiParam(value = "userSid", required = true) @PathVariable("userSid") String userSid, @ApiParam(value = "sid", required = true) @PathVariable("sid") String sid);
|
||||
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 待阅工作列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
// @PostMapping("/doingworks")
|
||||
// @ResponseBody
|
||||
// @ApiOperation(value = "待阅工作分页列表")
|
||||
// ResultBean<PagerVo<WorkDoAppVo>> doingReads(@Valid @RequestBody PagerQuery<MessageQuery> query);
|
||||
|
||||
/**
|
||||
* 已办工作列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
// @PostMapping("/didworks")
|
||||
// @ResponseBody
|
||||
// @ApiOperation(value = "已阅工作分页列表")
|
||||
// ResultBean<PagerVo<WorkDidAppVo>> didReads(@Valid @RequestBody PagerQuery<MessageQuery> query);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,73 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
|
||||
public class AppWorkApiFallBack implements AppWorkApi {
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<WorkDoAppVo>> doingWorks(
|
||||
@Valid PagerQuery<WorkQuery> query) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<WorkDidAppVo>> didWorks(
|
||||
@Valid PagerQuery<WorkQuery> query) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean selectNum(String userSid,String sid) {
|
||||
return ResultBean.fireFail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean selectReadNum(String userSid, String sid) {
|
||||
return ResultBean.fireFail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<WorkRecordOneVo> recordList(@Valid WorkRecordQuery query) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<List<WorkTypeTreeVo>> getWorkTypeTree(WorkQuery workQuery) {
|
||||
return new ResultBean<List<WorkTypeTreeVo>>().fail().setMsg("网站维护,请稍后再试");
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<WorkDidAppVo>> myAttenderrand(@Valid PagerQuery<WorkQuery> query) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean doingWorksCount(PagerQuery<WorkQuery> pagerQuery) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
// @Override
|
||||
// public ResultBean<PagerVo<WorkDoAppVo>> doingReads(@Valid PagerQuery<MessageQuery> query) {
|
||||
// // TODO Auto-generated method stub
|
||||
// return null;
|
||||
// }
|
||||
//
|
||||
// @Override
|
||||
// public ResultBean<PagerVo<WorkDidAppVo>> didReads(@Valid PagerQuery<MessageQuery> query) {
|
||||
// // TODO Auto-generated method stub
|
||||
// return null;
|
||||
// }
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,93 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
import com.yxt.jlzx.oa.api.seal.SealApiFallBack;
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/2 23:03
|
||||
* @description web我的工作接口
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-Work",
|
||||
name = "yxt-attend",
|
||||
path = "v1/work",
|
||||
fallback = WorkApiFallBack.class)
|
||||
public interface WorkApi {
|
||||
|
||||
/**
|
||||
* 待办工作列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
@PostMapping("/doingworks")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "待办工作分页列表")
|
||||
ResultBean<PagerVo<WorkDoVo>> doingWorks(@Valid @RequestBody PagerQuery<WorkQuery> query);
|
||||
|
||||
|
||||
/**
|
||||
* 待办工作列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
@PostMapping("/doingWorksNum")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "我的工作待办数量")
|
||||
ResultBean<Long> doingWorksNum(@Valid @RequestBody PagerQuery<WorkQuery> pagerQuery);
|
||||
|
||||
/**
|
||||
* 已办工作列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
@PostMapping("/didworks")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "已办工作分页列表")
|
||||
ResultBean<PagerVo<WorkDidVo>> didWorks(@Valid @RequestBody PagerQuery<WorkQuery> query);
|
||||
/**
|
||||
* 共文库查看
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
@PostMapping("/didworksadmin")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "已办工作分页列表")
|
||||
ResultBean<PagerVo<WorkDidVo>> didworksadmin(@Valid @RequestBody PagerQuery<WorkQuery> query);
|
||||
|
||||
/**
|
||||
* 审批记录列表
|
||||
*
|
||||
* @return 分页列表
|
||||
*/
|
||||
@PostMapping("/recordlist")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "审批记录列表(不分页)")
|
||||
ResultBean<List<WorkRecordVo>> recordList(@Valid @RequestBody WorkRecordQuery query);
|
||||
|
||||
|
||||
|
||||
|
||||
//待阅工作
|
||||
//ResultBean<PagerVo<WfTaskVo>> unreadWorks(PagerQuery<WfTaskQuery> query);
|
||||
|
||||
//已阅工作
|
||||
//ResultBean<PagerVo<WfHistTaskDidVo>> didWorks(PagerQuery<WfHistTaskQuery> query);
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import com.yxt.common.core.query.PagerQuery;
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import com.yxt.common.core.vo.PagerVo;
|
||||
|
||||
public class WorkApiFallBack implements WorkApi{
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<WorkDoVo>> doingWorks(
|
||||
@Valid PagerQuery<WorkQuery> query) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<WorkDidVo>> didWorks(
|
||||
@Valid PagerQuery<WorkQuery> query) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<PagerVo<WorkDidVo>> didworksadmin(PagerQuery<WorkQuery> query) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public ResultBean<List<WorkRecordVo>> recordList(
|
||||
@Valid WorkRecordQuery query) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean<Long> doingWorksNum(@Valid PagerQuery<WorkQuery> pagerQuery) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
@Data
|
||||
@Component
|
||||
public class WorkDidAppVo implements Vo {
|
||||
/**
|
||||
* 任务sid
|
||||
*/
|
||||
@ApiModelProperty(value = "taskSid")
|
||||
private String taskSid;
|
||||
/**
|
||||
* 流程名称
|
||||
*/
|
||||
@ApiModelProperty(value = "流程名称")
|
||||
private String processName;
|
||||
/**
|
||||
* 流程实例sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程实例sid")
|
||||
private String orderSid;
|
||||
/**
|
||||
* 文件标题
|
||||
*/
|
||||
@ApiModelProperty(value = "文件标题")
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 任务创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "任务创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date createTime;
|
||||
|
||||
|
||||
/**
|
||||
* 发起部门名称
|
||||
*/
|
||||
@ApiModelProperty(value = "发起部门名称")
|
||||
private String createDeptName;
|
||||
/**
|
||||
* 表单sid
|
||||
*/
|
||||
@ApiModelProperty(value = "表单sid")
|
||||
private String formSid;
|
||||
|
||||
@ApiModelProperty(value = "流程sid")
|
||||
private String processSid;
|
||||
/**
|
||||
* 是否可以撤回
|
||||
*/
|
||||
@ApiModelProperty(value = "是否可以撤回(1可以,0不可以)")
|
||||
private int isRecall;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,177 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/02 09:35
|
||||
* @description 已办工作
|
||||
*/
|
||||
@Data
|
||||
@Component
|
||||
public class WorkDidVo implements Vo {
|
||||
/**
|
||||
* 任务Sid
|
||||
*/
|
||||
@ApiModelProperty(value = "taskSid")
|
||||
private String taskSid;
|
||||
/**
|
||||
* 流程实例sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程实例sid")
|
||||
private String orderSid;
|
||||
/**
|
||||
* 流程sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程sid")
|
||||
private String processSid;
|
||||
/**
|
||||
* 流程名称
|
||||
*/
|
||||
@ApiModelProperty(value = "流程名称")
|
||||
private String processName;
|
||||
/**
|
||||
* 已办工作跳转路径
|
||||
*/
|
||||
@ApiModelProperty(value = "已办工作跳转路径")
|
||||
private String instanceUrl3;
|
||||
/**
|
||||
* 文件标题
|
||||
*/
|
||||
@ApiModelProperty(value = "文件标题")
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 发起部门名称
|
||||
*/
|
||||
@ApiModelProperty(value = "发起部门名称")
|
||||
private String createDeptName;
|
||||
@ApiModelProperty(value = "发起部门sid")
|
||||
private String createDeptSid;
|
||||
/**
|
||||
* 发起人姓名
|
||||
*/
|
||||
@ApiModelProperty(value = "发起人姓名")
|
||||
private String createrName;
|
||||
/**
|
||||
* 任务创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "任务创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
private Date createTime;
|
||||
/**
|
||||
* 紧急程度
|
||||
*/
|
||||
@ApiModelProperty(value = "紧急程度")
|
||||
private String imperativeGrade;
|
||||
/**
|
||||
* 任务名称(环节名称)
|
||||
*/
|
||||
@ApiModelProperty(value = "任务名称")
|
||||
private String taskName;
|
||||
/**
|
||||
* 前一个任务的sid(对应hist_task表中的)
|
||||
*/
|
||||
@ApiModelProperty(value = "前一个任务的sid")
|
||||
private String preTaskSid;
|
||||
/**
|
||||
* 任务处理人Sid
|
||||
*/
|
||||
@ApiModelProperty(value = "任务处理人Sid")
|
||||
private String actorSid;
|
||||
/**
|
||||
* 表单sid
|
||||
*/
|
||||
@ApiModelProperty(value = "表单sid")
|
||||
private String formSid;
|
||||
/**
|
||||
* 是否可以撤回
|
||||
*/
|
||||
@ApiModelProperty(value = "是否可以撤回(1可以,0不可以)")
|
||||
private int isRecall;
|
||||
/**
|
||||
* 流程实例发起人
|
||||
*/
|
||||
// @ApiModelProperty(value = "流程实例发起人sid")
|
||||
//private String orderDraftorSid;
|
||||
|
||||
|
||||
/**
|
||||
* 任务显示名称
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务显示名称")
|
||||
//private String displayName;
|
||||
/**
|
||||
* 任务类型
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务类型")
|
||||
//private int taskType;
|
||||
/**
|
||||
* 参与类型
|
||||
*/
|
||||
//@ApiModelProperty(value = "参与类型")
|
||||
//private int performType;
|
||||
|
||||
|
||||
/**
|
||||
* 任务完成时间
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务完成时间")
|
||||
//private Date finishTime;
|
||||
/**
|
||||
* 任务期望完成时间
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务期望完成时间")
|
||||
//private Date expireTime;
|
||||
/**
|
||||
* 任务处理url
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务处理url")
|
||||
//private String actionUrl;
|
||||
|
||||
/**
|
||||
* 可用参数
|
||||
*/
|
||||
//private String variable;
|
||||
/**
|
||||
* 版本号
|
||||
*/
|
||||
//@ApiModelProperty(value = "版本号")
|
||||
//private int ver;
|
||||
|
||||
/**
|
||||
* 发起部门sid
|
||||
*/
|
||||
//@ApiModelProperty(value = "发起部门sid")
|
||||
//private String createDeptSid;
|
||||
|
||||
|
||||
/**
|
||||
* 动作名称
|
||||
*/
|
||||
//@ApiModelProperty(value = "动作名称")
|
||||
//private String preActionName;
|
||||
/**
|
||||
* 当前处理人姓名
|
||||
*/
|
||||
//@ApiModelProperty(value = "当前处理人姓名")
|
||||
//private String operName;
|
||||
/**
|
||||
* 当前处理人部门名称
|
||||
*/
|
||||
//@ApiModelProperty(value = "当前处理人部门名称")
|
||||
//private String operDeptName;
|
||||
/**
|
||||
* 当前处理人岗位
|
||||
*/
|
||||
//@ApiModelProperty(value = "当前处理人岗位")
|
||||
//private String operPost;
|
||||
}
|
||||
@@ -0,0 +1,67 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/10/21 10:37
|
||||
* @description 任务
|
||||
*/
|
||||
@Data
|
||||
@Component
|
||||
public class WorkDoAppVo implements Vo {
|
||||
|
||||
/**
|
||||
* 任务sid
|
||||
*/
|
||||
@ApiModelProperty(value = "taskSid")
|
||||
private String taskSid;
|
||||
/**
|
||||
* 流程名称
|
||||
*/
|
||||
@ApiModelProperty(value = "流程名称")
|
||||
private String processName;
|
||||
/**
|
||||
* 流程实例sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程实例sid")
|
||||
private String orderSid;
|
||||
/**
|
||||
* 文件标题
|
||||
*/
|
||||
@ApiModelProperty(value = "文件标题")
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 任务创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "任务创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date createTime;
|
||||
|
||||
|
||||
/**
|
||||
* 发起部门名称
|
||||
*/
|
||||
@ApiModelProperty(value = "发起部门名称")
|
||||
private String createDeptName;
|
||||
/**
|
||||
* 表单sid
|
||||
*/
|
||||
@ApiModelProperty(value = "表单sid")
|
||||
private String formSid;
|
||||
|
||||
@ApiModelProperty(value = "流程sid")
|
||||
private String processSid;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,182 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/02 09:35
|
||||
* @description 待办工作
|
||||
*/
|
||||
@Data
|
||||
@Component
|
||||
public class WorkDoVo implements Vo {
|
||||
/**
|
||||
* 任务Sid
|
||||
*/
|
||||
@ApiModelProperty(value = "taskSid")
|
||||
private String taskSid;
|
||||
/**
|
||||
* 流程实例sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程实例sid")
|
||||
private String orderSid;
|
||||
/**
|
||||
* 流程sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程sid")
|
||||
private String processSid;
|
||||
/**
|
||||
* 流程名称
|
||||
*/
|
||||
@ApiModelProperty(value = "流程名称")
|
||||
private String processName;
|
||||
/**
|
||||
* 待办工作跳转路径
|
||||
*/
|
||||
@ApiModelProperty(value = "待办工作跳转路径")
|
||||
private String instanceUrl2;
|
||||
/**
|
||||
* 待阅工作跳转路径
|
||||
*/
|
||||
@ApiModelProperty(value = "待阅工作跳转路径")
|
||||
private String instanceUrl3;
|
||||
/**
|
||||
* 文件标题
|
||||
*/
|
||||
@ApiModelProperty(value = "文件标题")
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 发起部门名称
|
||||
*/
|
||||
@ApiModelProperty(value = "发起部门名称")
|
||||
private String createDeptName;
|
||||
/**
|
||||
* 发起人姓名
|
||||
*/
|
||||
@ApiModelProperty(value = "发起人姓名")
|
||||
private String createrName;
|
||||
/**
|
||||
* 发起人姓名
|
||||
*/
|
||||
@ApiModelProperty(value = "发起人sid")
|
||||
private String createBySid;
|
||||
/**
|
||||
* 任务创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "任务创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date createTime;
|
||||
/**
|
||||
* 紧急程度
|
||||
*/
|
||||
@ApiModelProperty(value = "紧急程度")
|
||||
private String imperativeGrade;
|
||||
/**
|
||||
* 任务名称(环节名称)
|
||||
*/
|
||||
@ApiModelProperty(value = "任务名称")
|
||||
private String taskName;
|
||||
/**
|
||||
* 前一个任务的sid(对应hist_task表中的)
|
||||
*/
|
||||
@ApiModelProperty(value = "前一个任务的sid")
|
||||
private String preTaskSid;
|
||||
/**
|
||||
* 任务处理人Sid
|
||||
*/
|
||||
@ApiModelProperty(value = "任务处理人Sid")
|
||||
private String actorSid;
|
||||
/**
|
||||
* 表单sid
|
||||
*/
|
||||
@ApiModelProperty(value = "表单sid")
|
||||
private String formSid;
|
||||
/**
|
||||
* 流程实例发起人
|
||||
*/
|
||||
// @ApiModelProperty(value = "流程实例发起人sid")
|
||||
//private String orderDraftorSid;
|
||||
|
||||
|
||||
/**
|
||||
* 任务显示名称
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务显示名称")
|
||||
//private String displayName;
|
||||
/**
|
||||
* 任务类型
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务类型")
|
||||
//private int taskType;
|
||||
/**
|
||||
* 参与类型
|
||||
*/
|
||||
//@ApiModelProperty(value = "参与类型")
|
||||
//private int performType;
|
||||
|
||||
|
||||
/**
|
||||
* 任务完成时间
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务完成时间")
|
||||
//private Date finishTime;
|
||||
/**
|
||||
* 任务期望完成时间
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务期望完成时间")
|
||||
//private Date expireTime;
|
||||
/**
|
||||
* 任务处理url
|
||||
*/
|
||||
//@ApiModelProperty(value = "任务处理url")
|
||||
//private String actionUrl;
|
||||
|
||||
/**
|
||||
* 可用参数
|
||||
*/
|
||||
//private String variable;
|
||||
/**
|
||||
* 版本号
|
||||
*/
|
||||
//@ApiModelProperty(value = "版本号")
|
||||
//private int ver;
|
||||
|
||||
/**
|
||||
* 发起部门sid
|
||||
*/
|
||||
//@ApiModelProperty(value = "发起部门sid")
|
||||
//private String createDeptSid;
|
||||
|
||||
|
||||
/**
|
||||
* 动作名称
|
||||
*/
|
||||
//@ApiModelProperty(value = "动作名称")
|
||||
//private String preActionName;
|
||||
/**
|
||||
* 当前处理人姓名
|
||||
*/
|
||||
//@ApiModelProperty(value = "当前处理人姓名")
|
||||
//private String operName;
|
||||
/**
|
||||
* 当前处理人部门名称
|
||||
*/
|
||||
//@ApiModelProperty(value = "当前处理人部门名称")
|
||||
//private String operDeptName;
|
||||
/**
|
||||
* 当前处理人岗位
|
||||
*/
|
||||
//@ApiModelProperty(value = "当前处理人岗位")
|
||||
//private String operPost;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,102 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.query.Query;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/10/16 09:50
|
||||
* @description 查询参数
|
||||
*/
|
||||
@Data
|
||||
public class WorkQuery implements Query {
|
||||
private static final long serialVersionUID = -6256204643003327901L;
|
||||
// @ApiModelProperty(value = "表单sid", required = false)
|
||||
//private String formSid;
|
||||
|
||||
/**
|
||||
* 流程sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程sid", required = false)
|
||||
private String processSid;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "请假类型", required = false)
|
||||
private String type;//暂时传值 -1,不使用该查询条件
|
||||
|
||||
|
||||
@ApiModelProperty(value = "年月", required = false)
|
||||
private String month;
|
||||
/**
|
||||
* 流程实例sid
|
||||
*/
|
||||
//@ApiModelProperty(value = "流程实例sid", required = false)
|
||||
//@NotBlank(message = "流程实例sid不能为空")
|
||||
//private String orderSid;
|
||||
|
||||
@ApiModelProperty(value = "流程类别sid", required = false)
|
||||
private String processTypeSid;
|
||||
|
||||
/**
|
||||
* 参与用户sid
|
||||
*/
|
||||
@ApiModelProperty(value = "参与用户sid", required = true)
|
||||
private String actorSid;
|
||||
/**
|
||||
* 标题
|
||||
*/
|
||||
@ApiModelProperty(value = "标题", required = false)
|
||||
private String title;
|
||||
|
||||
/**
|
||||
* 紧急程度
|
||||
*/
|
||||
@ApiModelProperty(value = "紧急程度(一般、紧急、非常紧急)", required = false)
|
||||
private String imperativeGrade;
|
||||
|
||||
/**
|
||||
* 流程实例-创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "流程实例-创建时间1", required = false)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
|
||||
private Date createStartTime;
|
||||
/**
|
||||
* 流程实例-创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "流程实例-创建时间2", required = false)
|
||||
@JsonFormat(pattern = "yyyy-MM-dd",timezone="GMT+8")
|
||||
private Date createEndTime;
|
||||
|
||||
/**
|
||||
* 流程实例创建人姓名
|
||||
*/
|
||||
@ApiModelProperty(value = "流程实例创建人姓名", required = false)
|
||||
private String createrName;
|
||||
|
||||
@ApiModelProperty(value = "流程实例创建人sid", required = false)
|
||||
private String createBySid;
|
||||
/**
|
||||
* 任务类型
|
||||
*/
|
||||
@ApiModelProperty(value = "任务类型(0待办、1待阅)", required = true)
|
||||
@NotBlank(message = "任务类型不能为空")
|
||||
private String taskType;
|
||||
/**
|
||||
* 办结状态
|
||||
*/
|
||||
@ApiModelProperty(value = "办结状态(0在办、1办结)", required = false)
|
||||
private String state;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "待办列表的查询名称公共字段")
|
||||
private String name;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import com.yxt.jlzx.oa.api.filesappendix.FilesappendixVo;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2020/11/18 18:19
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class WorkRecordOneVo implements Vo {
|
||||
|
||||
private String title;//标题
|
||||
private Integer size;//个数
|
||||
private String filePath;
|
||||
private String pdfFilePath;
|
||||
private List<FilesappendixVo> filesappendixVoList;
|
||||
|
||||
private List<WorkRecordVo> workRecordVoList;
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import com.yxt.common.core.query.Query;
|
||||
|
||||
@Data
|
||||
public class WorkRecordQuery implements Query{
|
||||
private static final long serialVersionUID = -6256204643003327901L;
|
||||
@ApiModelProperty(value = "表单sid", required = false)
|
||||
private String formSid;
|
||||
|
||||
/**
|
||||
* 流程sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程sid", required = false)
|
||||
private String processSid;
|
||||
/**
|
||||
* 流程实例sid
|
||||
*/
|
||||
@ApiModelProperty(value = "流程实例sid", required = true)
|
||||
@NotBlank(message = "流程实例sid不能为空")
|
||||
private String orderSid;
|
||||
/**
|
||||
* 任务名称
|
||||
*/
|
||||
@ApiModelProperty(value = "任务名称", required = false)
|
||||
private String taskName;
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import java.util.Date;
|
||||
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/10/16 09:35
|
||||
* @description 任务
|
||||
*/
|
||||
@Data
|
||||
@Component
|
||||
public class WorkRecordVo implements Vo {
|
||||
/**
|
||||
* sid
|
||||
*/
|
||||
@ApiModelProperty(value = "sid")
|
||||
private String sid;
|
||||
/**
|
||||
* 当前处理人姓名
|
||||
*/
|
||||
@ApiModelProperty(value = "当前处理人姓名")
|
||||
private String operName;
|
||||
/**
|
||||
* 当前处理人岗位
|
||||
*/
|
||||
@ApiModelProperty(value = "当前处理人岗位")
|
||||
private String operPost;
|
||||
/**
|
||||
* 任务名称(环节名称)
|
||||
*/
|
||||
@ApiModelProperty(value = "任务名称")
|
||||
private String taskName;
|
||||
/**
|
||||
* 当前处理人意见
|
||||
*/
|
||||
@ApiModelProperty(value = "当前处理人意见")
|
||||
private String operOpinion;
|
||||
/**
|
||||
* 任务创建时间
|
||||
*/
|
||||
@ApiModelProperty(value = "任务创建时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date createTime;
|
||||
/**
|
||||
* 任务完成时间
|
||||
*/
|
||||
@ApiModelProperty(value = "任务完成时间")
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
|
||||
private Date finishTime;
|
||||
/**
|
||||
* 用时(x天x小时x分)
|
||||
*/
|
||||
@ApiModelProperty(value = "用时")
|
||||
private String useMinutes;
|
||||
|
||||
/**
|
||||
* 动作名称
|
||||
*/
|
||||
@ApiModelProperty(value = "动作名称")
|
||||
private String actionName;
|
||||
|
||||
/**
|
||||
* 当前处理人部门名称
|
||||
*/
|
||||
// @ApiModelProperty(value = "当前处理人部门名称")
|
||||
// private String operDeptName;
|
||||
/**
|
||||
* 当前处理人姓名
|
||||
*/
|
||||
@ApiModelProperty(value = "当前处理人姓名")
|
||||
private String nextOperName;
|
||||
/**
|
||||
* 当前处理人岗位
|
||||
*/
|
||||
@ApiModelProperty(value = "当前处理人岗位")
|
||||
private String nextOperPost;
|
||||
/**
|
||||
* 任务名称(环节名称)
|
||||
*/
|
||||
@ApiModelProperty(value = "任务名称")
|
||||
private String nextTaskName;
|
||||
/**
|
||||
* 签名信息
|
||||
*/
|
||||
@ApiModelProperty(value = "签名信息")
|
||||
private String signature;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/3 16:21
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class WorkTypeTreeVo implements Vo {
|
||||
/**
|
||||
* 工作类别
|
||||
*/
|
||||
@ApiModelProperty(value = "工作类别")
|
||||
WorkTypeVo workTypeVo;
|
||||
/**
|
||||
* 工作列表
|
||||
*/
|
||||
@ApiModelProperty(value = "工作列表")
|
||||
List<WorkVo> workList;
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/04 14:21
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class WorkTypeVo implements Vo {
|
||||
@ApiModelProperty(value = "工作类别sid")
|
||||
private String sid;
|
||||
/**
|
||||
* 工作类别名称
|
||||
*/
|
||||
@ApiModelProperty(value = "工作类别名称")
|
||||
private String processTypeName;
|
||||
/**
|
||||
* 排序号
|
||||
*/
|
||||
@ApiModelProperty(value = "排序号")
|
||||
private int sortNo;
|
||||
|
||||
/**
|
||||
* 工作数量
|
||||
*/
|
||||
@ApiModelProperty(value = "工作数量")
|
||||
private int workCount;
|
||||
}
|
||||
@@ -0,0 +1,21 @@
|
||||
package com.yxt.attend.api.work;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/04 14:21
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class WorkVo implements Vo {
|
||||
@ApiModelProperty(value = "工作sid")
|
||||
private String sid;
|
||||
/**
|
||||
* 工作名称
|
||||
*/
|
||||
@ApiModelProperty(value = "工作名称")
|
||||
private String processName;
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/14 14:19
|
||||
* @description 提交/退回流程dto
|
||||
*/
|
||||
@Data
|
||||
public class BackWorkDto implements Dto{
|
||||
private static final long serialVersionUID = 6661570004528986911L;
|
||||
/**
|
||||
* 当前任务sid
|
||||
*/
|
||||
@ApiModelProperty(value = "当前任务sid", required = true)
|
||||
@NotBlank(message = "当前任务sid不能为空")
|
||||
private String currentTaskSid;
|
||||
/**
|
||||
* 处理人sid
|
||||
*/
|
||||
@ApiModelProperty(value = "处理人sid", required = true)
|
||||
@NotBlank(message = "处理人sid不能为空")
|
||||
private String operUserSid;
|
||||
/**
|
||||
* 当前处理人意见
|
||||
*/
|
||||
@ApiModelProperty(value = "当前处理人意见", required = true)
|
||||
private String operOpinion;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 是否发送短信提醒
|
||||
*/
|
||||
@ApiModelProperty(value = "是否发送短信提醒", required = true)
|
||||
private int isSendMsg;
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/14 14:19
|
||||
* @description 结束流程dto
|
||||
*/
|
||||
@Data
|
||||
public class EndWorkDto implements Dto{
|
||||
private static final long serialVersionUID = 6661570004528986911L;
|
||||
/**
|
||||
* 任务sid
|
||||
*/
|
||||
@ApiModelProperty(value = "任务sid", required = true)
|
||||
@NotBlank(message = "任务sid不能为空")
|
||||
private String taskSid;
|
||||
/**
|
||||
* 办理人sid
|
||||
*/
|
||||
@ApiModelProperty(value = "办理人sid", required = true)
|
||||
@NotBlank(message = "办理人sid不能为空")
|
||||
private String operUserSid;
|
||||
/**
|
||||
* 动作sid
|
||||
*/
|
||||
@ApiModelProperty(value = "动作sid", required = true)
|
||||
@NotBlank(message = "动作sid不能为空")
|
||||
private String actionSid;
|
||||
/**
|
||||
* 办结人办理意见
|
||||
*/
|
||||
@ApiModelProperty(value = "办结人办理意见", required = true)
|
||||
@NotBlank(message = "办结人办理意见不能为空")
|
||||
private String operOpinion;
|
||||
|
||||
/**
|
||||
* 分发用户
|
||||
*/
|
||||
@ApiModelProperty(value = "分发用户", required = false)
|
||||
private String sendUsersSid;
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,57 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2021/4/12 9:57
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class EndWorkDto2 implements Dto {
|
||||
private static final long serialVersionUID = -7835586547394685486L;
|
||||
|
||||
/**
|
||||
* 任务sid
|
||||
*/
|
||||
@ApiModelProperty(value = "任务sid", required = true)
|
||||
@NotBlank(message = "任务sid不能为空")
|
||||
private String taskSid;
|
||||
/**
|
||||
* 办理人sid
|
||||
*/
|
||||
@ApiModelProperty(value = "办理人sid", required = true)
|
||||
@NotBlank(message = "办理人sid不能为空")
|
||||
private String operUserSid;
|
||||
/**
|
||||
* 动作sid
|
||||
*/
|
||||
@ApiModelProperty(value = "动作sid", required = true)
|
||||
@NotBlank(message = "动作sid不能为空")
|
||||
private String actionSid;
|
||||
/**
|
||||
* 办结人办理意见
|
||||
*/
|
||||
@ApiModelProperty(value = "办结人办理意见", required = true)
|
||||
@NotBlank(message = "办结人办理意见不能为空")
|
||||
private String operOpinion;
|
||||
|
||||
/**
|
||||
* 分发用户
|
||||
*/
|
||||
@ApiModelProperty(value = "分发用户", required = false)
|
||||
private String sendUsersSid;
|
||||
|
||||
|
||||
@ApiModelProperty(value = "签章结果", required = true)
|
||||
@NotBlank(message = "签章结果不能为空")
|
||||
private String signatureResultB64;
|
||||
|
||||
@ApiModelProperty(value = "文档sid:流程实例sid")
|
||||
private String documentSid;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import com.yxt.common.core.dto.Dto;
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/14 14:19
|
||||
* @description 撤回流程dto
|
||||
*/
|
||||
@Data
|
||||
public class RecallWorkDto implements Dto{
|
||||
private static final long serialVersionUID = 6661570004528986911L;
|
||||
/**
|
||||
* 任务sid
|
||||
*/
|
||||
@ApiModelProperty(value = "任务sid", required = true)
|
||||
@NotBlank(message = "任务sid不能为空")
|
||||
private String taskSid;
|
||||
/**
|
||||
* 处理人sid
|
||||
*/
|
||||
@ApiModelProperty(value = "处理人sid", required = false)
|
||||
@NotBlank(message = "处理人sid不能为空")
|
||||
private String operUserSid;
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import com.yxt.common.core.vo.Vo;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2021/4/17 9:19
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class RecordVo implements Vo {
|
||||
private static final long serialVersionUID = -1224623246091166105L;
|
||||
|
||||
@ApiModelProperty(value = "印章图片的base64")
|
||||
private String sealPic;
|
||||
@ApiModelProperty(value = "图片的格式")
|
||||
private String sealPicType;
|
||||
@ApiModelProperty(value = "印章的高度")
|
||||
private int sealHeight;
|
||||
@ApiModelProperty(value = "印章的宽度")
|
||||
private int sealWidth;
|
||||
@ApiModelProperty(value = "原文")
|
||||
private String originalText;
|
||||
@ApiModelProperty(value = "是否验证通过")
|
||||
private String isTrue;
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
import lombok.Data;
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/14 14:19
|
||||
* @description 提交/退回流程dto
|
||||
*/
|
||||
@Data
|
||||
public class SubmitWorkDto extends BackWorkDto{
|
||||
private static final long serialVersionUID = 6661570004528986911L;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 动作sid
|
||||
*/
|
||||
@ApiModelProperty(value = "动作sid", required = true)
|
||||
@NotBlank(message = "动作sid不能为空")
|
||||
private String actionSid;
|
||||
|
||||
|
||||
/**
|
||||
* 下一处理人sid
|
||||
*/
|
||||
@ApiModelProperty(value = "下一处理人sid", required = true)
|
||||
@NotBlank(message = "下一处理人sid不能为空")
|
||||
private String nextUserSid;
|
||||
|
||||
/**
|
||||
* 分发用户
|
||||
*/
|
||||
@ApiModelProperty(value = "分发用户", required = false)
|
||||
private String sendUsersSid;
|
||||
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import javax.validation.constraints.NotBlank;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2021/4/11 22:23
|
||||
* @description
|
||||
*/
|
||||
@Data
|
||||
public class SubmitWorkDto2 extends BackWorkDto {
|
||||
private static final long serialVersionUID = 8031499964271150695L;
|
||||
|
||||
/**
|
||||
* 动作sid
|
||||
*/
|
||||
@ApiModelProperty(value = "动作sid", required = true)
|
||||
@NotBlank(message = "动作sid不能为空")
|
||||
private String actionSid;
|
||||
|
||||
|
||||
/**
|
||||
* 下一处理人sid
|
||||
*/
|
||||
@ApiModelProperty(value = "下一处理人sid", required = true)
|
||||
@NotBlank(message = "下一处理人sid不能为空")
|
||||
private String nextUserSid;
|
||||
|
||||
/**
|
||||
* 分发用户
|
||||
*/
|
||||
@ApiModelProperty(value = "分发用户", required = false)
|
||||
private String sendUsersSid;
|
||||
|
||||
@ApiModelProperty(value = "签章结果", required = true)
|
||||
@NotBlank(message = "签章结果不能为空")
|
||||
private String signatureResultB64;
|
||||
@ApiModelProperty(value = "文档sid")
|
||||
private String documentSid;
|
||||
}
|
||||
@@ -0,0 +1,69 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
|
||||
/**
|
||||
* @author yxt_mtl
|
||||
* @date 2020/11/13 17:03
|
||||
* @description OA中工作流接口
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-attend-WorkFlow",
|
||||
name = "yxt-attend",
|
||||
path = "v1/workflow",
|
||||
fallback = WorkFlowApiFallBack.class)
|
||||
public interface WorkFlowApi {
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 执行流程
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/submitwork")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "提交工作(执行流程)")
|
||||
ResultBean submitWork(@Valid @RequestBody SubmitWorkDto dto);
|
||||
|
||||
/**
|
||||
* 结束流程
|
||||
*
|
||||
* @param taskSid 任务sid
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/endwork")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "结束工作(执行流程)")
|
||||
ResultBean endWork(@Valid @RequestBody EndWorkDto dto);
|
||||
/**
|
||||
* 退回流程。 意见页面退回时
|
||||
* @param WfMTaskDto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/backwork")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "退回工作(执行流程)")
|
||||
ResultBean backWork(@Valid @RequestBody BackWorkDto dto);
|
||||
|
||||
/**
|
||||
* 撤回流程。待办列表中撤回.
|
||||
* @param WfMTaskDto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/recallwork")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "撤回工作(执行流程)")
|
||||
ResultBean recallWork(@Valid @RequestBody RecallWorkDto dto);
|
||||
|
||||
|
||||
}
|
||||
@@ -0,0 +1,54 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import io.swagger.annotations.ApiParam;
|
||||
import org.springframework.cloud.openfeign.FeignClient;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.ResponseBody;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import java.io.UnsupportedEncodingException;
|
||||
import java.sql.ResultSet;
|
||||
|
||||
/**
|
||||
* @author dimengzhe
|
||||
* @date 2021/4/11 22:06
|
||||
* @description
|
||||
*/
|
||||
@FeignClient(
|
||||
contextId = "yxt-jlzx-oa-WorkFlow2",
|
||||
name = "yxt-jlzx-oa",
|
||||
path = "v2/workflow",
|
||||
fallback = WorkFlowApiFallBack.class)
|
||||
public interface WorkFlowApi2 {
|
||||
|
||||
/**
|
||||
* 执行流程
|
||||
*
|
||||
* @param dto
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/submitwork")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "提交工作(执行流程)")
|
||||
ResultBean submitWork(@Valid @RequestBody SubmitWorkDto2 dto);
|
||||
|
||||
/**
|
||||
* 结束流程
|
||||
*
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/endwork")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "结束工作(执行流程)")
|
||||
ResultBean endWork(@Valid @RequestBody EndWorkDto2 dto);
|
||||
|
||||
@PostMapping("/selectRecord/{signatureSid}/{userSid}")
|
||||
@ResponseBody
|
||||
@ApiOperation(value = "根据记录获取签名相关信息以及验证结果")
|
||||
public ResultBean<RecordVo> selectRecord(@ApiParam(value = "记录sid", required = true) @PathVariable("signatureSid") String signatureSid,
|
||||
@ApiParam(value = "用户sid", required = true) @PathVariable("userSid") String userSid) throws UnsupportedEncodingException;
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package com.yxt.attend.api.workflow;
|
||||
|
||||
import javax.validation.Valid;
|
||||
|
||||
import com.yxt.common.core.result.ResultBean;
|
||||
|
||||
|
||||
public class WorkFlowApiFallBack implements WorkFlowApi{
|
||||
|
||||
@Override
|
||||
public ResultBean submitWork(@Valid SubmitWorkDto dto) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean endWork(@Valid EndWorkDto dto) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean backWork(@Valid BackWorkDto dto) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ResultBean recallWork(@Valid RecallWorkDto dto) {
|
||||
// TODO Auto-generated method stub
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user