chenwei
/
weaver-hostar
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增打卡地址

Browse Source
dev-chenwnj
chenwei 1 year ago
parent 15ab092f8b
commit ccfbb426ac
3 changed files with 71 additions and 35 deletions
Show Stats Download Patch File Download Diff File

4
src/com/engine/kq/biz/KQReportBiz.java
Unescape Escape View File

@ -1273,14 +1273,14 @@ public class KQReportBiz extends BaseBean {
//首先获取出差公出流程信息 //首先获取出差公出流程信息
Map<String, Object> evectionMap = new HashMap<>(); Map<String, Object> evectionMap = new HashMap<>();
String evectionTableName = Util.null2String(bb.getPropValue("project_hostar","evectionTableName")); String evectionTableName = Util.null2String(bb.getPropValue("project_hostar","evectionTableName"));
sql = " select c.resourceid, c.belongdate, c.longitude, c.latitude from ( " + sql = " select d.resourceid, d.belongdate, d.longitude, d.latitude from ( " +
" select a.belongdate, b.id as resourceid, b.subcompanyid1, b.departmentid, b.managerstr, b.managerid, b.loginid, c.jd as longitude, c.wd as latitude from kq_flow_split_evection a " + " select a.belongdate, b.id as resourceid, b.subcompanyid1, b.departmentid, b.managerstr, b.managerid, b.loginid, c.jd as longitude, c.wd as latitude from kq_flow_split_evection a " +
" left join hrmresource b " + " left join hrmresource b " +
" on b.id = a.resourceid " + " on b.id = a.resourceid " +
" left join " + evectionTableName + " c " + " left join " + evectionTableName + " c " +
" on c.requestid = a.requestid " + " on c.requestid = a.requestid " +
" where a.belongdate >='"+fromDate+"' and a.belongdate <='"+toDate+"' " + sqlWhere + " where a.belongdate >='"+fromDate+"' and a.belongdate <='"+toDate+"' " + sqlWhere +
" ) c " + " ) d " +
" where 1=1 " ; " where 1=1 " ;
bb.writeLog("sql: " + sql); bb.writeLog("sql: " + sql);

41
src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java
Unescape Escape View File

@ -309,6 +309,9 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
data.add(fieldValue); data.add(fieldValue);
fieldValue = Util.null2String(signDetailInfo.get("signinstatus1")); fieldValue = Util.null2String(signDetailInfo.get("signinstatus1"));
data.add(fieldValue); data.add(fieldValue);
//考勤二开
fieldValue = Util.null2String(signDetailInfo.get("signinaddress1"));
data.add(fieldValue);
continue; continue;
} else if(fieldName.equals("signin2")){ } else if(fieldName.equals("signin2")){
fieldValue = Util.null2String(signDetailInfo.get("signintime2")); fieldValue = Util.null2String(signDetailInfo.get("signintime2"));
@ -327,6 +330,9 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
data.add(fieldValue); data.add(fieldValue);
fieldValue = Util.null2String(signDetailInfo.get("signoutstatus1")); fieldValue = Util.null2String(signDetailInfo.get("signoutstatus1"));
data.add(fieldValue); data.add(fieldValue);
//考勤二开
fieldValue = Util.null2String(signDetailInfo.get("signoutaddress1"));
data.add(fieldValue);
continue; continue;
} else if(fieldName.equals("signout2")){ } else if(fieldName.equals("signout2")){
fieldValue = Util.null2String(signDetailInfo.get("signouttime2")); fieldValue = Util.null2String(signDetailInfo.get("signouttime2"));
@ -636,13 +642,26 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
String sql = ""; String sql = "";
KQTimesArrayComInfo kqTimesArrayComInfo = new KQTimesArrayComInfo(); KQTimesArrayComInfo kqTimesArrayComInfo = new KQTimesArrayComInfo();
try{ try{
sql = " select kqdate,resourceid,serialid,serialnumber,workbegindate,workbegintime, " + // sql = " select kqdate,resourceid,serialid,serialnumber,workbegindate,workbegintime, " +
" workenddate,workendtime,workmins,signindate,signintime,signoutdate,signouttime, \n" + // " workenddate,workendtime,workmins,signindate,signintime,signoutdate,signouttime, \n" +
" attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins,forgotBeginWorkCheckMins," + // " attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins,forgotBeginWorkCheckMins," +
" leaveMins,leaveInfo,evectionMins,outMins,signinid,signoutid \n" + // " leaveMins,leaveInfo,evectionMins,outMins,signinid,signoutid \n" +
" from kq_format_detail b \n" + // " from kq_format_detail b \n" +
" where resourceid = " + resourceId + " and kqdate ='" + kqDate + "' \n" + // " where resourceid = " + resourceId + " and kqdate ='" + kqDate + "' \n" +
" order by serialnumber \n"; // " order by serialnumber \n";
/*考勤二开--增加打卡地址start*/
sql = " select a.kqdate,a.resourceid,a.serialid,a.serialnumber,a.workbegindate,a.workbegintime, " +
" a.workenddate,a.workendtime,a.workmins,a.signindate,a.signintime,a.signoutdate,a.signouttime, \n" +
" a.attendanceMins,a.belatemins,a.graveBeLateMins,a.leaveearlymins,a.graveLeaveEarlyMins,a.absenteeismmins,a.forgotcheckMins,a.forgotBeginWorkCheckMins," +
" a.leaveMins,a.leaveInfo,a.evectionMins,a.outMins,a.signinid,a.signoutid, b.showaddress as signinaddr, c.showaddress as signoutaddr \n" +
" from kq_format_detail a " +
" left join hrmschedulesign b on b.id = a.signinid \n" +
" left join hrmschedulesign c on c.id = a.signoutid \n" +
" where a.resourceid = " + resourceId + " and a.kqdate ='" + kqDate + "' \n" +
" order by a.serialnumber \n";
/*考勤二开--增加打卡地址end*/
rs.execute(sql); rs.execute(sql);
while (rs.next()) { while (rs.next()) {
String resourceid = Util.null2String(rs.getString("resourceid")); String resourceid = Util.null2String(rs.getString("resourceid"));
@ -670,6 +689,10 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
String leaveInfo = Util.null2String(rs.getString("leaveInfo")); String leaveInfo = Util.null2String(rs.getString("leaveInfo"));
int evectionMins = rs.getInt("evectionMins"); int evectionMins = rs.getInt("evectionMins");
int outMins = rs.getInt("outMins"); int outMins = rs.getInt("outMins");
String signInAddr = Util.null2String(rs.getString("signinaddr"));
String signOutAddr = Util.null2String(rs.getString("signoutaddr"));
bb.writeLog("signInAddr: " + signInAddr);
bb.writeLog("signOutAddr: " + signOutAddr);
if(serialid.length()>0){ if(serialid.length()>0){
@ -688,6 +711,7 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime); data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime);
data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on")); data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
data.put("signinaddress"+serialnumber, signInAddr);
} }
if (workendtime.length() > 0) { if (workendtime.length() > 0) {
@ -706,6 +730,7 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime); data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime);
data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off")); data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off"));
data.put("signoutaddress"+serialnumber, signOutAddr);
} }
}else{ }else{
if(workMins>0){ if(workMins>0){
@ -720,9 +745,11 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
if(signinid.length() > 0){ if(signinid.length() > 0){
data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime); data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime);
data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on")); data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
data.put("signinaddress"+serialnumber, signInAddr);
if(signoutid.length() > 0){ if(signoutid.length() > 0){
data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime); data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime);
data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off")); data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off"));
data.put("signoutaddress"+serialnumber, signOutAddr);
} }
}else{ }else{
data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on")); data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));

33
src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java
Unescape Escape View File

@ -443,7 +443,10 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
data.put(fieldName, fieldValue); data.put(fieldName, fieldValue);
} }
} }
data.putAll(this.getSignDetailInfo(id, kqdate)); // data.putAll(this.getSignDetailInfo(id, kqdate));
Map<String, Object> signDetailInfo = this.getSignDetailInfo(id, kqdate);
bb.writeLog("signDetailInfo: " + signDetailInfo);
data.putAll(signDetailInfo);
//请假 //请假
List<Map<String, Object>> allLeaveRules = KQLeaveRulesBiz.getAllLeaveRules(); List<Map<String, Object>> allLeaveRules = KQLeaveRulesBiz.getAllLeaveRules();
@ -618,13 +621,13 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
String sql = ""; String sql = "";
KQTimesArrayComInfo kqTimesArrayComInfo = new KQTimesArrayComInfo(); KQTimesArrayComInfo kqTimesArrayComInfo = new KQTimesArrayComInfo();
try{ try{
sql = " select kqdate,resourceid,serialid,serialnumber,workbegindate,workbegintime, " + // sql = " select kqdate,resourceid,serialid,serialnumber,workbegindate,workbegintime, " +
" workenddate,workendtime,workmins,signindate,signintime,signoutdate,signouttime, \n" + // " workenddate,workendtime,workmins,signindate,signintime,signoutdate,signouttime, \n" +
" attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins,forgotBeginWorkCheckMins," + // " attendanceMins,belatemins,graveBeLateMins,leaveearlymins,graveLeaveEarlyMins,absenteeismmins,forgotcheckMins,forgotBeginWorkCheckMins," +
" leaveMins,leaveInfo,evectionMins,outMins,signinid,signoutid \n" + // " leaveMins,leaveInfo,evectionMins,outMins,signinid,signoutid \n" +
" from kq_format_detail b \n" + // " from kq_format_detail b \n" +
" where resourceid = " + resourceId + " and kqdate ='" + kqDate + "' \n" + // " where resourceid = " + resourceId + " and kqdate ='" + kqDate + "' \n" +
" order by serialnumber \n"; // " order by serialnumber \n";
/*考勤二开--增加打卡地址start*/ /*考勤二开--增加打卡地址start*/
sql = " select a.kqdate,a.resourceid,a.serialid,a.serialnumber,a.workbegindate,a.workbegintime, " + sql = " select a.kqdate,a.resourceid,a.serialid,a.serialnumber,a.workbegindate,a.workbegintime, " +
@ -666,6 +669,8 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
int outMins = rs.getInt("outMins"); int outMins = rs.getInt("outMins");
String signInAddr = Util.null2String(rs.getString("signinaddr")); String signInAddr = Util.null2String(rs.getString("signinaddr"));
String signOutAddr = Util.null2String(rs.getString("signoutaddr")); String signOutAddr = Util.null2String(rs.getString("signoutaddr"));
bb.writeLog("signInAddr: " + signInAddr);
bb.writeLog("signOutAddr: " + signOutAddr);
if(serialid.length()>0){ if(serialid.length()>0){
@ -682,8 +687,9 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
signStatusInfo.put("evectionMins",evectionMins); signStatusInfo.put("evectionMins",evectionMins);
signStatusInfo.put("outMins",outMins); signStatusInfo.put("outMins",outMins);
data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime + signInAddr); data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime );
data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on")); data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
data.put("signinaddress"+serialnumber, signInAddr);
} }
if (workendtime.length() > 0) { if (workendtime.length() > 0) {
@ -700,8 +706,9 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
signStatusInfo.put("evectionMins",evectionMins); signStatusInfo.put("evectionMins",evectionMins);
signStatusInfo.put("outMins",outMins); signStatusInfo.put("outMins",outMins);
data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime + signOutAddr); data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime );
data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off")); data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off"));
data.put("signoutaddress"+serialnumber, signOutAddr);
} }
}else{ }else{
if(workMins>0){ if(workMins>0){
@ -714,11 +721,13 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
signStatusInfo.put("outMins",outMins); signStatusInfo.put("outMins",outMins);
if(signinid.length() > 0){ if(signinid.length() > 0){
data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime); data.put("signintime"+serialnumber, signintime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signintime );
data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on")); data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));
data.put("signinaddress"+serialnumber, signInAddr);
if(signoutid.length() > 0){ if(signoutid.length() > 0){
data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime); data.put("signouttime"+serialnumber, signouttime.length()==0?SystemEnv.getHtmlLabelName(25994, user.getLanguage()):signouttime );
data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off")); data.put("signoutstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"off"));
data.put("signoutaddress"+serialnumber, signOutAddr);
} }
}else{ }else{
data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on")); data.put("signinstatus"+serialnumber, KQReportBiz.getSignStatus(signStatusInfo,user,"on"));

Write Preview
Loading…
Cancel
Save