考勤查询功能详情信息

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

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.ResponseBody;
import com.ai.ipu.data.JMap;
import com.ai.ipu.server.service.interfaces.AreaInOutRecordService;
import java.util.Date;
/**
 * 考勤管理
 */
@@ -32,7 +34,9 @@ public class AreaInOutRecordManageController {
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
		if(params.get("currentDate")==null|| params.get("currentDate").equals("")){
			params.put("currentDate",new Date());
		}
		PageInfo pageInfo = areaInOutRecordService.queryPageAttendanceCount(params, pageNum, pageSize);
@@ -45,17 +49,16 @@ public class AreaInOutRecordManageController {
	 */
	@ResponseBody
	@RequestMapping("/queryPageAttendanceRecordDetaile")
	public JMap queryPageAttendanceRecordDetaile(JMap params) throws Exception {
	public PageInfo queryPageAttendanceRecordDetaile(JMap params) throws Exception {
		// 当前页数
		int pageNum = params.getInt("pageNum") < 1 ? 1 : params.getInt("pageNum");
		// 每页条数
		int pageSize = params.getInt("pageSize") < 1 ? 10 : params.getInt("pageSize");
		JMap result = areaInOutRecordService.queryPageAttendanceRecordDetaile(params, pageNum, pageSize);
		result.put("pageNum", pageNum);
		result.put("pageSize", pageSize);
		return result;
		if(params.get("currentDate")==null|| params.get("currentDate").equals("")){
			params.put("currentDate",new Date());
		}
		PageInfo pageInfo = areaInOutRecordService.queryPageAttendanceRecordDetaile(params, pageNum, pageSize);
		return pageInfo;
	}

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

@@ -6,6 +6,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ai.ipu.server.util.EbcConstant;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import org.springframework.stereotype.Component;
@@ -48,9 +49,19 @@ public class AreaInOutRecordDaoImpl extends AbstractBizDao implements AreaInOutR
	}
	@Override
	public JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception {
		// TODO Auto-generated method stub
		return null;
	public PageInfo queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception {
		PageHelper.startPage(pageNum,pageSize);
		ISqlMgmtDao dao1 = SqlMgmtDaoFactory.createFileSqlMgmtDao(connName);
		List<Map<String, Object>> areaInOutRecordList=null;
		if(EbcConstant.AREA_IN_OUT_RECORD_WEEK.equals(params.get("mark"))){
			areaInOutRecordList= dao1.executeSelect("ipu.AreaInOutRecordDao", "queryPageWeekAttendanceRecordDetaile", params);
		}else if(EbcConstant.AREA_IN_OUT_RECORD_MONTH.equals(params.get("mark"))){
			areaInOutRecordList= dao1.executeSelect("ipu.AreaInOutRecordDao", "queryPageMonthAttendanceRecordDetaile", params);
		}else {
			return null;
		}
		PageInfo pageInfo = new PageInfo(areaInOutRecordList);
		return pageInfo;
	}
	@Override

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

@@ -61,7 +61,7 @@ public interface AreaInOutRecordDao {
	 * @return
	 * @throws Exception
	 */
	JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception;
	PageInfo queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 分页查询日进出围栏日志

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

@@ -11,6 +11,8 @@ import com.ai.ipu.server.dao.interfaces.AreaInOutRecordDao;
import com.ai.ipu.server.dao.interfaces.MapTagManageDao;
import com.ai.ipu.server.service.interfaces.AreaInOutRecordService;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -53,8 +55,18 @@ public class AreaInOutRecordServiceImpl implements AreaInOutRecordService {
	}
	@Override
	public JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception {
		return areaInOutRecordDao.queryPageAttendanceCount(params, pageNum, pageSize);
	public PageInfo queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception {
		PageInfo pageInfo = areaInOutRecordDao.queryPageAttendanceRecordDetaile(params, pageNum, pageSize);
		List<Map<String,Object>> pageInfoList = pageInfo.getList();
		for(Map<String,Object> areaInOutRecord:pageInfoList ){
			Date in_date = (Date)areaInOutRecord.get("IN_DATE");
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
			String inDateStr = sdf.format(in_date);       //将Date类型转换成String类型
			String [] arr2 = inDateStr.split(" ");
			areaInOutRecord.put("date",arr2[0]);
			areaInOutRecord.put("printTime",arr2[1]);
		}
		return pageInfo;
	}
	@Override

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

@@ -30,7 +30,7 @@ public interface AreaInOutRecordService {
	 * @return
	 * @throws Exception
	 */
	JMap queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception;
	PageInfo queryPageAttendanceRecordDetaile(JMap params, int pageNum, int pageSize) throws Exception;
	/**
	 * 分页查询进出围栏日志

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

@@ -124,4 +124,39 @@
		]]>
	</sql>
	<sql name="queryPageWeekAttendanceRecordDetaile">
		<![CDATA[
		<select id="queryPageWeekAttendanceRecordDetaile" resultType="java.util.Map">
	        SELECT
				EMPLOYEE_ID,
				min(cast( IN_DATE AS datetime)) IN_DATE
			FROM
				LR_AREA_IN_OUT_RECORD
			WHERE
				DATE_SUB( #{ currentDate }, INTERVAL 7 DAY ) < DATE_FORMAT( IN_DATE, '%Y-%m-%d' )
				AND DATE_FORMAT( IN_DATE, '%Y-%m-%d' )<= DATE_FORMAT( #{ currentDate }, '%Y-%m-%d' )
				AND EMPLOYEE_ID = #{ EMPLOYEE_ID }
			GROUP BY
				cast( IN_DATE AS date)
		</select>
		]]>
	</sql>
	<sql name="queryPageMonthAttendanceRecordDetaile">
		<![CDATA[
		<select id="queryPageMonthAttendanceRecordDetaile" resultType="java.util.Map">
	       SELECT
				EMPLOYEE_ID,
				min(cast( IN_DATE AS datetime )) IN_DATE
			FROM
				LR_AREA_IN_OUT_RECORD
			WHERE
				DATE_FORMAT( IN_DATE, '%Y-%m' ) = DATE_FORMAT( STR_TO_DATE( #{ currentDate }, '%Y-%m' ), '%Y-%m' )
				AND EMPLOYEE_ID = #{ EMPLOYEE_ID }
			GROUP BY
				cast(IN_DATE AS date)
		</select>
		]]>
	</sql>
</sqls>

ebc-sea-platform/src/main/resources/sql/ipu/MapTagManageDao.xml

@@ -14,7 +14,7 @@
			POLYGONFROMTEXT(#{mapTagShape}),
			#{residenceTimeLength},
			#{remarks},
			
			#{dataStatus},
			#{createDate},
			#{createOpId},

ebc-sea-platform/src/main/resources/test/application.properties

@@ -28,4 +28,6 @@ aap.iot.passWord=123456
#gis登录账号和密码
aap.gis.userName=EBC_PPRS
aap.gis.passwd=ITBS93wMYHosT
aap.gis.passwd=ITBS93wMYHosT
url.gis.token = http://192.168.74.189:9999/gisIntf/account/gettoken