出差餐补优化需求20240731

src/com/engine/hostar/thread/HandleCBDataThread.java

@@ -506,7 +506,7 @@ public class HandleCBDataThread  extends BaseBean implements Runnable{
                             }
                         }
 
-//                        String groupId = kqGroupMemberComInfo.getKQGroupId(res, kqDate);
+                        String groupId = kqGroupMemberComInfo.getKQGroupId(res, kqDate);
 
                         if (signNumber == 0) {
                             double minValue = 0.00;

src/com/engine/kq/cmd/report/ExportDailyExcelCmd.java

@@ -195,8 +195,8 @@ public class ExportDailyExcelCmd extends AbstractCommonCommand<Map<String, Objec
               " b.beLateMins,b.graveBeLate,b.graveBeLateMins,b.leaveEearly,b.leaveEarlyMins,b.graveLeaveEarly," +
               " b.graveLeaveEarlyMins,b.absenteeism,b.signdays,b.signmins, "+
               " b.absenteeismMins ,(b.forgotCheck+"+forgotBeginWorkCheck_field+") forgotCheck,zeropoint ";
-      String sqlFrom = " from hrmresource a, kq_format_total b,uf_cbxxjlb zm " +
+      String sqlFrom = " from hrmresource a JOIN kq_format_total b ON a.id = b.resourceid LEFT JOIN uf_cbxxjlb zm ON zm.xm = a.id AND zm.rq = b.kqdate " +
-              "where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"' and zm.xm=a.id and zm.rq = b.kqdate ";
+              " where b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
       String sqlWhere = rightSql;
       if(subCompanyId.length()>0){
         sqlWhere +=" and a.subcompanyid1 in("+subCompanyId+") ";

src/com/engine/kq/cmd/report/ExportExcelCmd.java

@@ -206,11 +206,11 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
 
       Map<String,Object> definedFieldInfo = new KQFormatBiz().getDefinedField();
       String definedFieldSum = Util.null2String(definedFieldInfo.get("definedFieldSum"));
-      String backFields = " (select sum(zm.cccb) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as mealAllowance," +
+      String backFields = " sum(zm.cccb) as mealAllowance," +
-              " (select sum(zm.zdcb) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as statAllowance," +
+              " sum(zm.zdcb) as statAllowance," +
-              " (select sum(zm.jmybcb) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as nightAllowance," +
+              " sum(zm.jmybcb) as nightAllowance," +
-              " (select sum(zm.hrzdcb) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as otherStatAllowance," +
+              " sum(zm.hrzdcb) as otherStatAllowance," +
-              " (select sum(zm.ybbz) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as nightShiftSubsidy," +
+              " sum(zm.ybbz) as nightShiftSubsidy," +
               " a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1 as subcompanyid,a.departmentid,a.jobtitle," +
               " sum(b.workdays) as workdays,sum(b.workMins) as workMins,sum(b.attendancedays) as attendancedays," +
               " sum(FLOOR( b.attendanceMins / 30 ) * 30 ) as attendanceMins,sum(b.beLate) as beLate,sum(b.beLateMins) as beLateMins, " +
@@ -222,7 +222,8 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
       if(rs.getDBType().equals("oracle")){
         backFields = 	"/*+ index(kq_format_total IDX_KQ_FORMAT_TOTAL_KQDATE) */ "+backFields;
       }
-      String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='" + fromDate + "' and b.kqdate <='" + toDate + "'";
+      String sqlFrom = " from hrmresource a JOIN kq_format_total b ON a.id = b.resourceid LEFT JOIN uf_cbxxjlb zm ON zm.xm = a.id AND zm.rq >= '" + fromDate + "' AND zm.rq <= '" + toDate + "'" +
+              " where b.kqdate >='" + fromDate + "' and b.kqdate <='" + toDate + "'";
       String sqlWhere = rightSql;
       String groupBy = " group by a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1,a.departmentid,a.jobtitle ";
       if (subCompanyId.length() > 0) {
@@ -278,22 +279,22 @@ public class ExportExcelCmd extends AbstractCommonCommand<Map<String, Object>> {
       String isShowFullPath = Util.null2String(kqSettingsComInfo.getMain_val(fullPathMainKey),"0");
 
 
-      /*考勤二开--驻点餐补start*/
+//      /*考勤二开--驻点餐补start*/
-      HostarUtil hostarUtil = new HostarUtil();
+//      HostarUtil hostarUtil = new HostarUtil();
-      Map<String, Double> attendanceMap = new HashMap<>();
+//      Map<String, Double> attendanceMap = new HashMap<>();
-      String acqAttendanceSql = "select a.id, b.attendanceMins, b.kqdate from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"' "+sqlWhere;
+//      String acqAttendanceSql = "select a.id, b.attendanceMins, b.kqdate from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"' "+sqlWhere;
-      bb.writeLog("acqAttendanceSql: " + acqAttendanceSql);
+//      bb.writeLog("acqAttendanceSql: " + acqAttendanceSql);
-      rs.executeQuery(acqAttendanceSql);
+//      rs.executeQuery(acqAttendanceSql);
-      while (rs.next()) {
+//      while (rs.next()) {
-        double attendanceMins = Util.getDoubleValue(Util.null2String(rs.getString("attendanceMins")));
+//        double attendanceMins = Util.getDoubleValue(Util.null2String(rs.getString("attendanceMins")));
-        String id = Util.null2String(rs.getString("id"));
+//        String id = Util.null2String(rs.getString("id"));
-        String kqdate = Util.null2String(rs.getString("kqdate"));
+//        String kqdate = Util.null2String(rs.getString("kqdate"));
-        if (attendanceMins >= 0.00) {
+//        if (attendanceMins >= 0.00) {
-          attendanceMap.put(id + "|DailyStatAllowance" +"|" + kqdate, attendanceMins);
+//          attendanceMap.put(id + "|DailyStatAllowance" +"|" + kqdate, attendanceMins);
-        }
+//        }
-      }
+//      }
-      bb.writeLog("attendanceMap: " + attendanceMap);
+//      bb.writeLog("attendanceMap: " + attendanceMap);
-      /*考勤二开--驻点餐补end*/
+//      /*考勤二开--驻点餐补end*/
 
 
       rs.execute(sql);

src/com/engine/kq/cmd/report/GetKQDailyReportCmd.java

@@ -145,17 +145,18 @@ public class GetKQDailyReportCmd extends AbstractCommonCommand<Map<String, Objec
 				forgotBeginWorkCheck_field = " isnull(b.forgotBeginWorkCheck,0) ";
 			}
 
-			String backFields = " (select zm.cccb from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as mealAllowance," +
+			String backFields = " zm.cccb as mealAllowance," +
-					" (select zm.zdcb from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as statAllowance," +
+					" zm.zdcb as statAllowance," +
-					" (select zm.jmybcb from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as nightAllowance," +
+					" zm.jmybcb as nightAllowance," +
-					" (select zm.hrzdcb from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as otherStatAllowance," +
+					" zm.hrzdcb as otherStatAllowance," +
-					" (select zm.ybbz from uf_cbxxjlb zm where zm.xm = a.id and zm.rq = b.kqdate) as nightShiftSubsidy," +
+					" zm.ybbz as nightShiftSubsidy," +
 					" a.id,a.lastname,a.subcompanyid1 as subcompanyid,a.departmentid, a.workcode,b.jobtitle,a.dsporder," +
 					" b.kqdate, b.workdays,b.workMins,b.serialid, b.attendancedays,FLOOR( b.attendanceMins / 30 ) * 30 AS attendanceMins," +
 					" b.beLate,b.beLateMins,b.graveBeLate,b.graveBeLateMins,b.leaveEearly,b.leaveEarlyMins," +
 					" b.signdays,b.signmins, "+
 					" b.graveLeaveEarly,b.graveLeaveEarlyMins,b.absenteeism , b.absenteeismMins ,(b.forgotCheck+"+forgotBeginWorkCheck_field+") forgotCheck,zeropoint ";
-			String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
+			String sqlFrom = " from hrmresource a JOIN kq_format_total b ON a.id = b.resourceid LEFT JOIN uf_cbxxjlb zm ON zm.xm = a.id AND zm.rq = b.kqdate " +
+					"where b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
 			String sqlWhere = rightSql;
 			if(subCompanyId.length()>0){
 				sqlWhere +=" and a.subcompanyid1 in("+subCompanyId+") ";

src/com/engine/kq/cmd/report/GetKQReportCmd.java

@@ -173,11 +173,11 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 			Map<String,Object> definedFieldInfo = new KQFormatBiz().getDefinedField();
 			String definedFieldSum = Util.null2String(definedFieldInfo.get("definedFieldSum"));
 
-			String backFields = " (select sum(zm.cccb) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as mealAllowance," +
+			String backFields = " sum(zm.cccb) as mealAllowance," +
-					" (select sum(zm.zdcb) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as statAllowance," +
+					" sum(zm.zdcb) as statAllowance," +
-					" (select sum(zm.jmybcb) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as nightAllowance," +
+					" sum(zm.jmybcb) as nightAllowance," +
-					" (select sum(zm.hrzdcb) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as otherStatAllowance," +
+					" sum(zm.hrzdcb) as otherStatAllowance," +
-					" (select sum(zm.ybbz) from uf_cbxxjlb zm where zm.xm = a.id and zm.rq >= '" + fromDate + "' and zm.rq <= '" + toDate + "') as nightShiftSubsidy," +
+					" sum(zm.ybbz) as nightShiftSubsidy," +
 					" a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1 as subcompanyid,a.departmentid,a.jobtitle," +
 					" sum(b.workdays) as workdays,sum(b.workMins) as workMins,sum(b.attendancedays) as attendancedays," +
 					" sum(FLOOR( b.attendanceMins / 30 ) * 30 ) as attendanceMins,sum(b.beLate) as beLate,sum(b.beLateMins) as beLateMins, " +
@@ -190,7 +190,8 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 			if(rs.getDBType().equals("oracle")){
 				backFields = "/*+ index(kq_format_total IDX_KQ_FORMAT_TOTAL_KQDATE) */ "+backFields;
 			}
-			String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
+			String sqlFrom = " from hrmresource a JOIN kq_format_total b ON a.id = b.resourceid LEFT JOIN uf_cbxxjlb zm ON zm.xm = a.id AND zm.rq >= '" + fromDate + "' AND zm.rq <= '" + toDate + "'" +
+					"where b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"'";
 			String sqlWhere = rightSql;
 			String groupBy = " group by a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1,a.departmentid,a.jobtitle ";
 			if(subCompanyId.length()>0){
@@ -327,7 +328,7 @@ public class GetKQReportCmd extends AbstractCommonCommand<Map<String, Object>> {
 
 
 //			/*考勤二开--驻点餐补start*/
-			HostarUtil hostarUtil = new HostarUtil();
+//			HostarUtil hostarUtil = new HostarUtil();
 //			Map<String, Double> attendanceMap = new HashMap<>();
 //			String acqAttendanceSql = "select a.id, b.attendanceMins, b.kqdate from hrmresource a, kq_format_total b where a.id= b.resourceid and b.kqdate >='"+fromDate+"' and b.kqdate <='"+toDate+"' "+sqlWhere;
 //			bb.writeLog("acqAttendanceSql: " + acqAttendanceSql);