获取默认单位

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

@@ -126,4 +126,17 @@ public class D_ES0009_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/com/miniframe/generate/comm/es/D_ES0010_HEADERS_RECODE.java

@@ -113,4 +113,17 @@ public class D_ES0010_HEADERS_RECODE extends BaseMapModel implements Serializabl
 	public String getUnitType() {
 		return this.unitType;
 	}
+	String unitDef;//单位组默认值
+	/**
+	 *单位组默认值
+	 */
+	public void setUnitDef(String unitDef) {
+		this.unitDef=unitDef;
+	}
+	/**
+	 *单位组默认值
+	 */
+	public String getUnitDef() {
+		return this.unitDef;
+	}
 }

generated/validator/resources_d_es0009_rows_recodeForm_validator.properties

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

generated/validator/resources_d_es0009_rows_recodeForm_validator_zh_CN.properties

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

generated/validator/resources_d_es0010_headers_recodeForm_validator.properties

@@ -6,4 +6,5 @@ d_es0010_headers_recode.dataType = \u503C\u6570\u636E\u7C7B\u578B
 d_es0010_headers_recode.valueType = \u503C\u7C7B\u578B
 d_es0010_headers_recode.valueDef = \u9ED8\u8BA4\u503C
 d_es0010_headers_recode.unitType = \u5355\u4F4D\u7C7B\u578B
+d_es0010_headers_recode.unitDef = \u5355\u4F4D\u7EC4\u9ED8\u8BA4\u503C
 d_es0010_headers_recodeForm = true

generated/validator/resources_d_es0010_headers_recodeForm_validator_zh_CN.properties

@@ -6,4 +6,5 @@ d_es0010_headers_recode.dataType = \u503C\u6570\u636E\u7C7B\u578B
 d_es0010_headers_recode.valueType = \u503C\u7C7B\u578B
 d_es0010_headers_recode.valueDef = \u9ED8\u8BA4\u503C
 d_es0010_headers_recode.unitType = \u5355\u4F4D\u7C7B\u578B
+d_es0010_headers_recode.unitDef = \u5355\u4F4D\u7EC4\u9ED8\u8BA4\u503C
 d_es0010_headers_recodeForm = true

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

@@ -10,13 +10,8 @@ import com.miniframe.generate.business.es.model.ES0009BaseModel;
 import com.miniframe.generate.comm.es.D_ES0009_ROWS_RECODE;
 import com.miniframe.mappers.es.dao.EsMapper;
 import com.miniframe.mappers.es.model.ProComAttDto;
-import com.miniframe.model.es.EsCom;
-import com.miniframe.model.es.EsProCom;
-import com.miniframe.model.es.EsProComAtt;
-import com.miniframe.model.es.EsProComAttSQLBuilder;
-import com.miniframe.model.es.dao.EsComMapper;
-import com.miniframe.model.es.dao.EsProComAttMapper;
-import com.miniframe.model.es.dao.EsProComMapper;
+import com.miniframe.model.es.*;
+import com.miniframe.model.es.dao.*;
 
 /**
  * 无锡发动机,“项目组件属性查询”逻辑处理（重新生成不覆盖）。
@@ -29,6 +24,19 @@ public class ES0009Service extends ES0009BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目组件属性查询”业务核心处理
  	 */
 	public void transExecute() throws Exception {
+
+		EsUnitSysUsMapper sudao = UtilTools.getBean(EsUnitSysUsMapper.class);
+		EsUnitSysUsSQLBuilder susb = new EsUnitSysUsSQLBuilder();
+		EsUnitSysUsSQLBuilder.Criteria susc = susb.createCriteria();
+		susc.andUidEqualTo(getD_eshead().getUserId());
+		List<EsUnitSysUs> sus = sudao.selectByExample(susb);
+		String sutId = "";
+		if(sus ==null||sus.isEmpty()){//获取系统单位
+			sutId="1";//系统单位
+		}else{
+			sutId=sus.get(0).getSutId();
+		}
+
 		String pcId = this.getA_es0009().getPcId();
 		EsMapper esdao = UtilTools.getBean(EsMapper.class);
 		List<ProComAttDto> dtos = esdao.selectPrComAttList(pcId);
@@ -43,6 +51,7 @@ public class ES0009Service extends ES0009BaseModel implements ExecProcessFlow {
 			row.setCode(dto.getCode());
 			row.setValueType(dto.getValueType());
 			row.setValueDef(dto.getValueDef());
+			row.setUnitDef(getUnitByGutIdAndStuId(dto.getUnitType(),sutId));
 			row.setDataType(dto.getDataType()==null?-1: dto.getDataType());
 			rows.add(row);
 		}
@@ -58,7 +67,20 @@ public class ES0009Service extends ES0009BaseModel implements ExecProcessFlow {
 
 		this.getD_es0009().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;
+	}
 	/**
 	 * 无锡发动机,“项目组件属性查询”业务前处理
  	 */

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

@@ -25,6 +25,18 @@ public class ES0010Service extends ES0010BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目组件属性值数据查询”业务核心处理
  	 */
 	public void transExecute() throws Exception {
+		EsUnitSysUsMapper sudao = UtilTools.getBean(EsUnitSysUsMapper.class);
+		EsUnitSysUsSQLBuilder susb = new EsUnitSysUsSQLBuilder();
+		EsUnitSysUsSQLBuilder.Criteria susc = susb.createCriteria();
+		susc.andUidEqualTo(getD_eshead().getUserId());
+		List<EsUnitSysUs> sus = sudao.selectByExample(susb);
+		String sutId = "";
+		if(sus ==null||sus.isEmpty()){//获取系统单位
+			sutId="1";//系统单位
+		}else{
+			sutId=sus.get(0).getSutId();
+		}
+
 		String pcaId = this.getA_es0010().getPcaId();
 		EsProComAttMapper pcadao =UtilTools.getBean(EsProComAttMapper.class);
 		EsProComAtt pca = pcadao.selectByPrimaryKey(pcaId);
@@ -61,6 +73,7 @@ public class ES0010Service extends ES0010BaseModel implements ExecProcessFlow {
 			hr.setValueDef(datt.getValueDef());
 			hr.setValueType(datt.getValueType());
 			hr.setUnitType(datt.getUnitType());
+			hr.setUnitDef(getUnitByGutIdAndStuId(datt.getUnitType(),sutId));
 			hrs.add(hr);
 		}
 		this.getD_es0010().setHeaders(hrs);
@@ -84,7 +97,19 @@ public class ES0010Service extends ES0010BaseModel implements ExecProcessFlow {
 		this.getD_es0010().setDatas(das);
 		this.getD_es0010().setPcaId(pcaId);
 	}
-	
+	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(无锡发动机)/报文体/ES0009_D(项目组件属性查询).csv

@@ -9,6 +9,7 @@
 1.7,valueType,值类型,int,,,,,,,,,,,
 1.8,valueDef,默认值,string,,,,,,,,,,,
 1.9,dataType,值数据类型,int,,,,,,,,,,,
+1.20,unitDef,单位组默认值,string,,,,,,,,,,,
 2,pcId,项目组件Id,string,,,,,,,,,,,
 3,comId,组件ID,string,,,,,,,,,,,
 4,name,组件name,string,,,,,,,,,,,

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

@@ -9,6 +9,7 @@
 2.6,valueType,值类型,int,,,,,,,,,,,
 2.7,valueDef,默认值,string,,,,,,,,,,,
 2.8,unitType,单位类型,string,,,,,,,,,,,
+2.9,unitDef,单位组默认值,string,,,,,,,,,,,
 3,datas,数据,list,,,,0,,,,,,,
 3.1,pcadgId,行号,int,,,,,,,,,,,
 3.2,pcadId,项目组件属性数据ID,string,,,,,,,,,,,