|
@@ -326,7 +326,7 @@ public class DataCollectController {
|
|
|
|
|
|
@RequestMapping("/getWorkDayDataSum")
|
|
@RequestMapping("/getWorkDayDataSum")
|
|
public String getWorkDayDataSum() {
|
|
public String getWorkDayDataSum() {
|
|
- String sqlCount = "select count(*) from att_work_hour_day where create_date >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) and come1 is not null and go1 is not null";
|
|
|
|
|
|
+ String sqlCount = "select count(*) from att_work_hour_day where create_date >= DATE_SUB(CURDATE(), INTERVAL 14 DAY) and come1 is not null and go1 is not null";
|
|
int totalCount = 0;
|
|
int totalCount = 0;
|
|
try (Connection connection = mysqlDataSource.getConnection()) {
|
|
try (Connection connection = mysqlDataSource.getConnection()) {
|
|
PreparedStatement countStmt = connection.prepareStatement(sqlCount);
|
|
PreparedStatement countStmt = connection.prepareStatement(sqlCount);
|
|
@@ -344,7 +344,7 @@ public class DataCollectController {
|
|
@RequestMapping("/getWorkDayDataList")
|
|
@RequestMapping("/getWorkDayDataList")
|
|
public List<UserFvTime> getWorkDayDataList(@RequestBody PageBO pageBO) {
|
|
public List<UserFvTime> getWorkDayDataList(@RequestBody PageBO pageBO) {
|
|
String sqlQuery = " select id,emp_no,emp_name,attendance_date,come1,go1,if(worktime_total_hour=0,off_hour,worktime_total_hour) as worktime_total_hour,overtime_total_hour " +
|
|
String sqlQuery = " select id,emp_no,emp_name,attendance_date,come1,go1,if(worktime_total_hour=0,off_hour,worktime_total_hour) as worktime_total_hour,overtime_total_hour " +
|
|
- " from att_work_hour_day where create_date >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) and come1 is not null and go1 is not null order by id limit ?,? ";
|
|
|
|
|
|
+ " from att_work_hour_day where create_date >= DATE_SUB(CURDATE(), INTERVAL 14 DAY) and come1 is not null and go1 is not null order by id limit ?,? ";
|
|
List<UserFvTime> resList = new ArrayList<>();
|
|
List<UserFvTime> resList = new ArrayList<>();
|
|
SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
|
|
|
@@ -524,7 +524,7 @@ public class DataCollectController {
|
|
|
|
|
|
@RequestMapping("/getBusinessTripDataSum")
|
|
@RequestMapping("/getBusinessTripDataSum")
|
|
public String getBusinessTripDataSum() {
|
|
public String getBusinessTripDataSum() {
|
|
- String sqlCount = "select count(*) from att_business_trip_order where audit_status = 3 and is_delete = 0 and create_date >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) ";
|
|
|
|
|
|
+ String sqlCount = "select count(*) from att_business_trip_order where audit_status = 3 and is_delete = 0 and create_date >= DATE_SUB(CURDATE(), INTERVAL 14 DAY) ";
|
|
|
|
|
|
int totalCount = 0;
|
|
int totalCount = 0;
|
|
try (Connection connection = mysqlDataSource.getConnection()) {
|
|
try (Connection connection = mysqlDataSource.getConnection()) {
|
|
@@ -545,7 +545,7 @@ public class DataCollectController {
|
|
String sqlQuery = "select id,emp_no,emp_name,reason,begin_date,end_date,c_departure_place_city " +
|
|
String sqlQuery = "select id,emp_no,emp_name,reason,begin_date,end_date,c_departure_place_city " +
|
|
" ,c_destination_place_city,trip_day,c_ccxm_name " +
|
|
" ,c_destination_place_city,trip_day,c_ccxm_name " +
|
|
" from att_business_trip_order abto " +
|
|
" from att_business_trip_order abto " +
|
|
- " where abto.audit_status = 3 and abto.is_delete = 0 and abto.create_date >= DATE_SUB(CURDATE(), INTERVAL 7 DAY) order by id limit ?,? ";
|
|
|
|
|
|
+ " where abto.audit_status = 3 and abto.is_delete = 0 and abto.create_date >= DATE_SUB(CURDATE(), INTERVAL 14 DAY) order by id limit ?,? ";
|
|
|
|
|
|
SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
|
|
SimpleDateFormat sdfYmd = new SimpleDateFormat("yyyy-MM-dd");
|
|
List<BusinessTrip> resList = new ArrayList<>();
|
|
List<BusinessTrip> resList = new ArrayList<>();
|