ecology
/
ebu_ecology_dev1
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

部门，分部自定义

jingwei
ic_excellent 2023-06-09 17:32:27 +08:00
parent 1c4fe8709d
commit 04095b3bbd
5 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/api/bokang/xiao/sh_bigdata/mapper/ReportMapper.java
View File

@ -28,9 +28,10 @@ public interface ReportMapper {
@CaseConversion(value = false)
List<Map<String, Object>> queryReportData(@ParamMapper("param") Map<String,Object> 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)

2
src/main/java/com/engine/hrm/cmd/departmentfielddefined/GetFieldDefinedCmd.java
View File

@ -200,7 +200,7 @@ public class GetFieldDefinedCmd extends AbstractCommonCommand<Map<String, Object
//分部或部门时查询对应是否可编辑字段 update by bokang.xiao
log.info(String.format("查询对应字段信息 ==> 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));

11
src/main/java/com/engine/hrm/cmd/departmentfielddefined/SaveFieldDefinedCmd.java
View File

@ -129,11 +129,12 @@ public class SaveFieldDefinedCmd extends AbstractCommonCommand<Map<String, Objec
fieldBean.initFieldType("department");
//部门和分部添加自定义字段时多一个列属性 update by bokang.xiao
log.info("save department groupId ==>"+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();

2
src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/GetFieldDefinedCmd.java
View File

@ -201,7 +201,7 @@ public class GetFieldDefinedCmd extends AbstractCommonCommand<Map<String, Object
//分部或部门时查询对应是否可编辑字段 update by bokang.xiao
log.info(String.format("查询对应字段信息 ==> 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));

7
src/main/java/com/engine/hrm/cmd/subcompanyfielddefined/SaveFieldDefinedCmd.java
View File

@ -128,11 +128,8 @@ public class SaveFieldDefinedCmd extends AbstractCommonCommand<Map<String, Objec
fieldBean.initFieldType("subcompany");
//部门和分部添加自定义字段时多一个列属性 update by bokang.xiao
log.info("save subCompany groupId ==>"+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();
//同步分部数据到矩阵