From 2744f85effbb276b7c93e3e14f9bb75fedba58f8 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Mon, 29 Aug 2022 11:07:10 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/entity/employee/vo/EmployeeTableVO.java | 2 +- .../entity/extend/param/ExtendInfoFieldParam.java | 5 +++++ .../organization/mapper/extend/ExtendInfoMapper.xml | 1 + .../service/impl/FieldDefinedServiceImpl.java | 2 +- .../engine/organization/transmethod/JobTransMethod.java | 8 ++++++++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java index ed1c9e78..1743372a 100644 --- a/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java +++ b/src/com/engine/organization/entity/employee/vo/EmployeeTableVO.java @@ -36,7 +36,7 @@ public class EmployeeTableVO { @OrganizationTableColumn(text = "姓名", width = "50%", column = "lastname") private String lastname; - @OrganizationTableColumn(text = "性别", width = "50%", column = "sex") + @OrganizationTableColumn(text = "性别", width = "50%", column = "sex",transmethod = "com.engine.organization.transmethod.JobTransMethod.getSexName") private String sex; diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java index e8ea88b0..f55992af 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java @@ -94,6 +94,11 @@ public class ExtendInfoFieldParam { String dbLength = "100"; if (fieldType.size() > 2) { dbLength = fieldType.get(2).toString(); + if (Integer.parseInt(dbLength) == 0) { + dbLength = "50"; + fieldType.set(2,"50"); + } + } fp.setSimpleText(Util.getIntValue(browserType, -1), dbLength); } else if (controlType.equals("2")) { diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml index 9229ba2c..1eee5d53 100644 --- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml @@ -353,6 +353,7 @@ isrequired=#{isrequired}, edit_show=#{editShow}, show_order=#{showOrder}, + custom_value=#{customValue}, WHERE id = #{id} AND delete_type = 0 diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index d44ccf90..f93333be 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -116,9 +116,9 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ Long maxId = getExtendInfoMapper().getMaxId(); extendInfo.setFieldName("field" + (maxId + 1)); extendInfo.setIsSystemDefault(1); - updateCount += getExtendInfoMapper().insertExtendInfo(extendInfo); // 新增表结构 getExtendInfoMapper().addTableColumn(extendInfo.getTableName(), extendInfo.getFieldName(), extendInfo.getFieldType()); + updateCount += getExtendInfoMapper().insertExtendInfo(extendInfo); // 明细表且为浏览按钮字段，添加span字段 if (null != extendGroup.getPid() && 3 == extendInfo.getControlType()) { String dbType = infoFieldParam.getDbType("2", ""); diff --git a/src/com/engine/organization/transmethod/JobTransMethod.java b/src/com/engine/organization/transmethod/JobTransMethod.java index 645d4e3d..20850a8b 100644 --- a/src/com/engine/organization/transmethod/JobTransMethod.java +++ b/src/com/engine/organization/transmethod/JobTransMethod.java @@ -57,4 +57,12 @@ public class JobTransMethod { } } + public static String getSexName(String sexValue) { + String sexName = "男"; + if ("1".equals(sexValue)) { + sexName = "女"; + } + return sexName; + } + }