From 28051ff61f5b8a9f851d9251867c39960e67670f Mon Sep 17 00:00:00 2001 From: Chengliang <1546584672@qq.com> Date: Mon, 26 May 2025 15:27:39 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=BE=8E=E5=85=89=E8=80=83=E5=8B=A4?= =?UTF-8?q?=E5=85=B3=E8=B4=A6=E5=8A=9F=E8=83=BD=20=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=AC=A1=E9=AA=8C=E8=AF=81=E9=80=9A=E8=BF=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/kq/cmd/report/GetKQReportCmd.java | 9 ++++---- .../impl/KqCloseAccountServiceImpl.java | 22 +++++++++++++------ 2 files changed, 20 insertions(+), 11 deletions(-) diff --git a/src/com/engine/kq/cmd/report/GetKQReportCmd.java b/src/com/engine/kq/cmd/report/GetKQReportCmd.java index 72273d2..c727a51 100644 --- a/src/com/engine/kq/cmd/report/GetKQReportCmd.java +++ b/src/com/engine/kq/cmd/report/GetKQReportCmd.java @@ -208,7 +208,7 @@ public class GetKQReportCmd extends AbstractCommonCommand> { } String sqlFrom = " from hrmresource a, kq_format_total b where a.id= b.resourceid and 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 "; + String groupBy = " group by a.id,a.lastname,a.workcode,a.dsporder,b.resourceid,a.subcompanyid1,a.departmentid,a.jobtitle,b.groupid "; List paramLists = new ArrayList<>(); List paramList = null; if(subCompanyId.length()>0){ @@ -409,9 +409,10 @@ public class GetKQReportCmd extends AbstractCommonCommand> { }else if("kqGroup".equals(fieldName)){ //QC3685035 考勤月度报表增加所属所属考勤组 KQGroupComInfo kqGroupComInfo = new KQGroupComInfo(); -// KQGroupMemberComInfo kqGroupMemberComInfo = new KQGroupMemberComInfo(); -// String groupId = kqGroupMemberComInfo.getKQGroupId(id, toDate); - fieldValue = kqGroupComInfo.getGroupname(Util.null2String(rs.getString("groupid"))); + KQGroupMemberComInfo kqGroupMemberComInfo = new KQGroupMemberComInfo(); + String groupId = kqGroupMemberComInfo.getKQGroupId(id, toDate); + fieldValue = kqGroupComInfo.getGroupname(groupId); +// fieldValue = kqGroupComInfo.getGroupname(Util.null2String(rs.getString("groupid"))); }else if("absenteeismDays".equals(fieldName)){ //QC3685035 考勤月度报表增加缺勤天数 List kqFormatTotalList = KqCalulateUtil.abnormalAttendance(id, fromDate, toDate); diff --git a/src/com/engine/xmgsecond/service/impl/KqCloseAccountServiceImpl.java b/src/com/engine/xmgsecond/service/impl/KqCloseAccountServiceImpl.java index 79736e6..330fead 100644 --- a/src/com/engine/xmgsecond/service/impl/KqCloseAccountServiceImpl.java +++ b/src/com/engine/xmgsecond/service/impl/KqCloseAccountServiceImpl.java @@ -36,17 +36,25 @@ public class KqCloseAccountServiceImpl extends Service implements KqCloseAccount public List closeAccount(Map param) { String billid = Util.null2String(param.get("billid")); - String subCompanyIds = Util.null2String(param.get("gzfb")); - String departmentIds = Util.null2String(param.get("gzbm")); - String startDate = Util.null2String(param.get("ksrq")); - String endDate = Util.null2String(param.get("jsrq")); + RecordSet rs = new RecordSet(); + String subCompanyIds = ""; + String departmentIds = ""; + String startDate = ""; + String endDate = ""; //0 发起 1 归档 String type = Util.null2String(param.get("type")); + rs.executeQuery("select gzfb,gzbm,ksrq,jsrq from uf_kqgzjl where id = ?",billid); + if (rs.next()) { + subCompanyIds = Util.null2String(rs.getString("gzfb")); + departmentIds = Util.null2String(rs.getString("gzbm")); + startDate = Util.null2String(rs.getString("ksrq")); + endDate = Util.null2String(rs.getString("jsrq")); + } + String currentTime = TimeUtil.getCurrentTimeString(); String lastname = user.getLastname(); List paResponseEntities = new ArrayList<>(); - RecordSet rs = new RecordSet(); List workflowList = getWorkflowList(); List workflowIds = workflowList.stream() .map(KqCloseSet::getWorkflowId) @@ -136,13 +144,13 @@ public class KqCloseAccountServiceImpl extends Service implements KqCloseAccount if(!subCompanyIds.isEmpty()) { //like - sql += " and gzfb is not null and gzfb in ("+subCompanyIds+")"; + sql += " and gzfb is not null and (','||gzfb||',' like '%,"+subCompanyIds+",%')"; rs.executeQuery(sql,endDate,startDate); result = rs.getCounts()>0; } if (!departmentIds.isEmpty() && !result) { - sql1 += " and gzbm is not null and gzbm in ("+departmentIds+")"; + sql1 += " and gzbm is not null and (','||gzbm||',' like '%,"+departmentIds+",%')"; rs.executeQuery(sql1,endDate,startDate); result = rs.getCounts()>0; }