From 2f505e8ca706337188509a7a9456686802c4fd3e Mon Sep 17 00:00:00 2001 From: Mlin Date: Fri, 6 Jan 2023 15:49:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA20230106?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/HrmResourceServiceImpl.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index ef98101e..2b042f6b 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSONObject; import com.api.browser.bean.BrowserBean; import com.api.browser.bean.SearchConditionGroup; import com.api.browser.bean.SearchConditionItem; +import com.cloudstore.eccom.constant.WeaAlignAttr; +import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; @@ -153,7 +155,18 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic @Override public Map listPage(HrmResourceSearchParam params) { + + OrganizationWeaTable table = new OrganizationWeaTable<>(user, HrmResourceVO.class); + WeaTableColumn weaTableColumn = new WeaTableColumn(); + weaTableColumn.setAlign(WeaAlignAttr.LEFT); + weaTableColumn.setDataalign(WeaAlignAttr.LEFT); + weaTableColumn.setWidth("25%"); + weaTableColumn.setText("测试"); + + List list = new ArrayList<>(); + list.add(weaTableColumn); +// table.setColumns(list); String sqlWhere = buildSqlWhere(params); table.setSqlwhere(sqlWhere); WeaResultMsg result = new WeaResultMsg(false); From d1612a151a7d5c1756137f67c6678c5bc9f7defe Mon Sep 17 00:00:00 2001 From: Mlin Date: Fri, 6 Jan 2023 17:27:02 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA20230106?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hrmresource/vo/HrmResourceJclVO.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java new file mode 100644 index 00000000..916ee84b --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceJclVO.java @@ -0,0 +1,47 @@ +package com.engine.organization.entity.hrmresource.vo; + +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.OrganizationTableColumn; +import com.engine.organization.annotation.OrganizationTableOperate; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author:ml + * @createTime: 2023/01/06 + * @version: 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "c0583f20-f10c-11ec-9947-00e04c680716", + fields = "t.id," + + "t.lastname," + + "t.departmentid," + + "t.subcompanyid1," + + "t.jobtitle," + + "t.mobile," + + "t.telephone," + + "t.managerid, " + + "t.dsporder ", + fromSql = "FROM hrmresource t ", + orderby = " dsporder ", + sortway = " asc", + primarykey = "id", + operates = { + @OrganizationTableOperate(text = "查看"), + @OrganizationTableOperate(index = "1", text = "另存为版本") + }, + tableType = WeaTableType.CHECKBOX +) +public class HrmResourceJclVO { + /** + * 主键 + */ + @OrganizationTableColumn(column = "id", display = false) + private Long id; +} From 71c427d1ec983d87d5e80fdde6b6156225086376 Mon Sep 17 00:00:00 2001 From: Mlin Date: Wed, 11 Jan 2023 14:48:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=AD=97=E6=AE=B5=E5=B1=95=E7=A4=BA20230111?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/resource/HrmResourceMapper.java | 5 +++ .../mapper/resource/HrmResourceMapper.xml | 33 +++++++++++++++++++ .../service/impl/HrmResourceServiceImpl.java | 32 ++++++++++++++++++ 3 files changed, 70 insertions(+) diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java index aaa7f84e..84d05129 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java @@ -1,5 +1,6 @@ package com.engine.organization.mapper.resource; +import com.alibaba.fastjson.JSONObject; import com.engine.organization.entity.hrmresource.po.ResourcePO; import com.engine.organization.entity.hrmresource.param.SearchTemplateParam; import com.engine.organization.entity.hrmresource.po.SearchTemplatePO; @@ -55,4 +56,8 @@ public interface HrmResourceMapper { Integer insertCustomTemplate(SearchTemplatePO templatePO); Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId); + + List queryAllResColumns(@Param("level") String level,@Param("grade") String grade); + + } diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml index 793d042a..7f1135d7 100644 --- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml +++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml @@ -370,5 +370,38 @@ + \ No newline at end of file diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 557e5526..67993340 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -6,6 +6,8 @@ import com.api.browser.bean.SearchConditionOption; import com.api.browser.util.ConditionType; import com.api.hrm.bean.HrmFieldBean; import com.api.hrm.util.HrmFieldSearchConditionComInfo; +import com.cloudstore.eccom.constant.WeaBoolAttr; +import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.hrm.util.face.HrmFaceCheckManager; @@ -40,6 +42,7 @@ import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.detach.DetachUtil; +import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageUtil; import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections.CollectionUtils; @@ -74,6 +77,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic private static final String RIGHT_NAME = "Roster:All"; + private static final String level = getFieldName("职等"); + private static final String grade = getFieldName("职级"); + private HrmRelationMapper getHrmRelationMapper() { return MapperProxyFactory.getProxy(HrmRelationMapper.class); } @@ -118,6 +124,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic OrganizationWeaTable table = new OrganizationWeaTable<>(user, HrmResourceVO.class); String sqlWhere = buildSqlWhere(params); table.setSqlwhere(sqlWhere); + + List weaTableColumnList = new ArrayList<>(); + WeaTableColumn weaTableColumn = new WeaTableColumn(); + + + List jsonObjectList = getHrmResourceMapper().queryAllResColumns(level,grade); +// for (com.alibaba.fastjson.JSONObject jsonObject : jsonObjectList){ +// System.out.println(jsonObject.getString("level_name")); +// weaTableColumn.setText("职等"); +// weaTableColumn.setDisplay(WeaBoolAttr.TRUE); +// weaTableColumn.setColumn("levelName"); +// weaTableColumnList.add(weaTableColumn); +// } +// table.setColumns(weaTableColumnList); + +// weaTableColumnList = columns.stream().map(v -> new WeaTableColumn("100", v.getTitle(), v.getKey())).collect(Collectors.toList()); WeaResultMsg result = new WeaResultMsg(false); result.putAll(table.makeDataResult()); result.success(); @@ -869,4 +891,14 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic options.add(0, searchConditionOption); } + + private static String getFieldName(String fieldabel) { + RecordSet recordSet = new RecordSet(); + String fieldname = null; + recordSet.executeQuery("select fieldname from jcl_org_field where fieldlabel='" + fieldabel+"'"); + if (recordSet.next()) { + fieldname = recordSet.getString("fieldname"); + } + return fieldname; + } } From 09d4dbddd5a53b7e306f75d50f3cc9e1959030c4 Mon Sep 17 00:00:00 2001 From: Mlin Date: Thu, 12 Jan 2023 09:41:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E5=88=97?= =?UTF-8?q?=E5=AE=9A=E5=88=B6=E6=A8=A1=E6=9D=BF=E6=9F=A5=E8=AF=A220230112?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../po/JclOrgCustomTemplatePO.java | 37 ++++++++++ .../vo/JclOrgCustomTemplateVO.java | 67 +++++++++++++++++++ .../mapper/resource/JclOrgCustomTemplate.xml | 29 ++++++++ .../service/HrmResourceService.java | 8 +++ .../service/impl/HrmResourceServiceImpl.java | 49 ++++++++++++++ .../web/HrmResourceController.java | 13 ++++ .../wrapper/HrmResourceWrapper.java | 4 ++ 7 files changed, 207 insertions(+) create mode 100644 src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java create mode 100644 src/com/engine/organization/entity/hrmresource/vo/JclOrgCustomTemplateVO.java create mode 100644 src/com/engine/organization/mapper/resource/JclOrgCustomTemplate.xml diff --git a/src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java b/src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java new file mode 100644 index 00000000..c1af333f --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java @@ -0,0 +1,37 @@ +package com.engine.organization.entity.hrmresource.po; + +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.OrganizationTableColumn; +import com.engine.organization.annotation.OrganizationTableOperate; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class JclOrgCustomTemplatePO { + + private Integer id; + + private String name; + + private String basicFields; + + private String personalFields; + + private String workFields; + + private Integer isused; + + private Integer creator; + + private Date createTime; + + private Date updateTime; +} diff --git a/src/com/engine/organization/entity/hrmresource/vo/JclOrgCustomTemplateVO.java b/src/com/engine/organization/entity/hrmresource/vo/JclOrgCustomTemplateVO.java new file mode 100644 index 00000000..f5bbbd1c --- /dev/null +++ b/src/com/engine/organization/entity/hrmresource/vo/JclOrgCustomTemplateVO.java @@ -0,0 +1,67 @@ +package com.engine.organization.entity.hrmresource.vo; + +import com.cloudstore.eccom.pc.table.WeaTableType; +import com.engine.organization.annotation.OrganizationTable; +import com.engine.organization.annotation.OrganizationTableColumn; +import com.engine.organization.annotation.OrganizationTableOperate; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "8df45b09-0cda-4f57-a93a-ca9f96a4c111", + fields = "t.id," + + "t.name," + + "t.basic_fields," + + "t.personal_fields," + + "t.work_fields," + + "t.isused," + + "t.creator," + + "t.create_time," + + "t.update_time", + fromSql = "FROM jcl_org_custom_template t ", + orderby = "id", + sortway = "asc", + primarykey = "id", + operates = { + @OrganizationTableOperate(index = "0", text = "编辑"), + @OrganizationTableOperate(index = "1", text = "另存为"), + @OrganizationTableOperate(index = "2", text = "删除") + }, + tableType = WeaTableType.CHECKBOX +) +public class JclOrgCustomTemplateVO { + + @OrganizationTableColumn(column = "id", display = false) + private Integer id; + + @OrganizationTableColumn(text = "模板名称", width = "30%", column = "name") + private String name; + + @OrganizationTableColumn(column = "basic_fields", display = false) + private String basicFields; + + @OrganizationTableColumn(column = "personal_fields", display = false) + private String personalFields; + + @OrganizationTableColumn(column = "work_fields", display = false) + private String workFields; + + @OrganizationTableColumn(column = "isused", display = false) + private Integer isUsed; + + @OrganizationTableColumn(column = "creator", display = false) + private Integer creator; + + @OrganizationTableColumn(text = "创建时间",column = "create_time", width = "30%") + private Date createTime; + + @OrganizationTableColumn(text = "更新时间",column = "update_time", display = false) + private Date updateTime; +} diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplate.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplate.xml new file mode 100644 index 00000000..65ef3455 --- /dev/null +++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplate.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + t.id, + t.name, + t.basic_fields, + t.personal_fields, + t.work_fields text, + t.isused, + t.creator, + t.create_time, + t.update_time + + + + + \ No newline at end of file diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java index a794f2b0..247a7d07 100644 --- a/src/com/engine/organization/service/HrmResourceService.java +++ b/src/com/engine/organization/service/HrmResourceService.java @@ -142,4 +142,12 @@ public interface HrmResourceService { * @param id */ void deleteCustomTemplate(Integer id); + + + /** + * 展示所有模板 + * @param params + * @return + */ + Map getCustomTemplate(Map params); } diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index 5de8cbff..cc20fc6b 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -17,12 +17,16 @@ import com.engine.organization.entity.company.bo.CompBO; import com.engine.organization.entity.company.po.CompPO; import com.engine.organization.entity.department.bo.DepartmentBO; import com.engine.organization.entity.department.po.DepartmentPO; +import com.engine.organization.entity.extend.bo.ExtendInfoBO; +import com.engine.organization.entity.extend.po.ExtendInfoPO; import com.engine.organization.entity.hrmresource.bo.HrmRelationBO; import com.engine.organization.entity.hrmresource.param.HrmRelationSaveParam; import com.engine.organization.entity.hrmresource.param.SearchTemplateParam; import com.engine.organization.entity.hrmresource.po.HrmRelationPO; +import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO; import com.engine.organization.entity.hrmresource.po.SearchTemplatePO; import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; +import com.engine.organization.entity.hrmresource.vo.JclOrgCustomTemplateVO; import com.engine.organization.entity.jclimport.po.CusFormFieldPO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; @@ -35,7 +39,9 @@ import com.engine.organization.mapper.hrmresource.HrmRelationMapper; import com.engine.organization.mapper.hrmresource.SystemDataMapper; import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.resource.HrmResourceMapper; +import com.engine.organization.mapper.resource.JclOrgCustomTemplateMapper; import com.engine.organization.service.HrmResourceService; +import com.engine.organization.transmethod.SystemTransMethod; import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; @@ -55,6 +61,7 @@ import weaver.general.Util; import weaver.hrm.definedfield.HrmFieldManager; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; /** @@ -398,6 +405,48 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic return hrmRelationPO.getId(); } + @Override + public Map getCustomTemplate(Map params) { + List infoPOList = new ArrayList<>(); + infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("name").fieldNameDesc("模板名称").fieldType("varchar(255)").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(1).isrequired(0).isSystemDefault(0).build()); + infoPOList.add(ExtendInfoPO.builder().id(null).fieldName("createTime").fieldNameDesc("创建时间").fieldType("date").controlType(1).browserType("1").customValue("[\"input\",\"text\",\"50\"]").showOrder(2).isrequired(0).isSystemDefault(0).build()); + Map tabInfoMap = new HashMap<>(); + tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, 2, false, true)); + List jclOrgCustomTemplatePOS = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).listAll(); + List isUsed = new ArrayList<>(); + AtomicInteger index = new AtomicInteger(0); + List> collect = jclOrgCustomTemplatePOS.stream().map(item -> { + Map resultMap = new HashMap<>(); + resultMap.put("id", item.getId()); + resultMap.put("name", item.getName()); + resultMap.put("createTime", item.getCreateTime()); + + if (1 == item.getIsused()) { + isUsed.add(index.get()); + } + index.getAndIncrement(); + + return resultMap; + }).collect(Collectors.toList()); + + tabInfoMap.put("datas", collect); + tabInfoMap.put("api_status", true); + Map> isUsedMap = new HashMap<>(); + isUsedMap.put("status", isUsed); + tabInfoMap.put("selectedData", isUsedMap); + tabInfoMap.put("isModalEdit", false); + return tabInfoMap; + + +// OrganizationWeaTable table = new OrganizationWeaTable<>(user, JclOrgCustomTemplateVO.class); +// String sqlWhere = buildSqlWhere(params); +// table.setSqlwhere(sqlWhere); +// WeaResultMsg result = new WeaResultMsg(false); +// result.putAll(table.makeDataResult()); +// result.success(); +// return new HashMap<>(result.getResultMap()); + } + /** * 查询条件 * diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index 7813c5f0..212c739e 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -305,4 +305,17 @@ public class HrmResourceController { return ReturnResult.exceptionHandle(e); } } + + @GET + @Path("/getCustomTemplate") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getCustomTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map params = request.getParameterMap(); + return ReturnResult.successed(getHrmResourceWrapper(user).getCustomTemplate(params)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e); + } + } } diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java index 8e1e183d..5167f83e 100644 --- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java +++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java @@ -99,4 +99,8 @@ public class HrmResourceWrapper extends OrganizationWrapper { public void deleteCustomTemplate(Integer id) { getHrmResourceService(user).deleteCustomTemplate(id); } + + public Map getCustomTemplate(Map params){ + return getHrmResourceService(user).getCustomTemplate(params); + } } From 8750850dfacd1eb61595272a1a1954cac1b4291f Mon Sep 17 00:00:00 2001 From: Mlin Date: Thu, 12 Jan 2023 11:30:25 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=8A=B1=E5=90=8D=E5=86=8C=E5=88=97?= =?UTF-8?q?=E5=AE=9A=E5=88=B6=E6=A8=A1=E6=9D=BF=E6=9F=A5=E8=AF=A220230112?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../po/JclOrgCustomTemplatePO.java | 46 +++++-- .../mapper/resource/JclOrgCustomTemplate.xml | 29 ----- .../resource/JclOrgCustomTemplateMapper.java | 29 +++++ .../resource/JclOrgCustomTemplateMapper.xml | 120 ++++++++++++++++++ .../service/impl/HrmResourceServiceImpl.java | 4 - .../web/HrmResourceController.java | 2 + 6 files changed, 189 insertions(+), 41 deletions(-) delete mode 100644 src/com/engine/organization/mapper/resource/JclOrgCustomTemplate.xml create mode 100644 src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java create mode 100644 src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml diff --git a/src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java b/src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java index c1af333f..03ccf830 100644 --- a/src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java +++ b/src/com/engine/organization/entity/hrmresource/po/JclOrgCustomTemplatePO.java @@ -1,37 +1,67 @@ package com.engine.organization.entity.hrmresource.po; -import com.cloudstore.eccom.pc.table.WeaTableType; -import com.engine.organization.annotation.OrganizationTable; -import com.engine.organization.annotation.OrganizationTableColumn; -import com.engine.organization.annotation.OrganizationTableOperate; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; import java.util.Date; +/** + * + * @TableName jcl_org_custom_template + */ @Data @Builder -@NoArgsConstructor @AllArgsConstructor -public class JclOrgCustomTemplatePO { - +@NoArgsConstructor +public class JclOrgCustomTemplatePO implements Serializable { + /** + * + */ private Integer id; + /** + * + */ private String name; + /** + * + */ private String basicFields; + /** + * + */ private String personalFields; + /** + * + */ private String workFields; + /** + * + */ private Integer isused; + /** + * + */ private Integer creator; + /** + * + */ private Date createTime; + /** + * + */ private Date updateTime; -} + + private static final long serialVersionUID = 1L; + +} \ No newline at end of file diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplate.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplate.xml deleted file mode 100644 index 65ef3455..00000000 --- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplate.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - t.id, - t.name, - t.basic_fields, - t.personal_fields, - t.work_fields text, - t.isused, - t.creator, - t.create_time, - t.update_time - - - - - \ No newline at end of file diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java new file mode 100644 index 00000000..09e48c14 --- /dev/null +++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java @@ -0,0 +1,29 @@ +package com.engine.organization.mapper.resource; + +import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO; + +import java.util.List; + +/** +* @author Mlin +* @description 针对表【jcl_org_custom_template】的数据库操作Mapper +* @createDate 2023-01-12 10:28:52 +* @Entity com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplate +*/ +public interface JclOrgCustomTemplateMapper { + + int deleteByPrimaryKey(Long id); + + int insert(JclOrgCustomTemplatePO record); + + int insertSelective(JclOrgCustomTemplatePO record); + + JclOrgCustomTemplatePO selectByPrimaryKey(Long id); + + int updateByPrimaryKeySelective(JclOrgCustomTemplatePO record); + + int updateByPrimaryKey(JclOrgCustomTemplatePO record); + + List listAll(); + +} diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml new file mode 100644 index 00000000..01b27d41 --- /dev/null +++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + id,name,basic_fields, + personal_fields,work_fields,isused, + creator,create_time,update_time + + + + + + + delete from jcl_org_custom_template + where id = #{id,jdbcType=INTEGER} + + + insert into jcl_org_custom_template + ( id,name,basic_fields + ,personal_fields,work_fields,isused + ,creator,create_time,update_time + ) + values (#{id,jdbcType=INTEGER},#{name,jdbcType=VARCHAR},#{basicFields,jdbcType=VARCHAR} + ,#{personalFields,jdbcType=VARCHAR},#{workFields,jdbcType=VARCHAR},#{isused,jdbcType=INTEGER} + ,#{creator,jdbcType=INTEGER},#{createTime,jdbcType=DATE},#{updateTime,jdbcType=DATE} + ) + + + insert into jcl_org_custom_template + + id, + name, + basic_fields, + personal_fields, + work_fields, + isused, + creator, + create_time, + update_time, + + + #{id,jdbcType=INTEGER}, + #{name,jdbcType=VARCHAR}, + #{basicFields,jdbcType=VARCHAR}, + #{personalFields,jdbcType=VARCHAR}, + #{workFields,jdbcType=VARCHAR}, + #{isused,jdbcType=INTEGER}, + #{creator,jdbcType=INTEGER}, + #{createTime,jdbcType=DATE}, + #{updateTime,jdbcType=DATE}, + + + + update jcl_org_custom_template + + + name = #{name,jdbcType=VARCHAR}, + + + basic_fields = #{basicFields,jdbcType=VARCHAR}, + + + personal_fields = #{personalFields,jdbcType=VARCHAR}, + + + work_fields = #{workFields,jdbcType=VARCHAR}, + + + isused = #{isused,jdbcType=INTEGER}, + + + creator = #{creator,jdbcType=INTEGER}, + + + create_time = #{createTime,jdbcType=DATE}, + + + update_time = #{updateTime,jdbcType=DATE}, + + + where id = #{id,jdbcType=INTEGER} + + + update jcl_org_custom_template + set + name = #{name,jdbcType=VARCHAR}, + basic_fields = #{basicFields,jdbcType=VARCHAR}, + personal_fields = #{personalFields,jdbcType=VARCHAR}, + work_fields = #{workFields,jdbcType=VARCHAR}, + isused = #{isused,jdbcType=INTEGER}, + creator = #{creator,jdbcType=INTEGER}, + create_time = #{createTime,jdbcType=DATE}, + update_time = #{updateTime,jdbcType=DATE} + where id = #{id,jdbcType=INTEGER} + + diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java index cc20fc6b..d658d0fc 100644 --- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java @@ -6,7 +6,6 @@ import com.api.browser.bean.SearchConditionOption; import com.api.browser.util.ConditionType; import com.api.hrm.bean.HrmFieldBean; import com.api.hrm.util.HrmFieldSearchConditionComInfo; -import com.cloudstore.eccom.constant.WeaBoolAttr; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; @@ -26,7 +25,6 @@ import com.engine.organization.entity.hrmresource.po.HrmRelationPO; import com.engine.organization.entity.hrmresource.po.JclOrgCustomTemplatePO; import com.engine.organization.entity.hrmresource.po.SearchTemplatePO; import com.engine.organization.entity.hrmresource.vo.HrmResourceVO; -import com.engine.organization.entity.hrmresource.vo.JclOrgCustomTemplateVO; import com.engine.organization.entity.jclimport.po.CusFormFieldPO; import com.engine.organization.entity.job.bo.JobBO; import com.engine.organization.entity.job.po.JobPO; @@ -41,14 +39,12 @@ import com.engine.organization.mapper.job.JobMapper; import com.engine.organization.mapper.resource.HrmResourceMapper; import com.engine.organization.mapper.resource.JclOrgCustomTemplateMapper; import com.engine.organization.service.HrmResourceService; -import com.engine.organization.transmethod.SystemTransMethod; import com.engine.organization.util.HasRightUtil; import com.engine.organization.util.MenuBtn; import com.engine.organization.util.OrganizationAssert; import com.engine.organization.util.db.DBType; import com.engine.organization.util.db.MapperProxyFactory; import com.engine.organization.util.detach.DetachUtil; -import com.engine.organization.util.page.Column; import com.engine.organization.util.page.PageUtil; import com.engine.organization.util.tree.SearchTreeUtil; import org.apache.commons.collections.CollectionUtils; diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java index 212c739e..9e3b515d 100644 --- a/src/com/engine/organization/web/HrmResourceController.java +++ b/src/com/engine/organization/web/HrmResourceController.java @@ -318,4 +318,6 @@ public class HrmResourceController { return ReturnResult.exceptionHandle(e); } } + + }