diff --git a/src/com/engine/organization/entity/TopMenuBtn.java b/src/com/engine/organization/entity/TopMenuBtn.java new file mode 100644 index 00000000..e429b78a --- /dev/null +++ b/src/com/engine/organization/entity/TopMenuBtn.java @@ -0,0 +1,26 @@ +package com.engine.organization.entity; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/09 + * @version: 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class TopMenuBtn { + private String isBatch; + private String isTop; + private String menuFun; + private String menuIcon; + private String menuName; + private String type; +} diff --git a/src/com/engine/organization/entity/scheme/po/LevelPO.java b/src/com/engine/organization/entity/scheme/po/LevelPO.java new file mode 100644 index 00000000..b9f18b06 --- /dev/null +++ b/src/com/engine/organization/entity/scheme/po/LevelPO.java @@ -0,0 +1,63 @@ +package com.engine.organization.entity.scheme.po; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/09 + * @version: 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class LevelPO { + /** + *自增主键 + */ + private long id; + /** + *编号 + */ + private String levelNo; + /** + *方案名称 + */ + private String levelName; + /** + *方案说明 + */ + private String description; + + /** + * 等级方案标识 + */ + private Long levelScheme; + /** + *禁用标记 + */ + private int forbiddenTag; + /** + * + */ + private Long creator; + /** + * + */ + private int deleteType; + /** + * + */ + private Date createTime; + /** + * + */ + private Date updateTime; +} diff --git a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java new file mode 100644 index 00000000..a74e51ea --- /dev/null +++ b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java @@ -0,0 +1,69 @@ +package com.engine.organization.entity.scheme.vo; + +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; + + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@OrganizationTable(pageId = "98e9c62f-cd12-11ec-a15f-00ffcbed7508", + fields = "t.id," + + "t.level_no," + + "t.level_name," + + "t.description," + + "t.level_scheme," + + "t.forbidden_tag," + + "t.creator," + + "t.delete_type," + + "t.create_time," + + "t.update_time", + fromSql = "FROM jcl_org_level t ", + orderby = "id desc", + primarykey = "id", + operates = { + @OrganizationTableOperate(index = "0", text = "编辑"), + @OrganizationTableOperate(index = "1", text = "删除") + } +) +public class LevelTableVO { + /** + * 主键 + */ + @OrganizationTableColumn(column = "id", display = false) + private Long id; + + /** + * 编号 + */ + @OrganizationTableColumn(text = "编号", width = "20%", column = "scheme_no") + private String levelNo; + /** + * 名称 + */ + @OrganizationTableColumn(text = "名称", width = "20%", column = "scheme_name") + private String levelName; + + /** + * 描述说明 + */ + @OrganizationTableColumn(text = "描述说明", width = "20%", column = "scheme_description") + private String description; + /** + * 等级方案 + */ + @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_description") + private String levelScheme; + + /** + * 禁用标记 + */ + @OrganizationTableColumn(text = "禁用标记", width = "20%", column = "forbidden_tag") + private Integer forbiddenTag; +} diff --git a/src/com/engine/organization/service/LevelService.java b/src/com/engine/organization/service/LevelService.java new file mode 100644 index 00000000..122abac2 --- /dev/null +++ b/src/com/engine/organization/service/LevelService.java @@ -0,0 +1,19 @@ +package com.engine.organization.service; + +import java.util.Map; + +/** + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/10 + * @version: 1.0 + */ +public interface LevelService { + /** + * 等级方案列表 + * + * @param params + * @return + */ + Map listPage(Map params); +} diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java new file mode 100644 index 00000000..199f7bd6 --- /dev/null +++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java @@ -0,0 +1,56 @@ +package com.engine.organization.service.impl; + +import com.cloudstore.eccom.result.WeaResultMsg; +import com.engine.core.impl.Service; +import com.engine.organization.component.OrganizationWeaTable; +import com.engine.organization.entity.scheme.vo.LevelTableVO; +import com.engine.organization.entity.scheme.vo.SchemeTableVO; +import com.engine.organization.service.LevelService; +import com.engine.organization.util.db.DBType; +import com.weaverboot.frame.ioc.anno.classAnno.WeaIocService; +import org.apache.commons.lang3.StringUtils; +import weaver.conn.RecordSet; + +import java.util.Map; + + +/** + * + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/10 + * @version: 1.0 + */ +@WeaIocService +public class LevelServiceImpl extends Service implements LevelService { + @Override + public Map listPage(Map params) { + OrganizationWeaTable table = new OrganizationWeaTable<>(user, LevelTableVO.class); + String sqlWhere = buildSqlWhere(params); + table.setSqlwhere(sqlWhere); + WeaResultMsg result = new WeaResultMsg(false); + result.putAll(table.makeDataResult()); + result.success(); + return result.getResultMap(); + } + + /** + * 查询条件 + * + * @param params + * @return + */ + private String buildSqlWhere(Map params) { + DBType dbType = DBType.get(new RecordSet().getDBType()); + String sqlWhere = " where delete_type ='0' "; + String name = (String) params.get("name"); + if (StringUtils.isNotBlank(name)) { + sqlWhere += " AND scheme_name " + dbType.like(name); + } + String no = (String) params.get("no"); + if (StringUtils.isNotBlank(no)) { + sqlWhere += " AND scheme_no " + dbType.like(no); + } + return sqlWhere; + } +} diff --git a/src/com/engine/organization/service/impl/SchemeServiceImpl.java b/src/com/engine/organization/service/impl/SchemeServiceImpl.java index afed7834..8605fc18 100644 --- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java +++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java @@ -62,8 +62,6 @@ public class SchemeServiceImpl extends Service implements SchemeService { public Map updateScheme(SchemeSearchParam param) { Map apidatas = new HashMap(); SchemeMapper mapper = MapperProxyFactory.getProxy(SchemeMapper.class); - List list = mapper.listByNo(Util.null2String(param.getSchemeNo())); - OrganizationAssert.isEmpty(list, "当前编号已存在"); SchemePO schemePO = SchemeDTO.convertParamToPO(param, (long) user.getUID()); mapper.updateScheme(schemePO); return apidatas; @@ -109,7 +107,7 @@ public class SchemeServiceImpl extends Service implements SchemeService { List addGroups = new ArrayList<>(); SearchConditionItem schemeNameCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案名称", "schemeName"); schemeNameCondition.setRules("required|string"); - SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 3, 50, "方案编号", "schemeNo"); + SearchConditionItem schemeNoCondition = OrganizationFormItemUtil.inputItem(user, 2, 17, 1, 50, "方案编号", "schemeNo"); schemeNoCondition.setRules("required|string"); SearchConditionItem textareaItem = OrganizationFormItemUtil.textareaItem(user, 2, 16, true, 2, 60, "方案说明", "schemeDescription"); diff --git a/src/com/engine/organization/web/LevelController.java b/src/com/engine/organization/web/LevelController.java new file mode 100644 index 00000000..951fef19 --- /dev/null +++ b/src/com/engine/organization/web/LevelController.java @@ -0,0 +1,50 @@ +package com.engine.organization.web; + +import com.engine.common.util.ParamUtil; +import com.engine.common.util.ServiceUtil; +import com.engine.organization.util.response.ReturnResult; +import com.engine.organization.wrapper.LevelWrapper; +import weaver.hrm.HrmUserVarify; +import weaver.hrm.User; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.MediaType; +import java.util.Map; + +/** + * + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/10 + * @version: 1.0 + */ +public class LevelController { + public LevelWrapper getLevelWrapper(User user) { + return ServiceUtil.getService(LevelWrapper.class, user); + } + + /** + * 获取list列表 + * + * @param request + * @param response + * @return + */ + @GET + @Path("/getLevelTable") + @Produces(MediaType.APPLICATION_JSON) + public ReturnResult listScheme(@Context HttpServletRequest request, @Context HttpServletResponse response) { + try { + User user = HrmUserVarify.getUser(request, response); + Map map = ParamUtil.request2Map(request); + return ReturnResult.successed(getLevelWrapper(user).listPage(map)); + } catch (Exception e) { + return ReturnResult.exceptionHandle(e.getMessage()); + } + } +} diff --git a/src/com/engine/organization/wrapper/LevelWrapper.java b/src/com/engine/organization/wrapper/LevelWrapper.java new file mode 100644 index 00000000..528cadae --- /dev/null +++ b/src/com/engine/organization/wrapper/LevelWrapper.java @@ -0,0 +1,32 @@ +package com.engine.organization.wrapper; + +import com.engine.common.util.ServiceUtil; +import com.engine.core.impl.Service; +import com.engine.organization.service.LevelService; +import com.engine.organization.service.impl.LevelServiceImpl; +import weaver.hrm.User; + +import java.util.Map; + +/** + * + * @description: TODO + * @author:dxfeng + * @createTime: 2022/05/10 + * @version: 1.0 + */ +public class LevelWrapper extends Service { + private LevelService getLevelService(User user) { + return ServiceUtil.getService(LevelServiceImpl.class, user); + } + + /** + * 等级方案列表 + * + * @param params + * @return + */ + public Map listPage(Map params) { + return getLevelService(user).listPage(params); + } +}