Merge remote-tracking branch 'origin/zhouwq' into develop

WebContent/jwapp/pages/bgmk/js/bgmkTab.js

@@ -68,7 +68,7 @@ var is_column = [ [
 						return getCodeName(v_typequery_data.rowSet, value);
 					}
 				},
-				{field : 'CREATOR_ID',title : '创建人员',width : 100,align : 'center'},
+				{field : 'CREATE_ID',title : '创建人员',width : 100,align : 'center'},
 				{field : 'CREATE_TIME',title : '创建时间',width : 100,align : 'center'}
 				] ];
 //列表加载完成回调

src_jwapp/com/jw/app/bgmk/viewAction.java

@@ -8,17 +8,7 @@ import com.gaowj.business.util.RequestUtils;
 
 public class viewAction extends BasicAction {
 
-
-
-	/**
-	 * 
-	 */
 	private static final long serialVersionUID = 847847227972540472L;
-
-	/**
-	 * 
-	 */
-
 	
 	public String bgmkTab() throws BusinessException{
 		return "bgmkTab";

src_jwapp/com/jw/app/business/bgmk/bgmkDAO.xml

@@ -44,7 +44,8 @@
 			</trim>
 		</where>
 	</sql>
-	
+
+
 	<insert id="insert_bgmk" parameterType="map">
 		insert into WORK_BG(
 		<trim prefix="" suffixOverrides=",">
@@ -64,27 +65,27 @@
 	<update id="update_bgmk" parameterType="map">
 	       <![CDATA[
             update WORK_BG set 
-        	 ]]>
-			<trim prefix="" suffixOverrides=",">
-				<foreach collection="info" item="info">
-					${info.key} = #{info.value} ,
-				</foreach>
-			</trim>
-			<where>
-				<if test="UUID != null and UUID != ''">
-					and UUID = #{UUID}
-	           </if>
-			</where>
-		</update>
+         ]]>
+		<trim prefix="" suffixOverrides=",">
+			<foreach collection="info" item="info">
+				${info.key} = #{info.value} ,
+			</foreach>
+		</trim>
+		<where>
+			<if test="UUID != null and UUID != ''">
+				and UUID = #{UUID}
+           </if>
+		</where>
+	</update>
 	
 	<delete id="delete_bgmk" parameterType="list">
-	        <![CDATA[
-	            delete from  WORK_BG where UUID IN
-	         ]]>
-			<foreach collection="list" item="UUID" open="(" separator=","
-				close=")">
-				#{UUID} 
-	         </foreach>
+        <![CDATA[
+            delete from  WORK_BG where UUID IN
+         ]]>
+		<foreach collection="list" item="UUID" open="(" separator=","
+			close=")">
+			#{UUID} 
+         </foreach>
 	</delete>
 
 	<select id="list_bgmk" parameterType="map" resultType="upperCaseKeyMap">
@@ -100,7 +101,7 @@
 		 <![CDATA[
 		   select count(*) c from WORK_BG f where 1=1 
 	     ]]>
-		<include refid="where_send" />
+		<include refid="where_bg" />
 	</select>