报工模块修改

WebContent/jwapp/pages/bgmk/js/bgmkEmployeeTab.js

@@ -56,9 +56,9 @@ var v_typequery_data = standardModel.dataAction.listAllCache(v_typequery);
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="报工模块  ";
+var ls_title="员工报工  ";
 var is_column = [ [
-				{field : 'CONTENT',title : '工作内容',width : 300,align : 'center'},
+				{field : 'CONTENT',title : '工作内容',width : 400,align : 'center'},
 				{field : 'BG_TIME',title : '报工时间',width : 80,align : 'center'},
 				{field : 'GZYS',title : '工作用时',width : 80,align : 'center'},		
 				] ];

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

@@ -56,11 +56,11 @@ var v_typequery_data = standardModel.dataAction.listAllCache(v_typequery);
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="报工模块  ";
+var ls_title="报工管理  ";
 var is_column = [ [
 				{field : 'USER_NAME',title : '人员姓名',width : 100,align : 'center'},
 				{field : 'DEPT_NAME',title : '人员部门',width : 80,align : 'center'},
-				{field : 'CONTENT',title : '工作内容',width : 300,align : 'center'},
+				{field : 'CONTENT',title : '工作内容',width : 400,align : 'left', halign:'center'},
 				{field : 'BG_TIME',title : '报工时间',width : 80,align : 'center'},
 				{field : 'GZYS',title : '工作用时',width : 80,align : 'center'},		
 				{field : 'USER_TYPE',title : '人员类型',width : 100,align : 'center',
@@ -68,8 +68,6 @@ var is_column = [ [
 						return getCodeName(v_typequery_data.rowSet, value);
 					}
 				},
-				{field : 'CREATE_ID',title : '创建人员',width : 100,align : 'center'},
-				{field : 'CREATE_TIME',title : '创建时间',width : 100,align : 'center'}
 				] ];
 //列表加载完成回调
 function dataOnLoadSuccess(){

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

@@ -93,7 +93,7 @@ public class dataAction extends BasicAction{
 		Map<String, Object> query = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
 		try {
 			query = QueryParamUtil.StringToDate(query);
-			Page<Map<String, Object>> pageRows = business.list_bgmk_employee(pageNo,pageSize, query);
+			Page<Map<String, Object>> pageRows = business.list_bgmk(pageNo,pageSize, query);
 			setPageCount((pageRows.getCount() - 1) / pageSize + 1);
 			Map<String, Object> data = new HashMap<String, Object>();
 			data.put("rowSet", QueryParamUtil.DateToString(pageRows.getItems())); 

src_jwapp/com/jw/app/business/bgmk/BgmkBusinessImpl.java

@@ -46,8 +46,8 @@ public class BgmkBusinessImpl implements BgmkBusiness {
 		if(entity.get("USER_NAME")==null){
 			entity.put("USER_NAME", SessionUtil.getCode());
 		}
-		if(entity.get("CREATOR_ID")==null){
-			entity.put("CREATOR_ID", SessionUtil.getCode());
+		if(entity.get("CREATE_ID")==null){
+			entity.put("CREATE_ID", SessionUtil.getCode());
 		}
 		
 		if(entity.get("DEPT_NAME")==null){

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

@@ -35,9 +35,7 @@
 		        <if test="USER_TYPE != null and USER_TYPE != ''">
 					and f.USER_TYPE = #{USER_TYPE}
 		        </if>
-		        <if test="CREATOR_ID != null and CREATOR_ID != ''">
-					and f.CREATOR_ID = #{CREATOR_ID}
-		        </if>
+		        
 		        <if test="CREATE_TIME != null and CREATE_TIME != ''">
 					and f.CREATE_TIME = #{CREATE_TIME}
 		        </if>
@@ -46,6 +44,8 @@
 	</sql>
 
 
+
+
 	<insert id="insert_bgmk" parameterType="map">
 		insert into WORK_BG(
 		<trim prefix="" suffixOverrides=",">
@@ -90,8 +90,7 @@
 
 	<select id="list_bgmk" parameterType="map" resultType="upperCaseKeyMap">
 		 <![CDATA[
-		  select f.* 
-		  from WORK_BG f where 1=1 
+		select f.* from WORK_BG f  
 	     ]]>		
 			<include refid="where_bg" />       
 			order by f.CREATE_TIME DESC
@@ -99,7 +98,7 @@
 	
 	<select id="listCount_bgmk" parameterType="map" resultType="int">
 		 <![CDATA[
-		   select count(*) c from WORK_BG f where 1=1 
+		    select count(*) from WORK_BG f 
 	     ]]>
 		<include refid="where_bg" />
 	</select>