模版添加类型 及image2

generated/com/miniframe/generate/comm/mdo/A_MDO0006.java

@@ -87,4 +87,30 @@ public class A_MDO0006 extends BaseMapModel implements Serializable {
 	public String getFlow() {
 		return this.flow;
 	}
+	int type;//1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+	/**
+	 *1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+	 */
+	public void setType(int type) {
+		this.type=type;
+	}
+	/**
+	 *1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+	 */
+	public int getType() {
+		return this.type;
+	}
+	String image2;//图片base64
+	/**
+	 *图片base64
+	 */
+	public void setImage2(String image2) {
+		this.image2=image2;
+	}
+	/**
+	 *图片base64
+	 */
+	public String getImage2() {
+		return this.image2;
+	}
 }

generated/com/miniframe/generate/comm/mdo/D_MDO0005_ROWS_RECODE.java

@@ -113,4 +113,30 @@ public class D_MDO0005_ROWS_RECODE extends BaseMapModel implements Serializable
 	public String getFlow() {
 		return this.flow;
 	}
+	int type;//1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+	/**
+	 *1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+	 */
+	public void setType(int type) {
+		this.type=type;
+	}
+	/**
+	 *1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+	 */
+	public int getType() {
+		return this.type;
+	}
+	String image2;//图片base64
+	/**
+	 *图片base64
+	 */
+	public void setImage2(String image2) {
+		this.image2=image2;
+	}
+	/**
+	 *图片base64
+	 */
+	public String getImage2() {
+		return this.image2;
+	}
 }

generated/validator/resources_a_mdo0006Form_validator.properties

@@ -4,4 +4,6 @@ a_mdo0006.remark = \u63CF\u8FF0
 a_mdo0006.image = \u56FE\u7247base64
 a_mdo0006.isshare = 
 a_mdo0006.flow = \u6D41\u7A0B\u56FE
+a_mdo0006.type = 1-\u51FD\u6570\u4F18\u5316\u6A21\u72482-\u7FFC\u578B\u4F18\u5316\u6A21\u72483-\u673A\u7FFC\u4F18\u5316\u6A21\u7248
+a_mdo0006.image2 = \u56FE\u7247base64
 a_mdo0006Form = true

generated/validator/resources_a_mdo0006Form_validator_zh_CN.properties

@@ -4,4 +4,6 @@ a_mdo0006.remark = \u63CF\u8FF0
 a_mdo0006.image = \u56FE\u7247base64
 a_mdo0006.isshare = 
 a_mdo0006.flow = \u6D41\u7A0B\u56FE
+a_mdo0006.type = 1-\u51FD\u6570\u4F18\u5316\u6A21\u72482-\u7FFC\u578B\u4F18\u5316\u6A21\u72483-\u673A\u7FFC\u4F18\u5316\u6A21\u7248
+a_mdo0006.image2 = \u56FE\u7247base64
 a_mdo0006Form = true

generated/validator/resources_d_mdo0005_rows_recodeForm_validator.properties

@@ -6,4 +6,6 @@ d_mdo0005_rows_recode.createtime = \u521B\u5EFA\u65F6\u95F4
 d_mdo0005_rows_recode.updatetime = \u66F4\u65B0\u65F6\u95F4
 d_mdo0005_rows_recode.isshare = 
 d_mdo0005_rows_recode.flow = \u6D41\u7A0B\u56FE
+d_mdo0005_rows_recode.type = 1-\u51FD\u6570\u4F18\u5316\u6A21\u72482-\u7FFC\u578B\u4F18\u5316\u6A21\u72483-\u673A\u7FFC\u4F18\u5316\u6A21\u7248
+d_mdo0005_rows_recode.image2 = \u56FE\u7247base64
 d_mdo0005_rows_recodeForm = true

generated/validator/resources_d_mdo0005_rows_recodeForm_validator_zh_CN.properties

@@ -6,4 +6,6 @@ d_mdo0005_rows_recode.createtime = \u521B\u5EFA\u65F6\u95F4
 d_mdo0005_rows_recode.updatetime = \u66F4\u65B0\u65F6\u95F4
 d_mdo0005_rows_recode.isshare = 
 d_mdo0005_rows_recode.flow = \u6D41\u7A0B\u56FE
+d_mdo0005_rows_recode.type = 1-\u51FD\u6570\u4F18\u5316\u6A21\u72482-\u7FFC\u578B\u4F18\u5316\u6A21\u72483-\u673A\u7FFC\u4F18\u5316\u6A21\u7248
+d_mdo0005_rows_recode.image2 = \u56FE\u7247base64
 d_mdo0005_rows_recodeForm = true

modelsrc/com/miniframe/model/mdo/MdoMod.java

@@ -54,6 +54,16 @@ public class MdoMod extends MiniserviceBaseModel implements Serializable {
      */
     private String flow;
 
+    /**
+     * 1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+     */
+    private Integer type;
+
+    /**
+     * 图片base64
+     */
+    private String image2;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -221,4 +231,40 @@ public class MdoMod extends MiniserviceBaseModel implements Serializable {
     public void setFlow(String flow) {
         this.flow = flow == null ? null : flow.trim();
     }
+
+    /**
+     * 获取1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+     *
+     * @return type - 1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+     */
+    public Integer getType() {
+        return type;
+    }
+
+    /**
+     * 设置1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+     *
+     * @param type 1-函数优化模版 2-翼型优化模版 3-机翼优化模版
+     */
+    public void setType(Integer type) {
+        this.type = type;
+    }
+
+    /**
+     * 获取图片base64
+     *
+     * @return image2 - 图片base64
+     */
+    public String getImage2() {
+        return image2;
+    }
+
+    /**
+     * 设置图片base64
+     *
+     * @param image2 图片base64
+     */
+    public void setImage2(String image2) {
+        this.image2 = image2 == null ? null : image2.trim();
+    }
 }

modelsrc/com/miniframe/model/mdo/MdoModSQLBuilder.java

@@ -704,6 +704,136 @@ public class MdoModSQLBuilder {
             addCriterion("flow not between", value1, value2, "flow");
             return (Criteria) this;
         }
+
+        public Criteria andTypeIsNull() {
+            addCriterion("type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIsNotNull() {
+            addCriterion("type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeEqualTo(Integer value) {
+            addCriterion("type =", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotEqualTo(Integer value) {
+            addCriterion("type <>", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThan(Integer value) {
+            addCriterion("type >", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("type >=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThan(Integer value) {
+            addCriterion("type <", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("type <=", value, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeIn(List<Integer> values) {
+            addCriterion("type in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotIn(List<Integer> values) {
+            addCriterion("type not in", values, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeBetween(Integer value1, Integer value2) {
+            addCriterion("type between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("type not between", value1, value2, "type");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2IsNull() {
+            addCriterion("image2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2IsNotNull() {
+            addCriterion("image2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2EqualTo(String value) {
+            addCriterion("image2 =", value, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2NotEqualTo(String value) {
+            addCriterion("image2 <>", value, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2GreaterThan(String value) {
+            addCriterion("image2 >", value, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2GreaterThanOrEqualTo(String value) {
+            addCriterion("image2 >=", value, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2LessThan(String value) {
+            addCriterion("image2 <", value, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2LessThanOrEqualTo(String value) {
+            addCriterion("image2 <=", value, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2Like(String value) {
+            addCriterion("image2 like", value, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2NotLike(String value) {
+            addCriterion("image2 not like", value, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2In(List<String> values) {
+            addCriterion("image2 in", values, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2NotIn(List<String> values) {
+            addCriterion("image2 not in", values, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2Between(String value1, String value2) {
+            addCriterion("image2 between", value1, value2, "image2");
+            return (Criteria) this;
+        }
+
+        public Criteria andImage2NotBetween(String value1, String value2) {
+            addCriterion("image2 not between", value1, value2, "image2");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

modelsrc/com/miniframe/model/mdo/dbconfig/MapperConfig-mdo.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 Wed Feb 05 12:03:48 CST 2025.
+    This file was generated on Wed Feb 05 14:24:51 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/mdo/xml/MdoProjectMapper.xml" />

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 Wed Feb 05 12:03:49 CST 2025.
+    This file was generated on Wed Feb 05 14:24:51 CST 2025.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

src/main/java/com/miniframe/bisiness/mdo/MDO0005Service.java

@@ -59,6 +59,8 @@ public class MDO0005Service extends MDO0005BaseModel implements ExecProcessFlow
 			row.setImage(mod.getImage());
 			row.setIsshare(mod.getIsshare().toString());
 			row.setRemark(mod.getRemark());
+			row.setType(mod.getType());
+			row.setImage2(mod.getImage2());
 			rows.add(row);
 		}
 

src/main/java/com/miniframe/bisiness/mdo/MDO0006Service.java

@@ -31,6 +31,8 @@ public class MDO0006Service extends MDO0006BaseModel implements ExecProcessFlow
 		String image =this.getA_mdo0006().getImage();
 		String flow =this.getA_mdo0006().getFlow();
 		String uid=this.getA_mdohead().getUserId();
+		String image2 =this.getA_mdo0006().getImage2();
+		Integer type =this.getA_mdo0006().getType();
 		Date nowDate = XIDateTimeUtils.getNowDate();
 		MdoModMapper modDao = UtilTools.getBean(MdoModMapper.class);
 		if(StringUtil.isEmpty(mid)){//添加
@@ -45,6 +47,8 @@ public class MDO0006Service extends MDO0006BaseModel implements ExecProcessFlow
 			mod.setIsshare(Short.valueOf(isshare));
 			mod.setName(name);
 			mod.setRemark(remark);
+			mod.setType(type);
+			mod.setImage2(image2);
 			modDao.insert(mod);
 		}else{//修改
 			MdoMod mod = modDao.selectByPrimaryKey(mid);
@@ -59,6 +63,8 @@ public class MDO0006Service extends MDO0006BaseModel implements ExecProcessFlow
 			mod.setIsshare(Short.valueOf(isshare));
 			mod.setName(name);
 			mod.setRemark(remark);
+			mod.setType(type);
+			mod.setImage2(image2);
 			modDao.updateByPrimaryKey(mod);
 		}
 

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0005_D(模板查询).csv

@@ -9,3 +9,5 @@
 2.6,updatetime,更新时间,string,,,,,,,,,,,
 2.7,isshare,,string,,,,,,,,,,,
 2.8,flow,流程图,string,,,,,,,,,,,
+2.9,type,1-函数优化模版 2-翼型优化模版 3-机翼优化模版,int,,,,,,,,,,,
+2.10,image2,图片base64,string,,,,,,,,,,,

系统设计/通信设计/通讯报文/mdo(系统服务)/报文体/MDO0006_A(模板添加修改).csv

@@ -5,4 +5,5 @@
 4,image,图片base64,string,,,,,,,,,,,
 5,isshare,,string,,,,,,,,,,,
 6,flow,流程图,string,,,,,,,,,,,
-
+7,type,1-函数优化模版 2-翼型优化模版 3-机翼优化模版,int,,,,,,,,,,,
+8,image2,图片base64,string,,,,,,,,,,,