liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

登记方案 职等职级接口

This commit is contained in:
dxfeng 2022-05-10 10:54:41 +08:00
parent c32eeed79c
commit 4f51589a84
11 changed files with 80 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/organization/annotation/Log.java
View File

@ -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

10
src/com/engine/organization/annotation/OrganizationTable.java
View File

@ -6,12 +6,10 @@ import com.cloudstore.eccom.pc.table.WeaTableType;
import java.lang.annotation.*;
/**
* 数据列表
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
* @Author dxfeng
* @Description: TODO
* @Date 2022/5/9
* @Version V1.0
**/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)

10
src/com/engine/organization/annotation/OrganizationTableColumn.java
View File

@ -3,12 +3,10 @@ package com.engine.organization.annotation;
import java.lang.annotation.*;
/**
* 数据列表表头
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
* @Author dxfeng
* @Description: TODO
* @Date 2022/5/9
* @Version V1.0
**/
@Target({ElementType.FIELD})
@Retention(RetentionPolicy.RUNTIME)

10
src/com/engine/organization/annotation/OrganizationTableOperate.java
View File

@ -3,12 +3,10 @@ package com.engine.organization.annotation;
import java.lang.annotation.*;
/**
* 列表操作按钮
* <p>Copyright: Copyright (c) 2022</p>
* <p>Company: 泛微软件</p>
*
* @author qiantao
* @version 1.0
* @Author dxfeng
* @Description: TODO
* @Date 2022/5/9
* @Version V1.0
**/
@Target({ElementType.ANNOTATION_TYPE})
@Retention(RetentionPolicy.RUNTIME)

2
src/com/engine/organization/entity/scheme/dto/SchemeDTO.java
View File

@ -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())

11
src/com/engine/organization/entity/scheme/vo/SchemeTableVO.java
View File

@ -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;
}

23
src/com/engine/organization/mapper/scheme/SchemeMapper.xml
View File

@ -27,8 +27,9 @@
, t.create_time
, t.update_time
</sql>
<select id="listSchemesByIds" parameterType="com.engine.organization.entity.scheme.po.SchemePO" resultMap="BaseResultMap">
<select id="listSchemesByIds" parameterType="com.engine.organization.entity.scheme.po.SchemePO"
resultMap="BaseResultMap">
select
<include refid="baseColumns"/>
from jcl_org_scheme t
@ -67,9 +68,7 @@
<if test="schemeDescription != null ">
scheme_description,
</if>
<if test="forbiddenTag != null ">
forbidden_tag,
</if>
forbidden_tag,
</trim>
<trim prefix="VALUES (" suffix=")" suffixOverrides=",">
<if test="creator != null">
@ -96,27 +95,25 @@
<if test="schemeDescription != null ">
#{schemeDescription},
</if>
<if test="forbiddenTag != null ">
#{forbiddenTag},
</if>
0,
</trim>
</insert>
<update id="updateScheme" parameterType="com.engine.organization.entity.scheme.po.SchemePO">
update jcl_org_scheme
<set>
creator=#{creator},
delete_type=#{deleteType},
create_time=#{createTime},
update_time=#{updateTime},
scheme_no=#{schemeNo},
scheme_name=#{schemeName},
scheme_description=#{schemeDescription},
forbidden_tag=#{forbiddenTag},
<if test="forbiddenTag != null ">
forbidden_tag=#{forbiddenTag},
</if>
</set>
WHERE id = #{id} AND delete_type = 0
</update>
<update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.scheme.po.SchemePO">
update jcl_org_scheme
<set>

2
src/com/engine/organization/service/SchemeService.java
View File

@ -61,7 +61,7 @@ public interface SchemeService {
/**
* 获取搜索条件
* 获取新增表单
*
* @param params
* @return

20
src/com/engine/organization/service/impl/SchemeServiceImpl.java
View File

@ -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<String, Object> apiDatas = new HashMap<>();
List<SearchConditionItem> selectItems = new ArrayList<>();
List<SearchConditionGroup> 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<String, Object> getTableBtn() {
Map<String, Object> apiDatas = new HashMap<>();
return apiDatas;
Map<String, Object> btnDatas = new HashMap<>();
ArrayList<TopMenuBtn> 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;
}
/**

15
src/com/engine/organization/web/SchemeController.java
View File

@ -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<String, Object> 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());
}
}
}

19
src/com/engine/organization/wrapper/SchemeWrapper.java
View File

@ -72,11 +72,30 @@ public class SchemeWrapper extends Service {
}
/**
* 获取搜索条件
* @param params
* @return
*/
public Map<String, Object> getSearchCondition(Map<String, Object> params) {
return getSchemeService(user).getSearchCondition(params);
}
/**
* 获取新增表单
* @param params
* @return
*/
public Map<String, Object> getSchemeForm(Map<String, Object> params) {
return getSchemeService(user).getSchemeForm(params);
}
/**
* 获取列表页面按钮信息
* @return
*/
public Map<String, Object> getTableBtn() {
return getSchemeService(user).getTableBtn();
}
}