企业列表修改

happy-job-base-system/src/main/webapp/webpage/modules/wscompany/wsCompanyList.js

@@ -97,51 +97,20 @@ $(document).ready(function() {
 		        sortName: 'companyName'
 		       
 		    }
-		   ,{
-			   field: 'salaryDay',
-			   title: '月发薪日',
-			   sortable: false,
-			   sortName: 'salaryDay'
-
-		   }
-			,{
-		        field: 'salaryPeriodStartDay',
-		        title: '结算周期',
-		        sortable: false,
-		        sortName: 'salaryPeriodStartDay'
-			   ,formatter:function(value, row , index){
-				   return row.salaryPeriodStartDay+"-"+row.salaryPeriodEndDay
-			   }
-		       
-		    }
-			,{
-		        field: 'wsUploadRecord.lastUploadTime',
-		        title: '最后上传时间',
-		        sortable: false,
-		        sortName: 'wsUploadRecord.lastUploadTime'
-			   ,formatter:function(value, row , index){
-				  	return value?value:"--";
-			   }
-		       
-		    }
-
-		   ,{
-			   field: 'wsUploadRecord.lastDocument',
-			   title: '上传状态',
-			   sortable: false,
-			   sortName: 'wsUploadRecord.lastDocument'
-			   ,formatter:function(value, row , index){
-				   value = value?"已上传":"<i style='color: #0F9E5E'>未上传</i>";
-                   <c:choose>
-					   <c:when test="${fns:hasPermission('wscompany:wsUploadRecord:list')}">
-							 return value+"&nbsp;&nbsp;&nbsp;<a href='javascript:viewRecordList(\""+row.id+"\")'>"+"查看记录"+"</a>";
-					   </c:when>
-                   </c:choose>
-
-			   }
+                   ,{
+                       field: 'yesterdayClock',
+                       title: '昨日员工数',
+                       sortable: false,
+                       sortName: 'yesterdayClock'
 
-		   }
+                   }
+                   ,{
+                       field: 'allStaff',
+                       title: '历史员工数',
+                       sortable: false,
+                       sortName: 'allStaff'
 
+                   }
                    ,{
                        field: 'operate',
                        title: '操作',

happy-job-module-hpjob/src/main/java/com/jeeplus/modules/wscompany/mapper/xml/WsCompanyMapper.xml

@@ -32,7 +32,27 @@
 	
 	<select id="findList" resultType="WsCompany" >
 		SELECT 
-			<include refid="wsCompanyColumns"/>
+			<include refid="wsCompanyColumns"/>,
+		(
+		SELECT
+		COUNT(wsp.id)
+		FROM
+		ws_punch_clock wsp
+		WHERE
+		wsp.company_id = a.id
+		AND DATEDIFF(
+		wsp.start_punch_clock,
+		NOW()
+		) = -1
+		) AS 'yesterdayClock',
+		(
+		SELECT
+		count(wss.id)
+		FROM
+		ws_staff wss
+		WHERE
+		wss.company_id = a.id
+		) AS 'allStaff'
 		FROM ws_company a
 		<include refid="wsCompanyJoins"/>
 		<where>