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 414 additions and 400 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
...@@ -34,6 +34,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -34,6 +34,7 @@ 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.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
...@@ -73,18 +74,17 @@ import cn.timer.api.dto.yggl.YgAreaDto; ...@@ -73,18 +74,17 @@ import cn.timer.api.dto.yggl.YgAreaDto;
import cn.timer.api.dto.yggl.YgCityDto; import cn.timer.api.dto.yggl.YgCityDto;
import cn.timer.api.dto.yggl.YgDrjqbDto; import cn.timer.api.dto.yggl.YgDrjqbDto;
import cn.timer.api.dto.yggl.YgDrsDto; import cn.timer.api.dto.yggl.YgDrsDto;
import cn.timer.api.dto.yggl.YgProDto;
import cn.timer.api.dto.yggl.YgQueryDto; import cn.timer.api.dto.yggl.YgQueryDto;
import cn.timer.api.dto.yggl.YgglCartogramDto; import cn.timer.api.dto.yggl.YgglCartogramDto;
import cn.timer.api.dto.yggl.YgjgDto; import cn.timer.api.dto.yggl.YgjgDto;
import cn.timer.api.dto.yggl.YgmzDto; 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.dto.yggl.YgzzDto;
import cn.timer.api.utils.Md5; import cn.timer.api.utils.Md5;
import cn.timer.api.utils.Result; 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;
/** /**
* @date 2019年11月15日 * @date 2019年11月15日
...@@ -117,7 +117,7 @@ public class YgglController { ...@@ -117,7 +117,7 @@ public class YgglController {
@Autowired @Autowired
private YgProDtoMapper ygProDtoMapper; private YgProDtoMapper ygProDtoMapper;
//weng //weng(民族)
@Autowired @Autowired
private YgMzDtoMapper ygMzDtoMapper; private YgMzDtoMapper ygMzDtoMapper;
/** /**
...@@ -136,9 +136,7 @@ public class YgglController { ...@@ -136,9 +136,7 @@ public class YgglController {
YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper); YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
return ResultUtil.data(ygglMainEmp, "获取员工档案成功"); return ResultUtil.data(ygglMainEmp, "获取员工档案成功");
} }
/**
* 展示员工所有单表(管理员)
*/
// 获取员工档案 // 获取员工档案
@GetMapping(value = "/ygda/{empNum}") @GetMapping(value = "/ygda/{empNum}")
@ApiOperation(value = "获取员工档案(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工档案(管)", httpMethod = "GET", notes = "接口发布说明")
...@@ -148,13 +146,11 @@ public class YgglController { ...@@ -148,13 +146,11 @@ public class YgglController {
QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>(); QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("org_code", orgCode).eq("emp_num", empNum); queryWrapper.eq("org_code", orgCode).eq("emp_num", empNum);
YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper); YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
Integer bmgwId = ygglMainEmp.getBmgwId();
return ResultUtil.data(ygglMainEmp, "获取员工档案成功"); return ResultUtil.data(ygglMainEmp, "获取员工档案成功");
} }
/** /**
* 根据岗位id获取员工档案部门岗位名称 * 根据岗位id获取员工档案部门岗位名称
*
* @param * @param
* @return * @return
*/ */
...@@ -178,7 +174,7 @@ public class YgglController { ...@@ -178,7 +174,7 @@ public class YgglController {
} }
/** /**
* 添加/修改员工档案(weng) * 添加员工档案(weng)
* *
* @param * @param
* @return * @return
...@@ -236,10 +232,8 @@ public class YgglController { ...@@ -236,10 +232,8 @@ public class YgglController {
} }
} }
} }
/** /**
* 修改员工档案 * 修改员工档案
*
* @param * @param
* @return * @return
*/ */
...@@ -252,7 +246,6 @@ public class YgglController { ...@@ -252,7 +246,6 @@ public class YgglController {
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>(); UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
updateWrapper.eq("org_code", userBean.getOrgCode()).eq("emp_num", ygglMainEmp.getEmpNum()); updateWrapper.eq("org_code", userBean.getOrgCode()).eq("emp_num", ygglMainEmp.getEmpNum());
ygglMainEmp.update(updateWrapper); ygglMainEmp.update(updateWrapper);
return ResultUtil.data(ygglMainEmp, "修改成功"); return ResultUtil.data(ygglMainEmp, "修改成功");
} }
return ResultUtil.error("请确认该员工是否存在！"); return ResultUtil.error("请确认该员工是否存在！");
...@@ -283,21 +276,20 @@ public class YgglController { ...@@ -283,21 +276,20 @@ public class YgglController {
queryWrapper. queryWrapper.
select("name","emp_num","bmgw_id","rz_time","job_type","phone","job_status") select("name","emp_num","bmgw_id","rz_time","job_type","phone","job_status")
.eq("org_code", orgCode).eq(t != null && t > -1, "job_type", t) .eq("org_code", orgCode).eq(t != null && t > -1, "job_type", t)
.eq(j != null && j > -1, "job_status", j).in(!bList.isEmpty(), "id", bList) .eq(j != null && j > -1, "job_status", j).in(!bList.isEmpty(), "bmgw_id", bList)
.and(!StrUtil.hasBlank(q), wq -> wq.like("name", q).or().like("phone", q)); .and(!StrUtil.hasBlank(q), wq -> wq.like("name", q).or().like("phone", q));
// List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper); // List<YgglMainEmp> lo = YgglMainEmp.builder().build().selectList(queryWrapper);
IPage<YgglMainEmp> ygglMainEmpPage = YgglMainEmp.builder().build().selectPage(page, queryWrapper); IPage<YgglMainEmp> ygglMainEmpPage = YgglMainEmp.builder().build().selectPage(page, queryWrapper);
// List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords(); // List<YgglMainEmp> ygglMainEmps = ygglMainEmpPage.getRecords();
ygglMainEmpPage.getCurrent();
ygglMainEmpPage.getPages();
ygglMainEmpPage.getTotal();
ygglMainEmpPage.getSize();
return ResultUtil.data(ygglMainEmpPage, "员工搜索成功"); return ResultUtil.data(ygglMainEmpPage, "员工搜索成功");
// return ResultUtil.data(ygglMainEmpPage, ygglMainEmps, "员工搜索成功"); // return ResultUtil.data(ygglMainEmpPage, ygglMainEmps, "员工搜索成功");
} }
/**
* 导入威力加强版
//威力加强版 * @param
* @return
*/
@PostMapping(value = "/ygdas") @PostMapping(value = "/ygdas")
@ApiOperation(value = "导入威力加强版", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "导入威力加强版", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 7) @ApiOperationSupport(order = 7)
...@@ -332,7 +324,6 @@ public class YgglController { ...@@ -332,7 +324,6 @@ public class YgglController {
continue; continue;
} }
} }
//判断是否已有员工登录表 //判断是否已有员工登录表
if (login==null) {// 添加三张表 if (login==null) {// 添加三张表
QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(e.getPhone()).pw(Md5.md5("123456")) QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().phone(e.getPhone()).pw(Md5.md5("123456"))
...@@ -354,7 +345,7 @@ public class YgglController { ...@@ -354,7 +345,7 @@ public class YgglController {
.sex(sex).jobNum(jobNum).bmgwId(gw) .sex(sex).jobNum(jobNum).bmgwId(gw)
.empNum(qyzxEmpLogin.getId()).orgCode(userBean.getOrgCode()).build(); .empNum(qyzxEmpLogin.getId()).orgCode(userBean.getOrgCode()).build();
emp.insert(); emp.insert();
boolean wanshan = new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper) new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()) .eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
.eq(YgglMainEmp::getId, emp.getId()) .eq(YgglMainEmp::getId, emp.getId())
.set(birthday!=null, YgglMainEmp::getBirthday, birthday) .set(birthday!=null, YgglMainEmp::getBirthday, birthday)
...@@ -376,12 +367,11 @@ public class YgglController { ...@@ -376,12 +367,11 @@ public class YgglController {
.syq(syq).sex(sex) .syq(syq).sex(sex)
.jobNum(jobNum).empNum(login.getId()).orgCode(userBean.getOrgCode()).build(); .jobNum(jobNum).empNum(login.getId()).orgCode(userBean.getOrgCode()).build();
emp.insert(); emp.insert();
boolean wanshan = new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper) new LambdaUpdateChainWrapper<YgglMainEmp>(ygglMainEmpMapper)
.eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()) .eq(YgglMainEmp::getOrgCode, userBean.getOrgCode())
.eq(YgglMainEmp::getId, emp.getId()) .eq(YgglMainEmp::getId, emp.getId())
.set(birthday!=null, YgglMainEmp::getBirthday, birthday) .set(birthday!=null, YgglMainEmp::getBirthday, birthday)
.set(jg!=null && jg!=0, YgglMainEmp::getJg, jg).update(); .set(jg!=null && jg!=0, YgglMainEmp::getJg, jg).update();
//return ResultUtil.data(emp, "添加员工档案成功!");
} else { } else {
e.setError("该手机号码已被使用"); e.setError("该手机号码已被使用");
errorList.add(e); errorList.add(e);
...@@ -406,7 +396,7 @@ public class YgglController { ...@@ -406,7 +396,7 @@ public class YgglController {
Iterator<YgDrjqbDto> itDr = drList.iterator(); Iterator<YgDrjqbDto> itDr = drList.iterator();
YgDrjqbDto a = drList.get(0);//一个员工导入 YgDrjqbDto a = drList.get(0);//一个员工导入
Integer size = drList.size(); Integer size = drList.size();
for (Integer i=0; i<size;) {// for (Integer i=0; i<size;i++) {//
YgDrjqbDto d = newList.get(i);//计数器 YgDrjqbDto d = newList.get(i);//计数器
if (itDr.hasNext()) { if (itDr.hasNext()) {
a=itDr.next(); a=itDr.next();
...@@ -420,7 +410,6 @@ public class YgglController { ...@@ -420,7 +410,6 @@ public class YgglController {
|| StrUtil.hasBlank(sex) || StrUtil.hasBlank(sex)
|| StrUtil.hasBlank(zj)) { || StrUtil.hasBlank(zj)) {
d.setError("请填写必填项"); d.setError("请填写必填项");
errorList.add(d);itDr.remove();i++;continue; errorList.add(d);itDr.remove();i++;continue;
} }
//手机号码格式不对 //手机号码格式不对
...@@ -508,7 +497,6 @@ public class YgglController { ...@@ -508,7 +497,6 @@ public class YgglController {
&& StrUtil.hasBlank(fourb)) { //没填写岗位，通过~ // && StrUtil.hasBlank(fourb)) { //没填写岗位，通过~ //
}else { }else {
//填写了部门岗位,办他！ //填写了部门岗位,办他！
Integer isHaveBmgw = isHavebmgw(bms,gw,orgCode); Integer isHaveBmgw = isHavebmgw(bms,gw,orgCode);
if (isHaveBmgw == 0) { if (isHaveBmgw == 0) {
d.setError("部门岗位有误"); d.setError("部门岗位有误");
...@@ -519,7 +507,6 @@ public class YgglController { ...@@ -519,7 +507,6 @@ public class YgglController {
} }
} }
i++;
}//for循环完毕！ }//for循环完毕！
YgDrsDto tofList = new YgDrsDto(drList, errorList, orgCode); YgDrsDto tofList = new YgDrsDto(drList, errorList, orgCode);
return tofList; return tofList;
...@@ -548,7 +535,7 @@ public class YgglController { ...@@ -548,7 +535,7 @@ public class YgglController {
String zy = d.getZy();String address = d.getAddress(); String zy = d.getZy();String address = d.getAddress();
String hjAddress = d.getHkAddress();String qq = d.getQq(); String hjAddress = d.getHkAddress();String qq = d.getQq();
String weixin =d.getWeixin(); String email = d.getEmail(); String weixin =d.getWeixin(); String email = d.getEmail();
String[] bathroom = {ygnbgh,jobType,jobStatus,rzTime,syq,zy,address,hjAddress,qq,weixin,email}; String[] bathroom = {ygnbgh,sex,jobType,jobStatus,rzTime,syq,zy,address,hjAddress,qq,weixin,email};
boolean child=takeshower(bathroom); boolean child=takeshower(bathroom);
if (child == false) { if (child == false) {
d.setError("填写内容不要大于50字数"); d.setError("填写内容不要大于50字数");
...@@ -562,16 +549,15 @@ public class YgglController { ...@@ -562,16 +549,15 @@ public class YgglController {
String bh = format.format(new Date())+orgCode+i+System.currentTimeMillis(); String bh = format.format(new Date())+orgCode+i+System.currentTimeMillis();
d.setYgnbgh(bh); d.setYgnbgh(bh);
} }
//男女(最大优化) //男女(最大优化)
d.setSex(YgEnumInterface.sex.isMan(sex)); d.setSex(YgEnumInterface.sex.isMan(sex));
//工作性质(最大优化) //工作性质(最大优化)
d.setJobType(YgEnumInterface.YgJobType.choose(jobType)); d.setJobType(YgEnumInterface.YgJobType.choose(jobType));
//员工状态(最大优化) //员工状态(最大优化)
d.setJobStatus(YgEnumInterface.jobStatus.isZhen(jobStatus)); d.setJobStatus(YgEnumInterface.jobStatus.isZhen(jobStatus));
//入职日期(已优化) //入职日期(最大优化)
d.setRzTime(YgEnumInterface.rzTime.tranTime2(YgEnumInterface.rzTime.tranTime(rzTime))); d.setRzTime(YgEnumInterface.rzTime.tranTime2(YgEnumInterface.rzTime.tranTime(rzTime)));
//试用期(已优化) //试用期(最大优化)
d.setSyq(YgEnumInterface.syq.choose(syq)); d.setSyq(YgEnumInterface.syq.choose(syq));
} }
YgDrsDto clear = new YgDrsDto(drList, errorList, orgCode); YgDrsDto clear = new YgDrsDto(drList, errorList, orgCode);
...@@ -602,7 +588,6 @@ public class YgglController { ...@@ -602,7 +588,6 @@ public class YgglController {
break; break;
} }
} }
Integer qiantao = qiantao(gwList,gw,0,orgCode); Integer qiantao = qiantao(gwList,gw,0,orgCode);
if (qiantao!=0) { if (qiantao!=0) {
return qiantao;//组织部门成立！ return qiantao;//组织部门成立！
...@@ -635,21 +620,18 @@ public class YgglController { ...@@ -635,21 +620,18 @@ public class YgglController {
Integer q = qiantao(gwList,gw,upid,orgCode); Integer q = qiantao(gwList,gw,upid,orgCode);
return q; return q;
}; };
/** /**
* 导出员工 * 导出员工
* @param * @param
* @return * @return
*/ */
@GetMapping(value = "/ygdas") @GetMapping(value = "/ygdas")
@ApiOperation(value = "导出/批量添加/修改员工", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "导出", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 8)
public Result<List<YgglMainEmp>> selectygdas(@CurrentUser UserBean userBean) { public Result<List<YgglMainEmp>> selectygdas(@CurrentUser UserBean userBean) {
Integer orgCode = userBean.getOrgCode(); int[] jList = {1,2,3};
QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>(); List<YgglMainEmp> list = new LambdaQueryChainWrapper<YgglMainEmp>(ygglMainEmpMapper).eq(YgglMainEmp::getOrgCode, userBean.getOrgCode()).in(YgglMainEmp::getJobStatus, jList).list();
queryWrapper.eq("org_code", orgCode); return ResultUtil.data(list, "导出员工成功");
List<YgglMainEmp> ygglMainEmpList = YgglMainEmp.builder().build().selectList(queryWrapper);
return ResultUtil.data(ygglMainEmpList, "导出员工成功");
} }
/** /**
...@@ -661,9 +643,8 @@ public class YgglController { ...@@ -661,9 +643,8 @@ public class YgglController {
@ApiOperation(value = "获取员工教育经历表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工教育经历表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 9) @ApiOperationSupport(order = 9)
public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaJyjlb>> selectjyjlb(@CurrentUser UserBean userBean) {
List<YgglAttaJyjlb> ygglAttaJyjlbss = YgglAttaJyjlb.builder().build() List<YgglAttaJyjlb> ygglAttaJyjlbss = YgglAttaJyjlb.builder().build().selectList(new QueryWrapper<YgglAttaJyjlb>()
.selectList(new QueryWrapper<YgglAttaJyjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaJyjlbss, "获取员工教育经历表成功"); return ResultUtil.data(ygglAttaJyjlbss, "获取员工教育经历表成功");
} }
...@@ -708,7 +689,6 @@ public class YgglController { ...@@ -708,7 +689,6 @@ public class YgglController {
/** /**
* 获取员工培训经历信息表 * 获取员工培训经历信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -716,12 +696,10 @@ public class YgglController { ...@@ -716,12 +696,10 @@ public class YgglController {
@ApiOperation(value = "获取员工培训经历信息表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工培训经历信息表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 13) @ApiOperationSupport(order = 13)
public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaPxjlxxb>> selectpxjlxxb(@CurrentUser UserBean userBean) {
List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build() List<YgglAttaPxjlxxb> ygglAttaPxjlxxbs = YgglAttaPxjlxxb.builder().build().selectList(new QueryWrapper<YgglAttaPxjlxxb>()
.selectList(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功"); return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功");
} }
// 获取员工培训经历信息表 // 获取员工培训经历信息表
@GetMapping(value = "/pxjlxxb/{empNum}") @GetMapping(value = "/pxjlxxb/{empNum}")
@ApiOperation(value = "获取员工培训经历信息表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工培训经历信息表(管)", httpMethod = "GET", notes = "接口发布说明")
...@@ -731,10 +709,8 @@ public class YgglController { ...@@ -731,10 +709,8 @@ public class YgglController {
new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功"); return ResultUtil.data(ygglAttaPxjlxxbs, "获取员工培训经历信息表成功");
} }
/** /**
* 添加/修改员工培训经历信息表 * 添加/修改员工培训经历信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -748,10 +724,8 @@ public class YgglController { ...@@ -748,10 +724,8 @@ public class YgglController {
ygglAttaPxjlxxb.insertOrUpdate(); ygglAttaPxjlxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaPxjlxxb, "添加/修改员工培训经历信息表成功"); return ResultUtil.data(ygglAttaPxjlxxb, "添加/修改员工培训经历信息表成功");
} }
/** /**
* 删除员工培训经历信息表 * 删除员工培训经历信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -763,10 +737,8 @@ public class YgglController { ...@@ -763,10 +737,8 @@ public class YgglController {
return ResultUtil.data(YgglAttaPxjlxxb.builder().build() return ResultUtil.data(YgglAttaPxjlxxb.builder().build()
.delete(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工培训经历信息表成功"); .delete(new QueryWrapper<YgglAttaPxjlxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工培训经历信息表成功");
} }
/** /**
* 获取员工工作经历表 * 获取员工工作经历表
*
* @param * @param
* @return * @return
*/ */
...@@ -774,9 +746,8 @@ public class YgglController { ...@@ -774,9 +746,8 @@ public class YgglController {
@ApiOperation(value = "获取员工工作经历表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工工作经历表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 17) @ApiOperationSupport(order = 17)
public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaGzjlb>> selectgzjlb(@CurrentUser UserBean userBean) {
List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build() List<YgglAttaGzjlb> ygglAttaGzjlbs = YgglAttaGzjlb.builder().build().selectList(new QueryWrapper<YgglAttaGzjlb>()
.selectList(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功"); return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功");
} }
// 获取员工工作经历表 // 获取员工工作经历表
...@@ -788,10 +759,8 @@ public class YgglController { ...@@ -788,10 +759,8 @@ public class YgglController {
new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaGzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功"); return ResultUtil.data(ygglAttaGzjlbs, "获取员工工作经历表成功");
} }
/** /**
* 添加/修改员工工作经历表 * 添加/修改员工工作经历表
*
* @param * @param
* @return * @return
*/ */
...@@ -804,10 +773,8 @@ public class YgglController { ...@@ -804,10 +773,8 @@ public class YgglController {
ygglAttaGzjlb.insertOrUpdate(); ygglAttaGzjlb.insertOrUpdate();
return ResultUtil.data(ygglAttaGzjlb, "添加/修改员工工作经历表成功"); return ResultUtil.data(ygglAttaGzjlb, "添加/修改员工工作经历表成功");
} }
/** /**
* 删除员工工作经历表 * 删除员工工作经历表
*
* @param * @param
* @return * @return
*/ */
...@@ -817,13 +784,10 @@ public class YgglController { ...@@ -817,13 +784,10 @@ public class YgglController {
public Result<Boolean> delgzjlb(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<Boolean> delgzjlb(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaGzjlb.builder().build() return ResultUtil.data(YgglAttaGzjlb.builder().build()
.delete(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", orgCode).eq("id", id)), "删除员工工作经历表成功"); .delete(new QueryWrapper<YgglAttaGzjlb>().eq("org_code", orgCode).eq("id", id)), "删除员工工作经历表成功");
} }
/** /**
* 获取员工职称信息表 * 获取员工职称信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -831,12 +795,10 @@ public class YgglController { ...@@ -831,12 +795,10 @@ public class YgglController {
@ApiOperation(value = "获取员工职称信息表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工职称信息表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 21) @ApiOperationSupport(order = 21)
public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaZcxxb>> selectzcxxb(@CurrentUser UserBean userBean) {
List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build() List<YgglAttaZcxxb> ygglAttaZcxxbs = YgglAttaZcxxb.builder().build().selectList(new QueryWrapper<YgglAttaZcxxb>()
.selectList(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功"); return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功");
} }
// 获取员工职称信息表 // 获取员工职称信息表
@GetMapping(value = "/zcxxb/{empNum}") @GetMapping(value = "/zcxxb/{empNum}")
@ApiOperation(value = "获取员工职称信息表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工职称信息表(管)", httpMethod = "GET", notes = "接口发布说明")
...@@ -846,10 +808,8 @@ public class YgglController { ...@@ -846,10 +808,8 @@ public class YgglController {
new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaZcxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功"); return ResultUtil.data(ygglAttaZcxxbs, "获取员工职称信息表成功");
} }
/** /**
* 添加/修改员工职称信息表 * 添加/修改员工职称信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -862,11 +822,8 @@ public class YgglController { ...@@ -862,11 +822,8 @@ public class YgglController {
ygglAttaZcxxb.insertOrUpdate(); ygglAttaZcxxb.insertOrUpdate();
return ResultUtil.data(ygglAttaZcxxb, "添加/修改员工职称信息表成功"); return ResultUtil.data(ygglAttaZcxxb, "添加/修改员工职称信息表成功");
} }
/** /**
* 删除员工职称信息表 * 删除员工职称信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -878,15 +835,8 @@ public class YgglController { ...@@ -878,15 +835,8 @@ public class YgglController {
return ResultUtil.data(YgglAttaZcxxb.builder().build() return ResultUtil.data(YgglAttaZcxxb.builder().build()
.delete(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工职称信息表成功"); .delete(new QueryWrapper<YgglAttaZcxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工职称信息表成功");
} }
/** /**
* 获取员工证书证件表 * 获取员工证书证件表
*
* @param * @param
* @return * @return
*/ */
...@@ -894,26 +844,21 @@ public class YgglController { ...@@ -894,26 +844,21 @@ public class YgglController {
@ApiOperation(value = "获取员工证书证件表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工证书证件表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 25) @ApiOperationSupport(order = 25)
public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean) {
List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build() List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build().selectList(new QueryWrapper<YgglAttaZszjb>()
.selectList(new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功"); return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
} }
// 获取员工证书证件表 // 获取员工证书证件表
@GetMapping(value = "/zszjb/{empNum}") @GetMapping(value = "/zszjb/{empNum}")
@ApiOperation(value = "获取员工证书证件表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工证书证件表(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 26) @ApiOperationSupport(order = 26)
public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<List<YgglAttaZszjb>> selectzszjb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build().selectList( List<YgglAttaZszjb> ygglAttaZszjbs = YgglAttaZszjb.builder().build().selectList(
new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum)); new QueryWrapper<YgglAttaZszjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", empNum));
return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功"); return ResultUtil.data(ygglAttaZszjbs, "获取员工证书证件表成功");
} }
/** /**
* 添加/修改员工证书证件表 * 添加/修改员工证书证件表
*
* @param * @param
* @return * @return
*/ */
...@@ -926,10 +871,8 @@ public class YgglController { ...@@ -926,10 +871,8 @@ public class YgglController {
ygglAttaZszjb.insertOrUpdate(); ygglAttaZszjb.insertOrUpdate();
return ResultUtil.data(ygglAttaZszjb, "添加/修改员工证书证件表成功"); return ResultUtil.data(ygglAttaZszjb, "添加/修改员工证书证件表成功");
} }
/** /**
* 删除员工证书证件表 * 删除员工证书证件表
*
* @param * @param
* @return * @return
*/ */
...@@ -943,7 +886,6 @@ public class YgglController { ...@@ -943,7 +886,6 @@ public class YgglController {
} }
/** /**
* 获取员工联系信息表 * 获取员工联系信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -951,9 +893,8 @@ public class YgglController { ...@@ -951,9 +893,8 @@ public class YgglController {
@ApiOperation(value = "获取员工联系信息表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工联系信息表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 29) @ApiOperationSupport(order = 29)
public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaLxxxb>> selectlxxxb(@CurrentUser UserBean userBean) {
List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build() List<YgglAttaLxxxb> ygglAttaLxxxbs = YgglAttaLxxxb.builder().build().selectList(new QueryWrapper<YgglAttaLxxxb>()
.selectList(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功"); return ResultUtil.data(ygglAttaLxxxbs, "获取员工联系信息表成功");
} }
// 获取员工联系信息表 // 获取员工联系信息表
...@@ -967,7 +908,6 @@ public class YgglController { ...@@ -967,7 +908,6 @@ public class YgglController {
} }
/** /**
* 添加/修改员工联系信息表 * 添加/修改员工联系信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -982,7 +922,6 @@ public class YgglController { ...@@ -982,7 +922,6 @@ public class YgglController {
} }
/** /**
* 删除员工联系信息表 * 删除员工联系信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -994,10 +933,8 @@ public class YgglController { ...@@ -994,10 +933,8 @@ public class YgglController {
return ResultUtil.data(YgglAttaLxxxb.builder().build() return ResultUtil.data(YgglAttaLxxxb.builder().build()
.delete(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工联系信息表成功"); .delete(new QueryWrapper<YgglAttaLxxxb>().eq("org_code", orgCode).eq("id", id)), "删除员工联系信息表成功");
} }
/** /**
* 获取员工紧急联系人表 * 获取员工紧急联系人表
*
* @param * @param
* @return * @return
*/ */
...@@ -1005,12 +942,10 @@ public class YgglController { ...@@ -1005,12 +942,10 @@ public class YgglController {
@ApiOperation(value = "获取员工紧急联系人表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工紧急联系人表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 33) @ApiOperationSupport(order = 33)
public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean) { public Result<List<YgglAttaJjlxr>> selectjjlxr(@CurrentUser UserBean userBean) {
List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build() List<YgglAttaJjlxr> ygglAttaJjlxrs = YgglAttaJjlxr.builder().build().selectList(new QueryWrapper<YgglAttaJjlxr>()
.selectList(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功"); return ResultUtil.data(ygglAttaJjlxrs, "获取员工紧急联系人表成功");
} }
// 获取员工紧急联系人表 // 获取员工紧急联系人表
@GetMapping(value = "/jjlxr/{empNum}") @GetMapping(value = "/jjlxr/{empNum}")
@ApiOperation(value = "获取员工紧急联系人表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工紧急联系人表(管)", httpMethod = "GET", notes = "接口发布说明")
...@@ -1022,7 +957,6 @@ public class YgglController { ...@@ -1022,7 +957,6 @@ public class YgglController {
} }
/** /**
* 添加/修改员工紧急联系人表 * 添加/修改员工紧急联系人表
*
* @param * @param
* @return * @return
*/ */
...@@ -1037,7 +971,6 @@ public class YgglController { ...@@ -1037,7 +971,6 @@ public class YgglController {
} }
/** /**
* 删除员工紧急联系人表 * 删除员工紧急联系人表
*
* @param * @param
* @return * @return
*/ */
...@@ -1049,11 +982,9 @@ public class YgglController { ...@@ -1049,11 +982,9 @@ public class YgglController {
return ResultUtil.data(YgglAttaJjlxr.builder().build() return ResultUtil.data(YgglAttaJjlxr.builder().build()
.delete(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", orgCode).eq("id", id)), "删除员工紧急联系人表成功"); .delete(new QueryWrapper<YgglAttaJjlxr>().eq("org_code", orgCode).eq("id", id)), "删除员工紧急联系人表成功");
} }
// 获取工资卡信息 // 获取工资卡信息
/** /**
* 获取员工工资卡信息 * 获取员工工资卡信息
*
* @param * @param
* @return * @return
*/ */
...@@ -1076,7 +1007,6 @@ public class YgglController { ...@@ -1076,7 +1007,6 @@ public class YgglController {
} }
/** /**
* 添加/修改工资卡信息 * 添加/修改工资卡信息
*
* @param * @param
* @return * @return
*/ */
...@@ -1091,7 +1021,6 @@ public class YgglController { ...@@ -1091,7 +1021,6 @@ public class YgglController {
} }
/** /**
* 删除工资卡信息 * 删除工资卡信息
*
* @param * @param
* @return * @return
*/ */
...@@ -1103,10 +1032,8 @@ public class YgglController { ...@@ -1103,10 +1032,8 @@ public class YgglController {
return ResultUtil.data(YgglAttaGzk.builder().build() return ResultUtil.data(YgglAttaGzk.builder().build()
.delete(new QueryWrapper<YgglAttaGzk>().eq("org_code", orgCode).eq("id", id)), "删除工资卡信息成功"); .delete(new QueryWrapper<YgglAttaGzk>().eq("org_code", orgCode).eq("id", id)), "删除工资卡信息成功");
} }
/** /**
* 获取员工合同信息表 * 获取员工合同信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -1114,9 +1041,8 @@ public class YgglController { ...@@ -1114,9 +1041,8 @@ public class YgglController {
@ApiOperation(value = "获取员工合同信息表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工合同信息表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 41) @ApiOperationSupport(order = 41)
public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaHtxxb>> selecthtxxb(@CurrentUser UserBean userBean) {
List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build() List<YgglAttaHtxxb> ygglAttaHtxxbs = YgglAttaHtxxb.builder().build().selectList(new QueryWrapper<YgglAttaHtxxb>()
.selectList(new QueryWrapper<YgglAttaHtxxb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功"); return ResultUtil.data(ygglAttaHtxxbs, "获取员工合同信息表成功");
} }
// 获取员工合同信息表 // 获取员工合同信息表
...@@ -1130,7 +1056,6 @@ public class YgglController { ...@@ -1130,7 +1056,6 @@ public class YgglController {
} }
/** /**
* 添加/修改员工合同信息表 * 添加/修改员工合同信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -1145,7 +1070,6 @@ public class YgglController { ...@@ -1145,7 +1070,6 @@ public class YgglController {
} }
/** /**
* 删除员工合同信息表 * 删除员工合同信息表
*
* @param * @param
* @return * @return
*/ */
...@@ -1167,9 +1091,8 @@ public class YgglController { ...@@ -1167,9 +1091,8 @@ public class YgglController {
@ApiOperation(value = "获取员工材料附件表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工材料附件表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 45) @ApiOperationSupport(order = 45)
public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaClfjb>> selectclfjb(@CurrentUser UserBean userBean) {
List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build() List<YgglAttaClfjb> ygglAttaClfjbs = YgglAttaClfjb.builder().build().selectList(new QueryWrapper<YgglAttaClfjb>()
.selectList(new QueryWrapper<YgglAttaClfjb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功"); return ResultUtil.data(ygglAttaClfjbs, "获取员工材料附件表成功");
} }
// 获取员工材料附件表 // 获取员工材料附件表
...@@ -1183,7 +1106,6 @@ public class YgglController { ...@@ -1183,7 +1106,6 @@ public class YgglController {
} }
/** /**
* 添加/修改员工材料附件表 * 添加/修改员工材料附件表
*
* @param * @param
* @return * @return
*/ */
...@@ -1198,7 +1120,6 @@ public class YgglController { ...@@ -1198,7 +1120,6 @@ public class YgglController {
} }
/** /**
* 删除员工材料附件表 * 删除员工材料附件表
*
* @param * @param
* @return * @return
*/ */
...@@ -1213,7 +1134,6 @@ public class YgglController { ...@@ -1213,7 +1134,6 @@ public class YgglController {
/** /**
* 获取成长记录表 * 获取成长记录表
*
* @param * @param
* @return * @return
*/ */
...@@ -1221,9 +1141,8 @@ public class YgglController { ...@@ -1221,9 +1141,8 @@ public class YgglController {
@ApiOperation(value = "获取成长记录表", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取成长记录表", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 49) @ApiOperationSupport(order = 49)
public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean) { public Result<List<YgglAttaCzjlb>> selectczjlb(@CurrentUser UserBean userBean) {
List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build() List<YgglAttaCzjlb> ygglAttaCzjlbs = YgglAttaCzjlb.builder().build().selectList(new QueryWrapper<YgglAttaCzjlb>()
.selectList(new QueryWrapper<YgglAttaCzjlb>().eq("org_code", userBean.getOrgCode()).eq("emp_num", .eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
userBean.getEmpNum()));
return ResultUtil.data(ygglAttaCzjlbs, "获取成长记录表成功"); return ResultUtil.data(ygglAttaCzjlbs, "获取成长记录表成功");
} }
// 获取成长记录表 // 获取成长记录表
...@@ -1237,7 +1156,6 @@ public class YgglController { ...@@ -1237,7 +1156,6 @@ public class YgglController {
} }
/** /**
* 添加/修改成长记录表 * 添加/修改成长记录表
*
* @param * @param
* @return * @return
*/ */
...@@ -1250,24 +1168,21 @@ public class YgglController { ...@@ -1250,24 +1168,21 @@ public class YgglController {
ygglAttaCzjlb.insertOrUpdate(); ygglAttaCzjlb.insertOrUpdate();
return ResultUtil.data(ygglAttaCzjlb, "添加/修改成长记录表成功"); return ResultUtil.data(ygglAttaCzjlb, "添加/修改成长记录表成功");
} }
/**
* 获取单个离职员工信息(管)
// 获取员工离职表 * @param
* @return
*/
@GetMapping(value = "/lzb/{empNum}") @GetMapping(value = "/lzb/{empNum}")
@ApiOperation(value = "获取员工离职表(管)", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取单个离职员工信息(管)", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 52) @ApiOperationSupport(order = 52)
public Result<List<YgglMainLzb>> selectlzb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) { public Result<YgglMainLzb> selectlzb(@CurrentUser UserBean userBean, @PathVariable Integer empNum) {
Integer orgCode = userBean.getOrgCode(); YgglMainLzb lzyg = new LambdaQueryChainWrapper<YgglMainLzb>(ygglMainLzbMapper)
QueryWrapper<YgglMainLzb> queryWrapper = new QueryWrapper<>(); .eq(YgglMainLzb::getOrgCode, userBean.getOrgCode()).eq(YgglMainLzb::getEmpNum, empNum).one();
queryWrapper.eq("org_code", orgCode); return ResultUtil.data(lzyg, "获取单个离职员工信息(管)成功");
List<YgglMainLzb> ygglMainLzbs = YgglMainLzb.builder().build().selectList(queryWrapper);
return ResultUtil.data(ygglMainLzbs, "获取员工离职表成功");
} }
/** /**
* 员工转正 * 员工转正
*
* @param * @param
* @return * @return
*/ */
...@@ -1281,10 +1196,8 @@ public class YgglController { ...@@ -1281,10 +1196,8 @@ public class YgglController {
.zzRemark(ygzzDto.getZzRemark()).build().update(updateWrapper); .zzRemark(ygzzDto.getZzRemark()).build().update(updateWrapper);
return ResultUtil.success("转正成功！"); return ResultUtil.success("转正成功！");
} }
/** /**
* 计划离职 type2-3 * 计划离职 type2-3
*
* @param * @param
* @return * @return
*/ */
...@@ -1292,41 +1205,30 @@ public class YgglController { ...@@ -1292,41 +1205,30 @@ public class YgglController {
@ApiOperation(value = "添加离职计划", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加离职计划", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 54) @ApiOperationSupport(order = 54)
public Result<YgglMainLzb> addjhlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) { public Result<YgglMainLzb> addjhlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>(); QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>();
queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum()).eq("org_code", userBean.getOrgCode()); queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum()).eq("org_code", userBean.getOrgCode());
YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper); YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build().selectOne(queryWrapper);
YgglMainLzb ygglMainLzb = YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).build(); YgglMainLzb ygglMainLzb = YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).build();
// 移动员工表数据到离职表 // 移动员工表数据到离职表
BeanUtil.copyProperties(ygglMainEmp, ygglMainLzb); BeanUtil.copyProperties(ygglMainEmp, ygglMainLzb);
ygglMainLzb.insert(); ygglMainLzb.insert();
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>(); UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum()); updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>(); UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>();
updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum()); updateWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(3).build().update(updateWrapper); YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(3).build().update(updateWrapper);
YgglMainLzb.builder().jobStatus(3).lzTime(lzygQueryDto.getLzTime()).lzyy(lzygQueryDto.getLzyy()) YgglMainLzb.builder().jobStatus(3).lzTime(lzygQueryDto.getLzTime()).lzyy(lzygQueryDto.getLzyy())
.lzbz(lzygQueryDto.getLzbz()).build().update(updateWrapper1); .lzbz(lzygQueryDto.getLzbz()).build().update(updateWrapper1);
// 删除员工表 // 删除员工表
// ygglMainEmp.deleteById(); // ygglMainEmp.deleteById();
// 删除员工登陆表 // 删除员工登陆表
// QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().id(ygglMainLzb.getEmpNum()).build(); // QyzxEmpLogin qyzxEmpLogin = QyzxEmpLogin.builder().id(ygglMainLzb.getEmpNum()).build();
// qyzxEmpLogin.deleteById(); // qyzxEmpLogin.deleteById();
return ResultUtil.data(ygglMainLzb, "添加待离职员工成功"); return ResultUtil.data(ygglMainLzb, "添加待离职员工成功");
} }
/** /**
* 确认离职 type3-4 * 确认离职 type3-4
*
* @param * @param
* @return * @return
*/ */
...@@ -1336,32 +1238,23 @@ public class YgglController { ...@@ -1336,32 +1238,23 @@ public class YgglController {
public Result<Void> addlzb(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) { public Result<Void> addlzb(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>(); QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<YgglMainEmp>();
queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum()); queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>(); UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum()); updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>(); UpdateWrapper<YgglMainLzb> updateWrapper1 = new UpdateWrapper<YgglMainLzb>();
updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum()); updateWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(4).build().update(updateWrapper); YgglMainEmp.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(4).build().update(updateWrapper);
YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(4).sjlzTime(new Date()).build() YgglMainLzb.builder().empNum(lzygQueryDto.getEmpNum()).jobStatus(4).sjlzTime(new Date()).build()
.update(updateWrapper1); .update(updateWrapper1);
// 查询该员工的关联表 // 查询该员工的关联表
QueryWrapper<QyzxEmpEntAsso> queryWrapper1 = new QueryWrapper<QyzxEmpEntAsso>(); QueryWrapper<QyzxEmpEntAsso> queryWrapper1 = new QueryWrapper<QyzxEmpEntAsso>();
queryWrapper1.eq("emp_num", lzygQueryDto.getEmpNum()); queryWrapper1.eq("emp_num", lzygQueryDto.getEmpNum());
// 确认离职 删除员工关联表 // 确认离职 删除员工关联表
QyzxEmpEntAsso qyzxEmpEntAsso = QyzxEmpEntAsso.builder().empNum(lzygQueryDto.getEmpNum()).build(); QyzxEmpEntAsso qyzxEmpEntAsso = QyzxEmpEntAsso.builder().empNum(lzygQueryDto.getEmpNum()).build();
qyzxEmpEntAsso.delete(queryWrapper1); qyzxEmpEntAsso.delete(queryWrapper1);
return ResultUtil.success("确认离职员工成功"); return ResultUtil.success("确认离职员工成功");
} }
/** /**
* 放弃离职 type3-2 * 放弃离职 type3-2
*
* @param * @param
* @return * @return
*/ */
...@@ -1369,24 +1262,18 @@ public class YgglController { ...@@ -1369,24 +1262,18 @@ public class YgglController {
@ApiOperation(value = "放弃离职", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "放弃离职", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 56) @ApiOperationSupport(order = 56)
public Result<Void> fqlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) { public Result<Void> fqlz(@CurrentUser UserBean userBean, @RequestBody LzygQueryDto lzygQueryDto) {
UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>(); UpdateWrapper<YgglMainEmp> updateWrapper = new UpdateWrapper<YgglMainEmp>();
updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum()); updateWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
YgglMainEmp.builder().jobStatus(2).build().update(updateWrapper); YgglMainEmp.builder().jobStatus(2).build().update(updateWrapper);
QueryWrapper<YgglMainLzb> queryWrapper = new QueryWrapper<YgglMainLzb>(); QueryWrapper<YgglMainLzb> queryWrapper = new QueryWrapper<YgglMainLzb>();
queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum()); queryWrapper.eq("emp_num", lzygQueryDto.getEmpNum());
// 删除离职表 // 删除离职表
YgglMainLzb.builder().id(lzygQueryDto.getEmpNum()).build().delete(queryWrapper); YgglMainLzb.builder().id(lzygQueryDto.getEmpNum()).build().delete(queryWrapper);
return ResultUtil.success("放弃成功"); return ResultUtil.success("放弃成功");
} }
/** /**
* 查询离职员工列表 * 查询离职员工列表
*
* @param * @param
* @return * @return
*/ */
...@@ -1395,24 +1282,13 @@ public class YgglController { ...@@ -1395,24 +1282,13 @@ public class YgglController {
@ApiOperationSupport(order = 57) @ApiOperationSupport(order = 57)
public Result<Object> querylzyg(@CurrentUser UserBean userBean, @RequestBody LzbQueryDto lzygQueryDto) { public Result<Object> querylzyg(@CurrentUser UserBean userBean, @RequestBody LzbQueryDto lzygQueryDto) {
lzygQueryDto.setOrgCode(userBean.getOrgCode()); lzygQueryDto.setOrgCode(userBean.getOrgCode());
IPage<YgglMainLzb> page = new Page<YgglMainLzb>( IPage<YgglMainLzb> page = new Page<YgglMainLzb>(
lzygQueryDto.getCurrentPage() == null ? 1 : lzygQueryDto.getCurrentPage(), lzygQueryDto.getCurrentPage() == null ? 1 : lzygQueryDto.getCurrentPage(),
lzygQueryDto.getTotalPage() == null ? 10 : lzygQueryDto.getTotalPage()); lzygQueryDto.getTotalPage() == null ? 10 : lzygQueryDto.getTotalPage());
List<YgglMainLzb> lzb = ygglMainLzbMapper.queryLzb(page, lzygQueryDto); List<YgglMainLzb> lzb = ygglMainLzbMapper.queryLzb(page, lzygQueryDto);
return ResultUtil.data(page, lzb, "离职员工搜索成功"); return ResultUtil.data(page, lzb, "离职员工搜索成功");
} }
/**
* 部门导入(未完成)
* @param
* @return
*/
@PostMapping(value = "/ygbmdr")
@ApiOperation(value = "员工部门导入未完成", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 58)
public Result<List<YgglMainEmp>> ygbmdr(UserBean userBean, List<YgglMainEmp> EmpList) {
return ResultUtil.success("员工导入成功！");
}
/** /**
* 展示民族/展示所有民族 * 展示民族/展示所有民族
* @param * @param
...@@ -1446,17 +1322,17 @@ public class YgglController { ...@@ -1446,17 +1322,17 @@ public class YgglController {
if (type == 1) { //省份 if (type == 1) { //省份
List<YgProDto> list = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getProvince,YgProDto::getName).orderByAsc(YgProDto::getProvince).list(); List<YgProDto> list = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getProvince,YgProDto::getName).orderByAsc(YgProDto::getProvince).list();
for (YgProDto pro : list) { for (YgProDto pro : list) {
maps.add(new YgjgDto(pro.getId(), pro.getProvince(), pro.getName())); maps.add(new YgjgDto(pro.getId(), pro.getProvince(), pro.getName(),null));
}} }}
if (type == 2) { //城市 if (type == 2) { //城市
List<YgCityDto> list = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getCity,YgCityDto::getName).eq(YgCityDto::getProvince, upId).orderByAsc(YgCityDto::getProvince).orderByAsc(YgCityDto::getCity).list(); List<YgCityDto> list = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getCity,YgCityDto::getName).eq(YgCityDto::getProvince, upId).orderByAsc(YgCityDto::getProvince).orderByAsc(YgCityDto::getCity).list();
for (YgCityDto city : list) { for (YgCityDto city : list) {
maps.add(new YgjgDto(city.getId(), city.getCity(), city.getName())); maps.add(new YgjgDto(city.getId(), city.getCity(), city.getName(),null));
}} }}
if (type == 3) { //地区 if (type == 3) { //地区
List<YgAreaDto> list = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getCity, upId).orderByAsc(YgAreaDto::getProvince).orderByAsc(YgAreaDto::getCity).list(); List<YgAreaDto> list = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getCity, upId).orderByAsc(YgAreaDto::getProvince).orderByAsc(YgAreaDto::getCity).list();
for (YgAreaDto area : list) { for (YgAreaDto area : list) {
maps.add(new YgjgDto(area.getId(), area.getId(), area.getName())); maps.add(new YgjgDto(area.getId(), area.getId(), area.getName(),null));
}} }}
//IYgjgDto iYgjgDto = PunishFactory.getPunish(type); //IYgjgDto iYgjgDto = PunishFactory.getPunish(type);
//List<String> strings = iYgjgDto.exePunish(); //List<String> strings = iYgjgDto.exePunish();
...@@ -1464,28 +1340,55 @@ public class YgglController { ...@@ -1464,28 +1340,55 @@ public class YgglController {
if (!maps.isEmpty()) return ResultUtil.data(maps, "展示籍贯成功"); if (!maps.isEmpty()) return ResultUtil.data(maps, "展示籍贯成功");
return ResultUtil.success(null); return ResultUtil.success(null);
} }
/**
* 根据籍贯id显示籍贯名
* @param
* @return
*/
@PostMapping(value = "/jgp/{id}") @PostMapping(value = "/jgp/{id}")
@ApiOperation(value = "显示籍贯省市区", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "根据籍贯id显示籍贯城市名", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 61) @ApiOperationSupport(order = 61)
public Result<String> selectjg(@CurrentUser UserBean userBean, @PathVariable Integer id) { public Result<YgjgDto> selectjg(@CurrentUser UserBean userBean, @RequestBody YgjgDto jgcity) {
String isPro =id.toString().substring(2,4); Integer jgid = jgcity.getJgid();
String isCity =id.toString().substring(4,6); Integer cid = jgcity.getType();
if ("00".equals(isPro)) { if (jgid!=null) {
YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getId, id).one(); String top = jgid.toString().substring(0,2);
if (pro!=null) { return ResultUtil.data(pro.getName(),"显示所在籍贯"); }} String isPro =jgid.toString().substring(2,4);
if ("00".equals(isCity)) { String isCity =jgid.toString().substring(4,6);
YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, id).one(); if ("00".equals(isPro)) {
if (city!=null ) { return ResultUtil.data(city.getName(),"显示所在籍贯"); }} YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getId, jgid).one();
YgAreaDto area = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getId, id).one(); if (pro!=null) jgcity.setJgname(pro.getName());
if (area!=null ) { return ResultUtil.data(area.getName(),"显示所在籍贯");} } else if ("00".equals(isCity)) {
return ResultUtil.error("编码有误，显示不到所在籍贯"); YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getProvince, top).one();
YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, jgid).one();
if (city!=null ) jgcity.setJgname(pro.getName()+city.getName());
}
YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getProvince, top).one();
YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, Integer.parseInt(top+isPro)).one();
YgAreaDto area = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getId, jgid).one();
if (area!=null ) jgcity.setJgname(pro.getName()+city.getName()+area.getName());
}
if (cid!=null) {
String top = cid.toString().substring(0,2);
String isPro =cid.toString().substring(2,4);
String isCity =cid.toString().substring(4,6);
if ("00".equals(isPro)) {
YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getId, cid).one();
if (pro!=null) jgcity.setCityname(pro.getName());
} else if ("00".equals(isCity)) {
YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getProvince, top).one();
YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, cid).one();
if (city!=null ) jgcity.setCityname(pro.getName()+city.getName());
}
YgProDto pro = new LambdaQueryChainWrapper<YgProDto>(ygProDtoMapper).select(YgProDto::getId,YgProDto::getName).eq(YgProDto::getProvince, top).one();
YgCityDto city = new LambdaQueryChainWrapper<YgCityDto>(ygCityDtoMapper).select(YgCityDto::getId,YgCityDto::getName).eq(YgCityDto::getId, Integer.parseInt(top+isPro)).one();
YgAreaDto area = new LambdaQueryChainWrapper<YgAreaDto>(ygAreaDtoMapper).select(YgAreaDto::getId,YgAreaDto::getName).eq(YgAreaDto::getId, cid).one();
if (area!=null ) jgcity.setCityname(pro.getName()+city.getName()+area.getName());
}
return ResultUtil.data(jgcity);
} }
/** /**
* 查询员工列表 * 查询员工列表
*
* @param * @param
* @return * @return
*/ */
...@@ -1496,11 +1399,9 @@ public class YgglController { ...@@ -1496,11 +1399,9 @@ public class YgglController {
List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean); List<YgQueryDto> ygQueryDto = ygglMainEmpMapper.queryEmpMessage(userBean);
return ResultUtil.data(ygQueryDto, "查询成功"); return ResultUtil.data(ygQueryDto, "查询成功");
} }
/*************** 统计图 ***************/ /*************** 统计图 ***************/
/** /**
* 查询统计图 * 查询统计图
*
* @return 成功信息 * @return 成功信息
*/ */
@GetMapping("/yggl") @GetMapping("/yggl")
...@@ -1538,32 +1439,41 @@ public class YgglController { ...@@ -1538,32 +1439,41 @@ public class YgglController {
return ResultUtil.data(map, "查询成功"); return ResultUtil.data(map, "查询成功");
} }
/**
* 获取成长记录表
* @param
* @return
*/
@GetMapping(value = "/ygsbgjj")
@ApiOperation(value = "获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 64)
public Result<List<YgglAttaSbgjj>> selectygsbgjj(@CurrentUser UserBean userBean) {
List<YgglAttaSbgjj> ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectList(new QueryWrapper<YgglAttaSbgjj>()
.eq("org_code", userBean.getOrgCode()).eq("emp_num", userBean.getEmpNum()));
return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功");
}
/** /**
* 获取员工社保公积金 * 获取员工社保公积金
*
* @param * @param
* @return * @return
*/ */
@GetMapping(value = "/ygsbgjj/{empNum}") @GetMapping(value = "/ygsbgjj/{empNum}")
@ApiOperation(value = "获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取员工社保公积金", httpMethod = "GET", notes = "接口发布说明")
@ApiOperationSupport(order = 64) @ApiOperationSupport(order = 65)
public Result<YgglAttaSbgjj> selectygsbgjj(@CurrentUser UserBean userBean,@PathVariable Integer empNum) { public Result<YgglAttaSbgjj> selectygsbgjj(@CurrentUser UserBean userBean,@PathVariable Integer empNum) {
YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectOne(new QueryWrapper<YgglAttaSbgjj>().eq("emp_num", empNum)); YgglAttaSbgjj ygglAttaSbgjj = YgglAttaSbgjj.builder().build().selectOne(new QueryWrapper<YgglAttaSbgjj>().eq("emp_num", empNum));
return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功"); return ResultUtil.data(ygglAttaSbgjj, "获取员工社保公积金成功");
} }
/** /**
* 添加/修改员工社保公积金 * 添加/修改员工社保公积金
*
* @param * @param
* @return * @return
*/ */
@PostMapping(value = "/ygsbgjj") @PostMapping(value = "/ygsbgjj")
@ApiOperation(value = "添加/修改员工社保公积金", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "添加/修改员工社保公积金", httpMethod = "POST", notes = "接口发布说明")
@ApiOperationSupport(order = 65) @ApiOperationSupport(order = 66)
public Result<YgglAttaSbgjj> addygsbgjj(@CurrentUser UserBean userBean,@RequestBody YgglAttaSbgjj ygglAttaSbgjj) { public Result<YgglAttaSbgjj> addygsbgjj(@CurrentUser UserBean userBean,@RequestBody YgglAttaSbgjj ygglAttaSbgjj) {
Integer empNum = ygglAttaSbgjj.getEmpNum(); Integer empNum = ygglAttaSbgjj.getEmpNum();
if (empNum == null) { if (empNum == null) {
...@@ -1579,4 +1489,18 @@ public class YgglController { ...@@ -1579,4 +1489,18 @@ public class YgglController {
return ResultUtil.data(ygglAttaSbgjj, "添加/修改员工社保公积金成功"); return ResultUtil.data(ygglAttaSbgjj, "添加/修改员工社保公积金成功");
} }
/**
* 删除员工社保公积金
* @param
* @return
*/
@DeleteMapping(value = "/ygsbgjj/{id}")
@ApiOperation(value = "删除员工社保公积金", httpMethod = "DELETE", notes = "接口发布说明")
@ApiOperationSupport(order = 67)
public Result<Boolean> delygsbgjj(@CurrentUser UserBean userBean, @PathVariable Integer id) {
Integer orgCode = userBean.getOrgCode();
return ResultUtil.data(YgglAttaSbgjj.builder().build()
.delete(new QueryWrapper<YgglAttaSbgjj>().eq("org_code", orgCode).eq("id", id)), "删除员工社保公积金成功");
}
} }
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