提交

src/main/java/cn/timer/api/dto/xcgl/PayTermDto.java

@@ -22,6 +22,8 @@ public class PayTermDto implements Serializable {
 	String xremarks;// 项备注
 	String xremarks;// 项备注
 	Integer xgsid;// 项对应的公式id
 	Integer xgsid;// 项对应的公式id
 	String xgsgs;// 项公式
 	String xgsgs;// 项公式
+	
+	Integer xiscustom;//是否自定义项（0：否；1：是）
 	/**
 	/**
 	 * 公式变量值1
 	 * 公式变量值1
 	 */
 	 */

src/main/resources/mapping/xcgl/XcglAssoJsgzzxMapper.xml

@@ -34,6 +34,7 @@
                 <result column="xdygk" property="xdygk"/>
                 <result column="xdygk" property="xdygk"/>
                 <result column="xdegk" property="xdegk"/>
                 <result column="xdegk" property="xdegk"/>
 		   		<result column="xjxgzid" property="xjxgzid"/>
 		   		<result column="xjxgzid" property="xjxgzid"/>
+		   		<result column="xiscustom" property="xiscustom"/>
     </resultMap>
     </resultMap>
     
     
     
     
@@ -62,7 +63,8 @@
 				gzzx.gsid as xgsid,
 				gzzx.gsid as xgsid,
 				gzzx.gsgs as xgsgs,
 				gzzx.gsgs as xgsgs,
 				gzzx.dygk as xdygk,
 				gzzx.dygk as xdygk,
-				gzzx.degk as xdegk
+				gzzx.degk as xdegk,
+				gzzx.is_custom as xiscustom
 			from xcgl_asso_jsgzzx gzzx
 			from xcgl_asso_jsgzzx gzzx
 		where gzzx.jxgzid = 0
 		where gzzx.jxgzid = 0
 		and gzzx.xzzid = #{xzzid}
 		and gzzx.xzzid = #{xzzid}

src/main/resources/mapping/xcgl/XcglAssoJxgzMapper.xml

@@ -33,6 +33,7 @@
                 <result column="xdegk" property="xdegk"/>
                 <result column="xdegk" property="xdegk"/>
 		   		<result column="xjxgzid" property="xjxgzid"/>
 		   		<result column="xjxgzid" property="xjxgzid"/>
 		   		<result column="xoptionid" property="xoptionid"/>
 		   		<result column="xoptionid" property="xoptionid"/>
+		   		<result column="xiscustom" property="xiscustom"/>
 		    </collection>
 		    </collection>
             
             
     </resultMap>
     </resultMap>
@@ -186,7 +187,8 @@
 				gzzx.degk as xdegk,
 				gzzx.degk as xdegk,
 				gzzx.jxgzid as xjxgzid,
 				gzzx.jxgzid as xjxgzid,
 				gzzx.optionid as xoptionid,
 				gzzx.optionid as xoptionid,
-				jxgz.xzzid as zxzzid
+				jxgz.xzzid as zxzzid,
+				gzzx.is_custom as xiscustom
 		from xcgl_asso_jxgz jxgz
 		from xcgl_asso_jxgz jxgz
 		LEFT JOIN xcgl_asso_jsgzzx as gzzx on gzzx.jxgzid = jxgz.id
 		LEFT JOIN xcgl_asso_jsgzzx as gzzx on gzzx.jxgzid = jxgz.id
 		where jxgz.xzzid = #{xzzid}
 		where jxgz.xzzid = #{xzzid}