From 04095b3bbd1e7dc1575f4bea5047f103e8132172 Mon Sep 17 00:00:00 2001 From: ic_excellent <2570192571@qq.com> Date: Fri, 9 Jun 2023 17:32:27 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=EF=BC=8C=E5=88=86=E9=83=A8?= =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bokang/xiao/sh_bigdata/mapper/ReportMapper.java | 5 +++-- .../departmentfielddefined/GetFieldDefinedCmd.java | 2 +- .../departmentfielddefined/SaveFieldDefinedCmd.java | 11 ++++++----- .../subcompanyfielddefined/GetFieldDefinedCmd.java | 2 +- .../subcompanyfielddefined/SaveFieldDefinedCmd.java | 7 ++----- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/api/bokang/xiao/sh_bigdata/mapper/ReportMapper.java b/src/main/java/com/api/bokang/xiao/sh_bigdata/mapper/ReportMapper.java index 716dd9b..b8a308c 100644 --- a/src/main/java/com/api/bokang/xiao/sh_bigdata/mapper/ReportMapper.java +++ b/src/main/java/com/api/bokang/xiao/sh_bigdata/mapper/ReportMapper.java @@ -28,9 +28,10 @@ public interface ReportMapper { @CaseConversion(value = false) List> queryReportData(@ParamMapper("param") Map param,@ParamMapper("uid") int uid); - @Select("select id,dlsk,yslx,hbcc,sfsj,ddsj,sfd,ddd,wdwcl,dwcljsy,wdwclqt,xcap,lxr,lxrdh,bz,gzcl,gzry,zs,dyjbr,djr,ldr,lddw,rwzt,ykdh,gbs, " + + @Select("select id,hbwb,ysclwb,gzrywb,gzclwb,ldrwb,sfsjyc,ddsjyc,dlsk,yslx,hbcc,sfsj,ddsj,sfd,ddd,wdwcl,dwcljsy,wdwclqt,xcap,lxr," + + " lxrdh,bz,gzcl,gzry,zs,dyjbr,djr,ldr,lddw,rwzt,ykdh,gbs, " + " (select LISTAGG(wb, ',') WITHIN GROUP (ORDER BY wb) from uf_zwfwdjjmb_dt1 where mainid = main.id) ysdx, " + - " dyjbr, (select lastname from åhrmresource where id = dyjbr) dyjbr_span," + + " dyjbr, (select lastname from hrmresource where id = dyjbr) dyjbr_span," + " djr, (select lastname from hrmresource where id = djr) djr_span " + " from uf_zwfwdjjmb main $t{param.whereSql} order by dlsk ") @CaseConversion(value = false) diff --git a/src/main/java/com/engine/hrm/cmd/departmentfielddefined/GetFieldDefinedCmd.java b/src/main/java/com/engine/hrm/cmd/departmentfielddefined/GetFieldDefinedCmd.java index 6ac4a3a..9b506d1 100644 --- a/src/main/java/com/engine/hrm/cmd/departmentfielddefined/GetFieldDefinedCmd.java +++ b/src/main/java/com/engine/hrm/cmd/departmentfielddefined/GetFieldDefinedCmd.java @@ -200,7 +200,7 @@ public class GetFieldDefinedCmd extends AbstractCommonCommand groupId:%s fieldId:%s",groupId,fieldid)); - if(groupId == 6 || groupId == 7) { + if(groupId == 6 || groupId == 7 || groupId == 21 || groupId == 22) { recordInfo.put("isEdit", formFieldMapper.queryIsEdit(fieldid, groupId)); } log.info("recordInfo ==>"+ JSON.toJSONString(recordInfo)); diff --git a/src/main/java/com/engine/hrm/cmd/departmentfielddefined/SaveFieldDefinedCmd.java b/src/main/java/com/engine/hrm/cmd/departmentfielddefined/SaveFieldDefinedCmd.java index 54d479e..2d5badc 100644 --- a/src/main/java/com/engine/hrm/cmd/departmentfielddefined/SaveFieldDefinedCmd.java +++ b/src/main/java/com/engine/hrm/cmd/departmentfielddefined/SaveFieldDefinedCmd.java @@ -129,11 +129,12 @@ public class SaveFieldDefinedCmd extends AbstractCommonCommand"+groupId); - if("6".equals(groupId) || "7".equals(groupId)){ - this.save(fieldBean,groupId,records.getJSONObject(i)); - }else { - this.save(fieldBean, groupId); - } + //if("6".equals(groupId) || "7".equals(groupId) || "21".equals(groupId) || "22".equals(groupId)){ + // this.save(fieldBean,groupId,records.getJSONObject(i)); + //}else { + // this.save(fieldBean, groupId); + //} + this.save(fieldBean,groupId,records.getJSONObject(i)); } HrmFieldComInfo.removeFieldCache(); diff --git a/src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/GetFieldDefinedCmd.java b/src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/GetFieldDefinedCmd.java index 24e5aeb..2e1b90a 100644 --- a/src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/GetFieldDefinedCmd.java +++ b/src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/GetFieldDefinedCmd.java @@ -201,7 +201,7 @@ public class GetFieldDefinedCmd extends AbstractCommonCommand groupId:%s fieldId:%s",groupId,fieldid)); - if(groupId == 6 || groupId == 7) { + if(groupId == 6 || groupId == 7 || groupId == 21 || groupId == 22) { recordInfo.put("isEdit", formFieldMapper.queryIsEdit(fieldid, groupId)); } log.info("recordInfo ==>"+ JSON.toJSONString(recordInfo)); diff --git a/src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/SaveFieldDefinedCmd.java b/src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/SaveFieldDefinedCmd.java index ec53258..f43c7be 100644 --- a/src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/SaveFieldDefinedCmd.java +++ b/src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/SaveFieldDefinedCmd.java @@ -128,11 +128,8 @@ public class SaveFieldDefinedCmd extends AbstractCommonCommand"+groupId); - if("6".equals(groupId) || "7".equals(groupId)){ - this.save(fieldBean,groupId,records.getJSONObject(i)); - }else { - this.save(fieldBean, groupId); - } + // + this.save(fieldBean,groupId,records.getJSONObject(i)); } HrmFieldComInfo.removeFieldCache(); //同步分部数据到矩阵