浏览代码

项目组件属性值处理

huangxingxing 3 月之前
父节点
当前提交
35223a1d7c
共有 27 个文件被更改,包括 2241 次插入53 次删除
  1. 4 11
      definitionsrc/returncode/returncode-business.properties
  2. 4 11
      definitionsrc/returncode/returncode-business_zh_CN.properties
  3. 40 0
      generated/com/miniframe/generate/comm/es/D_ES0010.java
  4. 77 0
      generated/com/miniframe/generate/comm/es/D_ES0010_DATAS_RECODE.java
  5. 90 0
      generated/com/miniframe/generate/comm/es/D_ES0010_DATAS_VALS_RECODE.java
  6. 103 0
      generated/com/miniframe/generate/comm/es/D_ES0010_HEADERS_RECODE.java
  7. 2 1
      generated/validator/resources_d_es0010Form_validator.properties
  8. 2 1
      generated/validator/resources_d_es0010Form_validator_zh_CN.properties
  9. 6 0
      generated/validator/resources_d_es0010_datas_recodeForm_validator.properties
  10. 6 0
      generated/validator/resources_d_es0010_datas_recodeForm_validator_zh_CN.properties
  11. 7 0
      generated/validator/resources_d_es0010_datas_vals_recodeForm_validator.properties
  12. 7 0
      generated/validator/resources_d_es0010_datas_vals_recodeForm_validator_zh_CN.properties
  13. 8 0
      generated/validator/resources_d_es0010_headers_recodeForm_validator.properties
  14. 8 0
      generated/validator/resources_d_es0010_headers_recodeForm_validator_zh_CN.properties
  15. 400 0
      modelsrc/com/miniframe/model/es/EsProComAttData.java
  16. 1291 0
      modelsrc/com/miniframe/model/es/EsProComAttDataSQLBuilder.java
  17. 10 0
      modelsrc/com/miniframe/model/es/dao/EsProComAttDataMapper.java
  18. 2 1
      modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.xml
  19. 50 0
      modelsrc/com/miniframe/model/es/xml/EsProComAttDataMapper.xml
  20. 1 1
      modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml
  21. 67 2
      src/main/java/com/miniframe/bisiness/es/ES0010Service.java
  22. 23 0
      src/main/java/com/miniframe/dbtransfer/EsProComAttDataDbTransfer.java
  23. 8 0
      src/main/java/com/miniframe/mappers/es/dao/EsMapper.java
  24. 5 0
      src/test/java/com/miniframe/EsMapperTest.java
  25. 2 1
      系统设计/实体Bean/es(实体列表).csv
  26. 4 15
      系统设计/数据定义/返 回 码/business(业务系统).csv
  27. 14 9
      系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0010_D(项目组件属性值数据查询).csv

+ 4 - 11
definitionsrc/returncode/returncode-business.properties

@@ -57,14 +57,7 @@ EB2000006 = \u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF01
 EB2000007 = \u6587\u4EF6\u8BFB\u53D6\u5931\u8D25\uFF01
 EB2000008 = \u6587\u4EF6\u4E0D\u5B58\u5728\uFF01
 EB2000008 = \u6587\u4EF6\u79FB\u52A8\u62F7\u8D1D\u5931\u8D25\uFF01
-MDO000001 = \u5DE5\u7A0B\u4E0D\u5B58\u5728\uFF01
-MDO000002 = \u6A21\u677F\u4E0D\u5B58\u5728\uFF01
-MDO000003 = \u8BBE\u8BA1\u53D8\u91CF\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01
-MDO000004 = \u7EA6\u675F\u6761\u4EF6\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01
-MDO000005 = \u76EE\u6807\u51FD\u6570\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01
-MDO000006 = \u8F93\u5165\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
-MDO000007 = \u8F93\u51FA\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
-MDO000008 = \u8FDB\u5316\u4F18\u5316\u5668\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
-MDO000009 = \u6C42\u89E3\u914D\u7F6E\u6587\u4EF6\u751F\u6210\u5931\u8D25\uFF01
-MDO000010 = \u6C42\u89E3\u5931\u8D25\uFF01
-MDO000011 = \u6C42\u89E3\u5668\u7C7B\u578B\u7F3A\u5931\uFF01
+ES000001 = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u4E0D\u5B58\u5728\uFF01
+ES000002 = \u7EC4\u4EF6\u5C5E\u6027\u6570\u636E\u4E0D\u5B58\u5728\uFF01
+ES000003 = \u8BE5\u7EC4\u4EF6\u5C5E\u6027\u6570\u636E\u7C7B\u578B\u4E0D\u662F\u6570\u5217\uFF01
+ES000004 = \u6570\u636E\u5B9A\u4E49\u9519\u8BEF\uFF01

+ 4 - 11
definitionsrc/returncode/returncode-business_zh_CN.properties

@@ -57,14 +57,7 @@ EB2000006 = \u6587\u4EF6\u4E0A\u4F20\u5931\u8D25\uFF01
 EB2000007 = \u6587\u4EF6\u8BFB\u53D6\u5931\u8D25\uFF01
 EB2000008 = \u6587\u4EF6\u4E0D\u5B58\u5728\uFF01
 EB2000008 = \u6587\u4EF6\u79FB\u52A8\u62F7\u8D1D\u5931\u8D25\uFF01
-MDO000001 = \u5DE5\u7A0B\u4E0D\u5B58\u5728\uFF01
-MDO000002 = \u6A21\u677F\u4E0D\u5B58\u5728\uFF01
-MDO000003 = \u8BBE\u8BA1\u53D8\u91CF\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01
-MDO000004 = \u7EA6\u675F\u6761\u4EF6\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01
-MDO000005 = \u76EE\u6807\u51FD\u6570\u6570\u636E\u683C\u5F0F\u9519\u8BEF\uFF01
-MDO000006 = \u8F93\u5165\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
-MDO000007 = \u8F93\u51FA\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
-MDO000008 = \u8FDB\u5316\u4F18\u5316\u5668\u53C2\u6570\u4E0D\u5B58\u5728\uFF01
-MDO000009 = \u6C42\u89E3\u914D\u7F6E\u6587\u4EF6\u751F\u6210\u5931\u8D25\uFF01
-MDO000010 = \u6C42\u89E3\u5931\u8D25\uFF01
-MDO000011 = \u6C42\u89E3\u5668\u7C7B\u578B\u7F3A\u5931\uFF01
+ES000001 = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u4E0D\u5B58\u5728\uFF01
+ES000002 = \u7EC4\u4EF6\u5C5E\u6027\u6570\u636E\u4E0D\u5B58\u5728\uFF01
+ES000003 = \u8BE5\u7EC4\u4EF6\u5C5E\u6027\u6570\u636E\u7C7B\u578B\u4E0D\u662F\u6570\u5217\uFF01
+ES000004 = \u6570\u636E\u5B9A\u4E49\u9519\u8BEF\uFF01

+ 40 - 0
generated/com/miniframe/generate/comm/es/D_ES0010.java

@@ -4,9 +4,49 @@
 package com.miniframe.generate.comm.es;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
+import java.util.*;
 /**
  * 项目组件属性值数据查询
  */
 public class D_ES0010 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
+	String pcaId;//项目组件属性ID
+	/**
+	 *项目组件属性ID
+	 */
+	public void setPcaId(String pcaId) {
+		this.pcaId=pcaId;
+	}
+	/**
+	 *项目组件属性ID
+	 */
+	public String getPcaId() {
+		return this.pcaId;
+	}
+	List <D_ES0010_HEADERS_RECODE> headers;//表头
+	/**
+	 *表头
+	 */
+	public void setHeaders(List <D_ES0010_HEADERS_RECODE> headers) {
+		this.headers=headers;
+	}
+	/**
+	 *表头
+	 */
+	public List <D_ES0010_HEADERS_RECODE> getHeaders() {
+		return this.headers;
+	}
+	List <D_ES0010_DATAS_RECODE> datas;//数据
+	/**
+	 *数据
+	 */
+	public void setDatas(List <D_ES0010_DATAS_RECODE> datas) {
+		this.datas=datas;
+	}
+	/**
+	 *数据
+	 */
+	public List <D_ES0010_DATAS_RECODE> getDatas() {
+		return this.datas;
+	}
 }

+ 77 - 0
generated/com/miniframe/generate/comm/es/D_ES0010_DATAS_RECODE.java

@@ -0,0 +1,77 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目组件属性值数据查询->数据
+ */
+public class D_ES0010_DATAS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pcadgId;//项目组件属性数据分组ID
+	/**
+	 *项目组件属性数据分组ID
+	 */
+	public void setPcadgId(String pcadgId) {
+		this.pcadgId=pcadgId;
+	}
+	/**
+	 *项目组件属性数据分组ID
+	 */
+	public String getPcadgId() {
+		return this.pcadgId;
+	}
+	String pcadId;//项目组件属性数据ID
+	/**
+	 *项目组件属性数据ID
+	 */
+	public void setPcadId(String pcadId) {
+		this.pcadId=pcadId;
+	}
+	/**
+	 *项目组件属性数据ID
+	 */
+	public String getPcadId() {
+		return this.pcadId;
+	}
+	String value;//数值
+	/**
+	 *数值
+	 */
+	public void setValue(String value) {
+		this.value=value;
+	}
+	/**
+	 *数值
+	 */
+	public String getValue() {
+		return this.value;
+	}
+	String unit;//单位
+	/**
+	 *单位
+	 */
+	public void setUnit(String unit) {
+		this.unit=unit;
+	}
+	/**
+	 *单位
+	 */
+	public String getUnit() {
+		return this.unit;
+	}
+	String cdvId;//数据属性id
+	/**
+	 *数据属性id
+	 */
+	public void setCdvId(String cdvId) {
+		this.cdvId=cdvId;
+	}
+	/**
+	 *数据属性id
+	 */
+	public String getCdvId() {
+		return this.cdvId;
+	}
+}

+ 90 - 0
generated/com/miniframe/generate/comm/es/D_ES0010_DATAS_VALS_RECODE.java

@@ -0,0 +1,90 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目组件属性值数据查询->数据->值
+ */
+public class D_ES0010_DATAS_VALS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pcadId;//项目组件属性数据ID
+	/**
+	 *项目组件属性数据ID
+	 */
+	public void setPcadId(String pcadId) {
+		this.pcadId=pcadId;
+	}
+	/**
+	 *项目组件属性数据ID
+	 */
+	public String getPcadId() {
+		return this.pcadId;
+	}
+	String value;//数值
+	/**
+	 *数值
+	 */
+	public void setValue(String value) {
+		this.value=value;
+	}
+	/**
+	 *数值
+	 */
+	public String getValue() {
+		return this.value;
+	}
+	String unit;//单位
+	/**
+	 *单位
+	 */
+	public void setUnit(String unit) {
+		this.unit=unit;
+	}
+	/**
+	 *单位
+	 */
+	public String getUnit() {
+		return this.unit;
+	}
+	int valueType;//值类型
+	/**
+	 *值类型
+	 */
+	public void setValueType(int valueType) {
+		this.valueType=valueType;
+	}
+	/**
+	 *值类型
+	 */
+	public int getValueType() {
+		return this.valueType;
+	}
+	String valueDef;//默认值
+	/**
+	 *默认值
+	 */
+	public void setValueDef(String valueDef) {
+		this.valueDef=valueDef;
+	}
+	/**
+	 *默认值
+	 */
+	public String getValueDef() {
+		return this.valueDef;
+	}
+	String cdvId;//数据属性id
+	/**
+	 *数据属性id
+	 */
+	public void setCdvId(String cdvId) {
+		this.cdvId=cdvId;
+	}
+	/**
+	 *数据属性id
+	 */
+	public String getCdvId() {
+		return this.cdvId;
+	}
+}

+ 103 - 0
generated/com/miniframe/generate/comm/es/D_ES0010_HEADERS_RECODE.java

@@ -0,0 +1,103 @@
+/**
+ * 无锡发动机
+ */
+package com.miniframe.generate.comm.es;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目组件属性值数据查询->表头
+ */
+public class D_ES0010_HEADERS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String cdId;//数据id
+	/**
+	 *数据id
+	 */
+	public void setCdId(String cdId) {
+		this.cdId=cdId;
+	}
+	/**
+	 *数据id
+	 */
+	public String getCdId() {
+		return this.cdId;
+	}
+	String cdvId;//数据属性id
+	/**
+	 *数据属性id
+	 */
+	public void setCdvId(String cdvId) {
+		this.cdvId=cdvId;
+	}
+	/**
+	 *数据属性id
+	 */
+	public String getCdvId() {
+		return this.cdvId;
+	}
+	String name;//数据属性名称
+	/**
+	 *数据属性名称
+	 */
+	public void setName(String name) {
+		this.name=name;
+	}
+	/**
+	 *数据属性名称
+	 */
+	public String getName() {
+		return this.name;
+	}
+	String code;//数据属性Code
+	/**
+	 *数据属性Code
+	 */
+	public void setCode(String code) {
+		this.code=code;
+	}
+	/**
+	 *数据属性Code
+	 */
+	public String getCode() {
+		return this.code;
+	}
+	int dataType;//值数据类型
+	/**
+	 *值数据类型
+	 */
+	public void setDataType(int dataType) {
+		this.dataType=dataType;
+	}
+	/**
+	 *值数据类型
+	 */
+	public int getDataType() {
+		return this.dataType;
+	}
+	int valueType;//值类型
+	/**
+	 *值类型
+	 */
+	public void setValueType(int valueType) {
+		this.valueType=valueType;
+	}
+	/**
+	 *值类型
+	 */
+	public int getValueType() {
+		return this.valueType;
+	}
+	String valueDef;//默认值
+	/**
+	 *默认值
+	 */
+	public void setValueDef(String valueDef) {
+		this.valueDef=valueDef;
+	}
+	/**
+	 *默认值
+	 */
+	public String getValueDef() {
+		return this.valueDef;
+	}
+}

+ 2 - 1
generated/validator/resources_d_es0010Form_validator.properties

@@ -1 +1,2 @@
-d_es0010Form = false
+d_es0010.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+d_es0010Form = true

+ 2 - 1
generated/validator/resources_d_es0010Form_validator_zh_CN.properties

@@ -1 +1,2 @@
-d_es0010Form = false
+d_es0010.pcaId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027ID
+d_es0010Form = true

+ 6 - 0
generated/validator/resources_d_es0010_datas_recodeForm_validator.properties

@@ -0,0 +1,6 @@
+d_es0010_datas_recode.pcadgId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636E\u5206\u7EC4ID
+d_es0010_datas_recode.pcadId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636EID
+d_es0010_datas_recode.value = \u6570\u503C
+d_es0010_datas_recode.unit = \u5355\u4F4D
+d_es0010_datas_recode.cdvId = \u6570\u636E\u5C5E\u6027id
+d_es0010_datas_recodeForm = true

+ 6 - 0
generated/validator/resources_d_es0010_datas_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,6 @@
+d_es0010_datas_recode.pcadgId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636E\u5206\u7EC4ID
+d_es0010_datas_recode.pcadId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636EID
+d_es0010_datas_recode.value = \u6570\u503C
+d_es0010_datas_recode.unit = \u5355\u4F4D
+d_es0010_datas_recode.cdvId = \u6570\u636E\u5C5E\u6027id
+d_es0010_datas_recodeForm = true

+ 7 - 0
generated/validator/resources_d_es0010_datas_vals_recodeForm_validator.properties

@@ -0,0 +1,7 @@
+d_es0010_datas_vals_recode.pcadId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636EID
+d_es0010_datas_vals_recode.value = \u6570\u503C
+d_es0010_datas_vals_recode.unit = \u5355\u4F4D
+d_es0010_datas_vals_recode.valueType = \u503C\u7C7B\u578B
+d_es0010_datas_vals_recode.valueDef = \u9ED8\u8BA4\u503C
+d_es0010_datas_vals_recode.cdvId = \u6570\u636E\u5C5E\u6027id
+d_es0010_datas_vals_recodeForm = true

+ 7 - 0
generated/validator/resources_d_es0010_datas_vals_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,7 @@
+d_es0010_datas_vals_recode.pcadId = \u9879\u76EE\u7EC4\u4EF6\u5C5E\u6027\u6570\u636EID
+d_es0010_datas_vals_recode.value = \u6570\u503C
+d_es0010_datas_vals_recode.unit = \u5355\u4F4D
+d_es0010_datas_vals_recode.valueType = \u503C\u7C7B\u578B
+d_es0010_datas_vals_recode.valueDef = \u9ED8\u8BA4\u503C
+d_es0010_datas_vals_recode.cdvId = \u6570\u636E\u5C5E\u6027id
+d_es0010_datas_vals_recodeForm = true

+ 8 - 0
generated/validator/resources_d_es0010_headers_recodeForm_validator.properties

@@ -0,0 +1,8 @@
+d_es0010_headers_recode.cdId = \u6570\u636Eid
+d_es0010_headers_recode.cdvId = \u6570\u636E\u5C5E\u6027id
+d_es0010_headers_recode.name = \u6570\u636E\u5C5E\u6027\u540D\u79F0
+d_es0010_headers_recode.code = \u6570\u636E\u5C5E\u6027Code
+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_recodeForm = true

+ 8 - 0
generated/validator/resources_d_es0010_headers_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,8 @@
+d_es0010_headers_recode.cdId = \u6570\u636Eid
+d_es0010_headers_recode.cdvId = \u6570\u636E\u5C5E\u6027id
+d_es0010_headers_recode.name = \u6570\u636E\u5C5E\u6027\u540D\u79F0
+d_es0010_headers_recode.code = \u6570\u636E\u5C5E\u6027Code
+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_recodeForm = true

+ 400 - 0
modelsrc/com/miniframe/model/es/EsProComAttData.java

@@ -0,0 +1,400 @@
+package com.miniframe.model.es;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+
+@Table(name = "es_pro_com_att_data")
+public class EsProComAttData extends MiniserviceBaseModel implements Serializable {
+    /**
+     * 项目组件属性数据ID
+     */
+    @Id
+    @Column(name = "pcad_id")
+    private String pcadId;
+
+    /**
+     * 工程ID
+     */
+    private String pid;
+
+    /**
+     * 组件ID
+     */
+    @Column(name = "com_id")
+    private String comId;
+
+    /**
+     * 属性ID
+     */
+    @Column(name = "att_id")
+    private String attId;
+
+    /**
+     * 项目组件ID
+     */
+    @Column(name = "pc_id")
+    private String pcId;
+
+    /**
+     * 项目组件属性ID
+     */
+    @Column(name = "pca_id")
+    private String pcaId;
+
+    /**
+     * 数据配置id
+     */
+    @Column(name = "cd_id")
+    private String cdId;
+
+    /**
+     * 数据属性ID
+     */
+    @Column(name = "cdv_id")
+    private String cdvId;
+
+    /**
+     * 数值
+     */
+    private String value;
+
+    /**
+     * 单位
+     */
+    private String unit;
+
+    /**
+     * 项目组件属性数据分组ID
+     */
+    @Column(name = "pcadg_id")
+    private String pcadgId;
+
+    /**
+     * 用户编码
+     */
+    private String uid;
+
+    /**
+     * 描述
+     */
+    private String remark;
+
+    /**
+     * 创建时间
+
+     */
+    @Column(name = "create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+
+     */
+    @Column(name = "update_time")
+    private Date updateTime;
+
+    /**
+     * 序号
+     */
+    private Integer ser;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 获取项目组件属性数据ID
+     *
+     * @return pcad_id - 项目组件属性数据ID
+     */
+    public String getPcadId() {
+        return pcadId;
+    }
+
+    /**
+     * 设置项目组件属性数据ID
+     *
+     * @param pcadId 项目组件属性数据ID
+     */
+    public void setPcadId(String pcadId) {
+        this.pcadId = pcadId == null ? null : pcadId.trim();
+    }
+
+    /**
+     * 获取工程ID
+     *
+     * @return pid - 工程ID
+     */
+    public String getPid() {
+        return pid;
+    }
+
+    /**
+     * 设置工程ID
+     *
+     * @param pid 工程ID
+     */
+    public void setPid(String pid) {
+        this.pid = pid == null ? null : pid.trim();
+    }
+
+    /**
+     * 获取组件ID
+     *
+     * @return com_id - 组件ID
+     */
+    public String getComId() {
+        return comId;
+    }
+
+    /**
+     * 设置组件ID
+     *
+     * @param comId 组件ID
+     */
+    public void setComId(String comId) {
+        this.comId = comId == null ? null : comId.trim();
+    }
+
+    /**
+     * 获取属性ID
+     *
+     * @return att_id - 属性ID
+     */
+    public String getAttId() {
+        return attId;
+    }
+
+    /**
+     * 设置属性ID
+     *
+     * @param attId 属性ID
+     */
+    public void setAttId(String attId) {
+        this.attId = attId == null ? null : attId.trim();
+    }
+
+    /**
+     * 获取项目组件ID
+     *
+     * @return pc_id - 项目组件ID
+     */
+    public String getPcId() {
+        return pcId;
+    }
+
+    /**
+     * 设置项目组件ID
+     *
+     * @param pcId 项目组件ID
+     */
+    public void setPcId(String pcId) {
+        this.pcId = pcId == null ? null : pcId.trim();
+    }
+
+    /**
+     * 获取项目组件属性ID
+     *
+     * @return pca_id - 项目组件属性ID
+     */
+    public String getPcaId() {
+        return pcaId;
+    }
+
+    /**
+     * 设置项目组件属性ID
+     *
+     * @param pcaId 项目组件属性ID
+     */
+    public void setPcaId(String pcaId) {
+        this.pcaId = pcaId == null ? null : pcaId.trim();
+    }
+
+    /**
+     * 获取数据配置id
+     *
+     * @return cd_id - 数据配置id
+     */
+    public String getCdId() {
+        return cdId;
+    }
+
+    /**
+     * 设置数据配置id
+     *
+     * @param cdId 数据配置id
+     */
+    public void setCdId(String cdId) {
+        this.cdId = cdId == null ? null : cdId.trim();
+    }
+
+    /**
+     * 获取数据属性ID
+     *
+     * @return cdv_id - 数据属性ID
+     */
+    public String getCdvId() {
+        return cdvId;
+    }
+
+    /**
+     * 设置数据属性ID
+     *
+     * @param cdvId 数据属性ID
+     */
+    public void setCdvId(String cdvId) {
+        this.cdvId = cdvId == null ? null : cdvId.trim();
+    }
+
+    /**
+     * 获取数值
+     *
+     * @return value - 数值
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * 设置数值
+     *
+     * @param value 数值
+     */
+    public void setValue(String value) {
+        this.value = value == null ? null : value.trim();
+    }
+
+    /**
+     * 获取单位
+     *
+     * @return unit - 单位
+     */
+    public String getUnit() {
+        return unit;
+    }
+
+    /**
+     * 设置单位
+     *
+     * @param unit 单位
+     */
+    public void setUnit(String unit) {
+        this.unit = unit == null ? null : unit.trim();
+    }
+
+    /**
+     * 获取项目组件属性数据分组ID
+     *
+     * @return pcadg_id - 项目组件属性数据分组ID
+     */
+    public String getPcadgId() {
+        return pcadgId;
+    }
+
+    /**
+     * 设置项目组件属性数据分组ID
+     *
+     * @param pcadgId 项目组件属性数据分组ID
+     */
+    public void setPcadgId(String pcadgId) {
+        this.pcadgId = pcadgId == null ? null : pcadgId.trim();
+    }
+
+    /**
+     * 获取用户编码
+     *
+     * @return uid - 用户编码
+     */
+    public String getUid() {
+        return uid;
+    }
+
+    /**
+     * 设置用户编码
+     *
+     * @param uid 用户编码
+     */
+    public void setUid(String uid) {
+        this.uid = uid == null ? null : uid.trim();
+    }
+
+    /**
+     * 获取描述
+     *
+     * @return remark - 描述
+     */
+    public String getRemark() {
+        return remark;
+    }
+
+    /**
+     * 设置描述
+     *
+     * @param remark 描述
+     */
+    public void setRemark(String remark) {
+        this.remark = remark == null ? null : remark.trim();
+    }
+
+    /**
+     * 获取创建时间
+
+     *
+     * @return create_time - 创建时间
+
+     */
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    /**
+     * 设置创建时间
+
+     *
+     * @param createTime 创建时间
+
+     */
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    /**
+     * 获取更新时间
+
+     *
+     * @return update_time - 更新时间
+
+     */
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    /**
+     * 设置更新时间
+
+     *
+     * @param updateTime 更新时间
+
+     */
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    /**
+     * 获取序号
+     *
+     * @return ser - 序号
+     */
+    public Integer getSer() {
+        return ser;
+    }
+
+    /**
+     * 设置序号
+     *
+     * @param ser 序号
+     */
+    public void setSer(Integer ser) {
+        this.ser = ser;
+    }
+}

+ 1291 - 0
modelsrc/com/miniframe/model/es/EsProComAttDataSQLBuilder.java

@@ -0,0 +1,1291 @@
+package com.miniframe.model.es;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class EsProComAttDataSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public EsProComAttDataSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andPcadIdIsNull() {
+            addCriterion("pcad_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdIsNotNull() {
+            addCriterion("pcad_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdEqualTo(String value) {
+            addCriterion("pcad_id =", value, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdNotEqualTo(String value) {
+            addCriterion("pcad_id <>", value, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdGreaterThan(String value) {
+            addCriterion("pcad_id >", value, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdGreaterThanOrEqualTo(String value) {
+            addCriterion("pcad_id >=", value, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdLessThan(String value) {
+            addCriterion("pcad_id <", value, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdLessThanOrEqualTo(String value) {
+            addCriterion("pcad_id <=", value, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdLike(String value) {
+            addCriterion("pcad_id like", value, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdNotLike(String value) {
+            addCriterion("pcad_id not like", value, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdIn(List<String> values) {
+            addCriterion("pcad_id in", values, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdNotIn(List<String> values) {
+            addCriterion("pcad_id not in", values, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdBetween(String value1, String value2) {
+            addCriterion("pcad_id between", value1, value2, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadIdNotBetween(String value1, String value2) {
+            addCriterion("pcad_id not between", value1, value2, "pcadId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNull() {
+            addCriterion("pid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIsNotNull() {
+            addCriterion("pid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidEqualTo(String value) {
+            addCriterion("pid =", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotEqualTo(String value) {
+            addCriterion("pid <>", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThan(String value) {
+            addCriterion("pid >", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidGreaterThanOrEqualTo(String value) {
+            addCriterion("pid >=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThan(String value) {
+            addCriterion("pid <", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLessThanOrEqualTo(String value) {
+            addCriterion("pid <=", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidLike(String value) {
+            addCriterion("pid like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotLike(String value) {
+            addCriterion("pid not like", value, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidIn(List<String> values) {
+            addCriterion("pid in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotIn(List<String> values) {
+            addCriterion("pid not in", values, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidBetween(String value1, String value2) {
+            addCriterion("pid between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andPidNotBetween(String value1, String value2) {
+            addCriterion("pid not between", value1, value2, "pid");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdIsNull() {
+            addCriterion("com_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdIsNotNull() {
+            addCriterion("com_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdEqualTo(String value) {
+            addCriterion("com_id =", value, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdNotEqualTo(String value) {
+            addCriterion("com_id <>", value, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdGreaterThan(String value) {
+            addCriterion("com_id >", value, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdGreaterThanOrEqualTo(String value) {
+            addCriterion("com_id >=", value, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdLessThan(String value) {
+            addCriterion("com_id <", value, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdLessThanOrEqualTo(String value) {
+            addCriterion("com_id <=", value, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdLike(String value) {
+            addCriterion("com_id like", value, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdNotLike(String value) {
+            addCriterion("com_id not like", value, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdIn(List<String> values) {
+            addCriterion("com_id in", values, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdNotIn(List<String> values) {
+            addCriterion("com_id not in", values, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdBetween(String value1, String value2) {
+            addCriterion("com_id between", value1, value2, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andComIdNotBetween(String value1, String value2) {
+            addCriterion("com_id not between", value1, value2, "comId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdIsNull() {
+            addCriterion("att_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdIsNotNull() {
+            addCriterion("att_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdEqualTo(String value) {
+            addCriterion("att_id =", value, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdNotEqualTo(String value) {
+            addCriterion("att_id <>", value, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdGreaterThan(String value) {
+            addCriterion("att_id >", value, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdGreaterThanOrEqualTo(String value) {
+            addCriterion("att_id >=", value, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdLessThan(String value) {
+            addCriterion("att_id <", value, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdLessThanOrEqualTo(String value) {
+            addCriterion("att_id <=", value, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdLike(String value) {
+            addCriterion("att_id like", value, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdNotLike(String value) {
+            addCriterion("att_id not like", value, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdIn(List<String> values) {
+            addCriterion("att_id in", values, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdNotIn(List<String> values) {
+            addCriterion("att_id not in", values, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdBetween(String value1, String value2) {
+            addCriterion("att_id between", value1, value2, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andAttIdNotBetween(String value1, String value2) {
+            addCriterion("att_id not between", value1, value2, "attId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdIsNull() {
+            addCriterion("pc_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdIsNotNull() {
+            addCriterion("pc_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdEqualTo(String value) {
+            addCriterion("pc_id =", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotEqualTo(String value) {
+            addCriterion("pc_id <>", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdGreaterThan(String value) {
+            addCriterion("pc_id >", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdGreaterThanOrEqualTo(String value) {
+            addCriterion("pc_id >=", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLessThan(String value) {
+            addCriterion("pc_id <", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLessThanOrEqualTo(String value) {
+            addCriterion("pc_id <=", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdLike(String value) {
+            addCriterion("pc_id like", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotLike(String value) {
+            addCriterion("pc_id not like", value, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdIn(List<String> values) {
+            addCriterion("pc_id in", values, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotIn(List<String> values) {
+            addCriterion("pc_id not in", values, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdBetween(String value1, String value2) {
+            addCriterion("pc_id between", value1, value2, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcIdNotBetween(String value1, String value2) {
+            addCriterion("pc_id not between", value1, value2, "pcId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdIsNull() {
+            addCriterion("pca_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdIsNotNull() {
+            addCriterion("pca_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdEqualTo(String value) {
+            addCriterion("pca_id =", value, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdNotEqualTo(String value) {
+            addCriterion("pca_id <>", value, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdGreaterThan(String value) {
+            addCriterion("pca_id >", value, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdGreaterThanOrEqualTo(String value) {
+            addCriterion("pca_id >=", value, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdLessThan(String value) {
+            addCriterion("pca_id <", value, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdLessThanOrEqualTo(String value) {
+            addCriterion("pca_id <=", value, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdLike(String value) {
+            addCriterion("pca_id like", value, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdNotLike(String value) {
+            addCriterion("pca_id not like", value, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdIn(List<String> values) {
+            addCriterion("pca_id in", values, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdNotIn(List<String> values) {
+            addCriterion("pca_id not in", values, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdBetween(String value1, String value2) {
+            addCriterion("pca_id between", value1, value2, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcaIdNotBetween(String value1, String value2) {
+            addCriterion("pca_id not between", value1, value2, "pcaId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdIsNull() {
+            addCriterion("cd_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdIsNotNull() {
+            addCriterion("cd_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdEqualTo(String value) {
+            addCriterion("cd_id =", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotEqualTo(String value) {
+            addCriterion("cd_id <>", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdGreaterThan(String value) {
+            addCriterion("cd_id >", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdGreaterThanOrEqualTo(String value) {
+            addCriterion("cd_id >=", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLessThan(String value) {
+            addCriterion("cd_id <", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLessThanOrEqualTo(String value) {
+            addCriterion("cd_id <=", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdLike(String value) {
+            addCriterion("cd_id like", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotLike(String value) {
+            addCriterion("cd_id not like", value, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdIn(List<String> values) {
+            addCriterion("cd_id in", values, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotIn(List<String> values) {
+            addCriterion("cd_id not in", values, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdBetween(String value1, String value2) {
+            addCriterion("cd_id between", value1, value2, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdIdNotBetween(String value1, String value2) {
+            addCriterion("cd_id not between", value1, value2, "cdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdIsNull() {
+            addCriterion("cdv_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdIsNotNull() {
+            addCriterion("cdv_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdEqualTo(String value) {
+            addCriterion("cdv_id =", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdNotEqualTo(String value) {
+            addCriterion("cdv_id <>", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdGreaterThan(String value) {
+            addCriterion("cdv_id >", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdGreaterThanOrEqualTo(String value) {
+            addCriterion("cdv_id >=", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdLessThan(String value) {
+            addCriterion("cdv_id <", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdLessThanOrEqualTo(String value) {
+            addCriterion("cdv_id <=", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdLike(String value) {
+            addCriterion("cdv_id like", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdNotLike(String value) {
+            addCriterion("cdv_id not like", value, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdIn(List<String> values) {
+            addCriterion("cdv_id in", values, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdNotIn(List<String> values) {
+            addCriterion("cdv_id not in", values, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdBetween(String value1, String value2) {
+            addCriterion("cdv_id between", value1, value2, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andCdvIdNotBetween(String value1, String value2) {
+            addCriterion("cdv_id not between", value1, value2, "cdvId");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNull() {
+            addCriterion("value is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIsNotNull() {
+            addCriterion("value is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueEqualTo(String value) {
+            addCriterion("value =", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotEqualTo(String value) {
+            addCriterion("value <>", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThan(String value) {
+            addCriterion("value >", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueGreaterThanOrEqualTo(String value) {
+            addCriterion("value >=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThan(String value) {
+            addCriterion("value <", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLessThanOrEqualTo(String value) {
+            addCriterion("value <=", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueLike(String value) {
+            addCriterion("value like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotLike(String value) {
+            addCriterion("value not like", value, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueIn(List<String> values) {
+            addCriterion("value in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotIn(List<String> values) {
+            addCriterion("value not in", values, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueBetween(String value1, String value2) {
+            addCriterion("value between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andValueNotBetween(String value1, String value2) {
+            addCriterion("value not between", value1, value2, "value");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitIsNull() {
+            addCriterion("unit is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitIsNotNull() {
+            addCriterion("unit is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitEqualTo(String value) {
+            addCriterion("unit =", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitNotEqualTo(String value) {
+            addCriterion("unit <>", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitGreaterThan(String value) {
+            addCriterion("unit >", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitGreaterThanOrEqualTo(String value) {
+            addCriterion("unit >=", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitLessThan(String value) {
+            addCriterion("unit <", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitLessThanOrEqualTo(String value) {
+            addCriterion("unit <=", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitLike(String value) {
+            addCriterion("unit like", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitNotLike(String value) {
+            addCriterion("unit not like", value, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitIn(List<String> values) {
+            addCriterion("unit in", values, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitNotIn(List<String> values) {
+            addCriterion("unit not in", values, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitBetween(String value1, String value2) {
+            addCriterion("unit between", value1, value2, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andUnitNotBetween(String value1, String value2) {
+            addCriterion("unit not between", value1, value2, "unit");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdIsNull() {
+            addCriterion("pcadg_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdIsNotNull() {
+            addCriterion("pcadg_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdEqualTo(String value) {
+            addCriterion("pcadg_id =", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdNotEqualTo(String value) {
+            addCriterion("pcadg_id <>", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdGreaterThan(String value) {
+            addCriterion("pcadg_id >", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdGreaterThanOrEqualTo(String value) {
+            addCriterion("pcadg_id >=", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdLessThan(String value) {
+            addCriterion("pcadg_id <", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdLessThanOrEqualTo(String value) {
+            addCriterion("pcadg_id <=", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdLike(String value) {
+            addCriterion("pcadg_id like", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdNotLike(String value) {
+            addCriterion("pcadg_id not like", value, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdIn(List<String> values) {
+            addCriterion("pcadg_id in", values, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdNotIn(List<String> values) {
+            addCriterion("pcadg_id not in", values, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdBetween(String value1, String value2) {
+            addCriterion("pcadg_id between", value1, value2, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcadgIdNotBetween(String value1, String value2) {
+            addCriterion("pcadg_id not between", value1, value2, "pcadgId");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNull() {
+            addCriterion("uid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIsNotNull() {
+            addCriterion("uid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidEqualTo(String value) {
+            addCriterion("uid =", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotEqualTo(String value) {
+            addCriterion("uid <>", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThan(String value) {
+            addCriterion("uid >", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidGreaterThanOrEqualTo(String value) {
+            addCriterion("uid >=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThan(String value) {
+            addCriterion("uid <", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLessThanOrEqualTo(String value) {
+            addCriterion("uid <=", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidLike(String value) {
+            addCriterion("uid like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotLike(String value) {
+            addCriterion("uid not like", value, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidIn(List<String> values) {
+            addCriterion("uid in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotIn(List<String> values) {
+            addCriterion("uid not in", values, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidBetween(String value1, String value2) {
+            addCriterion("uid between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUidNotBetween(String value1, String value2) {
+            addCriterion("uid not between", value1, value2, "uid");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNull() {
+            addCriterion("remark is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIsNotNull() {
+            addCriterion("remark is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkEqualTo(String value) {
+            addCriterion("remark =", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotEqualTo(String value) {
+            addCriterion("remark <>", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThan(String value) {
+            addCriterion("remark >", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkGreaterThanOrEqualTo(String value) {
+            addCriterion("remark >=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThan(String value) {
+            addCriterion("remark <", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLessThanOrEqualTo(String value) {
+            addCriterion("remark <=", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkLike(String value) {
+            addCriterion("remark like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotLike(String value) {
+            addCriterion("remark not like", value, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkIn(List<String> values) {
+            addCriterion("remark in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotIn(List<String> values) {
+            addCriterion("remark not in", values, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkBetween(String value1, String value2) {
+            addCriterion("remark between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarkNotBetween(String value1, String value2) {
+            addCriterion("remark not between", value1, value2, "remark");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNull() {
+            addCriterion("create_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIsNotNull() {
+            addCriterion("create_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeEqualTo(Date value) {
+            addCriterion("create_time =", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotEqualTo(Date value) {
+            addCriterion("create_time <>", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThan(Date value) {
+            addCriterion("create_time >", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("create_time >=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThan(Date value) {
+            addCriterion("create_time <", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("create_time <=", value, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeIn(List<Date> values) {
+            addCriterion("create_time in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotIn(List<Date> values) {
+            addCriterion("create_time not in", values, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeBetween(Date value1, Date value2) {
+            addCriterion("create_time between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("create_time not between", value1, value2, "createTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNull() {
+            addCriterion("update_time is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIsNotNull() {
+            addCriterion("update_time is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeEqualTo(Date value) {
+            addCriterion("update_time =", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotEqualTo(Date value) {
+            addCriterion("update_time <>", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThan(Date value) {
+            addCriterion("update_time >", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeGreaterThanOrEqualTo(Date value) {
+            addCriterion("update_time >=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThan(Date value) {
+            addCriterion("update_time <", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeLessThanOrEqualTo(Date value) {
+            addCriterion("update_time <=", value, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeIn(List<Date> values) {
+            addCriterion("update_time in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotIn(List<Date> values) {
+            addCriterion("update_time not in", values, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeBetween(Date value1, Date value2) {
+            addCriterion("update_time between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdateTimeNotBetween(Date value1, Date value2) {
+            addCriterion("update_time not between", value1, value2, "updateTime");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIsNull() {
+            addCriterion("ser is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIsNotNull() {
+            addCriterion("ser is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerEqualTo(Integer value) {
+            addCriterion("ser =", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotEqualTo(Integer value) {
+            addCriterion("ser <>", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerGreaterThan(Integer value) {
+            addCriterion("ser >", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerGreaterThanOrEqualTo(Integer value) {
+            addCriterion("ser >=", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerLessThan(Integer value) {
+            addCriterion("ser <", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerLessThanOrEqualTo(Integer value) {
+            addCriterion("ser <=", value, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerIn(List<Integer> values) {
+            addCriterion("ser in", values, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotIn(List<Integer> values) {
+            addCriterion("ser not in", values, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerBetween(Integer value1, Integer value2) {
+            addCriterion("ser between", value1, value2, "ser");
+            return (Criteria) this;
+        }
+
+        public Criteria andSerNotBetween(Integer value1, Integer value2) {
+            addCriterion("ser not between", value1, value2, "ser");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

+ 10 - 0
modelsrc/com/miniframe/model/es/dao/EsProComAttDataMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.es.dao;
+
+import com.miniframe.model.es.EsProComAttData;
+import com.miniframe.model.es.EsProComAttDataSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface EsProComAttDataMapper extends MiniserviceBaseDao, MFBaseMapper<EsProComAttData> {
+    long countByExample(EsProComAttDataSQLBuilder example);
+}

+ 2 - 1
modelsrc/com/miniframe/model/es/dbconfig/MapperConfig-es.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Thu May 29 17:43:19 CST 2025.
+    This file was generated on Fri May 30 09:49:04 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/es/xml/EsProMapper.xml" />
@@ -16,5 +16,6 @@
     <mapper resource="com/miniframe/model/es/xml/EsProComConMapper.xml" />
     <mapper resource="com/miniframe/model/es/xml/EsDataMapper.xml" />
     <mapper resource="com/miniframe/model/es/xml/EsDataAttMapper.xml" />
+    <mapper resource="com/miniframe/model/es/xml/EsProComAttDataMapper.xml" />
   </mappers>
 </configuration>

+ 50 - 0
modelsrc/com/miniframe/model/es/xml/EsProComAttDataMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.es.dao.EsProComAttDataMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.es.EsProComAttDataSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from es_pro_com_att_data
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

+ 1 - 1
modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Thu May 29 17:43:20 CST 2025.
+    This file was generated on Fri May 30 09:49:05 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 67 - 2
src/main/java/com/miniframe/bisiness/es/ES0010Service.java

@@ -1,8 +1,18 @@
 package com.miniframe.bisiness.es;
 
-import java.util.Map;
+import java.util.*;
+
 import com.miniframe.core.ExecProcessFlow;
+import com.miniframe.core.exception.BusinessException;
+import com.miniframe.core.ext.UtilTools;
+import com.miniframe.generate.appcode.AttValueType;
 import com.miniframe.generate.business.es.model.ES0010BaseModel;
+import com.miniframe.generate.comm.es.D_ES0010_DATAS_RECODE;
+import com.miniframe.generate.comm.es.D_ES0010_DATAS_VALS_RECODE;
+import com.miniframe.generate.comm.es.D_ES0010_HEADERS_RECODE;
+import com.miniframe.model.es.*;
+import com.miniframe.model.es.dao.*;
+import org.apache.tika.io.EndianUtils;
 
 /**
  * 无锡发动机,“项目组件属性值数据查询”逻辑处理(重新生成不覆盖)。
@@ -15,7 +25,62 @@ public class ES0010Service extends ES0010BaseModel implements ExecProcessFlow {
 	 * 无锡发动机,“项目组件属性值数据查询”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-	
+		String pcaId = this.getA_es0010().getPcaId();
+		EsProComAttMapper pcadao =UtilTools.getBean(EsProComAttMapper.class);
+		EsProComAtt pca = pcadao.selectByPrimaryKey(pcaId);
+		if(pca==null){
+			throw  new BusinessException("ES000001");//项目组件属性不存在
+		}
+		EsAttMapper attdao =UtilTools.getBean(EsAttMapper.class);
+		EsAtt att = attdao.selectByPrimaryKey(pca.getAttId());
+		if(att==null){
+			throw  new BusinessException("ES000002");//组件属性数据不存在
+		}
+		if(att.getValueType()!=Short.valueOf(AttValueType.v3.getIndex())){
+			throw new BusinessException("ES000003");//该组件属性数据类型不是数列
+		}
+		EsDataMapper dataDao = UtilTools.getBean(EsDataMapper.class);
+		EsData data = dataDao.selectByPrimaryKey(att.getValueDef());
+		if(data==null){
+			throw  new BusinessException("ES000004");//数据定义错误
+		}
+		EsDataAttMapper dataAttDao = UtilTools.getBean(EsDataAttMapper.class);
+		EsDataAttSQLBuilder dataAttSb = new EsDataAttSQLBuilder();
+		EsDataAttSQLBuilder.Criteria dataAttSc = dataAttSb.createCriteria();
+		dataAttSc.andCdIdEqualTo(data.getCdId());
+		dataAttSb.setOrderByClause("ser asc");
+		List<EsDataAtt> dataAtts = dataAttDao.selectByExample(dataAttSb);
+		List<D_ES0010_HEADERS_RECODE> hrs = new ArrayList<>();
+		for (EsDataAtt datt:dataAtts) {
+			D_ES0010_HEADERS_RECODE  hr  =new D_ES0010_HEADERS_RECODE();
+			hr.setCdvId(datt.getCdvId());
+			hr.setCdId(datt.getCdId());
+			hr.setName(datt.getName());
+			hr.setCode(datt.getCode());
+			hr.setDataType(data.getType());
+			hr.setValueDef(datt.getValueDef());
+			hr.setValueType(datt.getValueType());
+			hrs.add(hr);
+		}
+		this.getD_es0010().setHeaders(hrs);
+
+		EsProComAttDataMapper pcaddao = UtilTools.getBean(EsProComAttDataMapper.class);
+		EsProComAttDataSQLBuilder pcadsb = new EsProComAttDataSQLBuilder();
+		EsProComAttDataSQLBuilder.Criteria pcadsc = pcadsb.createCriteria();
+		pcadsc.andPcaIdEqualTo(pcaId);
+		pcadsb.setOrderByClause("ser asc");
+		List<EsProComAttData> pcads =pcaddao.selectByExample(pcadsb);
+		List<D_ES0010_DATAS_RECODE> das = new ArrayList<>();
+		for (EsProComAttData pcad :pcads) {
+			D_ES0010_DATAS_RECODE da =new D_ES0010_DATAS_RECODE();
+			da.setPcadgId(pcad.getPcadgId());
+			da.setPcadId(pcad.getPcadId());
+			da.setValue(pcad.getValue());
+			da.setUnit(pcad.getUnit());
+			da.setCdvId(pcad.getCdvId());
+			das.add(da);
+		}
+		this.getD_es0010().setDatas(das);
 	}
 	
 	/**

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/EsProComAttDataDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.es.EsProComAttData;
+
+/**
+ * 实体列表,“ES_PRO_COM_ATT_DATA”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class EsProComAttDataDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<EsProComAttData> list=l;
+		return list;
+	};
+
+}

+ 8 - 0
src/main/java/com/miniframe/mappers/es/dao/EsMapper.java

@@ -1,6 +1,7 @@
 package com.miniframe.mappers.es.dao;
 
 import com.miniframe.mappers.es.model.ProComAttDto;
+import com.miniframe.model.es.EsDataAtt;
 import com.miniframe.model.system.SysUser;
 import com.miniframe.system.MiniserviceBaseDao;
 import org.apache.ibatis.annotations.Select;
@@ -17,6 +18,12 @@ public interface EsMapper extends MiniserviceBaseDao {
     @Select("select max(ser) from es_pro_com where pid =#{pid} and id_code=#{idCode}")
     Integer getProComSer(String pid,String idCode);
 
+
+    /**
+     * 级联查询  项目组件属性值数据
+     * @param pcId
+     * @return
+     */
     @Select("select a.pca_id as pcaId," +
             "a.value as value," +
             "a.unit as unit," +
@@ -28,4 +35,5 @@ public interface EsMapper extends MiniserviceBaseDao {
             "(select max(c.type) from es_data as c where c.code = b.value_def) as dataType " +
             "from es_pro_com_att a,es_att b where a.att_id=b.att_id and pc_id=#{pcId} ORDER BY ser asc;")
     List<ProComAttDto> selectPrComAttList(String pcId);
+
 }

+ 5 - 0
src/test/java/com/miniframe/EsMapperTest.java

@@ -2,6 +2,7 @@ package com.miniframe;
 
 import com.miniframe.mappers.es.dao.EsMapper;
 import com.miniframe.mappers.es.model.ProComAttDto;
+import com.miniframe.model.es.EsDataAtt;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -20,4 +21,8 @@ public class EsMapperTest {
             System.out.println(vd);
         }
     }
+
+    @Test
+    public void selectDataAtts(){
+    }
 }

+ 2 - 1
系统设计/实体Bean/es(实体列表).csv

@@ -6,4 +6,5 @@
 5,ES_PRO_COM_ATT,项目组件属性表,FALSE,
 6,ES_PRO_COM_CON,项目组件链接表,FALSE,
 7,ES_DATA,数据配置表,FALSE,
-8,ES_DATA_ATT,数据属性配置表,FALSE,
+8,ES_DATA_ATT,数据属性值配置表,FALSE,
+9,ES_PRO_COM_ATT_DATA,项目组件属性值数据表,FALSE,

+ 4 - 15
系统设计/数据定义/返 回 码/business(业务系统).csv

@@ -62,18 +62,7 @@
 2000008,EB2000008,文件不存在!,
 2000009,EB2000008,文件移动拷贝失败!,
 
-3000001,MDO000001,工程不存在!,
-3000002,MDO000002,模板不存在!,
-3000003,MDO000003,设计变量数据格式错误!,
-3000004,MDO000004,约束条件数据格式错误!,
-3000005,MDO000005,目标函数数据格式错误!,
-
-3000006,MDO000006,输入参数不存在!,
-3000007,MDO000007,输出参数不存在!,
-3000008,MDO000008,进化优化器参数不存在!,
-
-3000009,MDO000009,求解配置文件生成失败!,
-3000010,MDO000010,求解失败!,
-3000011,MDO000011,求解器类型缺失!,
-
-3000011,MDO000012,Cst 数据错误!,
+3000001,ES000001,项目组件属性不存在!,
+3000002,ES000002,组件属性数据不存在!,
+3000003,ES000003,该组件属性数据类型不是数列!,
+3000004,ES000004,数据定义错误!,

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

@@ -1,11 +1,16 @@
 "序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
 1,pcaId,项目组件属性ID,string,,,,,,,,,,,
-2,rows,数据,list,,,,0,,,,,,,
-2.1,pcadgId,项目组件属性数据分组ID,string,,,,,,,,,,,
-2.2,vals,数据,list,,,,0,,,,,,,
-2.2.1,pcadId,项目组件属性数据ID,string,,,,,,,,,,,
-2.2.2,name,数据属性名称,string,,,,,,,,,,,
-2.2.3,code,数据属性Code,string,,,,,,,,,,,
-2.2.4,valueType,值类型,int,,,,,,,,,,,
-2.2.5,valueDef,默认值,string,,,,,,,,,,,
-3,dataType,值数据类型,int,,,,,,,,,,,
+2,headers,表头,list,,,,0,,,,,,,
+2.1,cdId,数据id,string,,,,,,,,,,,
+2.2,cdvId,数据属性id,string,,,,,,,,,,,
+2.3,name,数据属性名称,string,,,,,,,,,,,
+2.4,code,数据属性Code,string,,,,,,,,,,,
+2.5,dataType,值数据类型,int,,,,,,,,,,,
+2.6,valueType,值类型,int,,,,,,,,,,,
+2.7,valueDef,默认值,string,,,,,,,,,,,
+3,datas,数据,list,,,,0,,,,,,,
+3.1,pcadgId,项目组件属性数据分组ID,string,,,,,,,,,,,
+3.2,pcadId,项目组件属性数据ID,string,,,,,,,,,,,
+3.3,value,数值,string,,,,,,,,,,,
+3.4,unit,单位,string,,,,,,,,,,,
+3.5,cdvId,数据属性id,string,,,,,,,,,,,