!213 BUG修复

Merge pull request !213 from dxfeng/feature/dxf

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;
 
 

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")) {

src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml

@@ -353,6 +353,7 @@
             isrequired=#{isrequired},
             edit_show=#{editShow},
             show_order=#{showOrder},
+            custom_value=#{customValue},
         </set>
         WHERE id = #{id} AND delete_type = 0
     </update>

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", "");

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