获取默认单位

generated/com/miniframe/generate/comm/es/D_ES0012_ROWS_RECODE.java

@@ -126,4 +126,17 @@ public class D_ES0012_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public int getDataType() {
 		return this.dataType;
 	}
+	String unitDef;//单位组默认值
+	/**
+	 *单位组默认值
+	 */
+	public void setUnitDef(String unitDef) {
+		this.unitDef=unitDef;
+	}
+	/**
+	 *单位组默认值
+	 */
+	public String getUnitDef() {
+		return this.unitDef;
+	}
 }

generated/validator/resources_d_es0012_rows_recodeForm_validator.properties

@@ -7,4 +7,5 @@ d_es0012_rows_recode.code = \u5C5E\u6027\u7F16\u7801
 d_es0012_rows_recode.valueType = \u503C\u7C7B\u578B
 d_es0012_rows_recode.valueDef = \u9ED8\u8BA4\u503C
 d_es0012_rows_recode.dataType = \u503C\u6570\u636E\u7C7B\u578B
+d_es0012_rows_recode.unitDef = \u5355\u4F4D\u7EC4\u9ED8\u8BA4\u503C
 d_es0012_rows_recodeForm = true

generated/validator/resources_d_es0012_rows_recodeForm_validator_zh_CN.properties

@@ -7,4 +7,5 @@ d_es0012_rows_recode.code = \u5C5E\u6027\u7F16\u7801
 d_es0012_rows_recode.valueType = \u503C\u7C7B\u578B
 d_es0012_rows_recode.valueDef = \u9ED8\u8BA4\u503C
 d_es0012_rows_recode.dataType = \u503C\u6570\u636E\u7C7B\u578B
+d_es0012_rows_recode.unitDef = \u5355\u4F4D\u7EC4\u9ED8\u8BA4\u503C
 d_es0012_rows_recodeForm = true

src/main/java/com/miniframe/bisiness/es/ES0012Service.java

@@ -10,9 +10,10 @@ import com.miniframe.generate.comm.es.D_ES0009_ROWS_RECODE;
 import com.miniframe.generate.comm.es.D_ES0012_ROWS_RECODE;
 import com.miniframe.mappers.es.dao.EsMapper;
 import com.miniframe.mappers.es.model.ProComAttDto;
-import com.miniframe.model.es.EsProCom;
-import com.miniframe.model.es.EsProComSQLBuilder;
+import com.miniframe.model.es.*;
 import com.miniframe.model.es.dao.EsProComMapper;
+import com.miniframe.model.es.dao.EsUnitSysDelMapper;
+import com.miniframe.model.es.dao.EsUnitSysUsMapper;
 
 /**
  * 无锡发动机,“项目模拟数据组件属性查询”逻辑处理（重新生成不覆盖）。
@@ -25,6 +26,18 @@ public class ES0012Service extends ES0012BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目模拟数据组件属性查询”业务核心处理
  	 */
 	public void transExecute() throws Exception {
+		EsUnitSysUsMapper sudao = UtilTools.getBean(EsUnitSysUsMapper.class);
+		EsUnitSysUsSQLBuilder susb = new EsUnitSysUsSQLBuilder();
+		EsUnitSysUsSQLBuilder.Criteria susc = susb.createCriteria();
+		susc.andUidEqualTo(getA_eshead().getUserId());
+		List<EsUnitSysUs> sus = sudao.selectByExample(susb);
+		String sutId = "";
+		if(sus ==null||sus.isEmpty()){//获取系统单位
+			sutId="1";//系统单位
+		}else{
+			sutId=sus.get(0).getSutId();
+		}
+
 		String pid = this.getA_es0012().getPid();
 		EsProComMapper pcdao = UtilTools.getBean(EsProComMapper.class);
 		EsProComSQLBuilder pcsb = new EsProComSQLBuilder();
@@ -48,12 +61,25 @@ public class ES0012Service extends ES0012BaseModel implements ExecProcessFlow {
 				row.setValueType(dto.getValueType());
 				row.setValueDef(dto.getValueDef());
 				row.setDataType(dto.getDataType()==null?-1: dto.getDataType());
+				row.setUnitDef(getUnitByGutIdAndStuId(dto.getUnitType(),sutId));
 				rows.add(row);
 			}
 			this.getD_es0012().setRows(rows);
 		}
 	}
-	
+	private String getUnitByGutIdAndStuId(String gutId,String sutId){
+		String unitValue = "";
+		EsUnitSysDelMapper sddao = UtilTools.getBean(EsUnitSysDelMapper.class);
+		EsUnitSysDelSQLBuilder sdsb = new EsUnitSysDelSQLBuilder();
+		EsUnitSysDelSQLBuilder.Criteria sdcs =sdsb.createCriteria();
+		sdcs.andGutIdEqualTo(gutId);
+		sdcs.andSutIdEqualTo(sutId);
+		List<EsUnitSysDel> dels = sddao.selectByExample(sdsb);
+		if(dels !=null&&!dels.isEmpty()){//获取单位
+			unitValue=dels.get(0).getValue();
+		}
+		return unitValue;
+	}
 	/**
 	 * 无锡发动机,“项目模拟数据组件属性查询”业务前处理
  	 */

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0012_D(项目模拟数据组件属性查询).csv

@@ -8,4 +8,5 @@
 1.6,code,属性编码,string,,,,,,,,,,,
 1.7,valueType,值类型,int,,,,,,,,,,,
 1.8,valueDef,默认值,string,,,,,,,,,,,
-1.9,dataType,值数据类型,int,,,,,,,,,,,
+1.9,dataType,值数据类型,int,,,,,,,,,,,
+1.10,unitDef,单位组默认值,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0017_D(日志获取).csv

@@ -1,2 +1,2 @@
 "序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
-1,logs,日志,String,,,,,,,,,,,1,logs,日志,String,,,,,,,,,,,
+1,logs,日志,String,,,,,,,,,,,