wangchao преди 4 години
родител
ревизия
8088a9af4d

+ 7 - 12
ebc-sea-platform/src/main/java/com/ai/ipu/server/controller/AreaInOutRecordManageController.java

@ -1,5 +1,6 @@
1 1
package com.ai.ipu.server.controller;
2 2
3
import com.github.pagehelper.PageInfo;
3 4
import org.slf4j.Logger;
4 5
import org.slf4j.LoggerFactory;
5 6
import org.springframework.beans.factory.annotation.Autowired;
@ -26,17 +27,16 @@ public class AreaInOutRecordManageController {
26 27
	 */
27 28
	@ResponseBody
28 29
	@RequestMapping("/queryPageAttendanceCount")
29
	public JMap queryPageAttendanceCount(JMap params) throws Exception {
30
	public PageInfo queryPageAttendanceCount(JMap params) throws Exception {
30 31
		// 当前页数
31 32
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
32 33
		// 每页条数
33 34
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
34 35
35
		JMap result = areaInOutRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
36
		PageInfo pageInfo = areaInOutRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
36 37
37
		result.put("pageNum", pageNum);
38
		result.put("pageSize", pageSize);
39
		return result;
38
39
		return pageInfo;
40 40
41 41
	}
42 42
@ -64,17 +64,12 @@ public class AreaInOutRecordManageController {
64 64
	 */
65 65
	@ResponseBody
66 66
	@RequestMapping("/queryPageAreaInOutRecord")
67
	public JMap queryPageAreaInOutRecord(JMap params) throws Exception {
67
	public PageInfo queryPageAreaInOutRecord(JMap params) throws Exception {
68 68
		// 当前页数
69 69
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
70 70
		// 每页条数
71 71
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
72
73
		JMap result = areaInOutRecordService.queryPageAreaInOutRecord(params, pageNum, pageSize);
74
75
		result.put("pageNum", pageNum);
76
		result.put("pageSize", pageSize);
72
		PageInfo result = areaInOutRecordService.queryPageAreaInOutRecord(params, pageNum, pageSize);
77 73
		return result;
78
79 74
	}
80 75
}

+ 44 - 1
ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/impl/AreaInOutRecordDaoImpl.java

@ -6,6 +6,8 @@ import java.util.HashMap;
6 6
import java.util.List;
7 7
import java.util.Map;
8 8
9
import com.github.pagehelper.PageHelper;
10
import com.github.pagehelper.PageInfo;
9 11
import org.springframework.stereotype.Component;
10 12
11 13
import com.ai.ipu.common.date.TimeUtil;
@ -25,7 +27,22 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
25 27
	}
26 28
27 29
	@Override
28
	public JMap queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
30
	public PageInfo queryPageDayAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
31
		PageHelper.startPage(pageNum,pageSize);
32
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
33
		List<Map<String, Object>> equipmentList= dao1.executeSelect("ipu.AreaInOutRecordDao", "queryPageDayAreaInOutRecord", params);
34
		PageInfo pageInfo = new PageInfo(equipmentList);
35
		return pageInfo;
36
	}
37
38
	@Override
39
	public List<Map<String, Object>> queryPageWeekAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
40
		// TODO Auto-generated method stub
41
		return null;
42
	}
43
44
	@Override
45
	public List<Map<String, Object>> queryPageMonthAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
29 46
		// TODO Auto-generated method stub
30 47
		return null;
31 48
	}
@ -41,6 +58,32 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
41 58
		// TODO Auto-generated method stub
42 59
		return null;
43 60
	}
61
	@Override
62
	public PageInfo queryPageDayAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
63
		PageHelper.startPage(pageNum,pageSize);
64
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
65
		List<Map<String, Object>> equipmentList= dao1.executeSelect("ipu.AreaInOutRecordDao", "queryPageDayAttendanceCount", params);
66
		PageInfo pageInfo = new PageInfo(equipmentList);
67
		return pageInfo;
68
	}
69
70
	@Override
71
	public PageInfo queryPageWeekAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
72
		PageHelper.startPage(pageNum,pageSize);
73
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
74
		List<Map<String, Object>> equipmentList= dao1.executeSelect("ipu.AreaInOutRecordDao", "queryPageWeekAttendanceCount", params);
75
		PageInfo pageInfo = new PageInfo(equipmentList);
76
		return pageInfo;
77
	}
78
79
	@Override
80
	public PageInfo queryPageMonthAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
81
		PageHelper.startPage(pageNum,pageSize);
82
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
83
		List<Map<String, Object>> equipmentList= dao1.executeSelect("ipu.AreaInOutRecordDao", "queryPageMonthAttendanceCount", params);
84
		PageInfo pageInfo = new PageInfo(equipmentList);
85
		return pageInfo;
86
	}
44 87
45 88
	@Override
46 89
	public List<Map<String, Object>> getBeforeAreaInfo(JMap params) throws Exception {

+ 59 - 2
ebc-sea-platform/src/main/java/com/ai/ipu/server/dao/interfaces/AreaInOutRecordDao.java

@ -4,6 +4,7 @@ import java.util.List;
4 4
import java.util.Map;
5 5
6 6
import com.ai.ipu.data.JMap;
7
import com.github.pagehelper.PageInfo;
7 8
8 9
public interface AreaInOutRecordDao {
9 10
@ -19,6 +20,39 @@ public interface AreaInOutRecordDao {
19 20
	JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
20 21
21 22
	/**
23
	 * 分页查询日考勤统计分析
24
	 *
25
	 * @param params
26
	 * @param pageNum 当前页数
27
	 * @param pageSize 每页条数
28
	 * @return
29
	 * @throws Exception
30
	 */
31
	PageInfo queryPageDayAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
32
33
	/**
34
	 * 分页查询周考勤统计分析
35
	 *
36
	 * @param params
37
	 * @param pageNum 当前页数
38
	 * @param pageSize 每页条数
39
	 * @return
40
	 * @throws Exception
41
	 */
42
	PageInfo queryPageWeekAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
43
44
	/**
45
	 * 分页查询月考勤统计分析
46
	 *
47
	 * @param params
48
	 * @param pageNum 当前页数
49
	 * @param pageSize 每页条数
50
	 * @return
51
	 * @throws Exception
52
	 */
53
	PageInfo queryPageMonthAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
54
55
	/**
22 56
	 * 分页查询作业考勤信息详情
23 57
	 * 
24 58
	 * @param params
@ -30,7 +64,7 @@ public interface AreaInOutRecordDao {
30 64
	JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception;
31 65
32 66
	/**
33
	 * 分页查询进出围栏日志
67
	 * 分页查询进出围栏日志
34 68
	 * 
35 69
	 * @param params
36 70
	 * @param pageNum 当前页数
@ -38,7 +72,29 @@ public interface AreaInOutRecordDao {
38 72
	 * @return
39 73
	 * @throws Exception
40 74
	 */
41
	JMap queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
75
	PageInfo queryPageDayAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
76
77
	/**
78
	 * 分页查询日进出围栏日志
79
	 *
80
	 * @param params
81
	 * @param pageNum 当前页数
82
	 * @param pageSize 每页条数
83
	 * @return
84
	 * @throws Exception
85
	 */
86
	List<Map<String, Object>> queryPageWeekAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
87
88
	/**
89
	 * 分页查询日进出围栏日志
90
	 *
91
	 * @param params
92
	 * @param pageNum 当前页数
93
	 * @param pageSize 每页条数
94
	 * @return
95
	 * @throws Exception
96
	 */
97
	List<Map<String, Object>> queryPageMonthAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
42 98
43 99
	/**
44 100
	 * 查询之前所在围栏的信息
@ -66,4 +122,5 @@ public interface AreaInOutRecordDao {
66 122
	 */
67 123
	boolean updateSameOutTimeAreaOutRecord(String outDate, List<String> recordIdList) throws Exception;
68 124
125
69 126
}

+ 1 - 1
ebc-sea-platform/src/main/java/com/ai/ipu/server/enums/UserEnums.java

@ -19,7 +19,7 @@ public enum UserEnums {
19 19
	sixUser(6, "周八", "6666", "搜救", "1", "zhouba", "员工"),
20 20
	sevenUser(7, "吴九", "7777", "搜救", "1", "wujiu", "员工"), 
21 21
	eightUser(8, "郑十", "8888", "搜救", "1", "zhengshi", "员工"),
22
	nineUser(9, "刘一", "9999", "搜救", "1", "liuyi", "员工");
22
	nineUser(0, "刘一", "9999", "搜救", "1", "liuyi", "员工");
23 23
24 24
	public int id; // id
25 25
	public String userName;// 姓名

+ 58 - 4
ebc-sea-platform/src/main/java/com/ai/ipu/server/service/impl/AreaInOutRecordServiceImpl.java

@ -1,5 +1,8 @@
1 1
package com.ai.ipu.server.service.impl;
2 2
3
import com.ai.ipu.server.enums.UserEnums;
4
import com.ai.ipu.server.util.EbcConstant;
5
import com.github.pagehelper.PageInfo;
3 6
import org.springframework.beans.factory.annotation.Autowired;
4 7
import org.springframework.stereotype.Service;
5 8
@ -8,6 +11,9 @@ import com.ai.ipu.server.dao.interfaces.AreaInOutRecordDao;
8 11
import com.ai.ipu.server.dao.interfaces.MapTagManageDao;
9 12
import com.ai.ipu.server.service.interfaces.AreaInOutRecordService;
10 13
14
import java.util.List;
15
import java.util.Map;
16
11 17
@Service
12 18
public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
13 19
@ -18,8 +24,32 @@ public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
18 24
	MapTagManageDao mapTagManageDao;
19 25
20 26
	@Override
21
	public JMap queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
22
		return areaInOutRecordDao.queryPageAreaInOutRecord(params, pageNum, pageSize);
27
	public PageInfo queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception {
28
		//调用uspa接口分页模糊查询姓名、职务 现在暂用枚举
29
		List<Map<String, Object>> userList = UserEnums.getUserList();
30
		PageInfo pageInfo=null;
31
		if(EbcConstant.AREA_IN_OUT_RECORD_DAY.equals(params.get("mark"))){
32
			 pageInfo = areaInOutRecordDao.queryPageDayAreaInOutRecord(params, pageNum, pageSize);
33
		}else if(EbcConstant.AREA_IN_OUT_RECORD_WEEK.equals(params.get("mark"))){
34
			areaInOutRecordDao.queryPageWeekAreaInOutRecord(params, pageNum, pageSize);
35
		}else if(EbcConstant.AREA_IN_OUT_RECORD_MONTH.equals(params.get("mark"))){
36
			areaInOutRecordDao.queryPageMonthAreaInOutRecord(params, pageNum, pageSize);
37
		}else {
38
			return null;
39
		}
40
41
		List<Map<String,Object>> pageInfoList = pageInfo.getList();
42
		for(Map<String,Object> areaInOutRecord:pageInfoList ){
43
			for(Map<String,Object> userMap: userList){
44
				if((int)areaInOutRecord.get("EMPLOYEE_ID")==(int)userMap.get("id")){
45
					areaInOutRecord.put("userName",userMap.get("userName"));
46
					areaInOutRecord.put("duty",userMap.get("duty"));
47
				}
48
			}
49
		}
50
51
52
		return pageInfo;
23 53
	}
24 54
25 55
	@Override
@ -28,8 +58,32 @@ public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
28 58
	}
29 59
30 60
	@Override
31
	public JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
32
		return areaInOutRecordDao.queryPageAttendanceCount(params, pageNum, pageSize);
61
	public PageInfo queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception {
62
		//调用uspa接口分页模糊查询姓名、职务 现在暂用枚举
63
		List<Map<String, Object>> userList = UserEnums.getUserList();
64
		PageInfo pageInfo=null;
65
		if(EbcConstant.AREA_IN_OUT_RECORD_DAY.equals(params.get("mark"))){
66
			pageInfo = areaInOutRecordDao.queryPageDayAttendanceCount(params, pageNum, pageSize);
67
		}else if(EbcConstant.AREA_IN_OUT_RECORD_WEEK.equals(params.get("mark"))){
68
			pageInfo =areaInOutRecordDao.queryPageWeekAttendanceCount(params, pageNum, pageSize);
69
		}else if(EbcConstant.AREA_IN_OUT_RECORD_MONTH.equals(params.get("mark"))){
70
			pageInfo =areaInOutRecordDao.queryPageMonthAttendanceCount(params, pageNum, pageSize);
71
		}else {
72
			return null;
73
		}
74
75
		List<Map<String,Object>> pageInfoList = pageInfo.getList();
76
		for(Map<String,Object> areaInOutRecord:pageInfoList ){
77
			for(Map<String,Object> userMap: userList){
78
				long employeeId = (long)areaInOutRecord.get("EMPLOYEE_ID");
79
				int userId = (int)userMap.get("id");
80
				if((int)employeeId==userId){
81
					areaInOutRecord.put("userName",userMap.get("userName"));
82
					areaInOutRecord.put("duty",userMap.get("duty"));
83
				}
84
			}
85
		}
86
		return pageInfo;
33 87
	}
34 88
35 89
}

+ 3 - 2
ebc-sea-platform/src/main/java/com/ai/ipu/server/service/interfaces/AreaInOutRecordService.java

@ -1,6 +1,7 @@
1 1
package com.ai.ipu.server.service.interfaces;
2 2
3 3
import com.ai.ipu.data.JMap;
4
import com.github.pagehelper.PageInfo;
4 5
5 6
/**
6 7
 * 考勤管理
@ -18,7 +19,7 @@ public interface AreaInOutRecordService {
18 19
	 * @return
19 20
	 * @throws Exception
20 21
	 */
21
	JMap queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
22
	PageInfo queryPageAttendanceCount(JMap params, int pageNum, int pageSize) throws Exception;
22 23
23 24
	/**
24 25
	 * 分页查询考勤详细日志
@ -40,5 +41,5 @@ public interface AreaInOutRecordService {
40 41
	 * @return
41 42
	 * @throws Exception
42 43
	 */
43
	JMap queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
44
	PageInfo queryPageAreaInOutRecord(JMap params, int pageNum, int pageSize) throws Exception;
44 45
}

+ 9 - 0
ebc-sea-platform/src/main/java/com/ai/ipu/server/util/EbcConstant.java

@ -74,5 +74,14 @@ public class EbcConstant {
74 74
	
75 75
	//人员状态:SOS(自动)
76 76
	public static final String location_status_autosos_ZH="落水告警";
77
78
	//考勤查询日
79
	public static final String  AREA_IN_OUT_RECORD_DAY="day";
80
81
	//考勤查询周
82
	public static final String AREA_IN_OUT_RECORD_WEEK="week";
83
84
	//考勤查询月
85
	public static final String AREA_IN_OUT_RECORD_MONTH="month";
77 86
	
78 87
}

+ 67 - 0
ebc-sea-platform/src/main/resources/sql/ipu/AreaInOutRecordDao.xml

@ -57,4 +57,71 @@
57 57
		]]>
58 58
	</sql>
59 59
60
	<sql name="queryPageDayAttendanceCount">
61
		<![CDATA[
62
		<select id="queryPageDayAttendanceCount" resultType="java.util.Map">
63
	        SELECT
64
				EMPLOYEE_ID,
65
				min(cast( IN_DATE AS time )) IN_DATE
66
			FROM
67
				LR_AREA_IN_OUT_RECORD
68
			WHERE
69
				DATE_FORMAT( IN_DATE, '%Y-%m-%d' )= DATE_FORMAT( #{ currentDate }, '%Y-%m-%d' )
70
				AND EMPLOYEE_ID IN  ( 0, 1,2,3,4,5 )
71
				AND RECORD_LOCATION = '作业区域'
72
			GROUP BY
73
				EMPLOYEE_ID
74
		</select>
75
		]]>
76
	</sql>
77
78
	<sql name="queryPageWeekAttendanceCount">
79
		<![CDATA[
80
		<select id="queryPageWeekAttendanceCount" resultType="java.util.Map">
81
	        SELECT
82
				EMPLOYEE_ID,
83
				count( a.date ) gateDays
84
			FROM
85
				(
86
				SELECT DISTINCT
87
					EMPLOYEE_ID,
88
					DATE_FORMAT( IN_DATE, '%Y-%m-%d' ) date
89
				FROM
90
					LR_AREA_IN_OUT_RECORD
91
				WHERE
92
					DATE_SUB( DATE_FORMAT( #{ currentDate }, '%Y-%m-%d' ), INTERVAL 7 DAY ) < DATE_FORMAT( IN_DATE, '%Y-%m-%d' )
93
					AND DATE_FORMAT( IN_DATE, '%Y-%m-%d' )<= DATE_FORMAT( #{ currentDate }, '%Y-%m-%d' )
94
					AND EMPLOYEE_ID IN ( 1, 2, 3 ,4,5)
95
					AND RECORD_LOCATION = '作业区域'
96
				) a
97
			GROUP BY
98
				EMPLOYEE_ID
99
		</select>
100
		]]>
101
	</sql>
102
103
	<sql name="queryPageMonthAttendanceCount">
104
		<![CDATA[
105
		<select id="queryPageMonthAttendanceCount" resultType="java.util.Map">
106
	        SELECT
107
				EMPLOYEE_ID,
108
				count( a.date ) gateDays
109
			FROM
110
				(
111
				SELECT DISTINCT
112
					EMPLOYEE_ID,
113
					DATE_FORMAT( IN_DATE, '%Y-%m-%d' ) date
114
				FROM
115
					LR_AREA_IN_OUT_RECORD
116
				WHERE
117
					DATE_FORMAT( IN_DATE, '%Y-%m' ) = DATE_FORMAT( STR_TO_DATE( #{ currentDate }, '%Y-%m' ), '%Y-%m' )
118
					AND EMPLOYEE_ID IN ( 1, 2, 3, 4, 5 )
119
					AND RECORD_LOCATION = '作业区域'
120
				) a
121
			GROUP BY
122
				EMPLOYEE_ID
123
		</select>
124
		]]>
125
	</sql>
126
60 127
</sqls>