Skip to content

8
8timerapiv200
Commit b32f48cd by 邓实川
Options

Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc

parents 6d5db75d 055fc866
Showing with 281 additions and 191 deletions
pom.xml
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<properties> <properties>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<shiro.version>1.2.3</shiro.version> <shiro.version>1.2.3</shiro.version>
<swagger.version>2.9.2</swagger.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -66,35 +67,54 @@ ...@@ -66,35 +67,54 @@
</dependency> </dependency>
<!-- optional这个需要为 true 热部署才有效 --> <!-- optional这个需要为 true 热部署才有效 -->
<!-- <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-devtools</artifactId>
<optional>true</optional> </dependency> -->
<dependency> <dependency>
<groupId>io.springfox</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>springfox-swagger2</artifactId> <artifactId>spring-boot-devtools</artifactId>
<version>2.9.2</version> <optional>true</optional>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.github.xiaoymin/swagger-bootstrap-ui --> <!-- swagger2 -->
<dependency> <dependency>
<groupId>com.github.xiaoymin</groupId> <groupId>io.springfox</groupId>
<artifactId>swagger-bootstrap-ui</artifactId> <artifactId>springfox-swagger2</artifactId>
<version>1.9.6</version> <version>${swagger.version}</version>
<exclusions>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</exclusion>
<exclusion>
<groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!-- 解决 Illegal DefaultValue null for parameter type integer 异常 --> <!--防止进入swagger页面报类型转换错误，排除2.9.2中的引用，手动增加1.5.21版本 -->
<!-- https://mvnrepository.com/artifact/io.swagger/swagger-annotations -->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
<version>1.5.22</version> <version>1.5.21</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/io.swagger/swagger-models -->
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-models</artifactId> <artifactId>swagger-models</artifactId>
<version>1.5.22</version> <version>1.5.21</version>
</dependency> </dependency>
<!-- swagger2-UI -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>${swagger.version}</version>
</dependency>
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
<version>2.0.2</version>
</dependency>
<!-- --> <!-- -->
<dependency> <dependency>
...@@ -137,7 +157,7 @@ ...@@ -137,7 +157,7 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.shiro</groupId> <groupId>org.apache.shiro</groupId>
...@@ -209,7 +229,7 @@ ...@@ -209,7 +229,7 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.alibaba</groupId> <groupId>com.alibaba</groupId>
...@@ -296,21 +316,21 @@ ...@@ -296,21 +316,21 @@
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
<version>1.2</version> <version>1.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.json-lib</groupId> <groupId>net.sf.json-lib</groupId>
<artifactId>json-lib</artifactId> <artifactId>json-lib</artifactId>
<version>2.4</version> <version>2.4</version>
<classifier>jdk15</classifier> <classifier>jdk15</classifier>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/nl.bitwalker/UserAgentUtils --> <!-- https://mvnrepository.com/artifact/nl.bitwalker/UserAgentUtils -->
<dependency> <dependency>
<groupId>nl.bitwalker</groupId> <groupId>nl.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId> <artifactId>UserAgentUtils</artifactId>
<version>1.2.4</version> <version>1.2.4</version>
</dependency> </dependency>
</dependencies> </dependencies>
<repositories> <repositories>
......
src/main/java/cn/timer/api/bean/qyzx/QyzxEmpLogin.java
...@@ -74,7 +74,7 @@ public class QyzxEmpLogin extends Model<QyzxEmpLogin> { ...@@ -74,7 +74,7 @@ public class QyzxEmpLogin extends Model<QyzxEmpLogin> {
@ApiModelProperty(value="验证码 ",example="666666") @ApiModelProperty(value="验证码 ",example="666666")
private Integer code; private Integer code;
@ApiModelProperty(value="权限 ",example="['0','1','2']") @ApiModelProperty(value="权限 ",example="0,1,2")
@TableField(exist = false) @TableField(exist = false)
private List<String> menus; private List<String> menus;
......
src/main/java/cn/timer/api/bean/yggl/YgglAttaSbgjj.java
package cn.timer.api.bean.yggl; package cn.timer.api.bean.yggl;
import javax.persistence.Entity; import javax.persistence.Entity;
import javax.persistence.GeneratedValue; import javax.persistence.GeneratedValue;
import javax.persistence.Id; import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @author Tang 2019-12-27 * @author Tang 2019-12-27
*/ */
@Entity @Entity
@Data @Data
@Builder @Builder
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@Table(name="yggl_atta_sbgjj") @Table(name="yggl_atta_sbgjj")
@ApiModel("员工社保公积金") @ApiModel("员工社保公积金")
public class YgglAttaSbgjj extends Model<YgglAttaSbgjj> { public class YgglAttaSbgjj extends Model<YgglAttaSbgjj> {
private static final long serialVersionUID = 532391446907698642L; private static final long serialVersionUID = 532391446907698642L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
@ApiModelProperty(value="编号 编号",example="10001") @ApiModelProperty(value="编号 编号",example="10001")
private Integer id; private Integer id;
@ApiModelProperty(value="员工工号 员工工号",example="100") @ApiModelProperty(value="员工工号 员工工号",example="100")
private Integer empNum; private Integer empNum;
@ApiModelProperty(value="是否首次缴纳社保 0是 1否",example="0") @ApiModelProperty(value="是否首次缴纳社保 0是 1否",example="0")
private Integer isScjnsb; private Integer isScjnsb;
@ApiModelProperty(value="是否首次缴纳公积金 0是 1否",example="0") @ApiModelProperty(value="是否首次缴纳公积金 0是 1否",example="0")
private Integer isScjngjj; private Integer isScjngjj;
@ApiModelProperty(value="个人社保帐号 ",example="HJHG124") @ApiModelProperty(value="个人社保帐号 ",example="HJHG124")
private String grsbzh; private String grsbzh;
@ApiModelProperty(value="个人公积金帐号 ",example="OH81889257") @ApiModelProperty(value="个人公积金帐号 ",example="OH81889257")
private String grgjjzh; private String grgjjzh;
@ApiModelProperty(value="组织机构代码 ",example="117")
private Integer orgCode;
} }
\ No newline at end of file
src/main/java/cn/timer/api/bean/yggl/YgglMainEmp.java
...@@ -8,10 +8,14 @@ import javax.persistence.Id; ...@@ -8,10 +8,14 @@ import javax.persistence.Id;
import javax.persistence.Table; import javax.persistence.Table;
import javax.persistence.Transient; import javax.persistence.Transient;
import org.springframework.format.annotation.DateTimeFormat;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
...@@ -130,7 +134,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> { ...@@ -130,7 +134,7 @@ public class YgglMainEmp extends Model<YgglMainEmp> {
@ApiModelProperty(value="工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="101") @ApiModelProperty(value="工作性质 1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="101")
private Integer jobType; private Integer jobType;
@ApiModelProperty(value="员工状态 1试用、2正式、3离职中、4已离职",example="101") @ApiModelProperty(value="员工状态 1正式、2试用、3离职中、4已离职",example="101")
private Integer jobStatus; private Integer jobStatus;
@ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间") @ApiModelProperty(value="入职日期 ",example="客户注册后的时间为入职时间")
......
src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java
...@@ -36,6 +36,8 @@ public class WebSecurityConfig implements WebMvcConfigurer { ...@@ -36,6 +36,8 @@ public class WebSecurityConfig implements WebMvcConfigurer {
registry.addInterceptor(getSessionInterceptor()) registry.addInterceptor(getSessionInterceptor())
.addPathPatterns("/**") .addPathPatterns("/**")
.excludePathPatterns("/doc*") .excludePathPatterns("/doc*")
.excludePathPatterns("/v2/**")
.excludePathPatterns("/**/*.js")
.excludePathPatterns("/8timer/**") .excludePathPatterns("/8timer/**")
.excludePathPatterns("/kqz/punchclock/**") .excludePathPatterns("/kqz/punchclock/**")
.excludePathPatterns("/kqz/sauserregdata/**") .excludePathPatterns("/kqz/sauserregdata/**")
......
src/main/java/cn/timer/api/config/swagger/Swagger2Config.java
package cn.timer.api.config.swagger; package cn.timer.api.config.swagger;
import java.util.ArrayList;
import java.util.List;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import com.github.xiaoymin.swaggerbootstrapui.annotations.EnableSwaggerBootstrapUI; import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.builders.ApiInfoBuilder;
import springfox.documentation.builders.PathSelectors; import springfox.documentation.builders.PathSelectors;
import springfox.documentation.builders.RequestHandlerSelectors; import springfox.documentation.builders.RequestHandlerSelectors;
import springfox.documentation.service.ApiInfo; import springfox.documentation.service.ApiInfo;
import springfox.documentation.service.ApiKey;
import springfox.documentation.service.AuthorizationScope;
import springfox.documentation.service.SecurityReference;
import springfox.documentation.spi.DocumentationType; import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spi.service.contexts.SecurityContext;
import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2; import springfox.documentation.swagger2.annotations.EnableSwagger2;
@Configuration//声明为配置文件，让spring加载 @Configuration // 声明为配置文件，让spring加载
@EnableSwagger2//支持swagger2插件配置 @EnableSwagger2 // 支持swagger2插件配置
@EnableSwaggerBootstrapUI @EnableKnife4j
@Import(BeanValidatorPluginsConfiguration.class)
public class Swagger2Config { public class Swagger2Config {
// apiInfo对象主要是设置我们api文档的标题，描述，访问的地址，创建者等信息
@SuppressWarnings("deprecation")
@Bean @Bean
public Docket createRestApi() { public ApiInfo apiInfo() {
return new Docket(DocumentationType.SWAGGER_2) return new ApiInfoBuilder().title("8小时-Api接口文档").description("快速进行Api接口调试").termsOfServiceUrl("127.0.0.1:8080")
.apiInfo(apiInfo()) .contact("TangZhaoQian").version("1.0").build();
.select() }
//.apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
.apis(RequestHandlerSelectors.basePackage("cn.timer.api")) /**
.paths(PathSelectors.any()) * 创建API
.build(); */
}
//apiInfo对象主要是设置我们api文档的标题，描述，访问的地址，创建者等信息
@SuppressWarnings("deprecation")
@Bean @Bean
public ApiInfo apiInfo(){ public Docket createRestApi() {
return new ApiInfoBuilder() return new Docket(DocumentationType.SWAGGER_2)
.title("8小时-Api接口文档") // .pathMapping("/dev-api")
.description("快速进行Api接口调试") // 用来创建该API的基本信息，展示在文档的页面中（自定义展示的信息）
.termsOfServiceUrl("127.0.0.1:8080") .apiInfo(apiInfo())
.contact("TangZhaoQian") // 设置哪些接口暴露给Swagger展示
.version("1.0") .select()
.build(); // 扫描所有有注解的api，用这种方式更灵活
} // .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
//docket容器设置我们的文档基础信息，api包的位置，以及路劲的匹配规则（包含四种：全匹配，不匹配，正则匹配和ant匹配） // 扫描指定包中的swagger注解
// @Bean .apis(RequestHandlerSelectors.basePackage("cn.timer.api"))
// public Docket docket(){ // 扫描所有 .apis(RequestHandlerSelectors.any())
// //return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.basePackage("cn.timer.api.controller")).paths(PathSelectors.regex("/test/.*")).build(); .paths(PathSelectors.any()).build()
// return new Docket(DocumentationType.SWAGGER_2).apiInfo(apiInfo()).select().apis(RequestHandlerSelectors.basePackage("cn.timer.api.controller")).paths(PathSelectors.regex("/*/.*")).build(); /* 设置安全模式，swagger可以设置访问token */
// } .securitySchemes(securitySchemes()).securityContexts(securityContexts());
}
/**
* 安全模式，这里指定token通过Authorization头请求头传递
*/
private List<ApiKey> securitySchemes() {
List<ApiKey> apiKeyList = new ArrayList<ApiKey>();
apiKeyList.add(new ApiKey("Authorization", "Authorization", "header"));
return apiKeyList;
}
/**
* 安全上下文
*/
private List<SecurityContext> securityContexts() {
List<SecurityContext> securityContexts = new ArrayList<>();
securityContexts.add(SecurityContext.builder().securityReferences(defaultAuth())
.forPaths(PathSelectors.regex("^(?!auth).*$")).build());
return securityContexts;
}
/**
* 默认的安全上引用
*/
private List<SecurityReference> defaultAuth() {
AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
authorizationScopes[0] = authorizationScope;
List<SecurityReference> securityReferences = new ArrayList<>();
securityReferences.add(new SecurityReference("Authorization", authorizationScopes));
return securityReferences;
}
} }
\ No newline at end of file
src/main/java/cn/timer/api/controller/LoginController.java
...@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
...@@ -73,6 +74,7 @@ public class LoginController { ...@@ -73,6 +74,7 @@ public class LoginController {
*/ */
@PostMapping(value = "/sendcode") @PostMapping(value = "/sendcode")
@ApiOperation(value = "1.发送验证码", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "1.发送验证码", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 1)
public Result<String> sendCode(@RequestBody EntRegisterDto entRegisterDto) { public Result<String> sendCode(@RequestBody EntRegisterDto entRegisterDto) {
// 6位随机数验证码 // 6位随机数验证码
try { try {
...@@ -121,6 +123,7 @@ public class LoginController { ...@@ -121,6 +123,7 @@ public class LoginController {
*/ */
@PostMapping(value = "/authentication") @PostMapping(value = "/authentication")
@ApiOperation(value = "2.手机号码认证", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "2.手机号码认证", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 2)
public Result<String> authentication(@RequestBody EntRegisterDto entRegisterDto) { public Result<String> authentication(@RequestBody EntRegisterDto entRegisterDto) {
String phone = entRegisterDto.getPhone(); String phone = entRegisterDto.getPhone();
Integer code = entRegisterDto.getCode(); Integer code = entRegisterDto.getCode();
...@@ -141,7 +144,8 @@ public class LoginController { ...@@ -141,7 +144,8 @@ public class LoginController {
* @throws IOException * @throws IOException
*/ */
@PostMapping(value = "/test") @PostMapping(value = "/test")
@ApiOperation(value = "2.测试", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "3.测试", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 3)
public void test(HttpServletRequest request, HttpServletResponse res) throws IOException { public void test(HttpServletRequest request, HttpServletResponse res) throws IOException {
res.setHeader("content-type","text/html;charset=UTF-8"); res.setHeader("content-type","text/html;charset=UTF-8");
...@@ -173,7 +177,8 @@ public class LoginController { ...@@ -173,7 +177,8 @@ public class LoginController {
* @return * @return
*/ */
@PostMapping(value = "/updatepassword") @PostMapping(value = "/updatepassword")
@ApiOperation(value = "3.修改密码", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "4.修改密码", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 4)
public Result<String> updatepassword(@RequestBody EntRegisterDto entRegisterDto){ public Result<String> updatepassword(@RequestBody EntRegisterDto entRegisterDto){
String phone = entRegisterDto.getPhone(); String phone = entRegisterDto.getPhone();
......
src/main/java/cn/timer/api/controller/jxgl/AchievementsController.java
...@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.timer.api.bean.jxgl.JxglAdminJcsz; import cn.timer.api.bean.jxgl.JxglAdminJcsz;
...@@ -49,7 +50,6 @@ import cn.timer.api.utils.Result; ...@@ -49,7 +50,6 @@ import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil; import cn.timer.api.utils.ResultUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiOperationSupport;
import net.sf.json.JSONArray; import net.sf.json.JSONArray;
import net.sf.json.JSONObject; import net.sf.json.JSONObject;
......
src/main/java/cn/timer/api/controller/kqgl/AttController.java
package cn.timer.api.controller.kqgl; package cn.timer.api.controller.kqgl;
import java.io.UnsupportedEncodingException;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.text.DateFormat; import java.text.DateFormat;
import java.text.ParseException; import java.text.ParseException;
...@@ -38,6 +37,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -38,6 +37,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.json.JSONObject; import cn.hutool.json.JSONObject;
import cn.timer.api.bean.kqgl.AttCalendarAlarm; import cn.timer.api.bean.kqgl.AttCalendarAlarm;
...@@ -58,7 +58,6 @@ import cn.timer.api.bean.kqgl.AttendanceWeeklySch; ...@@ -58,7 +58,6 @@ import cn.timer.api.bean.kqgl.AttendanceWeeklySch;
import cn.timer.api.bean.kqgl.CalendarAlarm; import cn.timer.api.bean.kqgl.CalendarAlarm;
import cn.timer.api.bean.kqgl.ClockCollectData; import cn.timer.api.bean.kqgl.ClockCollectData;
import cn.timer.api.bean.kqgl.CustomRosterSchedule; import cn.timer.api.bean.kqgl.CustomRosterSchedule;
import cn.timer.api.bean.kqgl.KqglAssoKqjgly;
import cn.timer.api.bean.kqgl.KqzAttendanceGroupSearch; import cn.timer.api.bean.kqgl.KqzAttendanceGroupSearch;
import cn.timer.api.bean.kqgl.PunchCardAddress; import cn.timer.api.bean.kqgl.PunchCardAddress;
import cn.timer.api.bean.kqgl.PunchCardDetails; import cn.timer.api.bean.kqgl.PunchCardDetails;
...@@ -75,8 +74,6 @@ import cn.timer.api.bean.kqgl.TBlFkcmdTrans; ...@@ -75,8 +74,6 @@ import cn.timer.api.bean.kqgl.TBlFkcmdTrans;
import cn.timer.api.bean.kqgl.TBlFkcmdTransCmdParam; import cn.timer.api.bean.kqgl.TBlFkcmdTransCmdParam;
import cn.timer.api.bean.kqgl.UserAttendanceRel; import cn.timer.api.bean.kqgl.UserAttendanceRel;
import cn.timer.api.bean.kqgl.UserEquiRelation; import cn.timer.api.bean.kqgl.UserEquiRelation;
import cn.timer.api.bean.kqjg.KqjgRealtimeEnrollData;
import cn.timer.api.bean.xcgl.XcglAdminXzz;
import cn.timer.api.bean.yggl.YgglMainEmp; import cn.timer.api.bean.yggl.YgglMainEmp;
import cn.timer.api.config.Initialization.StaticVariable; import cn.timer.api.config.Initialization.StaticVariable;
import cn.timer.api.config.annotation.CurrentUser; import cn.timer.api.config.annotation.CurrentUser;
...@@ -99,7 +96,6 @@ import cn.timer.api.dao.kqgl.UserEquiRelationMapper; ...@@ -99,7 +96,6 @@ import cn.timer.api.dao.kqgl.UserEquiRelationMapper;
import cn.timer.api.dao.kqjg.KqjgRealtimeEnrollDataMapper; import cn.timer.api.dao.kqjg.KqjgRealtimeEnrollDataMapper;
import cn.timer.api.dao.yggl.YgglMainEmpMapper; import cn.timer.api.dao.yggl.YgglMainEmpMapper;
import cn.timer.api.dto.kqgl.AttemacDto; import cn.timer.api.dto.kqgl.AttemacDto;
import cn.timer.api.dto.kqgl.AttendanceMachineDto;
import cn.timer.api.dto.kqgl.MachinememberDto; import cn.timer.api.dto.kqgl.MachinememberDto;
import cn.timer.api.utils.DateUtil; import cn.timer.api.utils.DateUtil;
import cn.timer.api.utils.ResponseResult; import cn.timer.api.utils.ResponseResult;
...@@ -107,7 +103,6 @@ import cn.timer.api.utils.Result; ...@@ -107,7 +103,6 @@ import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil; import cn.timer.api.utils.ResultUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiParam; import io.swagger.annotations.ApiParam;
/** /**
......
src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java
...@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -19,6 +19,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.timer.api.bean.sbgjj.SbgjjAdminCbry; import cn.timer.api.bean.sbgjj.SbgjjAdminCbry;
...@@ -53,7 +54,6 @@ import cn.timer.api.utils.Result; ...@@ -53,7 +54,6 @@ import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil; import cn.timer.api.utils.ResultUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiOperationSupport;
@Api(tags = "社保公积金Api") @Api(tags = "社保公积金Api")
@RestController @RestController
......
src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java
...@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; ...@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
...@@ -48,7 +49,6 @@ import cn.timer.api.utils.Result; ...@@ -48,7 +49,6 @@ import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil; import cn.timer.api.utils.ResultUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiOperationSupport;
@Api(tags = "3.0审批模块") @Api(tags = "3.0审批模块")
@RestController @RestController
......
src/main/java/cn/timer/api/controller/yggl/YgglController.java.rej 0 → 100644
diff a/src/main/java/cn/timer/api/controller/yggl/YgglController.java b/src/main/java/cn/timer/api/controller/yggl/YgglController.java (rejected hunks)
@@ -76,6 +76,7 @@
import cn.timer.api.dto.yggl.YgQueryDto;
import cn.timer.api.dto.yggl.YgglCartogramDto;
import cn.timer.api.dto.yggl.YgjgDto;
+import cn.timer.api.dto.yggl.YgmzDto;
import cn.timer.api.dto.yggl.YgProDto;
import cn.timer.api.dto.yggl.YgzzDto;
import cn.timer.api.utils.Md5;
src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java
...@@ -51,4 +51,8 @@ public class AddygdaDto extends Page implements Serializable{ ...@@ -51,4 +51,8 @@ public class AddygdaDto extends Page implements Serializable{
@ApiModelProperty(value="性别 0：男；1：女",example="0") @ApiModelProperty(value="性别 0：男；1：女",example="0")
private Integer sex; private Integer sex;
} }
src/main/java/cn/timer/api/dto/yggl/YgQueryDto.java
/** /**
* @date 2019年11月16日 * @date 2019年11月16日
* @author 翁东州 * @author 翁东州
* @方法中文名称: * @方法中文名称:
*/ */
package cn.timer.api.dto.yggl; package cn.timer.api.dto.yggl;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
import cn.timer.api.utils.Page; import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import cn.timer.api.utils.Page;
import lombok.Builder; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.AllArgsConstructor;
import lombok.NoArgsConstructor; import lombok.Builder;
import lombok.Data;
/** import lombok.NoArgsConstructor;
* @date 2019年11月16日
* @author 翁东州 /**
* @方法中文名称: * @date 2019年11月16日
*/ * @author 翁东州
@Data * @方法中文名称:
@Builder */
@NoArgsConstructor @Data
@AllArgsConstructor @Builder
public class YgQueryDto extends Page implements Serializable{ @NoArgsConstructor
@AllArgsConstructor
private static final long serialVersionUID = -1230023773946170942L; public class YgQueryDto extends Page implements Serializable{
@ApiModelProperty(value="员工姓名",example="华仔") private static final long serialVersionUID = -1230023773946170942L;
private String empName;
@ApiModelProperty(value="员工姓名",example="华仔")
@ApiModelProperty(value="员工号",example="1") private String empName;
private Integer empNum;
@ApiModelProperty(value="员工号",example="1")
@ApiModelProperty(value="部门名",example="1") private Integer empNum;
private String deptName;
@ApiModelProperty(value="部门名",example="1")
@ApiModelProperty(value="上级部门名",example="1") private String deptName;
private String upName;
@ApiModelProperty(value="上级部门名",example="1")
@ApiModelProperty(value="入职时间",example="1") private String upName;
private Date rzTime;
@ApiModelProperty(value="入职时间",example="1")
@ApiModelProperty(value="应离职时间",example="1") private Date rzTime;
private Date ylzTime;
@ApiModelProperty(value="应离职时间",example="1")
@ApiModelProperty(value="工作性质1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="1") private Date ylzTime;
private Integer jobType;
@ApiModelProperty(value="工作性质1全职、2实习生、3兼职、4劳务派遣、5劳务、6派遣、7外包、8退休返聘",example="1")
@ApiModelProperty(value="手机号",example="1") private Integer jobType;
private String phone;
@ApiModelProperty(value="手机号",example="1")
@ApiModelProperty(value="部门id",example="101") private String phone;
private Integer bmgwid;
@ApiModelProperty(value="部门id",example="101")
@ApiModelProperty(value="员工状态1试用、2正式、3离职中、4已离职",example="2") private Integer bmgwid;
private Integer jobStatus;
@ApiModelProperty(value="员工状态1正式、2试用、3离职中、4已离职",example="2")
@ApiModelProperty(value="手机号、姓名",example="1388888888 or 张三") private Integer jobStatus;
private String query;
@ApiModelProperty(value="手机号、姓名",example="1388888888 or 张三")
@ApiModelProperty(value="备注",example="123") private String query;
private String bz;
} @ApiModelProperty(value="备注",example="123")
private String bz;
}
src/main/java/cn/timer/api/dto/yggl/YgjgDto.java
...@@ -38,6 +38,10 @@ public class YgjgDto implements Serializable { ...@@ -38,6 +38,10 @@ public class YgjgDto implements Serializable {
@Transient @Transient
@TableField(exist = false) @TableField(exist = false)
private String cityname;
@Transient
@TableField(exist = false)
private String jgname; private String jgname;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment