fix

code/sapparent/sapcms/src/main/java/org/fouram/controller/ApiController.java

@@ -244,7 +244,7 @@ public class ApiController extends BaseController {
 				return ResultUtil.error("参数pageNumber为空");
 			}
 			Object result = sapCheckService.findUserReportPage(dto.getStartDate(), dto.getEndDate(), dto.getDepartId(),
-					dto.getName(), dto.getState(), dto.getPageSize(), dto.getPageNumber());
+					dto.getName(), dto.getStatus(), dto.getPageSize(), dto.getPageNumber());
 			return ResultUtil.success(result, "操作成功");
 		} catch (Exception e) {
 			LoggerUtil.error(e);
@@ -272,7 +272,7 @@ public class ApiController extends BaseController {
 			// 明细
 			String resultFilePath = "/public/excel/userReport" + DateUtil.getTimeStamp() + ".xlsx";
 			List<Map<String, Object>> mxList = sapCheckService.findUserReports(dto.getStartDate(), dto.getEndDate(),
-					dto.getDepartId(), dto.getName(), dto.getState(), null, null);
+					dto.getDepartId(), dto.getName(), dto.getStatus(), null, null);
 			ExcelExportUtil.exportExcelFile(getRootPath() + ysFilePath, mxList, getRootPath() + resultFilePath, 1, 1);
 			return ResultUtil.success(resultFilePath, "操作成功");
 		} catch (Exception e) {

code/sapparent/sapservice/src/main/java/org/fouram/input/FindUsersDTO.java

@@ -18,7 +18,7 @@ public class FindUsersDTO implements Serializable {
 	private String endDate;
 	private String departId;
 	private String name;
-	private String state;
+	private String status;
 	private Integer pageNumber;
 	private Integer pageSize;
 }

code/sapparent/sapservice/src/main/java/org/fouram/mapper/SapCheckMapper.xml

@@ -150,7 +150,7 @@
 		from sap_check_report a, sap_checkdate b, wx_user c 
 		where a.checkinDay=b.checkinDay and a.userId = c.userId
 		<if test="departId != null and departId != ''">
-			and (a.firstDepartId=#{departId} or a.secondDepartId=#{departId})
+			and (c.firstDepartId=#{departId} or c.secondDepartId=#{departId})
 		</if>
 		<if test="startDate != null and startDate != ''">
 			and a.checkinDay >= #{startDate} 
@@ -175,7 +175,7 @@
 		from sap_check_report a, sap_checkdate b, wx_user c 
 		where a.checkinDay=b.checkinDay and a.userId = c.userId
 		<if test="departId != null and departId != ''">
-			and (a.firstDepartId=#{departId} or a.secondDepartId=#{departId})
+			and (c.firstDepartId=#{departId} or c.secondDepartId=#{departId})
 		</if>
 		<if test="startDate != null and startDate != ''">
 			and a.checkinDay >= #{startDate} 

code/sapparent/sapservice/src/main/java/org/fouram/service/SapCheckService.java

@@ -10,12 +10,14 @@ import org.fouram.core.base.service.BaseService;
 import org.fouram.core.plugin.weixin.cp.util.WXCpOaUtil;
 import org.fouram.core.util.BeanUtils;
 import org.fouram.core.util.DateUtil;
+import org.fouram.core.util.LoggerUtil;
 import org.fouram.core.util.Tools;
 import org.fouram.entity.SapCheck;
 import org.fouram.entity.SapCheckReport;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
@@ -238,6 +240,7 @@ public class SapCheckService extends BaseService {
 			pd.put("pageCurrent", String.valueOf(pageSize * (pageNumber - 1)));
 			pd.put("pageSize", String.valueOf(pageSize));
 		}
+		LoggerUtil.info(JSON.toJSONString(pd));
 		return (List<Map<String, Object>>) findList("SapCheckMapper.findUserReports", pd);
 	}
 
@@ -253,6 +256,7 @@ public class SapCheckService extends BaseService {
 		pd.put("departId", departId);
 		pd.put("name", name);
 		pd.put("reportDaySql", getReportDaySql(startDate, endDate));
+		LoggerUtil.info(JSON.toJSONString(pd));
 		return (List<Map<String, Object>>) findList("SapCheckMapper.selectReportDayList", pd);
 	}