Skip to content

8
8timerapiv200
Commit 965434d0 by 太阳与水
Options

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

parents a09f5e6f 9b5129e6
Showing with 445 additions and 856 deletions
.gitignore
...@@ -29,3 +29,5 @@ build/ ...@@ -29,3 +29,5 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
/mvnw
/mvnw.cmd
pom.xml
...@@ -137,7 +137,6 @@ ...@@ -137,7 +137,6 @@
<dependency> <dependency>
<groupId>org.apache.commons</groupId> <groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId> <artifactId>commons-lang3</artifactId>
<version>3.4</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -210,7 +209,6 @@ ...@@ -210,7 +209,6 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.9.8</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -328,7 +326,6 @@ ...@@ -328,7 +326,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration> <configuration>
<source>1.8</source> <source>1.8</source>
<target>1.8</target> <target>1.8</target>
...@@ -349,7 +346,6 @@ ...@@ -349,7 +346,6 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId> <artifactId>maven-resources-plugin</artifactId>
<version>3.0.1</version>
<configuration> <configuration>
<!--<failOnMissingWebXml>false</failOnMissingWebXml> --> <!--<failOnMissingWebXml>false</failOnMissingWebXml> -->
<includeEmptyDirs>true</includeEmptyDirs> <includeEmptyDirs>true</includeEmptyDirs>
......
src/main/java/cn/timer/api/Application.java
...@@ -11,19 +11,29 @@ import org.springframework.http.converter.HttpMessageConverter; ...@@ -11,19 +11,29 @@ import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.scheduling.annotation.EnableScheduling; import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement; import org.springframework.transaction.annotation.EnableTransactionManagement;
import org.springframework.web.client.RestTemplate; import org.springframework.web.client.RestTemplate;
import org.springframework.web.cors.CorsConfiguration;
import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
import org.springframework.web.filter.CorsFilter;
import com.alibaba.fastjson.serializer.SerializerFeature; import com.alibaba.fastjson.serializer.SerializerFeature;
import com.alibaba.fastjson.support.config.FastJsonConfig; import com.alibaba.fastjson.support.config.FastJsonConfig;
import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter; import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
import cn.hutool.core.net.NetUtil;
@MapperScan("cn.timer.api.dao") // 扫描的mapper @MapperScan("cn.timer.api.dao") // 扫描的mapper
//@ComponentScan(basePackages = {"cn.timer.api.controller"}) //@ComponentScan(basePackages = {"cn.timer.api.controller"})
@SpringBootApplication @SpringBootApplication
@EnableScheduling @EnableScheduling
@EnableTransactionManagement @EnableTransactionManagement
public class Application{ public class Application {
public static void main(String[] args) { public static void main(String[] args) {
final Integer port = 8089;
if (!NetUtil.isUsableLocalPort(port)) {
System.err.printf("端口%d被占用了，无法启动%n", port);
System.exit(1);
}
SpringApplication.run(Application.class, args); SpringApplication.run(Application.class, args);
} }
...@@ -47,6 +57,7 @@ public class Application{ ...@@ -47,6 +57,7 @@ public class Application{
// 5.返回HttpMessageConverters对象 // 5.返回HttpMessageConverters对象
return new HttpMessageConverters(converter); return new HttpMessageConverters(converter);
} }
// extends SpringBootServletInitializer // extends SpringBootServletInitializer
@Autowired @Autowired
private RestTemplateBuilder restTemplateBuilder; private RestTemplateBuilder restTemplateBuilder;
...@@ -56,8 +67,25 @@ public class Application{ ...@@ -56,8 +67,25 @@ public class Application{
return restTemplateBuilder.build(); return restTemplateBuilder.build();
} }
private CorsConfiguration buildConfig() {
CorsConfiguration corsConfiguration = new CorsConfiguration();
corsConfiguration.addAllowedOrigin("*"); // 1允许任何域名使用
corsConfiguration.addAllowedHeader("*"); // 2允许任何头
corsConfiguration.addAllowedMethod("*"); // 3允许任何方法（post、get等）
corsConfiguration.setAllowCredentials(true);
return corsConfiguration;
}
@Bean
public CorsFilter corsFilter() {
UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
source.registerCorsConfiguration("/**", buildConfig()); // 4
return new CorsFilter(source);
}
// @Override // @Override
// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) { // protected SpringApplicationBuilder configure(SpringApplicationBuilder
// builder) {
// return builder.sources(Application.class); // return builder.sources(Application.class);
// } // }
} }
src/main/java/cn/timer/api/bean/clazz/CityClazz.java
...@@ -36,6 +36,8 @@ import lombok.NoArgsConstructor; ...@@ -36,6 +36,8 @@ import lombok.NoArgsConstructor;
@ApiModel("城市类") @ApiModel("城市类")
public class CityClazz extends Model<CityClazz>{ public class CityClazz extends Model<CityClazz>{
private static final long serialVersionUID = 3208566213833439168L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/jxgl/JxglAdminJcsz.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("基础设置") @ApiModel("基础设置")
public class JxglAdminJcsz extends Model<JxglAdminJcsz> { public class JxglAdminJcsz extends Model<JxglAdminJcsz> {
/**
*
*/
private static final long serialVersionUID = 8687909529181749192L; private static final long serialVersionUID = 8687909529181749192L;
@Id @Id
......
src/main/java/cn/timer/api/bean/jxgl/JxglAdminKpzsz.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("考评组设置") @ApiModel("考评组设置")
public class JxglAdminKpzsz extends Model<JxglAdminKpzsz> { public class JxglAdminKpzsz extends Model<JxglAdminKpzsz> {
/**
*
*/
private static final long serialVersionUID = 3542750698820133341L; private static final long serialVersionUID = 3542750698820133341L;
@Id @Id
......
src/main/java/cn/timer/api/bean/jxgl/JxglAdminZbk.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("指标库") @ApiModel("指标库")
public class JxglAdminZbk extends Model<JxglAdminZbk> { public class JxglAdminZbk extends Model<JxglAdminZbk> {
/**
*
*/
private static final long serialVersionUID = 2558055045569841060L; private static final long serialVersionUID = 2558055045569841060L;
@Id @Id
......
src/main/java/cn/timer/api/bean/jxgl/JxglAssoFbzbk.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("指标库量化指标") @ApiModel("指标库量化指标")
public class JxglAssoFbzbk extends Model<JxglAssoFbzbk> { public class JxglAssoFbzbk extends Model<JxglAssoFbzbk> {
/**
*
*/
private static final long serialVersionUID = 2052434463054119049L; private static final long serialVersionUID = 2052434463054119049L;
@Id @Id
......
src/main/java/cn/timer/api/bean/jxgl/JxglAssoJxdj.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("绩效等级") @ApiModel("绩效等级")
public class JxglAssoJxdj extends Model<JxglAssoJxdj> { public class JxglAssoJxdj extends Model<JxglAssoJxdj> {
/**
*
*/
private static final long serialVersionUID = -1705525475344521687L; private static final long serialVersionUID = -1705525475344521687L;
@Id @Id
......
src/main/java/cn/timer/api/bean/jxgl/JxglAssoKpzry.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("考评组管理员/被考核人员") @ApiModel("考评组管理员/被考核人员")
public class JxglAssoKpzry extends Model<JxglAssoKpzry> { public class JxglAssoKpzry extends Model<JxglAssoKpzry> {
/**
*
*/
private static final long serialVersionUID = -7561458217477289939L; private static final long serialVersionUID = -7561458217477289939L;
@Id @Id
......
src/main/java/cn/timer/api/bean/jxgl/JxglAssoMbsz.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("模板设计") @ApiModel("模板设计")
public class JxglAssoMbsz extends Model<JxglAssoMbsz> { public class JxglAssoMbsz extends Model<JxglAssoMbsz> {
/**
*
*/
private static final long serialVersionUID = 3349081275918939640L; private static final long serialVersionUID = 3349081275918939640L;
@Id @Id
......
src/main/java/cn/timer/api/bean/jxgl/JxglAssoWdzbgl.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
......
src/main/java/cn/timer/api/bean/jxgl/JxglAssoZbzdsz.java
package cn.timer.api.bean.jxgl; package cn.timer.api.bean.jxgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("指标字段设置") @ApiModel("指标字段设置")
public class JxglAssoZbzdsz extends Model<JxglAssoZbzdsz> { public class JxglAssoZbzdsz extends Model<JxglAssoZbzdsz> {
/**
*
*/
private static final long serialVersionUID = -7704484193612123538L; private static final long serialVersionUID = -7704484193612123538L;
@Id @Id
......
src/main/java/cn/timer/api/bean/kqgl/KqglAssoKqjgly.java
package cn.timer.api.bean.kqgl; package cn.timer.api.bean.kqgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
......
src/main/java/cn/timer/api/bean/kqgl/PunchCardDetails.java
...@@ -107,6 +107,7 @@ public class PunchCardDetails implements Serializable{ ...@@ -107,6 +107,7 @@ public class PunchCardDetails implements Serializable{
return sbdk1; return sbdk1;
} }
@SuppressWarnings("unlikely-arg-type")
public void setSbdk1(Long sbdk1) { public void setSbdk1(Long sbdk1) {
this.sbdk1 = sbdk1; this.sbdk1 = sbdk1;
if (sbdk1 != null && !sbdk1.equals("") && !sbdk1.equals(0l)) { if (sbdk1 != null && !sbdk1.equals("") && !sbdk1.equals(0l)) {
...@@ -126,6 +127,7 @@ public class PunchCardDetails implements Serializable{ ...@@ -126,6 +127,7 @@ public class PunchCardDetails implements Serializable{
return xbdk1; return xbdk1;
} }
@SuppressWarnings("unlikely-arg-type")
public void setXbdk1(Long xbdk1) { public void setXbdk1(Long xbdk1) {
this.xbdk1 = xbdk1; this.xbdk1 = xbdk1;
if (xbdk1 != null && !xbdk1.equals("") && !xbdk1.equals(0l)) { if (xbdk1 != null && !xbdk1.equals("") && !xbdk1.equals(0l)) {
...@@ -145,6 +147,7 @@ public class PunchCardDetails implements Serializable{ ...@@ -145,6 +147,7 @@ public class PunchCardDetails implements Serializable{
return sbdk2; return sbdk2;
} }
@SuppressWarnings("unlikely-arg-type")
public void setSbdk2(Long sbdk2) { public void setSbdk2(Long sbdk2) {
this.sbdk2 = sbdk2; this.sbdk2 = sbdk2;
if (sbdk2 != null && !sbdk2.equals("") && !sbdk2.equals(0l)) { if (sbdk2 != null && !sbdk2.equals("") && !sbdk2.equals(0l)) {
...@@ -164,6 +167,7 @@ public class PunchCardDetails implements Serializable{ ...@@ -164,6 +167,7 @@ public class PunchCardDetails implements Serializable{
return xbdk2; return xbdk2;
} }
@SuppressWarnings("unlikely-arg-type")
public void setXbdk2(Long xbdk2) { public void setXbdk2(Long xbdk2) {
this.xbdk2 = xbdk2; this.xbdk2 = xbdk2;
if (xbdk2 != null && !xbdk2.equals("") && !xbdk2.equals(0l)) { if (xbdk2 != null && !xbdk2.equals("") && !xbdk2.equals(0l)) {
...@@ -183,6 +187,7 @@ public class PunchCardDetails implements Serializable{ ...@@ -183,6 +187,7 @@ public class PunchCardDetails implements Serializable{
return sbdk3; return sbdk3;
} }
@SuppressWarnings("unlikely-arg-type")
public void setSbdk3(Long sbdk3) { public void setSbdk3(Long sbdk3) {
this.sbdk3 = sbdk3; this.sbdk3 = sbdk3;
if (sbdk3 != null && !sbdk3.equals("") && !sbdk3.equals(0l)) { if (sbdk3 != null && !sbdk3.equals("") && !sbdk3.equals(0l)) {
...@@ -202,6 +207,7 @@ public class PunchCardDetails implements Serializable{ ...@@ -202,6 +207,7 @@ public class PunchCardDetails implements Serializable{
return xbdk3; return xbdk3;
} }
@SuppressWarnings("unlikely-arg-type")
public void setXbdk3(Long xbdk3) { public void setXbdk3(Long xbdk3) {
this.xbdk3 = xbdk3; this.xbdk3 = xbdk3;
if (xbdk3 != null && !xbdk3.equals("") && !xbdk3.equals(0l)) { if (xbdk3 != null && !xbdk3.equals("") && !xbdk3.equals(0l)) {
...@@ -245,6 +251,7 @@ public class PunchCardDetails implements Serializable{ ...@@ -245,6 +251,7 @@ public class PunchCardDetails implements Serializable{
return dksj; return dksj;
} }
@SuppressWarnings("unlikely-arg-type")
public void setDksj(Long dksj) { public void setDksj(Long dksj) {
this.dksj = dksj; this.dksj = dksj;
if (dksj != null && !dksj.equals("")) { if (dksj != null && !dksj.equals("")) {
......
src/main/java/cn/timer/api/bean/kqgl/PunchRecord.java
...@@ -57,6 +57,7 @@ public class PunchRecord implements Serializable { ...@@ -57,6 +57,7 @@ public class PunchRecord implements Serializable {
return dktime; return dktime;
} }
@SuppressWarnings("unlikely-arg-type")
public void setDktime(Long dktime) { public void setDktime(Long dktime) {
this.dktime = dktime; this.dktime = dktime;
if (dktime != null && !dktime.equals("")) { if (dktime != null && !dktime.equals("")) {
...@@ -180,6 +181,7 @@ public class PunchRecord implements Serializable { ...@@ -180,6 +181,7 @@ public class PunchRecord implements Serializable {
return attime; return attime;
} }
@SuppressWarnings("unlikely-arg-type")
public void setAttime(Long attime) { public void setAttime(Long attime) {
this.attime = attime; this.attime = attime;
......
src/main/java/cn/timer/api/bean/kqjg/KqjgRealtimeEnrollData.java
package cn.timer.api.bean.kqjg; package cn.timer.api.bean.kqjg;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.IdType;
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;
...@@ -26,9 +26,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +26,6 @@ import lombok.NoArgsConstructor;
@ApiModel("机器上传的实时登记数据") @ApiModel("机器上传的实时登记数据")
public class KqjgRealtimeEnrollData extends Model<KqjgRealtimeEnrollData> { public class KqjgRealtimeEnrollData extends Model<KqjgRealtimeEnrollData> {
/**
*
*/
private static final long serialVersionUID = -2002607279902017749L; private static final long serialVersionUID = -2002607279902017749L;
@Id @Id
......
src/main/java/cn/timer/api/bean/qyzx/QyzxEmpLogin.java
...@@ -79,6 +79,7 @@ public class QyzxEmpLogin extends Model<QyzxEmpLogin> { ...@@ -79,6 +79,7 @@ public class QyzxEmpLogin extends Model<QyzxEmpLogin> {
private List<String> menus; private List<String> menus;
@TableField(exist = false) @TableField(exist = false)
@Builder.Default
private List<QysDto> qys = new ArrayList<QysDto>(); private List<QysDto> qys = new ArrayList<QysDto>();
} }
\ No newline at end of file
src/main/java/cn/timer/api/bean/sbgjj/SbgjjAreaInfo.java
...@@ -25,6 +25,8 @@ import lombok.NoArgsConstructor; ...@@ -25,6 +25,8 @@ import lombok.NoArgsConstructor;
@ApiModel("社保公积金基数") @ApiModel("社保公积金基数")
public class SbgjjAreaInfo extends Model<SbgjjAreaInfo> { public class SbgjjAreaInfo extends Model<SbgjjAreaInfo> {
private static final long serialVersionUID = 182454543208472911L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/sbgjj/SbgjjAssoCbfa.java
package cn.timer.api.bean.sbgjj; package cn.timer.api.bean.sbgjj;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("参保方案") @ApiModel("参保方案")
public class SbgjjAssoCbfa extends Model<SbgjjAssoCbfa> { public class SbgjjAssoCbfa extends Model<SbgjjAssoCbfa> {
/**
*
*/
private static final long serialVersionUID = -6328104461184682537L; private static final long serialVersionUID = -6328104461184682537L;
@Id @Id
......
src/main/java/cn/timer/api/bean/sbgjj/SbgjjAssoCbfzmx.java
package cn.timer.api.bean.sbgjj; package cn.timer.api.bean.sbgjj;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("参保方案明细") @ApiModel("参保方案明细")
public class SbgjjAssoCbfzmx extends Model<SbgjjAssoCbfzmx> { public class SbgjjAssoCbfzmx extends Model<SbgjjAssoCbfzmx> {
/**
*
*/
private static final long serialVersionUID = -9196350600285596196L; private static final long serialVersionUID = -9196350600285596196L;
@Id @Id
......
src/main/java/cn/timer/api/bean/sbgjj/SbgjjAssoYjzd.java
package cn.timer.api.bean.sbgjj; package cn.timer.api.bean.sbgjj;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("月结账单") @ApiModel("月结账单")
public class SbgjjAssoYjzd extends Model<SbgjjAssoYjzd> { public class SbgjjAssoYjzd extends Model<SbgjjAssoYjzd> {
/**
*
*/
private static final long serialVersionUID = 7039124193890835671L; private static final long serialVersionUID = 7039124193890835671L;
@Id @Id
......
src/main/java/cn/timer/api/bean/sbgjj/SbgjjTypeDetails.java
package cn.timer.api.bean.sbgjj; package cn.timer.api.bean.sbgjj;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("社保公积金方案") @ApiModel("社保公积金方案")
public class SbgjjTypeDetails extends Model<SbgjjTypeDetails> { public class SbgjjTypeDetails extends Model<SbgjjTypeDetails> {
/**
*
*/
private static final long serialVersionUID = 1624629196919610692L; private static final long serialVersionUID = 1624629196919610692L;
@Id @Id
......
src/main/java/cn/timer/api/bean/sbgjj/SbgjjYjCsbh.java
package cn.timer.api.bean.sbgjj; package cn.timer.api.bean.sbgjj;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("城市") @ApiModel("城市")
public class SbgjjYjCsbh extends Model<SbgjjYjCsbh> { public class SbgjjYjCsbh extends Model<SbgjjYjCsbh> {
/**
*
*/
private static final long serialVersionUID = 5138001946671740275L; private static final long serialVersionUID = 5138001946671740275L;
@Id @Id
......
src/main/java/cn/timer/api/bean/spmk/SpmkClr.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("处理人") @ApiModel("处理人")
public class SpmkClr extends Model<SpmkClr> { public class SpmkClr extends Model<SpmkClr> {
private static final long serialVersionUID = 2999549121813628489L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkIcon.java
...@@ -9,7 +9,6 @@ import com.baomidou.mybatisplus.annotation.IdType; ...@@ -9,7 +9,6 @@ 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 cn.timer.api.bean.spmk.SpmkClr.SpmkClrBuilder;
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;
...@@ -26,6 +25,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +25,8 @@ import lombok.NoArgsConstructor;
@ApiModel("图标库") @ApiModel("图标库")
public class SpmkIcon extends Model<SpmkIcon> { public class SpmkIcon extends Model<SpmkIcon> {
private static final long serialVersionUID = 3669828433939946316L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkJqgz.java
...@@ -26,6 +26,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +26,8 @@ import lombok.NoArgsConstructor;
@ApiModel("假勤规则") @ApiModel("假勤规则")
public class SpmkJqgz extends Model<SpmkJqgz> { public class SpmkJqgz extends Model<SpmkJqgz> {
private static final long serialVersionUID = 3806274737897793795L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkKj.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("控件") @ApiModel("控件")
public class SpmkKj extends Model<SpmkKj> { public class SpmkKj extends Model<SpmkKj> {
private static final long serialVersionUID = -1463389256002459795L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkKjMk.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("控件模版关联") @ApiModel("控件模版关联")
public class SpmkKjMk extends Model<SpmkKjMk> { public class SpmkKjMk extends Model<SpmkKjMk> {
private static final long serialVersionUID = 7826285133719947956L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkKjpz.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.*; import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
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;
...@@ -30,6 +32,8 @@ import lombok.NoArgsConstructor; ...@@ -30,6 +32,8 @@ import lombok.NoArgsConstructor;
@ApiModel("控件配置") @ApiModel("控件配置")
public class SpmkKjpz extends Model<SpmkKjpz> { public class SpmkKjpz extends Model<SpmkKjpz> {
private static final long serialVersionUID = 4471227872317103666L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkLcjd.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.*; import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
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 cn.timer.api.config.swagger.IgnoreSwaggerParameter;
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;
...@@ -30,6 +32,8 @@ import lombok.NoArgsConstructor; ...@@ -30,6 +32,8 @@ import lombok.NoArgsConstructor;
@ApiModel("流程节点") @ApiModel("流程节点")
public class SpmkLcjd extends Model<SpmkLcjd> { public class SpmkLcjd extends Model<SpmkLcjd> {
private static final long serialVersionUID = -7718951890425087486L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkLcjdEmpAsso.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("流程节点员工关联") @ApiModel("流程节点员工关联")
public class SpmkLcjdEmpAsso extends Model<SpmkLcjdEmpAsso> { public class SpmkLcjdEmpAsso extends Model<SpmkLcjdEmpAsso> {
private static final long serialVersionUID = -781283259033327552L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkMb.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("审批模版") @ApiModel("审批模版")
public class SpmkMb extends Model<SpmkMb> { public class SpmkMb extends Model<SpmkMb> {
private static final long serialVersionUID = -3347983303738594498L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkSpcz.java
...@@ -3,7 +3,11 @@ package cn.timer.api.bean.spmk; ...@@ -3,7 +3,11 @@ package cn.timer.api.bean.spmk;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import javax.persistence.*; import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
...@@ -29,6 +33,8 @@ import lombok.NoArgsConstructor; ...@@ -29,6 +33,8 @@ import lombok.NoArgsConstructor;
@ApiModel("审批操作") @ApiModel("审批操作")
public class SpmkSpcz extends Model<SpmkSpcz> { public class SpmkSpcz extends Model<SpmkSpcz> {
private static final long serialVersionUID = 3566026137671837723L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkSpgl.java
...@@ -28,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -28,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("审批管理") @ApiModel("审批管理")
public class SpmkSpgl extends Model<SpmkSpgl> { public class SpmkSpgl extends Model<SpmkSpgl> {
private static final long serialVersionUID = -4266670348589252169L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkSpnr.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("审批内容") @ApiModel("审批内容")
public class SpmkSpnr extends Model<SpmkSpnr> { public class SpmkSpnr extends Model<SpmkSpnr> {
private static final long serialVersionUID = -1940496608397785345L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkSpz.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("审批组") @ApiModel("审批组")
public class SpmkSpz extends Model<SpmkSpz> { public class SpmkSpz extends Model<SpmkSpz> {
private static final long serialVersionUID = 3386197134163815550L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkSxpz.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("属性配置") @ApiModel("属性配置")
public class SpmkSxpz extends Model<SpmkSxpz> { public class SpmkSxpz extends Model<SpmkSxpz> {
private static final long serialVersionUID = 1780544983489999335L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/spmk/SpmkXzx.java
package cn.timer.api.bean.spmk; package cn.timer.api.bean.spmk;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("选择项") @ApiModel("选择项")
public class SpmkXzx extends Model<SpmkXzx> { public class SpmkXzx extends Model<SpmkXzx> {
private static final long serialVersionUID = 4721522728897877974L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoGztsz.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("工资条组-设置") @ApiModel("工资条组-设置")
public class XcglAssoGztsz extends Model<XcglAssoGztsz> { public class XcglAssoGztsz extends Model<XcglAssoGztsz> {
/**
*
*/
private static final long serialVersionUID = 6638841164667873057L; private static final long serialVersionUID = 6638841164667873057L;
@Id @Id
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoGztzt.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor; ...@@ -26,9 +28,6 @@ import lombok.NoArgsConstructor;
@ApiModel("工资条组内成员状态") @ApiModel("工资条组内成员状态")
public class XcglAssoGztzt extends Model<XcglAssoGztzt> { public class XcglAssoGztzt extends Model<XcglAssoGztzt> {
/**
*
*/
private static final long serialVersionUID = -3805877765856830893L; private static final long serialVersionUID = -3805877765856830893L;
@Id @Id
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoJsgzzx.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoJxgz.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoOption.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXcjsgz.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXzb.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXzdadx.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoXzury.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
......
src/main/java/cn/timer/api/bean/xcgl/XcglAssoZxfjkc.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import javax.persistence.Table;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
......
src/main/java/cn/timer/api/bean/xcgl/XcglSalaryItem.java
package cn.timer.api.bean.xcgl; package cn.timer.api.bean.xcgl;
import java.util.ArrayList; import javax.persistence.Entity;
import java.util.Date; import javax.persistence.GeneratedValue;
import java.util.List; import javax.persistence.Id;
import javax.persistence.Table;
import javax.persistence.*;
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 cn.timer.api.dto.xcgl.PayTermDto;
import cn.timer.api.dto.xcgl.XcglAssoDto;
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;
......
src/main/java/cn/timer/api/bean/yggl/YgglAttaSbgjj.java
package cn.timer.api.bean.yggl; package cn.timer.api.bean.yggl;
import java.util.Date; import javax.persistence.Entity;
import javax.persistence.*; import javax.persistence.GeneratedValue;
import javax.persistence.Id;
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;
...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor; ...@@ -26,6 +28,8 @@ import lombok.NoArgsConstructor;
@ApiModel("员工社保公积金") @ApiModel("员工社保公积金")
public class YgglAttaSbgjj extends Model<YgglAttaSbgjj> { public class YgglAttaSbgjj extends Model<YgglAttaSbgjj> {
private static final long serialVersionUID = 532391446907698642L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId (type = IdType.AUTO) @TableId (type = IdType.AUTO)
......
src/main/java/cn/timer/api/bean/zzgl/ZzglBmgwM.java
...@@ -35,6 +35,8 @@ import lombok.NoArgsConstructor; ...@@ -35,6 +35,8 @@ import lombok.NoArgsConstructor;
@ApiModel("部门岗位表") @ApiModel("部门岗位表")
public class ZzglBmgwM extends Model<ZzglBmgwM> { public class ZzglBmgwM extends Model<ZzglBmgwM> {
private static final long serialVersionUID = -3467488578145579513L;
@Id @Id
@GeneratedValue @GeneratedValue
@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO)
......
src/main/java/cn/timer/api/config/Initialization/InitializeSetting.java
package cn.timer.api.config.Initialization; package cn.timer.api.config.Initialization;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner; import org.springframework.boot.ApplicationRunner;
import org.springframework.core.annotation.Order; import org.springframework.core.annotation.Order;
......
src/main/java/cn/timer/api/config/annotation/UserBean.java
...@@ -12,6 +12,8 @@ import lombok.*; ...@@ -12,6 +12,8 @@ import lombok.*;
@AllArgsConstructor @AllArgsConstructor
public class UserBean implements Serializable { public class UserBean implements Serializable {
private static final long serialVersionUID = -1141678314103123565L;
@IgnoreSwaggerParameter @IgnoreSwaggerParameter
private Integer empNum; private Integer empNum;
......
src/main/java/cn/timer/api/config/interceptor/RedisSessionInterceptor.java
...@@ -5,6 +5,8 @@ import java.io.IOException; ...@@ -5,6 +5,8 @@ import java.io.IOException;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSession;
import org.springframework.stereotype.Component;
import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
...@@ -12,12 +14,28 @@ import cn.hutool.json.JSONObject; ...@@ -12,12 +14,28 @@ import cn.hutool.json.JSONObject;
import cn.timer.api.utils.ResponseResult; import cn.timer.api.utils.ResponseResult;
//拦截登录失效的请求 //拦截登录失效的请求
@Component
public class RedisSessionInterceptor implements HandlerInterceptor { public class RedisSessionInterceptor implements HandlerInterceptor {
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler)
throws Exception { throws Exception {
// response.setHeader("Access-Control-Allow-Origin","http://120.24.24.239:8088");
//// response.setHeader("Access-Control-Allow-Origin",request.getHeader("Origin"));
// response.setHeader("Access-Control-Allow-Methods", "*");
// response.setHeader("Access-Control-Allow-Credentials", "true");
// response.setHeader("Access-Control-Allow-Headers", "*");
//
// System.out.print("request.Origin>"+request.getHeader("Origin"));
// //option预检查，直接通过请求
// if ("OPTIONS".equals(request.getMethod())){
// return true;
// }
/* /*
* Enumeration<String> names = request.getHeaderNames(); * Enumeration<String> names = request.getHeaderNames();
* while(names.hasMoreElements()) { String name = (String)names.nextElement(); * while(names.hasMoreElements()) { String name = (String)names.nextElement();
......
src/main/java/cn/timer/api/config/interceptor/WebSecurityConfig.java
...@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Configuration; ...@@ -10,6 +10,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
...@@ -79,4 +80,18 @@ public class WebSecurityConfig implements WebMvcConfigurer { ...@@ -79,4 +80,18 @@ public class WebSecurityConfig implements WebMvcConfigurer {
argumentResolvers.add(userMethodArgumentResolver); argumentResolvers.add(userMethodArgumentResolver);
} }
// @Override
// public void addCorsMappings(CorsRegistry registry) {
//// System.out.println("我是MyWebConfig跨域");
// //设置允许跨域的路径
// registry.addMapping("/**")
// //设置允许跨域请求的域名
// .allowedOrigins("*")
// //是否允许证书 不再默认开启
// .allowCredentials(true)
// //设置允许的方法
// .allowedMethods("*")
// //跨域允许时间
// .maxAge(3600);
// }
} }
src/main/java/cn/timer/api/config/sort/SimpleSortBuilder.java
...@@ -12,6 +12,7 @@ public class SimpleSortBuilder { ...@@ -12,6 +12,7 @@ public class SimpleSortBuilder {
/** /**
* 调用的时候使用SimpleSortBuilder.generateSort("name","xh_d");表示先以name升序，之后以xh降序 * 调用的时候使用SimpleSortBuilder.generateSort("name","xh_d");表示先以name升序，之后以xh降序
*/ */
@SuppressWarnings("deprecation")
public static Sort generateSort(String... fields) { public static Sort generateSort(String... fields) {
List<Order> orders = new ArrayList<Order>(); List<Order> orders = new ArrayList<Order>();
for(String f:fields) { for(String f:fields) {
...@@ -20,6 +21,7 @@ public class SimpleSortBuilder { ...@@ -20,6 +21,7 @@ public class SimpleSortBuilder {
return new Sort(orders); return new Sort(orders);
} }
@SuppressWarnings("deprecation")
private static Order generateOrder(String f) { private static Order generateOrder(String f) {
Order order = null; Order order = null;
String[] ff = f.split("_"); String[] ff = f.split("_");
......
src/main/java/cn/timer/api/config/specification/SimpleSpecification.java
...@@ -11,6 +11,8 @@ import org.springframework.data.jpa.domain.Specification; ...@@ -11,6 +11,8 @@ import org.springframework.data.jpa.domain.Specification;
public class SimpleSpecification<T> implements Specification<T> { public class SimpleSpecification<T> implements Specification<T> {
private static final long serialVersionUID = 9090560756576906120L;
/** /**
* 查询的条件列表，是一组列表 * 查询的条件列表，是一组列表
*/ */
......
src/main/java/cn/timer/api/config/specification/SimpleSpecificationBuilder.java
...@@ -37,6 +37,7 @@ public class SimpleSpecificationBuilder<T> { ...@@ -37,6 +37,7 @@ public class SimpleSpecificationBuilder<T> {
* *
* @return * @return
*/ */
@SuppressWarnings("rawtypes")
public SimpleSpecificationBuilder add(String key, String oper, Object value, String join) { public SimpleSpecificationBuilder add(String key, String oper, Object value, String join) {
SpecificationOperator so = new SpecificationOperator(); SpecificationOperator so = new SpecificationOperator();
so.setKey(key); so.setKey(key);
...@@ -52,6 +53,7 @@ public class SimpleSpecificationBuilder<T> { ...@@ -52,6 +53,7 @@ public class SimpleSpecificationBuilder<T> {
* *
* @return this，方便后续的链式调用 * @return this，方便后续的链式调用
*/ */
@SuppressWarnings("rawtypes")
public SimpleSpecificationBuilder addOr(String key, String oper, Object value) { public SimpleSpecificationBuilder addOr(String key, String oper, Object value) {
return this.add(key, oper, value, "or"); return this.add(key, oper, value, "or");
} }
...@@ -61,10 +63,12 @@ public class SimpleSpecificationBuilder<T> { ...@@ -61,10 +63,12 @@ public class SimpleSpecificationBuilder<T> {
* *
* @return * @return
*/ */
@SuppressWarnings("rawtypes")
public SimpleSpecificationBuilder add(String key, String oper, Object value) { public SimpleSpecificationBuilder add(String key, String oper, Object value) {
return this.add(key, oper, value, "and"); return this.add(key, oper, value, "and");
} }
@SuppressWarnings("rawtypes")
public Specification generateSpecification() { public Specification generateSpecification() {
Specification<T> specification = new SimpleSpecification<T>(opers); Specification<T> specification = new SimpleSpecification<T>(opers);
return specification; return specification;
......
src/main/java/cn/timer/api/config/swagger/CustomizeModelAttributeParameterExpander.java
...@@ -13,8 +13,6 @@ import static springfox.documentation.schema.Collections.isContainerType; ...@@ -13,8 +13,6 @@ import static springfox.documentation.schema.Collections.isContainerType;
import static springfox.documentation.schema.Types.isVoid; import static springfox.documentation.schema.Types.isVoid;
import static springfox.documentation.schema.Types.typeNameFor; import static springfox.documentation.schema.Types.typeNameFor;
import java.beans.BeanInfo;
import java.beans.IntrospectionException;
import java.beans.Introspector; import java.beans.Introspector;
import java.beans.PropertyDescriptor; import java.beans.PropertyDescriptor;
import java.lang.reflect.Field; import java.lang.reflect.Field;
...@@ -37,7 +35,6 @@ import org.springframework.util.ClassUtils; ...@@ -37,7 +35,6 @@ import org.springframework.util.ClassUtils;
import com.fasterxml.classmate.ResolvedType; import com.fasterxml.classmate.ResolvedType;
import com.fasterxml.classmate.members.ResolvedField; import com.fasterxml.classmate.members.ResolvedField;
import com.fasterxml.classmate.members.ResolvedMethod; import com.fasterxml.classmate.members.ResolvedMethod;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Optional; import com.google.common.base.Optional;
import com.google.common.base.Predicate; import com.google.common.base.Predicate;
...@@ -255,6 +252,7 @@ public class CustomizeModelAttributeParameterExpander extends ModelAttributePara ...@@ -255,6 +252,7 @@ public class CustomizeModelAttributeParameterExpander extends ModelAttributePara
}; };
} }
@SuppressWarnings("unchecked")
private Predicate<ModelAttributeField> simpleType() { private Predicate<ModelAttributeField> simpleType() {
return and(not(isCollection()), not(isMap()), return and(not(isCollection()), not(isMap()),
or( or(
...@@ -355,7 +353,8 @@ public class CustomizeModelAttributeParameterExpander extends ModelAttributePara ...@@ -355,7 +353,8 @@ public class CustomizeModelAttributeParameterExpander extends ModelAttributePara
private Set<PropertyDescriptor> propertyDescriptors(final Class<?> clazz) { private Set<PropertyDescriptor> propertyDescriptors(final Class<?> clazz) {
try { try {
Set<PropertyDescriptor> beanProps = new HashSet<>(); Set<PropertyDescriptor> beanProps = new HashSet<>();
PropertyDescriptor[] descriptors = getBeanInfo(clazz).getPropertyDescriptors(); // PropertyDescriptor[] descriptors = getBeanInfo(clazz).getPropertyDescriptors();
PropertyDescriptor[] descriptors = Introspector.getBeanInfo(clazz).getPropertyDescriptors();
for (PropertyDescriptor descriptor : descriptors) { for (PropertyDescriptor descriptor : descriptors) {
Field field = null; Field field = null;
...@@ -404,10 +403,10 @@ public class CustomizeModelAttributeParameterExpander extends ModelAttributePara ...@@ -404,10 +403,10 @@ public class CustomizeModelAttributeParameterExpander extends ModelAttributePara
} }
@VisibleForTesting // @VisibleForTesting
BeanInfo getBeanInfo(Class<?> clazz) throws IntrospectionException { // BeanInfo getBeanInfo(Class<?> clazz) throws IntrospectionException {
return Introspector.getBeanInfo(clazz); // return Introspector.getBeanInfo(clazz);
} // }
public static String determineScalarParameterType(Set<? extends MediaType> consumes, HttpMethod method) { public static String determineScalarParameterType(Set<? extends MediaType> consumes, HttpMethod method) {
String parameterType = "query"; String parameterType = "query";
......
src/main/java/cn/timer/api/config/swagger/Swagger2Config.java
...@@ -29,6 +29,7 @@ public class Swagger2Config { ...@@ -29,6 +29,7 @@ public class Swagger2Config {
.build(); .build();
} }
//apiInfo对象主要是设置我们api文档的标题，描述，访问的地址，创建者等信息 //apiInfo对象主要是设置我们api文档的标题，描述，访问的地址，创建者等信息
@SuppressWarnings("deprecation")
@Bean @Bean
public ApiInfo apiInfo(){ public ApiInfo apiInfo(){
return new ApiInfoBuilder() return new ApiInfoBuilder()
......
src/main/java/cn/timer/api/controller/LoginController.java
...@@ -34,7 +34,6 @@ import cn.timer.api.config.annotation.UserBean; ...@@ -34,7 +34,6 @@ import cn.timer.api.config.annotation.UserBean;
import cn.timer.api.config.enums.CommonEnum; import cn.timer.api.config.enums.CommonEnum;
import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper; import cn.timer.api.dao.qyzx.QyzxEmpEntAssoMapper;
import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper; import cn.timer.api.dao.qyzx.QyzxEmpLoginMapper;
import cn.timer.api.dao.qyzx.QyzxSmsMapper;
import cn.timer.api.dao.zzgl.ZzglBmgwMMapper; import cn.timer.api.dao.zzgl.ZzglBmgwMMapper;
import cn.timer.api.dto.login.QysDto; import cn.timer.api.dto.login.QysDto;
import cn.timer.api.dto.qyzx.EntRegisterDto; import cn.timer.api.dto.qyzx.EntRegisterDto;
...@@ -61,8 +60,7 @@ public class LoginController { ...@@ -61,8 +60,7 @@ public class LoginController {
@Autowired @Autowired
private QyzxEmpEntAssoMapper qyzxEmpEntAssoMapper; private QyzxEmpEntAssoMapper qyzxEmpEntAssoMapper;
@Autowired
private QyzxSmsMapper qyzxSmsMapper;
// @Autowired // @Autowired
// private DataSourceTransactionManager transactionManager; // private DataSourceTransactionManager transactionManager;
...@@ -87,8 +85,8 @@ public class LoginController { ...@@ -87,8 +85,8 @@ public class LoginController {
entRegisterDto.setPhone(phone); entRegisterDto.setPhone(phone);
} }
JSONObject j = aliyunSMS.yzm(entRegisterDto, entRegisterDto.getTc(), code); JSONObject j = aliyunSMS.yzm(entRegisterDto, entRegisterDto.getTc(), code);
String bizId = (String) j.get("BizId"); // String bizId = (String) j.get("BizId");
Integer type = entRegisterDto.getMessageType(); // Integer type = entRegisterDto.getMessageType();
// 获取当前日期的字符串格式 // 获取当前日期的字符串格式
String today = DateUtil.today(); String today = DateUtil.today();
// yyyy-MM-dd // yyyy-MM-dd
...@@ -355,7 +353,6 @@ public class LoginController { ...@@ -355,7 +353,6 @@ public class LoginController {
ip = UserIp.getIpAddr(request); ip = UserIp.getIpAddr(request);
qyzxEmpLogin1.setIp(ip); qyzxEmpLogin1.setIp(ip);
} catch (Exception e) { } catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace(); e.printStackTrace();
} }
List<QysDto> qys = qyzxEmpLoginMapper.getQys(qyzxEmpLogin1.getId()); List<QysDto> qys = qyzxEmpLoginMapper.getQys(qyzxEmpLogin1.getId());
...@@ -372,6 +369,7 @@ public class LoginController { ...@@ -372,6 +369,7 @@ public class LoginController {
return ResultUtil.error("帐号被禁用"); return ResultUtil.error("帐号被禁用");
} }
qyzxEmpLogin1.setOrgId(ctrl.getId()); qyzxEmpLogin1.setOrgId(ctrl.getId());
@SuppressWarnings("unused")
String phone = qyzxEmpLogin1.getPhone(); String phone = qyzxEmpLogin1.getPhone();
if ( CommonEnum.U_TYPE_ADMIN.getType().equals(ctrl.getUserType()) if ( CommonEnum.U_TYPE_ADMIN.getType().equals(ctrl.getUserType())
|| CommonEnum.U_TYPE_C_ADMIN.getType().equals(ctrl.getUserType())) { || CommonEnum.U_TYPE_C_ADMIN.getType().equals(ctrl.getUserType())) {
......
src/main/java/cn/timer/api/controller/dzht/DzhtController2.java
...@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController; ...@@ -23,7 +23,6 @@ import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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;
......
src/main/java/cn/timer/api/controller/jxgl/AchievementsController.java
...@@ -29,8 +29,6 @@ import cn.timer.api.bean.jxgl.JxglAssoFbzbk; ...@@ -29,8 +29,6 @@ import cn.timer.api.bean.jxgl.JxglAssoFbzbk;
import cn.timer.api.bean.jxgl.JxglAssoJxdj; import cn.timer.api.bean.jxgl.JxglAssoJxdj;
import cn.timer.api.bean.jxgl.JxglAssoKpzry; import cn.timer.api.bean.jxgl.JxglAssoKpzry;
import cn.timer.api.bean.jxgl.JxglAssoZbzdsz; import cn.timer.api.bean.jxgl.JxglAssoZbzdsz;
import cn.timer.api.bean.kqgl.AttendanceGroup;
import cn.timer.api.bean.xcgl.XcglAdminXzz;
import cn.timer.api.config.annotation.CurrentUser; import cn.timer.api.config.annotation.CurrentUser;
import cn.timer.api.config.annotation.UserBean; import cn.timer.api.config.annotation.UserBean;
import cn.timer.api.dao.jxgl.JxglAdminJcszMapper; import cn.timer.api.dao.jxgl.JxglAdminJcszMapper;
...@@ -95,6 +93,7 @@ public class AchievementsController { ...@@ -95,6 +93,7 @@ public class AchievementsController {
public ResponseResult IndexfieldList(@CurrentUser UserBean userBean) { public ResponseResult IndexfieldList(@CurrentUser UserBean userBean) {
int qyid = userBean.getOrgCode();//坏小孩【企业id】 int qyid = userBean.getOrgCode();//坏小孩【企业id】
@SuppressWarnings("unused")
int userid = userBean.getEmpNum();//用户id int userid = userBean.getEmpNum();//用户id
List<JxglAssoZbzdsz> zbzdsz = new LambdaQueryChainWrapper<JxglAssoZbzdsz>(jxglassozbzdszmapper).eq(JxglAssoZbzdsz::getQyid, qyid).eq(JxglAssoZbzdsz::getIsSfqy,1).list(); List<JxglAssoZbzdsz> zbzdsz = new LambdaQueryChainWrapper<JxglAssoZbzdsz>(jxglassozbzdszmapper).eq(JxglAssoZbzdsz::getQyid, qyid).eq(JxglAssoZbzdsz::getIsSfqy,1).list();
...@@ -142,9 +141,11 @@ public class AchievementsController { ...@@ -142,9 +141,11 @@ public class AchievementsController {
int qyid = userBean.getOrgCode();//坏小孩【企业id】 int qyid = userBean.getOrgCode();//坏小孩【企业id】
int userid = userBean.getEmpNum();//用户id int userid = userBean.getEmpNum();//用户id
@SuppressWarnings("unused")
Map<String, Object> result = new HashMap<String, Object>(); Map<String, Object> result = new HashMap<String, Object>();
String xgyh = basics.get("a").toString(); String xgyh = basics.get("a").toString();
@SuppressWarnings("rawtypes")
HashMap hashMap = JSON.parseObject(xgyh, HashMap.class); HashMap hashMap = JSON.parseObject(xgyh, HashMap.class);
int jcszid = 0; int jcszid = 0;
...@@ -297,6 +298,7 @@ public class AchievementsController { ...@@ -297,6 +298,7 @@ public class AchievementsController {
public ResponseResult IndexDatabase(@CurrentUser UserBean userBean,@RequestBody IndexDatabaseDto indexd) { public ResponseResult IndexDatabase(@CurrentUser UserBean userBean,@RequestBody IndexDatabaseDto indexd) {
int qyid = userBean.getOrgCode();//坏小孩【企业id】 int qyid = userBean.getOrgCode();//坏小孩【企业id】
@SuppressWarnings("unused")
int userid = userBean.getEmpNum();//用户id int userid = userBean.getEmpNum();//用户id
JxglAdminZbk zbk = JxglAdminZbk.builder().build(); JxglAdminZbk zbk = JxglAdminZbk.builder().build();
...@@ -364,7 +366,9 @@ public class AchievementsController { ...@@ -364,7 +366,9 @@ public class AchievementsController {
@ApiOperation(value = "获取指标字段详细", httpMethod = "GET", notes = "接口发布说明") @ApiOperation(value = "获取指标字段详细", httpMethod = "GET", notes = "接口发布说明")
public ResponseResult IndexFieldDetailed(@CurrentUser UserBean userBean,@PathVariable Integer id) { public ResponseResult IndexFieldDetailed(@CurrentUser UserBean userBean,@PathVariable Integer id) {
@SuppressWarnings("unused")
int qyid = userBean.getOrgCode();//坏小孩【企业id】 int qyid = userBean.getOrgCode();//坏小孩【企业id】
@SuppressWarnings("unused")
int userid = userBean.getEmpNum();//用户id int userid = userBean.getEmpNum();//用户id
IndexDetailDto detai = new IndexDetailDto(); IndexDetailDto detai = new IndexDetailDto();
...@@ -384,7 +388,9 @@ public class AchievementsController { ...@@ -384,7 +388,9 @@ public class AchievementsController {
@ApiOperation(value = "修改指标库", httpMethod = "PUT", notes = "接口发布说明") @ApiOperation(value = "修改指标库", httpMethod = "PUT", notes = "接口发布说明")
public ResponseResult updaIndexdatabase(@CurrentUser UserBean userBean,@RequestBody IndexDatabaseDto indexd) { public ResponseResult updaIndexdatabase(@CurrentUser UserBean userBean,@RequestBody IndexDatabaseDto indexd) {
@SuppressWarnings("unused")
int qyid = userBean.getOrgCode();//坏小孩【企业id】 int qyid = userBean.getOrgCode();//坏小孩【企业id】
@SuppressWarnings("unused")
int userid = userBean.getEmpNum();//用户id int userid = userBean.getEmpNum();//用户id
JxglAdminZbk zbk = JxglAdminZbk.builder().build(); JxglAdminZbk zbk = JxglAdminZbk.builder().build();
...@@ -481,6 +487,7 @@ public class AchievementsController { ...@@ -481,6 +487,7 @@ public class AchievementsController {
@ApiOperation(value = "新增考评组", httpMethod = "POST", notes = "接口发布说明") @ApiOperation(value = "新增考评组", httpMethod = "POST", notes = "接口发布说明")
public ResponseResult IndexEvaluationSection(@CurrentUser UserBean userBean,@RequestBody AppraisalGroupSettingsDto appgroset) { public ResponseResult IndexEvaluationSection(@CurrentUser UserBean userBean,@RequestBody AppraisalGroupSettingsDto appgroset) {
int qyid = userBean.getOrgCode();//坏小孩【企业id】 int qyid = userBean.getOrgCode();//坏小孩【企业id】
@SuppressWarnings("unused")
int userid = userBean.getEmpNum();//用户id int userid = userBean.getEmpNum();//用户id
JxglAdminKpzsz kpz = JxglAdminKpzsz.builder().build(); JxglAdminKpzsz kpz = JxglAdminKpzsz.builder().build();
...@@ -577,6 +584,7 @@ public class AchievementsController { ...@@ -577,6 +584,7 @@ public class AchievementsController {
public ResponseResult SelectIndexItem(@CurrentUser UserBean userBean,@PathVariable Integer id) { public ResponseResult SelectIndexItem(@CurrentUser UserBean userBean,@PathVariable Integer id) {
int qyid = userBean.getOrgCode();//坏小孩【企业id】 int qyid = userBean.getOrgCode();//坏小孩【企业id】
@SuppressWarnings("unused")
int userid = userBean.getEmpNum();//用户id int userid = userBean.getEmpNum();//用户id
List<JxglAdminZbk> zbklist = new LambdaQueryChainWrapper<JxglAdminZbk>(jxgladminzbkmapper).eq(JxglAdminZbk::getQyid,qyid) List<JxglAdminZbk> zbklist = new LambdaQueryChainWrapper<JxglAdminZbk>(jxgladminzbkmapper).eq(JxglAdminZbk::getQyid,qyid)
......
src/main/java/cn/timer/api/controller/sbgjj/SocialSecurityFundController.java
...@@ -21,7 +21,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; ...@@ -21,7 +21,6 @@ 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 cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.timer.api.bean.kqgl.AttGroupBinPunchMode;
import cn.timer.api.bean.sbgjj.SbgjjAdminCbry; import cn.timer.api.bean.sbgjj.SbgjjAdminCbry;
import cn.timer.api.bean.sbgjj.SbgjjAreaInfo; import cn.timer.api.bean.sbgjj.SbgjjAreaInfo;
import cn.timer.api.bean.sbgjj.SbgjjAssoCbfa; import cn.timer.api.bean.sbgjj.SbgjjAssoCbfa;
......
src/main/java/cn/timer/api/controller/spmk/SpmkServiceImpl.java
package cn.timer.api.controller.spmk; package cn.timer.api.controller.spmk;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -15,19 +14,15 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -15,19 +14,15 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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.core.toolkit.Wrappers;
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 cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.timer.api.bean.spmk.SpmkClr;
import cn.timer.api.bean.spmk.SpmkIcon; import cn.timer.api.bean.spmk.SpmkIcon;
import cn.timer.api.bean.spmk.SpmkJqgz; import cn.timer.api.bean.spmk.SpmkJqgz;
import cn.timer.api.bean.spmk.SpmkLcjd; import cn.timer.api.bean.spmk.SpmkLcjd;
...@@ -37,15 +32,11 @@ import cn.timer.api.bean.spmk.SpmkSpcz; ...@@ -37,15 +32,11 @@ import cn.timer.api.bean.spmk.SpmkSpcz;
import cn.timer.api.bean.spmk.SpmkSpgl; import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.bean.spmk.SpmkSpz; import cn.timer.api.bean.spmk.SpmkSpz;
import cn.timer.api.bean.spmk.SpmkSxpz; import cn.timer.api.bean.spmk.SpmkSxpz;
import cn.timer.api.bean.zcgl.ZcglAdminZccrkgl;
import cn.timer.api.config.annotation.CurrentUser; import cn.timer.api.config.annotation.CurrentUser;
import cn.timer.api.config.annotation.UserBean; import cn.timer.api.config.annotation.UserBean;
import cn.timer.api.config.enums.CommonEnum; import cn.timer.api.config.enums.CommonEnum;
import cn.timer.api.dao.spmk.SpmkLcjdEmpAssoMapper;
import cn.timer.api.dao.spmk.SpmkLcjdMapper;
import cn.timer.api.dao.spmk.SpmkSpglMapper; import cn.timer.api.dao.spmk.SpmkSpglMapper;
import cn.timer.api.dao.spmk.SpmkSpzMapper; import cn.timer.api.dao.spmk.SpmkSpzMapper;
import cn.timer.api.dao.spmk.SpmkSxpzMapper;
import cn.timer.api.dto.spmk.SpmkMbKjDto; import cn.timer.api.dto.spmk.SpmkMbKjDto;
import cn.timer.api.dto.spmk.SpmkSpglDto; import cn.timer.api.dto.spmk.SpmkSpglDto;
import cn.timer.api.dto.spmk.SpmkSpglMoveDto; import cn.timer.api.dto.spmk.SpmkSpglMoveDto;
...@@ -53,15 +44,12 @@ import cn.timer.api.dto.spmk.SpmkSpglSortDto; ...@@ -53,15 +44,12 @@ import cn.timer.api.dto.spmk.SpmkSpglSortDto;
import cn.timer.api.dto.spmk.SpmkSpzDto; import cn.timer.api.dto.spmk.SpmkSpzDto;
import cn.timer.api.dto.spmk.SpmkSpzSortDto; import cn.timer.api.dto.spmk.SpmkSpzSortDto;
import cn.timer.api.dto.spmk.SpmkSpzSpglDto; import cn.timer.api.dto.spmk.SpmkSpzSpglDto;
import cn.timer.api.dto.zcgl.ZcglDetailsDto;
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; import io.swagger.annotations.ApiOperationSupport;
import lombok.extern.slf4j.Slf4j;
@Slf4j
@Api(tags = "3.0审批模块") @Api(tags = "3.0审批模块")
@RestController @RestController
@Transactional @Transactional
...@@ -73,12 +61,12 @@ public class SpmkServiceImpl { ...@@ -73,12 +61,12 @@ public class SpmkServiceImpl {
private SpmkSpglMapper spmkSpglMapper; private SpmkSpglMapper spmkSpglMapper;
@Autowired @Autowired
private SpmkSpzMapper spmkSpzMapper; private SpmkSpzMapper spmkSpzMapper;
@Autowired // @Autowired
private SpmkLcjdMapper spmkLcjdMapper; // private SpmkLcjdMapper spmkLcjdMapper;
@Autowired // @Autowired
private SpmkSxpzMapper spmkSxpzMapper; // private SpmkSxpzMapper spmkSxpzMapper;
@Autowired // @Autowired
private SpmkLcjdEmpAssoMapper spmkLcjdEmpAssoMapper; // private SpmkLcjdEmpAssoMapper spmkLcjdEmpAssoMapper;
/** /**
* 审批组-列表 * 审批组-列表
...@@ -166,6 +154,7 @@ public class SpmkServiceImpl { ...@@ -166,6 +154,7 @@ public class SpmkServiceImpl {
@ApiOperation(value = "审批管理-编辑", httpMethod = "PUT", notes = "接口发布说明") @ApiOperation(value = "审批管理-编辑", httpMethod = "PUT", notes = "接口发布说明")
@ApiOperationSupport(order = 9) @ApiOperationSupport(order = 9)
public Result<SpmkSpgl> updateSpgl(@CurrentUser UserBean userBean,@RequestBody SpmkSpglDto spmkSpglDto){ public Result<SpmkSpgl> updateSpgl(@CurrentUser UserBean userBean,@RequestBody SpmkSpglDto spmkSpglDto){
@SuppressWarnings("unused")
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
SpmkSpgl spmkSpgl = SpmkSpgl.builder().build(); SpmkSpgl spmkSpgl = SpmkSpgl.builder().build();
...@@ -235,7 +224,7 @@ public class SpmkServiceImpl { ...@@ -235,7 +224,7 @@ public class SpmkServiceImpl {
SpmkSpz.builder().sort(CommonEnum.SPZ_OTHER.getType()).build().update(new UpdateWrapper<SpmkSpz>().eq("org_code", orgCode).eq("name", "其他")); SpmkSpz.builder().sort(CommonEnum.SPZ_OTHER.getType()).build().update(new UpdateWrapper<SpmkSpz>().eq("org_code", orgCode).eq("name", "其他"));
Integer count = spmkSpzMapper.updateListSortById(spmkSpzSortDtos); Integer count = spmkSpzMapper.updateListSortById(spmkSpzSortDtos);
System.out.println(count);
return ResultUtil.success("审批组批量排序成功"); return ResultUtil.success("审批组批量排序成功");
} }
...@@ -247,6 +236,7 @@ public class SpmkServiceImpl { ...@@ -247,6 +236,7 @@ public class SpmkServiceImpl {
@ApiOperationSupport(order = 8) @ApiOperationSupport(order = 8)
public Result<Void> updatespglsort(@CurrentUser UserBean userBean,@RequestBody List<SpmkSpglSortDto> spmkSpglSortDtos) { public Result<Void> updatespglsort(@CurrentUser UserBean userBean,@RequestBody List<SpmkSpglSortDto> spmkSpglSortDtos) {
Integer count = spmkSpglMapper.updateListSortById(spmkSpglSortDtos); Integer count = spmkSpglMapper.updateListSortById(spmkSpglSortDtos);
System.out.println(count);
return ResultUtil.success("审批管理批量排序成功"); return ResultUtil.success("审批管理批量排序成功");
} }
......
src/main/java/cn/timer/api/controller/xcgl/SalaryManagementController.java
...@@ -11,6 +11,7 @@ import java.util.List; ...@@ -11,6 +11,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import javax.annotation.Resource; import javax.annotation.Resource;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
...@@ -22,12 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -22,12 +23,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper; import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
import com.github.pagehelper.PageHelper;
import cn.hutool.core.util.StrUtil;
import cn.timer.api.bean.kqgl.AttendanceGroup; import cn.timer.api.bean.kqgl.AttendanceGroup;
import cn.timer.api.bean.kqgl.AttendanceReport; import cn.timer.api.bean.kqgl.AttendanceReport;
import cn.timer.api.bean.kqgl.AttendanceWeeklySch; import cn.timer.api.bean.kqgl.AttendanceWeeklySch;
...@@ -35,7 +32,6 @@ import cn.timer.api.bean.kqgl.PunchCardDetails; ...@@ -35,7 +32,6 @@ import cn.timer.api.bean.kqgl.PunchCardDetails;
import cn.timer.api.bean.kqgl.PunchRecord; import cn.timer.api.bean.kqgl.PunchRecord;
import cn.timer.api.bean.kqgl.Schedule; import cn.timer.api.bean.kqgl.Schedule;
import cn.timer.api.bean.kqgl.SpecialDate; import cn.timer.api.bean.kqgl.SpecialDate;
import cn.timer.api.bean.sbgjj.SbgjjAssoCbfa;
import cn.timer.api.bean.xcgl.XcglAdminXzz; import cn.timer.api.bean.xcgl.XcglAdminXzz;
import cn.timer.api.bean.xcgl.XcglAssoGztsz; import cn.timer.api.bean.xcgl.XcglAssoGztsz;
import cn.timer.api.bean.xcgl.XcglAssoGztzt; import cn.timer.api.bean.xcgl.XcglAssoGztzt;
...@@ -74,9 +70,7 @@ import cn.timer.api.dao.xcgl.XcglAssoZxfjkcMapper; ...@@ -74,9 +70,7 @@ import cn.timer.api.dao.xcgl.XcglAssoZxfjkcMapper;
import cn.timer.api.dao.xcgl.XcglSalaryItemMapper; import cn.timer.api.dao.xcgl.XcglSalaryItemMapper;
import cn.timer.api.dao.yggl.YgglMainEmpMapper; import cn.timer.api.dao.yggl.YgglMainEmpMapper;
import cn.timer.api.dto.sbgjj.InspersonnelDto; import cn.timer.api.dto.sbgjj.InspersonnelDto;
import cn.timer.api.dto.sbgjj.SearchPlanDto;
import cn.timer.api.dto.xcgl.AdditionalDeductionDto; import cn.timer.api.dto.xcgl.AdditionalDeductionDto;
import cn.timer.api.dto.xcgl.AdditionalkcDto;
import cn.timer.api.dto.xcgl.CalculatedFieldDto; import cn.timer.api.dto.xcgl.CalculatedFieldDto;
import cn.timer.api.dto.xcgl.CalculationDto; import cn.timer.api.dto.xcgl.CalculationDto;
import cn.timer.api.dto.xcgl.CalculationOptionsDto; import cn.timer.api.dto.xcgl.CalculationOptionsDto;
...@@ -354,6 +348,7 @@ public class SalaryManagementController { ...@@ -354,6 +348,7 @@ public class SalaryManagementController {
XcglAssoJsgzzx zzx = XcglAssoJsgzzx.builder().build(); XcglAssoJsgzzx zzx = XcglAssoJsgzzx.builder().build();
zzx.setSalaryitem(fixed[f]);//薪资项 zzx.setSalaryitem(fixed[f]);//薪资项
zzx.setYhmbzd(fixed[f]);//银行模板项 需与银行一一对应 zzx.setYhmbzd(fixed[f]);//银行模板项 需与银行一一对应
@SuppressWarnings("unused")
XcglAssoXzdazdy daz = xcglassoxzdazdymapper.SalaryFixedWages(fixed[f]); XcglAssoXzdazdy daz = xcglassoxzdazdymapper.SalaryFixedWages(fixed[f]);
zzx.setRule("从薪资档案-"+fixed[f]+"自动提取数据");//规则******************************** zzx.setRule("从薪资档案-"+fixed[f]+"自动提取数据");//规则********************************
zzx.setGsid(0);//公式id 0：未关联规则 zzx.setGsid(0);//公式id 0：未关联规则
...@@ -545,6 +540,7 @@ public class SalaryManagementController { ...@@ -545,6 +540,7 @@ public class SalaryManagementController {
//计薪规则组 //计薪规则组
List<XcglAssoJxgz> jxgzlist = new LambdaQueryChainWrapper<XcglAssoJxgz>(xcglassojxgzmapper).eq(XcglAssoJxgz::getXzzid, paygro.getPxfs()).list(); List<XcglAssoJxgz> jxgzlist = new LambdaQueryChainWrapper<XcglAssoJxgz>(xcglassojxgzmapper).eq(XcglAssoJxgz::getXzzid, paygro.getPxfs()).list();
@SuppressWarnings("unused")
List<XcglAssoJxgz> jxgzs = new ArrayList<XcglAssoJxgz>(); List<XcglAssoJxgz> jxgzs = new ArrayList<XcglAssoJxgz>();
for(XcglAssoJxgz jxgzl : jxgzlist) { for(XcglAssoJxgz jxgzl : jxgzlist) {
...@@ -631,6 +627,7 @@ public class SalaryManagementController { ...@@ -631,6 +627,7 @@ public class SalaryManagementController {
@PutMapping(value = "/salarygroup") @PutMapping(value = "/salarygroup")
@ApiOperation(value = "修改薪资组", httpMethod = "PUT", notes = "接口发布说明") @ApiOperation(value = "修改薪资组", httpMethod = "PUT", notes = "接口发布说明")
public ResponseResult ModifySalaryGroup(@CurrentUser UserBean userBean, @RequestBody PayrollGroupDto paygro) { public ResponseResult ModifySalaryGroup(@CurrentUser UserBean userBean, @RequestBody PayrollGroupDto paygro) {
@SuppressWarnings("unused")
Integer empNum = userBean.getEmpNum(); Integer empNum = userBean.getEmpNum();
Integer orgCode = userBean.getOrgCode(); Integer orgCode = userBean.getOrgCode();
...@@ -1218,6 +1215,7 @@ public class SalaryManagementController { ...@@ -1218,6 +1215,7 @@ public class SalaryManagementController {
// List<XcglAssoJsgzzx> attsect = xcglassojsgzzxmapper.selectSalarySectionList(id); // List<XcglAssoJsgzzx> attsect = xcglassojsgzzxmapper.selectSalarySectionList(id);
//薪资组信息 //薪资组信息
@SuppressWarnings("unused")
XcglAdminXzz xzz = new LambdaQueryChainWrapper<XcglAdminXzz>(xcgladminxzzmapper).eq(XcglAdminXzz::getId, id).one(); XcglAdminXzz xzz = new LambdaQueryChainWrapper<XcglAdminXzz>(xcgladminxzzmapper).eq(XcglAdminXzz::getId, id).one();
//当前薪资组内人员 //当前薪资组内人员
List<XcglAssoXzury> znrys = new LambdaQueryChainWrapper<XcglAssoXzury>(xcglassoxzurymapper).eq(XcglAssoXzury::getXzzid, id).eq(XcglAssoXzury::getQyid,userBean.getOrgCode()).list(); List<XcglAssoXzury> znrys = new LambdaQueryChainWrapper<XcglAssoXzury>(xcglassoxzurymapper).eq(XcglAssoXzury::getXzzid, id).eq(XcglAssoXzury::getQyid,userBean.getOrgCode()).list();
...@@ -1345,8 +1343,11 @@ public class SalaryManagementController { ...@@ -1345,8 +1343,11 @@ public class SalaryManagementController {
if(xtzd.getOptionid() > 0) {//说明阔以根据表查出结果 if(xtzd.getOptionid() > 0) {//说明阔以根据表查出结果
XcglAssoOption lbcx = new LambdaQueryChainWrapper<XcglAssoOption>(xcglassooptionmapper).eq(XcglAssoOption::getId,xtzd.getOptionid()).one(); XcglAssoOption lbcx = new LambdaQueryChainWrapper<XcglAssoOption>(xcglassooptionmapper).eq(XcglAssoOption::getId,xtzd.getOptionid()).one();
if(lbcx.getTablename() != null && !lbcx.getTablename().equals("") && lbcx.getFieldname() != null && !lbcx.getFieldname().equals("")) { if(lbcx.getTablename() != null && !lbcx.getTablename().equals("") && lbcx.getFieldname() != null && !lbcx.getFieldname().equals("")) {
@SuppressWarnings("unused")
String tablename = lbcx.getTablename();//对应库表名 String tablename = lbcx.getTablename();//对应库表名
@SuppressWarnings("unused")
String fieldname = lbcx.getFieldname();//对应库字段名 String fieldname = lbcx.getFieldname();//对应库字段名
@SuppressWarnings("unused")
List<Map<String, Object>> list = null; List<Map<String, Object>> list = null;
// if(tablename.equals("yggl_main_emp")) {//员工管理 // if(tablename.equals("yggl_main_emp")) {//员工管理
// QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>(); // QueryWrapper<YgglMainEmp> queryWrapper = new QueryWrapper<>();
...@@ -1432,6 +1433,7 @@ public class SalaryManagementController { ...@@ -1432,6 +1433,7 @@ public class SalaryManagementController {
if(payatt.getOptionid() > 0) {//说明阔以根据表查出结果 if(payatt.getOptionid() > 0) {//说明阔以根据表查出结果
XcglAssoOption lbcx = new LambdaQueryChainWrapper<XcglAssoOption>(xcglassooptionmapper).eq(XcglAssoOption::getId,payatt.getOptionid()).one(); XcglAssoOption lbcx = new LambdaQueryChainWrapper<XcglAssoOption>(xcglassooptionmapper).eq(XcglAssoOption::getId,payatt.getOptionid()).one();
if(lbcx.getFieldname() != null && !lbcx.getFieldname().equals("")) {//关于考勤的只有 -- 字段名：“fieldname” if(lbcx.getFieldname() != null && !lbcx.getFieldname().equals("")) {//关于考勤的只有 -- 字段名：“fieldname”
@SuppressWarnings("unused")
String tablename = lbcx.getTablename();//对应库表名 String tablename = lbcx.getTablename();//对应库表名
String fieldname = lbcx.getFieldname();//对应库字段名 String fieldname = lbcx.getFieldname();//对应库字段名
......
src/main/java/cn/timer/api/dao/jxgl/JxglAdminJcszMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAdminJcsz; import cn.timer.api.bean.jxgl.JxglAdminJcsz;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 基础设置 * 基础设置
* *
......
src/main/java/cn/timer/api/dao/jxgl/JxglAdminKpzszMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAdminKpzsz; import cn.timer.api.bean.jxgl.JxglAdminKpzsz;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 考评组设置 * 考评组设置
* @author LAL 2020-01-08 * @author LAL 2020-01-08
......
src/main/java/cn/timer/api/dao/jxgl/JxglAdminZbkMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAdminZbk; import cn.timer.api.bean.jxgl.JxglAdminZbk;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 指标库 * 指标库
* @author LAL 2020-01-06 * @author LAL 2020-01-06
......
src/main/java/cn/timer/api/dao/jxgl/JxglAssoFbzbkMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAssoFbzbk; import cn.timer.api.bean.jxgl.JxglAssoFbzbk;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 指标库量化指标 * 指标库量化指标
* @author LAL 2020-01-06 * @author LAL 2020-01-06
......
src/main/java/cn/timer/api/dao/jxgl/JxglAssoJxdjMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAssoJxdj; import cn.timer.api.bean.jxgl.JxglAssoJxdj;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 绩效等级 * 绩效等级
* *
......
src/main/java/cn/timer/api/dao/jxgl/JxglAssoKpzryMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAssoKpzry; import cn.timer.api.bean.jxgl.JxglAssoKpzry;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 考评组管理员/被考核人员 * 考评组管理员/被考核人员
* @author LAL 2020-01-08 * @author LAL 2020-01-08
......
src/main/java/cn/timer/api/dao/jxgl/JxglAssoMbszMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAssoMbsz; import cn.timer.api.bean.jxgl.JxglAssoMbsz;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 模板设计 * 模板设计
* @author LAL 2020-01-08 * @author LAL 2020-01-08
......
src/main/java/cn/timer/api/dao/jxgl/JxglAssoWdzbglMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAssoWdzbgl; import cn.timer.api.bean.jxgl.JxglAssoWdzbgl;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 维度指标关联 * 维度指标关联
* @author LAL 2020-01-08 * @author LAL 2020-01-08
......
src/main/java/cn/timer/api/dao/jxgl/JxglAssoZbzdszMapper.java
package cn.timer.api.dao.jxgl; package cn.timer.api.dao.jxgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.jxgl.JxglAssoZbzdsz; import cn.timer.api.bean.jxgl.JxglAssoZbzdsz;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 指标字段设置 * 指标字段设置
* *
......
src/main/java/cn/timer/api/dao/kqjg/KqjgRealtimeEnrollDataMapper.java
package cn.timer.api.dao.kqjg; package cn.timer.api.dao.kqjg;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.kqjg.KqjgRealtimeEnrollData; import cn.timer.api.bean.kqjg.KqjgRealtimeEnrollData;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 机器上传的实时登记数据 * 机器上传的实时登记数据
* @author lal 2019-12-24 * @author lal 2019-12-24
......
src/main/java/cn/timer/api/dao/sbgjj/SbgjjAdminCbryMapper.java
package cn.timer.api.dao.sbgjj; package cn.timer.api.dao.sbgjj;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.sbgjj.SbgjjAdminCbry; import cn.timer.api.bean.sbgjj.SbgjjAdminCbry;
import cn.timer.api.bean.yggl.YgglMainEmp; import cn.timer.api.bean.yggl.YgglMainEmp;
import cn.timer.api.dto.sbgjj.InspersonnelDto; import cn.timer.api.dto.sbgjj.InspersonnelDto;
import cn.timer.api.dto.sbgjj.InsuredPersonnelDto; import cn.timer.api.dto.sbgjj.InsuredPersonnelDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 参保人员 * 参保人员
* @author Tang 2019-12-09 * @author Tang 2019-12-09
......
src/main/java/cn/timer/api/dao/sbgjj/SbgjjAreaInfoMapper.java
package cn.timer.api.dao.sbgjj; package cn.timer.api.dao.sbgjj;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.sbgjj.SbgjjAreaInfo; import cn.timer.api.bean.sbgjj.SbgjjAreaInfo;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 社保公积金基数 * 社保公积金基数
* @author Tang 2019-12-06 * @author Tang 2019-12-06
......
src/main/java/cn/timer/api/dao/sbgjj/SbgjjAssoCbfaMapper.java
package cn.timer.api.dao.sbgjj; package cn.timer.api.dao.sbgjj;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.sbgjj.SbgjjAssoCbfa; import cn.timer.api.bean.sbgjj.SbgjjAssoCbfa;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 参保方案 * 参保方案
* @author Tang 2019-12-07 * @author Tang 2019-12-07
......
src/main/java/cn/timer/api/dao/sbgjj/SbgjjAssoCbfzmxMapper.java
package cn.timer.api.dao.sbgjj; package cn.timer.api.dao.sbgjj;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.sbgjj.SbgjjAssoCbfzmx; import cn.timer.api.bean.sbgjj.SbgjjAssoCbfzmx;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 参保方案明细 * 参保方案明细
* @author Tang 2019-12-07 * @author Tang 2019-12-07
......
src/main/java/cn/timer/api/dao/sbgjj/SbgjjAssoYjzdMapper.java
package cn.timer.api.dao.sbgjj; package cn.timer.api.dao.sbgjj;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.sbgjj.SbgjjAssoYjzd; import cn.timer.api.bean.sbgjj.SbgjjAssoYjzd;
import cn.timer.api.dto.sbgjj.MonthlyCheckoutSheetDto; import cn.timer.api.dto.sbgjj.MonthlyCheckoutSheetDto;
import cn.timer.api.dto.sbgjj.MonthlyStatementDto; import cn.timer.api.dto.sbgjj.MonthlyStatementDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 月结账单 * 月结账单
* @author Tang 2019-12-09 * @author Tang 2019-12-09
......
src/main/java/cn/timer/api/dao/sbgjj/SbgjjTypeDetailsMapper.java
package cn.timer.api.dao.sbgjj; package cn.timer.api.dao.sbgjj;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.sbgjj.SbgjjTypeDetails; import cn.timer.api.bean.sbgjj.SbgjjTypeDetails;
import cn.timer.api.dto.sbgjj.SocialfundDto; import cn.timer.api.dto.sbgjj.SocialfundDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 社保公积金方案 * 社保公积金方案
* @author lal 2019-12-06 * @author lal 2019-12-06
......
src/main/java/cn/timer/api/dao/sbgjj/SbgjjYjCsbhMapper.java
package cn.timer.api.dao.sbgjj; package cn.timer.api.dao.sbgjj;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.sbgjj.SbgjjYjCsbh; import cn.timer.api.bean.sbgjj.SbgjjYjCsbh;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 城市 * 城市
* @author Tang 2019-12-06 * @author Tang 2019-12-06
......
src/main/java/cn/timer/api/dao/spmk/SpmkClrMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkClr; import cn.timer.api.bean.spmk.SpmkClr;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 处理人 * 处理人
* @author Tang 2019-11-26 * @author Tang 2019-11-26
......
src/main/java/cn/timer/api/dao/spmk/SpmkIconMapper.java
...@@ -4,7 +4,6 @@ import org.springframework.stereotype.Repository; ...@@ -4,7 +4,6 @@ import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.spmk.SpmkClr;
import cn.timer.api.bean.spmk.SpmkIcon; import cn.timer.api.bean.spmk.SpmkIcon;
/** /**
......
src/main/java/cn/timer/api/dao/spmk/SpmkJqgzMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkJqgz; import cn.timer.api.bean.spmk.SpmkJqgz;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 假勤规则 * 假勤规则
* @author Tang 2019-12-09 * @author Tang 2019-12-09
......
src/main/java/cn/timer/api/dao/spmk/SpmkKjMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkKj; import cn.timer.api.bean.spmk.SpmkKj;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 控件 * 控件
* @author Tang 2019-11-25 * @author Tang 2019-11-25
......
src/main/java/cn/timer/api/dao/spmk/SpmkKjMkMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkKjMk; import cn.timer.api.bean.spmk.SpmkKjMk;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 控件模版关联 * 控件模版关联
* @author Tang 2019-11-25 * @author Tang 2019-11-25
......
src/main/java/cn/timer/api/dao/spmk/SpmkKjpzMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkKjpz; import cn.timer.api.bean.spmk.SpmkKjpz;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 控件配置 * 控件配置
* @author Tang 2019-11-25 * @author Tang 2019-11-25
......
src/main/java/cn/timer/api/dao/spmk/SpmkLcjdEmpAssoMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkLcjdEmpAsso; import cn.timer.api.bean.spmk.SpmkLcjdEmpAsso;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 流程节点员工关联 * 流程节点员工关联
* @author Tang 2019-11-25 * @author Tang 2019-11-25
......
src/main/java/cn/timer/api/dao/spmk/SpmkLcjdMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkLcjd; import cn.timer.api.bean.spmk.SpmkLcjd;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 流程节点 * 流程节点
* @author Tang 2019-11-22 * @author Tang 2019-11-22
......
src/main/java/cn/timer/api/dao/spmk/SpmkMbMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkMb; import cn.timer.api.bean.spmk.SpmkMb;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 审批模版 * 审批模版
* @author Tang 2019-11-25 * @author Tang 2019-11-25
......
src/main/java/cn/timer/api/dao/spmk/SpmkSpczMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkSpcz; import cn.timer.api.bean.spmk.SpmkSpcz;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 审批操作 * 审批操作
* @author Tang 2019-11-26 * @author Tang 2019-11-26
......
src/main/java/cn/timer/api/dao/spmk/SpmkSpglMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkSpgl; import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.dto.spmk.SpmkSpglDto;
import cn.timer.api.dto.spmk.SpmkSpglSortDto; import cn.timer.api.dto.spmk.SpmkSpglSortDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 审批管理 * 审批管理
* @author Tang 2019-11-22 * @author Tang 2019-11-22
......
src/main/java/cn/timer/api/dao/spmk/SpmkSpnrMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkSpnr; import cn.timer.api.bean.spmk.SpmkSpnr;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 审批内容 * 审批内容
* @author Tang 2019-11-26 * @author Tang 2019-11-26
......
src/main/java/cn/timer/api/dao/spmk/SpmkSpzMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkSpz; import cn.timer.api.bean.spmk.SpmkSpz;
import cn.timer.api.dto.spmk.SpmkSpzDto;
import cn.timer.api.dto.spmk.SpmkSpzSortDto; import cn.timer.api.dto.spmk.SpmkSpzSortDto;
import cn.timer.api.dto.spmk.SpmkSpzSpglDto; import cn.timer.api.dto.spmk.SpmkSpzSpglDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 审批组 * 审批组
* @author Tang 2019-11-22 * @author Tang 2019-11-22
......
src/main/java/cn/timer/api/dao/spmk/SpmkSxpzMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkSxpz; import cn.timer.api.bean.spmk.SpmkSxpz;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 属性配置 * 属性配置
* @author Tang 2019-11-25 * @author Tang 2019-11-25
......
src/main/java/cn/timer/api/dao/spmk/SpmkXzxMapper.java
package cn.timer.api.dao.spmk; package cn.timer.api.dao.spmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.spmk.SpmkXzx; import cn.timer.api.bean.spmk.SpmkXzx;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 选择项 * 选择项
* @author Tang 2019-11-25 * @author Tang 2019-11-25
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoGztszMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.xcgl.XcglAssoGztsz; import cn.timer.api.bean.xcgl.XcglAssoGztsz;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 工资条组-设置 * 工资条组-设置
* @author lal 2019-12-12 * @author lal 2019-12-12
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoGztztMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.xcgl.XcglAssoGztzt; import cn.timer.api.bean.xcgl.XcglAssoGztzt;
import cn.timer.api.dto.xcgl.PayslipDetailsDto; import cn.timer.api.dto.xcgl.PayslipDetailsDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 工资条组内成员状态 * 工资条组内成员状态
* @author lal 2019-12-12 * @author lal 2019-12-12
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoJsgzzxMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.xcgl.XcglAssoJsgzzx; import cn.timer.api.bean.xcgl.XcglAssoJsgzzx;
import cn.timer.api.dto.xcgl.CalculationOptionsDto; import cn.timer.api.dto.xcgl.CalculationOptionsDto;
import cn.timer.api.dto.xcgl.PayTermDto; import cn.timer.api.dto.xcgl.PayTermDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 计薪规则组项 * 计薪规则组项
* @author lal 2019-11-23 * @author lal 2019-11-23
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoJxgzMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.xcgl.XcglAssoJxgz; import cn.timer.api.bean.xcgl.XcglAssoJxgz;
import cn.timer.api.dto.xcgl.PayGroupedDataDto; import cn.timer.api.dto.xcgl.PayGroupedDataDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 计薪规则组 * 计薪规则组
* *
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoOptionMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.xcgl.XcglAssoOption; import cn.timer.api.bean.xcgl.XcglAssoOption;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 薪资选项 * 薪资选项
* @author lal 2019-11-25 * @author lal 2019-11-25
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXcjsgzMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.xcgl.XcglAssoXcjsgz; import cn.timer.api.bean.xcgl.XcglAssoXcjsgz;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 薪酬计算规则公式 * 薪酬计算规则公式
* @author lal 2019-11-23 * @author lal 2019-11-23
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzbMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.xcgl.XcglAssoXzb; import cn.timer.api.bean.xcgl.XcglAssoXzb;
import cn.timer.api.dto.xcgl.CalculationDto; import cn.timer.api.dto.xcgl.CalculationDto;
import cn.timer.api.dto.xcgl.CalculationValueDto; import cn.timer.api.dto.xcgl.CalculationValueDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 薪资表 * 薪资表
* @author lal 2019-11-26 * @author lal 2019-11-26
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoXzuryMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.kqgl.UserAttendanceRel;
import cn.timer.api.bean.xcgl.XcglAssoXzury; import cn.timer.api.bean.xcgl.XcglAssoXzury;
import cn.timer.api.dto.xcgl.SalaryPersonFieldDto; import cn.timer.api.dto.xcgl.SalaryPersonFieldDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 薪资组内人员 * 薪资组内人员
* @author Tang 2019-11-20 * @author Tang 2019-11-20
......
src/main/java/cn/timer/api/dao/xcgl/XcglAssoZxfjkcMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import java.util.List; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import cn.timer.api.bean.xcgl.XcglAssoZxfjkc; import cn.timer.api.bean.xcgl.XcglAssoZxfjkc;
import cn.timer.api.dto.xcgl.AdditionalDeductionDto; import cn.timer.api.dto.xcgl.AdditionalDeductionDto;
import cn.timer.api.dto.xcgl.SearchSalariedPeopleDto; import cn.timer.api.dto.xcgl.SearchSalariedPeopleDto;
......
src/main/java/cn/timer/api/dao/xcgl/XcglSalaryItemMapper.java
package cn.timer.api.dao.xcgl; package cn.timer.api.dao.xcgl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import java.util.List;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.xcgl.XcglSalaryItem; import cn.timer.api.bean.xcgl.XcglSalaryItem;
import cn.timer.api.dto.xcgl.XcglAssoOptionDto; import cn.timer.api.dto.xcgl.XcglAssoOptionDto;
import java.util.List;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 薪资项名 * 薪资项名
* @author Tang 2019-11-25 * @author Tang 2019-11-25
......
src/main/java/cn/timer/api/dao/yggl/YgglAttaSbgjjMapper.java
package cn.timer.api.dao.yggl; package cn.timer.api.dao.yggl;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.yggl.YgglAttaSbgjj; import cn.timer.api.bean.yggl.YgglAttaSbgjj;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
/** /**
* 员工社保公积金 * 员工社保公积金
* @author Tang 2019-12-27 * @author Tang 2019-12-27
......
src/main/java/cn/timer/api/dto/qyzx/AdminListDto.java
...@@ -11,6 +11,7 @@ import lombok.Builder; ...@@ -11,6 +11,7 @@ import lombok.Builder;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
@SuppressWarnings("rawtypes")
@Data @Data
@Builder @Builder
@AllArgsConstructor @AllArgsConstructor
......
src/main/java/cn/timer/api/dto/sbgjj/InsuranceSchemeDto.java
package cn.timer.api.dto.sbgjj; package cn.timer.api.dto.sbgjj;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
...@@ -12,10 +11,8 @@ import lombok.NoArgsConstructor; ...@@ -12,10 +11,8 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor @NoArgsConstructor
public class InsuranceSchemeDto implements Serializable { public class InsuranceSchemeDto implements Serializable {
/**
*
*/
private static final long serialVersionUID = 5454190307549431744L; private static final long serialVersionUID = 5454190307549431744L;
int id; int id;
String fwf;//服务费 String fwf;//服务费
String insuredcities;//参保城市 String insuredcities;//参保城市
......
src/main/java/cn/timer/api/dto/spmk/SpmkMbKjDto.java
package cn.timer.api.dto.spmk; package cn.timer.api.dto.spmk;
import cn.timer.api.bean.spmk.SpmkMb;
import cn.timer.api.bean.spmk.SpmkMb.SpmkMbBuilder;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/spmk/SpmkSpglDto.java
package cn.timer.api.dto.spmk; package cn.timer.api.dto.spmk;
import java.util.Date; import java.util.Date;
import java.util.List;
import javax.persistence.Transient; import javax.persistence.Transient;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableField;
import cn.timer.api.bean.spmk.SpmkKjpz;
import cn.timer.api.bean.spmk.SpmkLcjd;
import cn.timer.api.bean.spmk.SpmkMb;
import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.bean.spmk.SpmkSpgl.SpmkSpglBuilder;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/spmk/SpmkSpglLcjdDto.java
...@@ -2,16 +2,9 @@ package cn.timer.api.dto.spmk; ...@@ -2,16 +2,9 @@ package cn.timer.api.dto.spmk;
import java.util.Date; import java.util.Date;
import javax.persistence.GeneratedValue;
import javax.persistence.Id;
import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.FieldFill;
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 cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.bean.spmk.SpmkSpgl.SpmkSpglBuilder;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/spmk/SpmkSpglMoveDto.java
package cn.timer.api.dto.spmk; package cn.timer.api.dto.spmk;
import java.util.Date;
import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.bean.spmk.SpmkSpgl.SpmkSpglBuilder;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/spmk/SpmkSpglSortDto.java
package cn.timer.api.dto.spmk; package cn.timer.api.dto.spmk;
import java.util.Date;
import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.bean.spmk.SpmkSpgl.SpmkSpglBuilder;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/spmk/SpmkSpzDto.java
package cn.timer.api.dto.spmk; package cn.timer.api.dto.spmk;
import java.util.List;
import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.dto.spmk.SpmkSpzSpglDto.SpmkSpzSpglDtoBuilder;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/spmk/SpmkSpzSortDto.java
package cn.timer.api.dto.spmk; package cn.timer.api.dto.spmk;
import cn.timer.api.dto.spmk.SpmkSpzDto.SpmkSpzDtoBuilder;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/spmk/SpmkSpzSpglDto.java
...@@ -3,8 +3,6 @@ package cn.timer.api.dto.spmk; ...@@ -3,8 +3,6 @@ package cn.timer.api.dto.spmk;
import java.util.List; import java.util.List;
import cn.timer.api.bean.spmk.SpmkSpgl; import cn.timer.api.bean.spmk.SpmkSpgl;
import cn.timer.api.bean.spmk.SpmkSpz;
import cn.timer.api.bean.spmk.SpmkSpz.SpmkSpzBuilder;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/xcgl/FixedSalaryStaffDto.java
...@@ -3,7 +3,6 @@ package cn.timer.api.dto.xcgl; ...@@ -3,7 +3,6 @@ package cn.timer.api.dto.xcgl;
import java.io.Serializable; import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Map;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/cn/timer/api/dto/xcgl/SalaryGroupGroupingDto.java
...@@ -3,7 +3,6 @@ package cn.timer.api.dto.xcgl; ...@@ -3,7 +3,6 @@ package cn.timer.api.dto.xcgl;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import cn.timer.api.bean.xcgl.XcglAssoJsgzzx;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
......
src/main/java/cn/timer/api/dto/xcgl/SalaryPersonFieldDto.java
package cn.timer.api.dto.xcgl; package cn.timer.api.dto.xcgl;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
......
src/main/java/cn/timer/api/dto/xcgl/TjSalaryItemDot.java
...@@ -2,7 +2,6 @@ package cn.timer.api.dto.xcgl; ...@@ -2,7 +2,6 @@ package cn.timer.api.dto.xcgl;
import java.io.Serializable; import java.io.Serializable;
import cn.timer.api.dto.xcgl.SearchSalariedPeopleDto.SearchSalariedPeopleDtoBuilder;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
......
src/main/java/cn/timer/api/dto/zzgl/EmpDeptDto.java
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
package cn.timer.api.dto.zzgl; package cn.timer.api.dto.zzgl;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/cn/timer/api/dto/zzgl/LogDgjlsDto.java
...@@ -10,7 +10,6 @@ import java.util.Date; ...@@ -10,7 +10,6 @@ import java.util.Date;
import com.baomidou.mybatisplus.extension.activerecord.Model; import com.baomidou.mybatisplus.extension.activerecord.Model;
import cn.timer.api.bean.yggl.YgglMainEmp;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
......
src/main/java/cn/timer/api/dto/zzgl/LogDgjlsQueryDto.java
...@@ -4,8 +4,6 @@ package cn.timer.api.dto.zzgl; ...@@ -4,8 +4,6 @@ package cn.timer.api.dto.zzgl;
import java.io.Serializable; import java.io.Serializable;
import java.util.List; import java.util.List;
import cn.timer.api.config.swagger.IgnoreSwaggerParameter;
import cn.timer.api.utils.Page; import cn.timer.api.utils.Page;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/cn/timer/api/dto/zzgl/ZzglLogDgjlQueryDto.java
...@@ -2,11 +2,6 @@ package cn.timer.api.dto.zzgl; ...@@ -2,11 +2,6 @@ package cn.timer.api.dto.zzgl;
import java.io.Serializable; import java.io.Serializable;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.timer.api.bean.yggl.YgglMainEmp;
import cn.timer.api.config.swagger.IgnoreSwaggerParameter; import cn.timer.api.config.swagger.IgnoreSwaggerParameter;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
......
src/main/java/cn/timer/api/utils/ApiReturnUtil.java
...@@ -36,7 +36,7 @@ public class ApiReturnUtil implements Serializable{ ...@@ -36,7 +36,7 @@ public class ApiReturnUtil implements Serializable{
return new ApiReturnObject("00",errorMessage,object); return new ApiReturnObject("00",errorMessage,object);
} }
} }
public static ApiReturnObject pageManual(Integer pageNumber, Integer pageSize,Integer countNum, List returnObject) { public static ApiReturnObject pageManual(Integer pageNumber, Integer pageSize,Integer countNum, List<Void> returnObject) {
return new ApiReturnObject(pageNumber+"",pageSize+"",countNum+"",getTotalPages(countNum, pageSize),"00","success",returnObject); return new ApiReturnObject(pageNumber+"",pageSize+"",countNum+"",getTotalPages(countNum, pageSize),"00","success",returnObject);
} }
......
src/main/java/cn/timer/api/utils/DateFormatUtils.java
...@@ -540,7 +540,7 @@ public class DateFormatUtils { ...@@ -540,7 +540,7 @@ public class DateFormatUtils {
*/ */
Date d1 = convertToDate(s2, "yyyy-MM-dd HH:mm:ss"); Date d1 = convertToDate(s2, "yyyy-MM-dd HH:mm:ss");
Date d2 = convertToDate(s1, "yyyy-MM-dd HH:mm:ss"); Date d2 = convertToDate(s1, "yyyy-MM-dd HH:mm:ss");
//System.out.println(DateDifferentExample(d1, d2)); System.out.println(DateDifferentExample(d1, d2));
} }
} }
\ No newline at end of file
src/main/java/cn/timer/api/utils/ExcelUtil.java
...@@ -156,11 +156,13 @@ public class ExcelUtil<T> { ...@@ -156,11 +156,13 @@ public class ExcelUtil<T> {
} }
try { try {
workbook.write(out); workbook.write(out);
workbook.close();
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
@SuppressWarnings("unused")
public Collection<T> importExcel(File file, Collection<T> dataset) throws Exception { public Collection<T> importExcel(File file, Collection<T> dataset) throws Exception {
// 装载流 // 装载流
...@@ -181,7 +183,6 @@ public class ExcelUtil<T> { ...@@ -181,7 +183,6 @@ public class ExcelUtil<T> {
HSSFRow row = sheet.getRow(i); HSSFRow row = sheet.getRow(i);
String result = new String();
if (row != null) { if (row != null) {
// 装载obj // 装载obj
for (int k = 0; k < row.getLastCellNum(); k++) { for (int k = 0; k < row.getLastCellNum(); k++) {
...@@ -199,10 +200,12 @@ public class ExcelUtil<T> { ...@@ -199,10 +200,12 @@ public class ExcelUtil<T> {
//ret.add(dataObj(dataset, row)); //ret.add(dataObj(dataset, row));
} }
} }
hw.close();
return dataset; return dataset;
} }
@SuppressWarnings("deprecation")
private static String cellFormat(HSSFCell cell){ private static String cellFormat(HSSFCell cell){
String result = new String(); String result = new String();
if (null != cell) { if (null != cell) {
...@@ -275,6 +278,7 @@ public class ExcelUtil<T> { ...@@ -275,6 +278,7 @@ public class ExcelUtil<T> {
@SuppressWarnings("unused")
private static Map<String, Object> dataObj(Object obj, HSSFRow row) throws Exception { private static Map<String, Object> dataObj(Object obj, HSSFRow row) throws Exception {
Class<?> rowClazz = obj.getClass(); Class<?> rowClazz = obj.getClass();
Field[] fields = FieldUtils.getAllFields(rowClazz); Field[] fields = FieldUtils.getAllFields(rowClazz);
...@@ -290,6 +294,7 @@ public class ExcelUtil<T> { ...@@ -290,6 +294,7 @@ public class ExcelUtil<T> {
return map; return map;
} }
@SuppressWarnings("deprecation")
public static String getVal(HSSFCell hssfCell) { public static String getVal(HSSFCell hssfCell) {
if (hssfCell != null) { if (hssfCell != null) {
hssfCell.setCellType(Cell.CELL_TYPE_STRING); hssfCell.setCellType(Cell.CELL_TYPE_STRING);
......
src/main/java/cn/timer/api/utils/ImportExcelUntil.java
...@@ -55,6 +55,7 @@ public class ImportExcelUntil { ...@@ -55,6 +55,7 @@ public class ImportExcelUntil {
return map; return map;
} }
@SuppressWarnings("deprecation")
public static List<Map<String, Object>> importExcel(MultipartFile file,Object obj) throws Exception { public static List<Map<String, Object>> importExcel(MultipartFile file,Object obj) throws Exception {
// 装载流 // 装载流
...@@ -147,6 +148,7 @@ public class ImportExcelUntil { ...@@ -147,6 +148,7 @@ public class ImportExcelUntil {
ret.add(dataObj(obj, row)); ret.add(dataObj(obj, row));
} }
} }
hw.close();
return ret; return ret;
} }
...@@ -156,6 +158,7 @@ public class ImportExcelUntil { ...@@ -156,6 +158,7 @@ public class ImportExcelUntil {
* @param hssfCell * @param hssfCell
* @return * @return
*/ */
@SuppressWarnings("deprecation")
public static String getVal(HSSFCell hssfCell) { public static String getVal(HSSFCell hssfCell) {
if(hssfCell!=null){ if(hssfCell!=null){
hssfCell.setCellType(Cell.CELL_TYPE_STRING); hssfCell.setCellType(Cell.CELL_TYPE_STRING);
......
src/main/java/cn/timer/api/utils/NumberedGeneration.java
...@@ -13,7 +13,7 @@ public class NumberedGeneration { ...@@ -13,7 +13,7 @@ public class NumberedGeneration {
long m = Long.parseLong((str)); long m = Long.parseLong((str));
Integer ret = (int) (m + l); Integer ret = (int) (m + l);
long n = l + 1; long n = l + 1;
System.out.println(n);
return ret+1000; return ret+1000;
} }
......
src/main/java/cn/timer/api/utils/ResponseResultNew.java
package cn.timer.api.utils; package cn.timer.api.utils;
import java.io.Serializable; import java.io.Serializable;
import java.util.List;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -33,37 +32,37 @@ public class ResponseResultNew<T> implements Serializable { ...@@ -33,37 +32,37 @@ public class ResponseResultNew<T> implements Serializable {
@ApiModelProperty(value="data",example="101") @ApiModelProperty(value="data",example="101")
private T data; private T data;
private List<T> datas; // private List<T> datas;
//
private T page; // private T page;
//
//
private static final String PAGE_KEY = "page"; // private static final String PAGE_KEY = "page";
private static final String NUMBER_KEY = "number"; // private static final String NUMBER_KEY = "number";
private static final String SIZE_KEY = "size"; // private static final String SIZE_KEY = "size";
private static final String TOTALELEMENTS_KEY = "totalelements"; // private static final String TOTALELEMENTS_KEY = "totalelements";
private static final String TOTALPAGES_KEY = "totalpages"; // private static final String TOTALPAGES_KEY = "totalpages";
private static final String OFFSET_KEY = "offset"; // private static final String OFFSET_KEY = "offset";
private static final String MESSAGE_SUCCESS = "操作成功"; private static final String MESSAGE_SUCCESS = "操作成功";
private static final String MESSAGE_FAIL = "操作失败"; // private static final String MESSAGE_FAIL = "操作失败";
private static final String MESSAGE_ERROR = "操作错误"; // private static final String MESSAGE_ERROR = "操作错误";
private static final String MESSAGE_UNLOGIN = "会话超时，请重新登录"; // private static final String MESSAGE_UNLOGIN = "会话超时，请重新登录";
private static final String MESSAGE_KICKOUT = "当前账户已在其他地方登录，请重新登录"; // private static final String MESSAGE_KICKOUT = "当前账户已在其他地方登录，请重新登录";
private static final String MESSAGE_PARAMERROR = "参数错误"; // private static final String MESSAGE_PARAMERROR = "参数错误";
private static final String MESSAGE_UNAUTHORIZED = "授权错误"; // private static final String MESSAGE_UNAUTHORIZED = "授权错误";
private static final String MESSAGE_UNAUTHENTICATED = "认证错误"; // private static final String MESSAGE_UNAUTHENTICATED = "认证错误";
private static final String MESSAGE_EXCEPTION = "服务器异常"; // private static final String MESSAGE_EXCEPTION = "服务器异常";
private static final String STATUS_CODE_SUCCESS = "200"; private static final String STATUS_CODE_SUCCESS = "200";
private static final String STATUS_CODE_FAIL = "201"; // private static final String STATUS_CODE_FAIL = "201";
private static final String STATUS_CODE_ERROR = "202"; // private static final String STATUS_CODE_ERROR = "202";
private static final String STATUS_CODE_UNLOGIN = "301"; // private static final String STATUS_CODE_UNLOGIN = "301";
private static final String STATUS_CODE_KICKOUT = "302"; // private static final String STATUS_CODE_KICKOUT = "302";
private static final String STATUS_CODE_UNPARAM = "400"; // private static final String STATUS_CODE_UNPARAM = "400";
private static final String STATUS_CODE_UNAUTHORIZED = "401"; // private static final String STATUS_CODE_UNAUTHORIZED = "401";
private static final String STATUS_CODE_UNAUTHENTICATED = "405"; // private static final String STATUS_CODE_UNAUTHENTICATED = "405";
private static final String STATUS_CODE_EXCEPTION = "500"; // private static final String STATUS_CODE_EXCEPTION = "500";
public ResponseResultNew() { public ResponseResultNew() {
...@@ -80,6 +79,7 @@ public class ResponseResultNew<T> implements Serializable { ...@@ -80,6 +79,7 @@ public class ResponseResultNew<T> implements Serializable {
* *
* @return * @return
*/ */
@SuppressWarnings("rawtypes")
public ResponseResultNew success() { public ResponseResultNew success() {
this.code = STATUS_CODE_SUCCESS; this.code = STATUS_CODE_SUCCESS;
this.result = Boolean.TRUE; this.result = Boolean.TRUE;
...@@ -94,6 +94,7 @@ public class ResponseResultNew<T> implements Serializable { ...@@ -94,6 +94,7 @@ public class ResponseResultNew<T> implements Serializable {
* @param message * @param message
* @return * @return
*/ */
@SuppressWarnings("rawtypes")
public ResponseResultNew success(String message) { public ResponseResultNew success(String message) {
this.code = STATUS_CODE_SUCCESS; this.code = STATUS_CODE_SUCCESS;
this.result = Boolean.TRUE; this.result = Boolean.TRUE;
...@@ -101,6 +102,7 @@ public class ResponseResultNew<T> implements Serializable { ...@@ -101,6 +102,7 @@ public class ResponseResultNew<T> implements Serializable {
this.data = null; this.data = null;
return this; return this;
} }
@SuppressWarnings("rawtypes")
public ResponseResultNew fail(String message) { public ResponseResultNew fail(String message) {
this.code = STATUS_CODE_SUCCESS; this.code = STATUS_CODE_SUCCESS;
this.result = Boolean.TRUE; this.result = Boolean.TRUE;
...@@ -113,6 +115,7 @@ public class ResponseResultNew<T> implements Serializable { ...@@ -113,6 +115,7 @@ public class ResponseResultNew<T> implements Serializable {
* @param obj * @param obj
* @return * @return
*/ */
@SuppressWarnings("rawtypes")
public ResponseResultNew successData(T data) { public ResponseResultNew successData(T data) {
this.code = STATUS_CODE_SUCCESS; this.code = STATUS_CODE_SUCCESS;
this.result = Boolean.TRUE; this.result = Boolean.TRUE;
......
src/main/java/cn/timer/api/utils/RestTemplateUtil.java
...@@ -45,6 +45,7 @@ public class RestTemplateUtil { ...@@ -45,6 +45,7 @@ public class RestTemplateUtil {
headers.setContentType(MediaType.APPLICATION_JSON_UTF8); headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
@SuppressWarnings("unused")
HttpEntity<T> httpEntity = new HttpEntity<T>(param, headers); HttpEntity<T> httpEntity = new HttpEntity<T>(param, headers);
return restTemplate.getForEntity(url, JSONObject.class, param).getBody(); return restTemplate.getForEntity(url, JSONObject.class, param).getBody();
} }
...@@ -60,6 +61,7 @@ public class RestTemplateUtil { ...@@ -60,6 +61,7 @@ public class RestTemplateUtil {
HttpHeaders headers = new HttpHeaders(); HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON_UTF8); headers.setContentType(MediaType.APPLICATION_JSON_UTF8);
headers.add("Accept", MediaType.APPLICATION_JSON.toString()); headers.add("Accept", MediaType.APPLICATION_JSON.toString());
@SuppressWarnings("unused")
HttpEntity<JSONObject> requestEntity = new HttpEntity<JSONObject>(param, headers); HttpEntity<JSONObject> requestEntity = new HttpEntity<JSONObject>(param, headers);
return restTemplate.postForEntity(url, param, String.class).getBody(); return restTemplate.postForEntity(url, param, String.class).getBody();
} }
......
src/main/java/cn/timer/api/utils/ResultUtil.java
...@@ -10,36 +10,36 @@ import com.baomidou.mybatisplus.core.metadata.IPage; ...@@ -10,36 +10,36 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
@Service("resultUtil") @Service("resultUtil")
public class ResultUtil<T> { public class ResultUtil<T> {
private static final String CODE_KEY = "code"; // private static final String CODE_KEY = "code";
private static final String RESULT_KEY = "result"; // private static final String RESULT_KEY = "result";
private static final String MESSAGE_KEY = "message"; // private static final String MESSAGE_KEY = "message";
private static final String DATA_KEY = "data"; // private static final String DATA_KEY = "data";
//
private static final String PAGE_KEY = "page"; // private static final String PAGE_KEY = "page";
private static final String NUMBER_KEY = "number"; // private static final String NUMBER_KEY = "number";
private static final String SIZE_KEY = "size"; // private static final String SIZE_KEY = "size";
private static final String TOTALELEMENTS_KEY = "totalelements"; // private static final String TOTALELEMENTS_KEY = "totalelements";
private static final String TOTALPAGES_KEY = "totalpages"; // private static final String TOTALPAGES_KEY = "totalpages";
private static final String OFFSET_KEY = "offset"; // private static final String OFFSET_KEY = "offset";
private static final String MESSAGE_SUCCESS = "操作成功"; private static final String MESSAGE_SUCCESS = "操作成功";
private static final String MESSAGE_FAIL = "操作失败"; private static final String MESSAGE_FAIL = "操作失败";
private static final String MESSAGE_ERROR = "操作错误";
private static final String MESSAGE_UNLOGIN = "会话超时，请重新登录"; private static final String MESSAGE_UNLOGIN = "会话超时，请重新登录";
private static final String MESSAGE_KICKOUT = "当前账户已在其他地方登录，请重新登录"; // private static final String MESSAGE_ERROR = "操作错误";
private static final String MESSAGE_PARAMERROR = "参数错误"; // private static final String MESSAGE_KICKOUT = "当前账户已在其他地方登录，请重新登录";
private static final String MESSAGE_UNAUTHORIZED = "授权错误"; // private static final String MESSAGE_PARAMERROR = "参数错误";
private static final String MESSAGE_UNAUTHENTICATED = "认证错误"; // private static final String MESSAGE_UNAUTHORIZED = "授权错误";
private static final String MESSAGE_EXCEPTION = "服务器异常"; // private static final String MESSAGE_UNAUTHENTICATED = "认证错误";
// private static final String MESSAGE_EXCEPTION = "服务器异常";
private static final String STATUS_CODE_SUCCESS = "200"; private static final String STATUS_CODE_SUCCESS = "200";
private static final String STATUS_CODE_FAIL = "201"; // private static final String STATUS_CODE_FAIL = "201";
private static final String STATUS_CODE_ERROR = "202"; // private static final String STATUS_CODE_ERROR = "202";
private static final String STATUS_CODE_UNLOGIN = "301"; private static final String STATUS_CODE_UNLOGIN = "301";
private static final String STATUS_CODE_KICKOUT = "302"; // private static final String STATUS_CODE_KICKOUT = "302";
private static final String STATUS_CODE_UNPARAM = "400"; // private static final String STATUS_CODE_UNPARAM = "400";
private static final String STATUS_CODE_UNAUTHORIZED = "401"; // private static final String STATUS_CODE_UNAUTHORIZED = "401";
private static final String STATUS_CODE_UNAUTHENTICATED = "405"; // private static final String STATUS_CODE_UNAUTHENTICATED = "405";
private static final String STATUS_CODE_EXCEPTION = "500"; private static final String STATUS_CODE_EXCEPTION = "500";
private Result<T> result; private Result<T> result;
...@@ -81,6 +81,7 @@ public class ResultUtil<T> { ...@@ -81,6 +81,7 @@ public class ResultUtil<T> {
return this.result; return this.result;
} }
@SuppressWarnings("rawtypes")
public Result<T> setData(T t1, T t2, String msg) { public Result<T> setData(T t1, T t2, String msg) {
this.result.setCurrent(((IPage) t1).getCurrent()); this.result.setCurrent(((IPage) t1).getCurrent());
...@@ -93,6 +94,7 @@ public class ResultUtil<T> { ...@@ -93,6 +94,7 @@ public class ResultUtil<T> {
return this.result; return this.result;
} }
@SuppressWarnings("rawtypes")
public Result<T> setData2(T t1, T t2, String msg) { public Result<T> setData2(T t1, T t2, String msg) {
this.result.setCurrent((long) ((com.github.pagehelper.Page) t1).getPageNum()); this.result.setCurrent((long) ((com.github.pagehelper.Page) t1).getPageNum());
......
src/main/java/cn/timer/api/utils/SerializationUtils.java
...@@ -9,6 +9,7 @@ import java.util.List; ...@@ -9,6 +9,7 @@ import java.util.List;
*/ */
public class SerializationUtils { public class SerializationUtils {
@SuppressWarnings("unchecked")
public static List<Object> toSerialization(byte[] object) { public static List<Object> toSerialization(byte[] object) {
try { try {
ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(object); ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(object);
......
src/main/java/cn/timer/api/utils/UserIp.java
...@@ -2,14 +2,10 @@ package cn.timer.api.utils; ...@@ -2,14 +2,10 @@ package cn.timer.api.utils;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.NetworkInterface; import java.net.NetworkInterface;
import java.net.URL;
import java.net.URLConnection;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.StringTokenizer;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
......
src/main/resources/application-pro.yml
...@@ -24,9 +24,12 @@ spring: ...@@ -24,9 +24,12 @@ spring:
# ddl-auto: update # ddl-auto: update
# show-sql: true # show-sql: true
datasource: datasource:
username: tang username: root
password: Tang123456! password: youlingHR73!
url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL # username: tang
# password: Tang123456!
# url: jdbc:mysql://120.24.172.51:3306/youlingrc_tang?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
url: jdbc:mysql://114.115.168.73:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL # url: jdbc:mysql://192.168.172.200:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
# url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL # url: jdbc:mysql://db.hhlsz.com:3306/youlingrc_8timer201?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&allowMultiQueries=true&zeroDateTimeBehavior=CONVERT_TO_NULL
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
......
src/test/java/cn/timer/api/ApplicationTests.java deleted 100644 → 0
package cn.timer.api;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.StrUtil;
@RunWith(SpringRunner.class)
@SpringBootTest
public class ApplicationTests {
@Test
public void contextLoads() {
}
/*
* public static void main(String[] args) { int[] ints = {1,6,6}; ints = null;
* String str = null; System.err.println(ArrayUtil.join(ints,","));
* System.err.println(StrUtil.splitToInt(str, ",")); }
*/
}
src/test/java/cn/timer/api/OSSClientConstants.java deleted 100644 → 0
package cn.timer.api;
/**
* @class:OSSClientConstants
* @descript:阿里云注册用户基本常量
* @date 2019-11-21
* @author dsc
*/
public class OSSClientConstants {
//阿里云API的外网域名( 华南/深圳)
public static final String ENDPOINT = "http://oss-cn-shenzhen.aliyuncs.com";
//阿里云API的密钥Access Key ID
public static final String ACCESS_KEY_ID = "LTAI4FjnqT1g5SChE5hacic2";
//阿里云API的密钥Access Key Secret
public static final String ACCESS_KEY_SECRET = "6b54EvxzM1hE8eGo1bPu8wdRa8zAkm";
//阿里云API的bucket名称
public static final String BACKET_NAME = "8time";
//阿里云API的文件夹名称
public static final String FOLDER="8timeV2.0/";
}
src/test/java/cn/timer/api/OSSTest.java deleted 100644 → 0
package cn.timer.api;
import java.io.File;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
import com.aliyun.oss.internal.OSSHeaders;
import com.aliyun.oss.model.CannedAccessControlList;
import com.aliyun.oss.model.GetObjectRequest;
import com.aliyun.oss.model.ObjectMetadata;
import com.aliyun.oss.model.PutObjectRequest;
import com.aliyun.oss.model.StorageClass;
import cn.timer.api.utils.Result;
import cn.timer.api.utils.ResultUtil;
/**
* OSS接口操作示例
* 1.创建空间
* 2.上传文件
* 3.下载文件
* @author dsc
*
*/
public class OSSTest {
/**
* 1.创建储存空间
* sout控制台輸出 储存空间名
*/
public static Result<Void> createZone(String bucketName) {
// Endpoint以杭州为例，其它Region请按实际情况填写。
String endpoint = "http://oss-cn-shenzhen.aliyuncs.com";
// 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
String accessKeyId = "LTAI4FjnqT1g5SChE5hacic2";
String accessKeySecret = "6b54EvxzM1hE8eGo1bPu8wdRa8zAkm";
// 创建OSSClient实例。
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
// 创建存储空间。
ossClient.createBucket(bucketName);
// 关闭OSSClient。
ossClient.shutdown();
// 控制台输出空间名
System.err.println("bucketName:"+bucketName);
// 返回成功
return ResultUtil.success();
}
/**
* 2.上传文件
* @param dir 模块文件夹名
* @param fileName 文件名
* @param path 本地文件路径
* @param orgCode 公司id
* @param moudle
* @return 文件名
*/
public static Result<String> uploadFile(String orgCode,String moudle,String dir,String fileName,String path) {
// Endpoint以杭州为例，其它Region请按实际情况填写。
String endpoint = "http://oss-cn-shenzhen.aliyuncs.com";
// 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
String accessKeyId = "LTAI4FjnqT1g5SChE5hacic2";
String accessKeySecret = "6b54EvxzM1hE8eGo1bPu8wdRa8zAkm";
// 上传储存空间设置为8time
String bucketName = "8time";
// <yourObjectName>上传文件到OSS时需要指定包含文件后缀在内的完整路径，例如abc/efg/123.jpg。
// String objectName = "8time/test/123.jpg";
// 创建OSSClient实例。
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
// 创建PutObjectRequest对象。
// 项目名+用户公司id+模块名+文件夹名+文件名
PutObjectRequest putObjectRequest = new PutObjectRequest(bucketName,
"8timeV2.0/"+orgCode+"/"+moudle+"/"+dir+"/"+fileName, new File(path));
// 如果需要上传时设置存储类型与访问权限，请参考以下示例代码。
// TODO 文件类型jpg jpeg
ObjectMetadata metadata = new ObjectMetadata();
metadata.setHeader(OSSHeaders.OSS_STORAGE_CLASS, StorageClass.Standard.toString());
metadata.setObjectAcl(CannedAccessControlList.Private);
putObjectRequest.setMetadata(metadata);
// 上传文件。
ossClient.putObject(putObjectRequest);
// 关闭OSSClient。
ossClient.shutdown();
// 返回上传成功的文件名
return ResultUtil.success(fileName);
}
/**
* 3.从OSS下载文件
* @param objectName 完整路径的文件名
* @param path 本地储存文件路径
* @param orgCode 公司id
* @param dir 包名
* @param fileName 文件名
* @param moudle 模块名
* @return 完整文件名
*/
public static Result<String> downloadFile(String orgCode, String moudle, String dir, String fileName, String path) {
// Endpoint以杭州为例，其它Region请按实际情况填写。
String endpoint = "http://oss-cn-shenzhen.aliyuncs.com";
// 阿里云主账号AccessKey拥有所有API的访问权限，风险很高。强烈建议您创建并使用RAM账号进行API访问或日常运维，请登录 https://ram.console.aliyun.com 创建RAM账号。
String accessKeyId = "LTAI4FjnqT1g5SChE5hacic2";
String accessKeySecret = "6b54EvxzM1hE8eGo1bPu8wdRa8zAkm";
// 下载储存空间设置为8time
String bucketName = "8time";
// <yourObjectName>从OSS下载文件时需要指定包含文件后缀在内的完整路径，例如abc/efg/123.jpg。
// String objectName = "8time/test/123.jpg";
// 创建OSSClient实例。
OSS ossClient = new OSSClientBuilder().build(endpoint, accessKeyId, accessKeySecret);
// 下载OSS文件到本地文件。如果指定的本地文件存在会覆盖，不存在则新建。
ossClient.getObject(new GetObjectRequest(bucketName,"8timeV2.0/"+orgCode+"/"+moudle+"/"+dir+"/"+fileName), new File(path+fileName));
// 关闭OSSClient。
ossClient.shutdown();
// 完整路径的文件名
System.err.println("objectName:"+"8timeV2.0/"+orgCode+"/"+moudle+"/"+dir+"/"+fileName);
System.err.println("path:"+path+fileName);
// 返回成功的本地路径
return ResultUtil.success(path+fileName);
}
//测试
public static void main(String[] args) {
// OSSTest oTest = new OSSTest();
// oTest.createZone();
// oTest.uploadFile("123456", "模块名", "123.jpg", new File("C:\\Users\\Administrator\\Pictures\\Saved Pictures\\1.jpg"));
// oTest.downloadFile("123456", "模块名", "123.jpg", "C:\\Users\\Administrator\\Desktop\\");
}
}
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