项目属性多条添加修改

generated/com/miniframe/generate/comm/ac/D_AC00005.java

@@ -4,35 +4,23 @@
 package com.miniframe.generate.comm.ac;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
+import java.util.*;
 /**
  * 项目属性添加修改
  */
 public class D_AC00005 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	String pid;//项目id
+	List <D_AC00005_ROWS_RECODE> rows;//数据
 	/**
-	 *项目id
+	 *数据
 	 */
-	public void setPid(String pid) {
-		this.pid=pid;
+	public void setRows(List <D_AC00005_ROWS_RECODE> rows) {
+		this.rows=rows;
 	}
 	/**
-	 *项目id
+	 *数据
 	 */
-	public String getPid() {
-		return this.pid;
-	}
-	int type;//类型0气动1结构2气弹
-	/**
-	 *类型0气动1结构2气弹
-	 */
-	public void setType(int type) {
-		this.type=type;
-	}
-	/**
-	 *类型0气动1结构2气弹
-	 */
-	public int getType() {
-		return this.type;
+	public List <D_AC00005_ROWS_RECODE> getRows() {
+		return this.rows;
 	}
 }

generated/com/miniframe/generate/comm/ac/D_AC00005_ROWS_RECODE.java

@@ -0,0 +1,64 @@
+/**
+ * 气动设计
+ */
+package com.miniframe.generate.comm.ac;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 项目属性添加修改->数据
+ */
+public class D_AC00005_ROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String pid;//项目id
+	/**
+	 *项目id
+	 */
+	public void setPid(String pid) {
+		this.pid=pid;
+	}
+	/**
+	 *项目id
+	 */
+	public String getPid() {
+		return this.pid;
+	}
+	String attId;//属性ID
+	/**
+	 *属性ID
+	 */
+	public void setAttId(String attId) {
+		this.attId=attId;
+	}
+	/**
+	 *属性ID
+	 */
+	public String getAttId() {
+		return this.attId;
+	}
+	String pattId;//项目属性ID
+	/**
+	 *项目属性ID
+	 */
+	public void setPattId(String pattId) {
+		this.pattId=pattId;
+	}
+	/**
+	 *项目属性ID
+	 */
+	public String getPattId() {
+		return this.pattId;
+	}
+	String val;//项目属性值
+	/**
+	 *项目属性值
+	 */
+	public void setVal(String val) {
+		this.val=val;
+	}
+	/**
+	 *项目属性值
+	 */
+	public String getVal() {
+		return this.val;
+	}
+}

generated/validateform/d_ac00005_rows_recodeForm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
+<!-- 项目属性添加修改->数据Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<form-validation>
+<formset>
+<form name="d_ac00005_rows_recodeForm">
+<field property="pid" depends="required">
+    <arg0 key="d_ac00005_rows_recode.pid"/>
+</field>
+<field property="attId" depends="required">
+    <arg0 key="d_ac00005_rows_recode.attId"/>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validator/resources_d_ac00005Form_validator.properties

@@ -1,3 +1 @@
-d_ac00005.pid = \u9879\u76EEid
-d_ac00005.type = \u7C7B\u578B0\u6C14\u52A81\u7ED3\u67842\u6C14\u5F39
-d_ac00005Form = true
+d_ac00005Form = false

generated/validator/resources_d_ac00005Form_validator_zh_CN.properties

@@ -1,3 +1 @@
-d_ac00005.pid = \u9879\u76EEid
-d_ac00005.type = \u7C7B\u578B0\u6C14\u52A81\u7ED3\u67842\u6C14\u5F39
-d_ac00005Form = true
+d_ac00005Form = false

generated/validator/resources_d_ac00005_rows_recodeForm_validator.properties

@@ -0,0 +1,5 @@
+d_ac00005_rows_recode.pid = \u9879\u76EEid
+d_ac00005_rows_recode.attId = \u5C5E\u6027ID
+d_ac00005_rows_recode.pattId = \u9879\u76EE\u5C5E\u6027ID
+d_ac00005_rows_recode.val = \u9879\u76EE\u5C5E\u6027\u503C
+d_ac00005_rows_recodeForm = true

generated/validator/resources_d_ac00005_rows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,5 @@
+d_ac00005_rows_recode.pid = \u9879\u76EEid
+d_ac00005_rows_recode.attId = \u5C5E\u6027ID
+d_ac00005_rows_recode.pattId = \u9879\u76EE\u5C5E\u6027ID
+d_ac00005_rows_recode.val = \u9879\u76EE\u5C5E\u6027\u503C
+d_ac00005_rows_recodeForm = true

src/main/java/com/miniframe/bisiness/ac/AC00005Service.java

@@ -1,5 +1,6 @@
 package com.miniframe.bisiness.ac;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -7,7 +8,9 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.ac.model.AC00005BaseModel;
 import com.miniframe.generate.comm.ac.A_AC00005_ROWS_RECODE;
+import com.miniframe.generate.comm.ac.D_AC00005_ROWS_RECODE;
 import com.miniframe.model.ac.AcProAtt;
+import com.miniframe.model.ac.AcProAttSQLBuilder;
 import com.miniframe.model.ac.dao.AcProAttMapper;
 import io.netty.util.internal.StringUtil;
 
@@ -24,9 +27,16 @@ public class AC00005Service extends AC00005BaseModel implements ExecProcessFlow
 	public void transExecute() throws Exception {
 		List<A_AC00005_ROWS_RECODE> rows=this.getA_ac00005().getRows();
 		AcProAttMapper dao = UtilTools.getBean(AcProAttMapper.class);
+		List<D_AC00005_ROWS_RECODE> drows =new ArrayList<>();
 		for (A_AC00005_ROWS_RECODE r:rows) {
-			if(StringUtil.isNullOrEmpty(r.getPattId())){//添加
-				AcProAtt pa = new AcProAtt();
+			AcProAtt pa;
+			AcProAttSQLBuilder sb = new AcProAttSQLBuilder();
+			AcProAttSQLBuilder.Criteria sc = sb.createCriteria();
+			sc.andPidEqualTo(r.getPid());
+			sc.andAttIdEqualTo(r.getAttId());
+			List<AcProAtt> pas = dao.selectByExample(sb);
+			if(pas==null||pas.isEmpty()){//添加
+				pa= new AcProAtt();
 				pa.setPid(r.getPid());
 				pa.setAttId(r.getAttId());
 				pa.setPattId(UtilTools.getUUid());
@@ -35,17 +45,22 @@ public class AC00005Service extends AC00005BaseModel implements ExecProcessFlow
 				pa.setUpdateTime(new Date());
 				pa.setUid(this.getA_achead().getUserId());
 				dao.insert(pa);
-			}else{
-				AcProAtt pa=dao.selectByPrimaryKey(r.getPattId());
-				if(pa!=null){
-					pa.setPid(r.getPid());
-					pa.setAttId(r.getAttId());
-					pa.setVal(r.getVal());
-					pa.setUpdateTime(new Date());
-					dao.updateByPrimaryKey(pa);
-				}
+			}else{//修改
+				pa=pas.get(0);
+				pa.setPid(r.getPid());
+				pa.setAttId(r.getAttId());
+				pa.setVal(r.getVal());
+				pa.setUpdateTime(new Date());
+				dao.updateByPrimaryKey(pa);
 			}
+			D_AC00005_ROWS_RECODE dr =new D_AC00005_ROWS_RECODE();
+			dr.setPattId(pa.getPattId());
+			dr.setAttId(pa.getAttId());
+			dr.setPid(pa.getPid());
+			dr.setVal(pa.getVal());
+			drows.add(dr);
 		}
+		this.getD_ac00005().setRows(drows);
 	}
 	
 	/**

系统设计/通信设计/通讯报文/ac(气动设计)/报文体/AC00005_D(项目属性添加修改).csv

@@ -1,3 +1,6 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
-1,pid,项目id,string,,,是,,,,,,,,
-2,type,类型0气动1结构2气弹,int,,,是,,,,,,,,
+1,rows,数据,list,,,,0,,,,,,,
+1.1,pid,项目id,string,,,是,,,,,,,,
+1.2,attId,属性ID,string,,,是,,,,,,,,,
+1.3,pattId,项目属性ID,string,,,,,,,,,,,
+1.4,val,项目属性值,string,,,,,,,,,,,