src/main/java/com/product/mobile/core/entity/FaceFieldEntity.java

@@ -92,7 +92,21 @@
    private String type;
    
    private String length;
	
    /**
     * 隐藏 1=是，0=否
     */
    private String hidden;
	

    public String getHidden() {
        return hidden;
    }


    public void setHidden(String hidden) {
        this.hidden = hidden;
    }
    private Map<String, Object> otherParams = new HashMap<>();
    
    public String getType() {

 src/main/java/com/product/mobile/core/service/FaceMobileService.java

@@ -11,6 +11,7 @@
import com.google.common.collect.Sets;
import com.product.common.lang.StringUtils;
import com.product.core.cache.DataPoolCacheImpl;
import com.product.core.dao.BaseDao;
import com.product.core.entity.DataTableEntity;
import com.product.core.entity.FieldSetEntity;
import com.product.core.exception.BaseException;
@@ -21,6 +22,8 @@
import com.product.tool.flow.config.CmnConst;
import com.product.tool.flow.service.FlowDetailService;
import com.product.util.BaseUtil;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -38,127 +41,171 @@

    @Resource
    FlowDetailService flowDetailService;

	
    @Autowired
    public BaseDao baseDao;
	
    ///获取表单总入口
    /**
     * 
     * @param fse传入表名，或 表UUID
     * @return
     */
    public List<FaceFieldEntity> getFaceConfig(FieldSetEntity fse) {

        String tableUuid = fse.getString("table_uuid");
        if (tableUuid == null && StringUtils.isNotEmpty(fse.getString("uuid"))
	
        String tableUuid=fse.getString("table_uuid");
        if (tableUuid==null && StringUtils.isNotEmpty(fse.getString("uuid"))
                && StringUtils.isEmpty(fse.getString("table_name"))) {
            //通过业务表信息查表单信息
            FieldSetEntity detailFse = getBaseDao().getFieldSetEntity(CmnConst.TABLE_FLOW_DETAIL, fse.getString(CmnConst.FIELD_UUID), false);
            if (detailFse != null) {
            if(detailFse!=null) {
                //获取表名
                fse.setValue("table_name", detailFse.getString("table_name"));
            }

			
        }
        //通过审批任务的uuid来查表单信息
        if (tableUuid == null && StringUtils.isNotEmpty(fse.getString("table_name"))) {
        if (tableUuid==null && StringUtils.isNotEmpty(fse.getString("table_name"))) {
            FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("所有表信息", new String[]{fse.getString("table_name")});
            if (!FieldSetEntity.isEmpty(tableInfo)) {
                tableUuid = tableInfo.getString("uuid");
                fse.setValue("table_uuid", tableUuid);
            }
        }

        if (tableUuid != null) {

		
        if(tableUuid!=null && fse.getString("table_name")==null) {
			
            FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("所有表信息(uuid)", new String[]{tableUuid});
            if (!FieldSetEntity.isEmpty(tableInfo)) {
                //获取表名
                fse.setValue("table_name", tableInfo.getString("table_name"));
            }
        }

        List<FaceFieldEntity> ls = getFaceFieldByTable(fse);

        addproperty(tableUuid, fse.getString("table_name"), ls);
		
        List<FaceFieldEntity> ls=getFaceFieldByTable(fse);
        if(ls==null)ls=new ArrayList<FaceFieldEntity>();
        addproperty(tableUuid,fse.getString("table_name"),ls);
        //所有表单uuid自动添加，并为hidden
        return ls;

		
    }
    //递归把主表和子表的字段属性添加进去，如果没有配表单，则取表数据结构进行展示

    /**
     * 
     * @param ls查出来的表单信息
     * @param tables     记录的所有表，对应的表单信息
     * @param tables 记录的所有表，对应的表单信息
     */
    private void addproperty(String table_uuid, String table_name, List<FaceFieldEntity> ls) {
        if (ls == null) {
            ls = new ArrayList<FaceFieldEntity>();
        }
        if (ls.size() > 0) {
            for (int i = 0; i < ls.size(); i++) {
                String subTableName = ls.get(i).getSubTableName();///可能是子表
                if (StringUtils.isEmpty(subTableName)) {///主表字段
    private void  addproperty(String table_uuid,String table_name,List<FaceFieldEntity> ls) {
        if(ls.size()>0) {
            for(int i=0;i<ls.size();i++) {
                String subTableName=ls.get(i).getSubTableName();///可能是子表
                if(StringUtils.isEmpty(subTableName)) {///主表字段
                    DataTableEntity dt = DataPoolCacheImpl.getInstance().getCacheData("表字段信息"
                            , new String[]{table_uuid, ls.get(i).getField()});

                    if (!DataTableEntity.isEmpty(dt)) {
                            ,new String[] {table_uuid,ls.get(i).getField()});
					
                    if(!DataTableEntity.isEmpty(dt)) {
//                        if(StringUtils.isEmpty(ls.get(i).getType())) {
//                            ls.get(i).setType(dt.getFieldSetEntity(0).getString("field_type"));
//                        }
                        if (StringUtils.isEmpty(ls.get(i).getPrompt()) &&
                        if(StringUtils.isEmpty(ls.get(i).getPrompt()) && 
                                !StringUtils.isEmpty(dt.getFieldSetEntity(0).getString("field_reference"))) {
                            ls.get(i).setPrompt(dt.getFieldSetEntity(0).getString("field_reference"));
                        }
                        if (StringUtils.isEmpty(ls.get(i).getRequired()) &&
                        if(StringUtils.isEmpty(ls.get(i).getRequired()) && 
                                !StringUtils.isEmpty(dt.getFieldSetEntity(0).getString("is_required"))) {
                            ls.get(i).setRequired(dt.getFieldSetEntity(0).getString("is_required"));
                        }
                        if (StringUtils.isEmpty(ls.get(i).getName()) &&
                        if(StringUtils.isEmpty(ls.get(i).getName()) && 
                                !StringUtils.isEmpty(dt.getFieldSetEntity(0).getString("field_show_name"))) {
                            ls.get(i).setName(dt.getFieldSetEntity(0).getString("field_show_name"));
                        }
                    }
                    ls.get(i).setTable(table_name);
                } else {
                }else {
                    //============把子表字段也处理一下
                    //子表
                    FieldSetEntity tableInfo = BaseUtil.getSingleInfoByCache("所有表信息", new String[]{subTableName});
                    if (!FieldSetEntity.isEmpty(tableInfo)) {
                        addproperty(tableInfo.getString("uuid"), tableInfo.getString("table_name"), ls.get(i).getSubField());
                        addproperty(tableInfo.getString("uuid"),tableInfo.getString("table_name"),ls.get(i).getSubField());
                    }
                }

				
            }
            DataTableEntity dt = DataPoolCacheImpl.getInstance().getCacheData("表字段信息", new String[]{table_uuid, "uuid"});
            if (!DataTableEntity.isEmpty(dt)) {
                FaceFieldEntity uuid = new FaceFieldEntity();
            DataTableEntity dt = DataPoolCacheImpl.getInstance().getCacheData("表字段信息",new String[] {table_uuid,"uuid"});
            if(!DataTableEntity.isEmpty(dt)) {
                FaceFieldEntity uuid=new FaceFieldEntity();
                uuid.setComponentType("uuid");
                uuid.setField("uuid");
                uuid.setName("编  码");
                uuid.setType("String");
                uuid.setTable(table_name);
                uuid.setDisabled("0");
                uuid.setHidden("1"); 
                ls.add(uuid);
            }

        } else {///以表单设计为准，如果没有配置表单，则以数据表为准，全部保留
            DataTableEntity dte = DataPoolCacheImpl.getInstance().getCacheData("所有字段信息并按表分组", new String[]{table_uuid});
            for (int j = 0; j < dte.getRows(); j++) {
                FaceFieldEntity uuid = new FaceFieldEntity();
                FieldSetEntity f = dte.getFieldSetEntity(j);
                if ("pk".equals(f.getString("field_type"))
                        || "updated_by".equals(f.getString("field_name"))
                        || "uuid".equals(f.getString("field_name"))
                        || "updated_utc_datetime".equals(f.getString("field_name"))) {
                    continue;
			
        }else {///以表单设计为准，如果没有配置表单，则以数据表为准，全部保留
            toConvertFace(table_uuid,table_name,ls,null);
            //返回子表
            Object [][]sub=baseDao.getSubTableName(table_name);
            if(sub!=null && sub.length>0&&sub[0].length>0) {
                for(int i=0;i<sub[0].length;i++) {
                    toConvertFace(sub[0][i].toString(),sub[1][i].toString(),new ArrayList<FaceFieldEntity>(),ls);
                }
                uuid.setPrompt(f.getString("field_reference"));
                uuid.setName(f.getString("field_show_name"));
                uuid.setField(f.getString("field_name"));
                uuid.setType(f.getString("field_type"));
                uuid.setTable(table_name);
                ls.add(uuid);
            }
			
        }
    }


    /**
     * 数据库表字段定义转换成表单定义
     * @param table_uuid
     * @param table_name
     * @param ls
     * @param pls 父界面
     */
    private void toConvertFace(String table_uuid,String table_name,List<FaceFieldEntity> ls,List<FaceFieldEntity> pls) {
        if(ls==null) {
            ls=new ArrayList<FaceFieldEntity>();
        }
        DataTableEntity dte = DataPoolCacheImpl.getInstance().getCacheData("所有字段信息并按表分组",new String[] {table_uuid});
        for(int j=0;j<dte.getRows();j++) {
            FaceFieldEntity uuid=new FaceFieldEntity();
            FieldSetEntity f=dte.getFieldSetEntity(j);
            if("pk".equals(f.getString("field_type")) 
                    ||"updated_by".equals(f.getString("field_name"))
                    ||"updated_utc_datetime".equals(f.getString("field_name"))) {
                continue;
            }
            if("uuid".equals(f.getString("field_name"))) {
                uuid.setHidden("1"); 
            }
            if("userids".equals(f.getString("field_type")) ||"orgUuids".equals(f.getString("field_type")) ) {
                uuid.setMultiple("1");
            }else {
                uuid.setMultiple("0");
            }
				
            uuid.setComponentType("");
            uuid.setPrompt(f.getString("field_reference"));
            uuid.setName(f.getString("field_show_name"));
            uuid.setField(f.getString("field_name"));
            uuid.setType(f.getString("field_type"));
            uuid.setTable(table_name);
            ls.add(uuid);
        }
        if(pls!=null) {
            FaceFieldEntity uuid=new FaceFieldEntity();
            uuid.setHidden(""); 
            uuid.setComponentType("subTable");
            uuid.setPrompt("");
            uuid.setName("");
            uuid.setField("");
            uuid.setType("");
            uuid.setSubField(ls);
            uuid.setSubTableName(table_name);
            pls.add(uuid);
        }
    }
	
    public List<FaceFieldEntity> getFaceFieldByTable(FieldSetEntity fse) {
        String tableUuid = fse.getString("table_uuid");
        String tableName = fse.getString("table_name");
@@ -214,7 +261,8 @@

    private List<FaceFieldEntity> getFaceField(FieldSetEntity faceFse) {
        if (FieldSetEntity.isEmpty(faceFse) || DataTableEntity.isEmpty(faceFse.getSubDataTable("product_sys_face_control_property"))) {
            throw new BaseException(MobileCoreCode.GET_FACE_CONFIG_FAIL);
            return null;
//            throw new BaseException(MobileCoreCode.GET_FACE_CONFIG_FAIL);
        }

        DataTableEntity productSysFaceControlProperty = faceFse.getSubDataTable("product_sys_face_control_property");