diff --git a/src/com/engine/organization/annotation/Log.java b/src/com/engine/organization/annotation/Log.java index 35b4810f..124c5ea7 100644 --- a/src/com/engine/organization/annotation/Log.java +++ b/src/com/engine/organization/annotation/Log.java @@ -5,12 +5,11 @@ import com.engine.organization.enums.OperateTypeEnum; import java.lang.annotation.*; /** - * @Author weaver_cl + * @Author dxfeng * @Description: TODO - * @Date 2022/4/27 + * @Date 2022/5/9 * @Version V1.0 **/ - @Target({ElementType.PARAMETER, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) @Documented diff --git a/src/com/engine/organization/annotation/OrganizationTable.java b/src/com/engine/organization/annotation/OrganizationTable.java index e5f89e50..0217da51 100644 --- a/src/com/engine/organization/annotation/OrganizationTable.java +++ b/src/com/engine/organization/annotation/OrganizationTable.java @@ -6,12 +6,10 @@ import com.cloudstore.eccom.pc.table.WeaTableType; import java.lang.annotation.*; /** - * 数据列表 - *

Copyright: Copyright (c) 2022

- *

Company: 泛微软件

- * - * @author qiantao - * @version 1.0 + * @Author dxfeng + * @Description: TODO + * @Date 2022/5/9 + * @Version V1.0 **/ @Target({ElementType.TYPE}) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/com/engine/organization/annotation/OrganizationTableColumn.java b/src/com/engine/organization/annotation/OrganizationTableColumn.java index ea73ce9d..7467de68 100644 --- a/src/com/engine/organization/annotation/OrganizationTableColumn.java +++ b/src/com/engine/organization/annotation/OrganizationTableColumn.java @@ -3,12 +3,10 @@ package com.engine.organization.annotation; import java.lang.annotation.*; /** - * 数据列表表头 - *

Copyright: Copyright (c) 2022

- *

Company: 泛微软件

- * - * @author qiantao - * @version 1.0 + * @Author dxfeng + * @Description: TODO + * @Date 2022/5/9 + * @Version V1.0 **/ @Target({ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/com/engine/organization/annotation/OrganizationTableOperate.java b/src/com/engine/organization/annotation/OrganizationTableOperate.java index 38a2ea36..3df682bd 100644 --- a/src/com/engine/organization/annotation/OrganizationTableOperate.java +++ b/src/com/engine/organization/annotation/OrganizationTableOperate.java @@ -3,12 +3,10 @@ package com.engine.organization.annotation; import java.lang.annotation.*; /** - * 列表操作按钮 - *

Copyright: Copyright (c) 2022

- *

Company: 泛微软件

- * - * @author qiantao - * @version 1.0 + * @Author dxfeng + * @Description: TODO + * @Date 2022/5/9 + * @Version V1.0 **/ @Target({ElementType.ANNOTATION_TYPE}) @Retention(RetentionPolicy.RUNTIME) diff --git a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java index 7792bdc8..22d40a32 100644 --- a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java +++ b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java @@ -83,7 +83,7 @@ public class SchemeDTO { .schemeNo(param.getSchemeNo() == null ? null : param.getSchemeNo()) .schemeName(param.getSchemeName() == null ? null : param.getSchemeName()) .schemeDescription(param.getSchemeDescription() == null ? null : param.getSchemeDescription()) - .forbiddenTag(param.getForbiddenTag() == null ? 0 : param.getForbiddenTag() ? 1 : 0) + .forbiddenTag(param.getForbiddenTag() == null ? null : param.getForbiddenTag() ? 1 : 0) .deleteType(0) .createTime(new Date()) .updateTime(new Date()) diff --git a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java index b5efb4b0..9dd69157 100644 --- a/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java +++ b/src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java @@ -39,6 +39,9 @@ public class SchemeTableVO { private Long id; + /** + * 方案编号 + */ @OrganizationTableColumn(text = "编号", width = "25%", column = "scheme_no") private String schemeNo; /** @@ -47,11 +50,15 @@ public class SchemeTableVO { @OrganizationTableColumn(text = "方案名称", width = "25%", column = "scheme_name") private String schemeName; - //薪资档案引用 + /** + * 方案描述 + */ @OrganizationTableColumn(text = "方案说明", width = "25%", column = "scheme_description") private String schemeDescription; - //默认使用 + /** + * 禁用标识 + */ @OrganizationTableColumn(text = "禁用标记", width = "25%", column = "forbidden_tag") private Integer forbiddenTag; } diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml index 4382a663..a524250b 100644 --- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml +++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml @@ -27,8 +27,9 @@ , t.create_time , t.update_time - - select from jcl_org_scheme t @@ -67,9 +68,7 @@ scheme_description, - - forbidden_tag, - + forbidden_tag, @@ -96,27 +95,25 @@ #{schemeDescription}, - - #{forbiddenTag}, - + 0, - + update jcl_org_scheme creator=#{creator}, - delete_type=#{deleteType}, - create_time=#{createTime}, update_time=#{updateTime}, scheme_no=#{schemeNo}, scheme_name=#{schemeName}, scheme_description=#{schemeDescription}, - forbidden_tag=#{forbiddenTag}, + + forbidden_tag=#{forbiddenTag}, + WHERE id = #{id} AND delete_type = 0 - + update jcl_org_scheme diff --git a/src/com/engine/organization/service/SchemeService.java b/src/com/engine/organization/service/SchemeService.java index 3462ce29..c3c28023 100644 --- a/src/com/engine/organization/service/SchemeService.java +++ b/src/com/engine/organization/service/SchemeService.java @@ -61,7 +61,7 @@ public interface SchemeService { /** - * 获取搜索条件 + * 获取新增表单 * * @param params * @return diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index 33cdaf15..afed7834 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -5,6 +5,7 @@ import com.api.browser.bean.SearchConditionItem; import com.cloudstore.eccom.result.WeaResultMsg; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.TopMenuBtn; import com.engine.organization.entity.scheme.dto.SchemeDTO; import com.engine.organization.entity.scheme.param.SchemeSearchParam; import com.engine.organization.entity.scheme.po.SchemePO; @@ -106,10 +107,10 @@ public class SchemeServiceImpl extends Service implements SchemeService { Map apiDatas = new HashMap<>(); List selectItems = new ArrayList<>(); List addGroups = new ArrayList<>(); - SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "方案名称", "schemeName"); - schemeNameCondition.setRules("required"); - SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 16, 3, 50, "方案编号", "schemeNo"); - schemeNoCondition.setRules("required"); + SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案名称", "schemeName"); + schemeNameCondition.setRules("required|string"); + SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案编号", "schemeNo"); + schemeNoCondition.setRules("required|string"); SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "方案说明", "schemeDescription"); // 编辑状态下赋值操作 @@ -133,9 +134,14 @@ public class SchemeServiceImpl extends Service implements SchemeService { @Override public Map getTableBtn() { - Map apiDatas = new HashMap<>(); - - return apiDatas; + Map btnDatas = new HashMap<>(); + ArrayList btnList = new ArrayList<>(); + // 新建 + btnList.add(TopMenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建").type( "BTN_Addnew").build()); + // 批量删除 + btnList.add(TopMenuBtn.builder().isBatch("1").isTop("1").menuFun("batchDelete").menuIcon("icon-coms-Batch-delete").menuName("批量删除").type( "BTN_BatchDelete").build()); + btnDatas.put("topMenu",btnList); + return btnDatas; } /** diff --git a/src/com/engine/organization/web/SchemeController.java b/src/com/engine/organization/web/SchemeController.java index efc5e4c2..e461a51a 100644 --- a/src/com/engine/organization/web/SchemeController.java +++ b/src/com/engine/organization/web/SchemeController.java @@ -43,8 +43,7 @@ public class SchemeController { @GET @Path("/getTable") @Produces(MediaType.APPLICATION_JSON) - public ReturnResult listScheme(@Context HttpServletRequest request, @Context HttpServletResponse response - ) { + public ReturnResult listScheme(@Context HttpServletRequest request, @Context HttpServletResponse response) { try { User user = HrmUserVarify.getUser(request, response); Map map = ParamUtil.request2Map(request); @@ -166,5 +165,17 @@ public class SchemeController { } } + @GET + @Path("/getTableBtn") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult getTableBtn(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + return ReturnResult.successed(getSchemeWrapper(user).getTableBtn()); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } + } diff --git a/src/com/engine/organization/wrapper/SchemeWrapper.java b/src/com/engine/organization/wrapper/SchemeWrapper.java index d75b2741..1e3c0388 100644 --- a/src/com/engine/organization/wrapper/SchemeWrapper.java +++ b/src/com/engine/organization/wrapper/SchemeWrapper.java @@ -72,11 +72,30 @@ public class SchemeWrapper extends Service { } + /** + * 获取搜索条件 + * @param params + * @return + */ public Map getSearchCondition(Map params) { return getSchemeService(user).getSearchCondition(params); } + + /** + * 获取新增表单 + * @param params + * @return + */ public Map getSchemeForm(Map params) { return getSchemeService(user).getSchemeForm(params); } + + /** + * 获取列表页面按钮信息 + * @return + */ + public Map getTableBtn() { + return getSchemeService(user).getTableBtn(); + } }