diff --git a/src/com/api/organization/web/SchemeController.java b/src/com/api/organization/web/SchemeController.java
index 95f6c02a..81b153ae 100644
--- a/src/com/api/organization/web/SchemeController.java
+++ b/src/com/api/organization/web/SchemeController.java
@@ -3,11 +3,12 @@ package com.api.organization.web;
import javax.ws.rs.Path;
/**
- * @Author weaver_cl
- * @Description: TODO
- * @Date 2022/4/26
- * @Version V1.0
- **/
+ *
+ * @description: TODO
+ * @author:dxfeng
+ * @createTime: 2022/05/10
+ * @version: 1.0
+ */
@Path("/bs/hrmorganization/scheme")
public class SchemeController extends com.engine.organization.web.SchemeController {
diff --git a/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java b/src/com/engine/organization/entity/scheme/dto/SchemeDTO.java
index 7792bdc8..926df6ce 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 ? 0 : param.getForbiddenTag() ? 0 : 1)
.deleteType(0)
.createTime(new Date())
.updateTime(new Date())
diff --git a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
index a74e51ea..32edbac8 100644
--- a/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
+++ b/src/com/engine/organization/entity/scheme/vo/LevelTableVO.java
@@ -13,18 +13,19 @@ import lombok.NoArgsConstructor;
@Builder
@NoArgsConstructor
@AllArgsConstructor
-@OrganizationTable(pageId = "98e9c62f-cd12-11ec-a15f-00ffcbed7508",
+@OrganizationTable(pageId = "3a0b752e-d028-11ec-91fc-00ffcbed7508",
fields = "t.id," +
"t.level_no," +
"t.level_name," +
"t.description," +
+ "s.scheme_name," +
"t.level_scheme," +
"t.forbidden_tag," +
"t.creator," +
"t.delete_type," +
"t.create_time," +
"t.update_time",
- fromSql = "FROM jcl_org_level t ",
+ fromSql = "FROM jcl_org_level t inner join jcl_org_scheme s on t.level_scheme = s.id ",
orderby = "id desc",
primarykey = "id",
operates = {
@@ -42,25 +43,31 @@ public class LevelTableVO {
/**
* 编号
*/
- @OrganizationTableColumn(text = "编号", width = "20%", column = "scheme_no")
+ @OrganizationTableColumn(text = "编号", width = "20%", column = "level_no")
private String levelNo;
/**
* 名称
*/
- @OrganizationTableColumn(text = "名称", width = "20%", column = "scheme_name")
+ @OrganizationTableColumn(text = "名称", width = "20%", column = "level_name")
private String levelName;
/**
* 描述说明
*/
- @OrganizationTableColumn(text = "描述说明", width = "20%", column = "scheme_description")
+ @OrganizationTableColumn(text = "描述说明", width = "20%", column = "description")
private String description;
/**
* 等级方案
*/
- @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_description")
+ // @OrganizationTableColumn(text = "等级方案", width = "20%", column = "level_scheme")
private String levelScheme;
+ /**
+ * 等级方案
+ */
+ @OrganizationTableColumn(text = "等级方案", width = "20%", column = "scheme_name")
+ private String schemeName;
+
/**
* 禁用标记
*/
diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
index 4b8c2246..72ee5dfa 100644
--- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
@@ -68,9 +68,6 @@
update_time,
-
- id,
-
scheme_no,
@@ -95,9 +92,6 @@
#{updateTime},
-
- #{id},
-
#{schemeNo},
diff --git a/src/com/engine/organization/service/impl/LevelServiceImpl.java b/src/com/engine/organization/service/impl/LevelServiceImpl.java
index 199f7bd6..fac1fe7e 100644
--- a/src/com/engine/organization/service/impl/LevelServiceImpl.java
+++ b/src/com/engine/organization/service/impl/LevelServiceImpl.java
@@ -42,14 +42,14 @@ public class LevelServiceImpl extends Service implements LevelService {
*/
private String buildSqlWhere(Map params) {
DBType dbType = DBType.get(new RecordSet().getDBType());
- String sqlWhere = " where delete_type ='0' ";
- String name = (String) params.get("name");
+ String sqlWhere = " where t.delete_type ='0' ";
+ String name = (String) params.get("levelName");
if (StringUtils.isNotBlank(name)) {
- sqlWhere += " AND scheme_name " + dbType.like(name);
+ sqlWhere += " AND t.level_name " + dbType.like(name);
}
- String no = (String) params.get("no");
+ String no = (String) params.get("levelNo");
if (StringUtils.isNotBlank(no)) {
- sqlWhere += " AND scheme_no " + dbType.like(no);
+ sqlWhere += " AND t.level_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 432c9544..66bbadce 100644
--- a/src/com/engine/organization/service/impl/SchemeServiceImpl.java
+++ b/src/com/engine/organization/service/impl/SchemeServiceImpl.java
@@ -70,7 +70,7 @@ public class SchemeServiceImpl extends Service implements SchemeService {
@Override
public void updateForbiddenTagById(SchemeSearchParam params) {
SchemeMapper mapper = MapperProxyFactory.getProxy(SchemeMapper.class);
- SchemePO schemePO = SchemePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 1 : 0).build();
+ SchemePO schemePO = SchemePO.builder().id(params.getId()).forbiddenTag(params.getForbiddenTag() ? 0 : 1).build();
mapper.updateForbiddenTagById(schemePO);
}