From 58cb0f6caab2b23b663211ec94956b63c9521ad8 Mon Sep 17 00:00:00 2001
From: wangfs <15029758498@163.com>
Date: Fri, 12 Oct 2018 10:18:28 +0800
Subject: [PATCH] 更改工时查询sql

---
 src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java         |   4 ++--
 src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java   | 151 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------
 src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java                |   9 +++++++++
 src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java       |  14 +++++++++++++-
 src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java |   8 ++++++++
 src/main/resources/mybatis/smapper/AsraDailySmapper.xml                 |  42 +++++++++++++++++++++++++++++++++++++-----
 6 files changed, 135 insertions(+), 93 deletions(-)

diff --git a/src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java b/src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java
index ecb7ea3..8eaf566 100644
--- a/src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java
+++ b/src/main/java/com/zteits/oa/api/base/constants/SessionEnum.java
@@ -17,9 +17,9 @@ public enum SessionEnum {
     //验证码
     IMAGE_CODE("imageCode"),
     //user 与 session 关联关系
-    USER_SESSION_REL("user:session"),
+    USER_SESSION_REL("useroa:session"),
     //user 对象
-    USER_INFO("userop:session"),
+    USER_INFO("useroa:session"),
     //登录密码输错次数
     PASS_WRONG_NUM("pass:wrong:num");
 
diff --git a/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java b/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
index 95fa40e..cd9c2e3 100644
--- a/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
+++ b/src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
@@ -42,24 +42,24 @@ import java.util.Date;
 @Service
 public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
 
-    @Autowired
-    private AsraDailyDao asraDailyDao;
-
-    @Override
-    public BizResult<List<AsraDailyDTO>> queryAsraDailyList(AsraDailyQueryReq asraDailyQueryReq) {
-        List<AsraDailyDTO> asraDailyDTOs = new ArrayList<>();
-        List<AsraDaily> asraDailies = asraDailyDao.queryAsraDailyList(asraDailyQueryReq);
-        if(CollectionUtil.isNotEmpty(asraDailies)){
-            for(AsraDaily asraDaily:asraDailies){
-                AsraDailyDTO asraDailyDTO = new AsraDailyDTO();
-                BeanUtils.copyProperties(asraDaily,asraDailyDTO);
-                asraDailyDTOs.add(asraDailyDTO);
-            }
-        }
-        return new BizResult<>(asraDailyDTOs);
-    }
-
-    /**
+	@Autowired
+	private AsraDailyDao asraDailyDao;
+
+	@Override
+	public BizResult<List<AsraDailyDTO>> queryAsraDailyList(AsraDailyQueryReq asraDailyQueryReq) {
+		List<AsraDailyDTO> asraDailyDTOs = new ArrayList<>();
+		List<AsraDaily> asraDailies = asraDailyDao.queryAsraDailyList(asraDailyQueryReq);
+		if(CollectionUtil.isNotEmpty(asraDailies)){
+			for(AsraDaily asraDaily:asraDailies){
+				AsraDailyDTO asraDailyDTO = new AsraDailyDTO();
+				BeanUtils.copyProperties(asraDaily,asraDailyDTO);
+				asraDailyDTOs.add(asraDailyDTO);
+			}
+		}
+		return new BizResult<>(asraDailyDTOs);
+	}
+
+	/**
 	 * 工时查询-当天提交及未提交人数汇总.<br/>
 	 * @param request
 	 * @return
@@ -85,83 +85,64 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
 			AsraDailyForTotalNumAndDetailReq request) {
 		QueryAsraDailyAllForListReqDTO queryAsraDailyAllForListReqDTO = new QueryAsraDailyAllForListReqDTO();
 		List<AsraProjectAndPersonNumDTO> personNumDTOList = new ArrayList<>();
-		
-		
+		//1.查询项目填报人数
+		personNumDTOList = asraDailyDao.queryAsraDailyAllCountForList(request);
+		//查询项目明细
 		List<AsraDailyDO> list = asraDailyDao.queryAsraDailyAllForList(request);
-		//添加项目
-		if(CollectionUtil.isNotEmpty(list)){
+
+		//2.添加明细
+		for(AsraProjectAndPersonNumDTO asraProjectAndPersonNumDTO:personNumDTOList){
+			List<QueryAsraDailyAllDetailForListReqDTO> listDetail = new ArrayList<>();
+			if(asraProjectAndPersonNumDTO == null){
+				continue;
+			}
 			for(AsraDailyDO asraDailyDO:list){
 				if(asraDailyDO == null){
 					continue;
 				}
-				AsraProjectAndPersonNumDTO asraProjectAndPersonNumDTO = new AsraProjectAndPersonNumDTO();
-				BeanUtils.copyProperties(asraDailyDO, asraProjectAndPersonNumDTO);
-				if(!personNumDTOList.contains(asraProjectAndPersonNumDTO)){
-					personNumDTOList.add(asraProjectAndPersonNumDTO);
-				}else{
-					for (AsraProjectAndPersonNumDTO getAsraProjectAndPersonNumDTO:personNumDTOList){
-						if(getAsraProjectAndPersonNumDTO == null){
-							continue;
-						}
-						if(getAsraProjectAndPersonNumDTO.getProjectId().equals(asraDailyDO.getProjectId())){
-							getAsraProjectAndPersonNumDTO.setCommitPersonNum(getAsraProjectAndPersonNumDTO.getCommitPersonNum()+asraDailyDO.getCommitPersonNum());
-						}
-					}
-				}
-			}
-			//2.添加明细
-			for(AsraProjectAndPersonNumDTO asraProjectAndPersonNumDTO:personNumDTOList){
-				List<QueryAsraDailyAllDetailForListReqDTO> listDetail = new ArrayList<>();
-				if(asraProjectAndPersonNumDTO == null){
-					continue;
-				}
-				for(AsraDailyDO asraDailyDO:list){
-					if(asraDailyDO == null){
-						continue;
-					}
-					if(asraProjectAndPersonNumDTO.getProjectId().equals(asraDailyDO.getProjectId())){
-						QueryAsraDailyAllDetailForListReqDTO dto = new QueryAsraDailyAllDetailForListReqDTO();
-						BeanUtils.copyProperties(asraDailyDO, dto);
-						if(asraDailyDO.getDailyDate()!=null){
-							String dailyDate = DateUtil.format(asraDailyDO.getDailyDate(),"yyyy-MM-dd");
-							dto.setDailyDate(dailyDate.substring(0,4)+"年"+dailyDate.substring(5,7)+"月"+dailyDate.substring(8)+"日");
-						}
-						listDetail.add(dto);
-						
+				if(asraProjectAndPersonNumDTO.getProjectId().equals(asraDailyDO.getProjectId())){
+					QueryAsraDailyAllDetailForListReqDTO dto = new QueryAsraDailyAllDetailForListReqDTO();
+					BeanUtils.copyProperties(asraDailyDO, dto);
+					if(asraDailyDO.getDailyDate()!=null){
+						String dailyDate = DateUtil.format(asraDailyDO.getDailyDate(),"yyyy-MM-dd");
+						dto.setDailyDate(dailyDate.substring(0,4)+"年"+dailyDate.substring(5,7)+"月"+dailyDate.substring(8)+"日");
 					}
+					listDetail.add(dto);
+
 				}
-				asraProjectAndPersonNumDTO.setListDetail(listDetail);
 			}
+			asraProjectAndPersonNumDTO.setListDetail(listDetail);
 		}
-		queryAsraDailyAllForListReqDTO.setList(personNumDTOList);
-		
-		return new BizResult<QueryAsraDailyAllForListReqDTO>(queryAsraDailyAllForListReqDTO);
-	}
-	
-	
-    @Override
-    public BizResult<Long> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request) {
-        AsraDaily asraDaily = new AsraDaily();
-        BeanUtils.copyProperties(request, asraDaily);
-        asraDaily.setModfiyDate(new Date());
-        asraDaily.setModfiyEmpid(request.getAsarOpId() + "");
-        asraDaily.setModfiyEmpName(request.getAsarOpName() + "");
-        Date dailyDate = DateUtil.parseDate(request.getDailyDate());
-        asraDaily.setDailyDate(dailyDate);
-
-        Long id;
-        if (null == request.getId()) {
-            //新增
-            asraDaily.setDataState(1);
-            asraDaily.setCreateDate(new Date());
-            asraDaily.setCreateEmpid(request.getAsarOpId()+"");
-            asraDaily.setCreateEmpName(request.getAsarOpName() + "");
+
+        queryAsraDailyAllForListReqDTO.setList(personNumDTOList);
+
+        return new BizResult<QueryAsraDailyAllForListReqDTO>(queryAsraDailyAllForListReqDTO);
+}
+
+
+	@Override
+	public BizResult<Long> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request) {
+		AsraDaily asraDaily = new AsraDaily();
+		BeanUtils.copyProperties(request, asraDaily);
+		asraDaily.setModfiyDate(new Date());
+		asraDaily.setModfiyEmpid(request.getAsarOpId() + "");
+		asraDaily.setModfiyEmpName(request.getAsarOpName() + "");
+		Date dailyDate = DateUtil.parseDate(request.getDailyDate());
+		asraDaily.setDailyDate(dailyDate);
+
+		Long id;
+		if (null == request.getId()) {
+			//新增
+			asraDaily.setDataState(1);
+			asraDaily.setCreateDate(new Date());
+			asraDaily.setCreateEmpid(request.getAsarOpId()+"");
+			asraDaily.setCreateEmpName(request.getAsarOpName() + "");
 			id = asraDailyDao.saveAsraDaily(asraDaily);
-        } else {
-            //更新
+		} else {
+			//更新
 			id = asraDailyDao.updateAsraDaily(asraDaily);
-        }
+		}
 
-        return new BizResult<>(id);
-    }
+		return new BizResult<>(id);
+	}
 }
diff --git a/src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java b/src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
index 117b2ae..3b6215c 100644
--- a/src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
+++ b/src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
@@ -2,6 +2,7 @@ package com.zteits.oa.report.dao;
 
 import java.util.List;
 
+import com.zteits.oa.api.dto.asradaily.AsraProjectAndPersonNumDTO;
 import com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq;
 import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
 import com.zteits.oa.report.domain.AsraDaily;
@@ -48,6 +49,14 @@ public interface AsraDailyDao {
     List<AsraDailyDO> queryAsraDailyAllForList(AsraDailyForTotalNumAndDetailReq request);
 
     /**
+     * 工时查询-所有员工及自己项目人数统计.<br/>
+     * @param request
+     * @return
+     * 2018年8月1日  wangfs.<br/>
+     */
+    List<AsraProjectAndPersonNumDTO> queryAsraDailyAllCountForList(AsraDailyForTotalNumAndDetailReq request);
+
+    /**
      * 保存日报信息
      * @param
      * @return
diff --git a/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java b/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
index 49da979..ca6d395 100644
--- a/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
+++ b/src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.xiaoleilu.hutool.util.CollectionUtil;
+import com.zteits.oa.api.dto.asradaily.AsraProjectAndPersonNumDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -36,7 +37,7 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
 
     @Autowired
     private AsraDailyMapper asraDailyMapper;
-    
+
     @Autowired
     private AsraDailySmapper asraDailySmapper;
 
@@ -102,4 +103,15 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
 		// TODO Auto-generated method stub
 		return asraDailySmapper.queryAsraDailyAllForList(request);
 	}
+
+	/**
+	 * 工时查询-所有员工及自己项目人数统计.<br/>
+	 * @param request
+	 * @return
+	 * 2018年8月1日  wangfs.<br/>
+	 */
+	@Override
+	public List<AsraProjectAndPersonNumDTO> queryAsraDailyAllCountForList(AsraDailyForTotalNumAndDetailReq request) {
+		return asraDailySmapper.queryAsraDailyAllCountForList(request);
+	}
 }
diff --git a/src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java b/src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java
index 6c72802..ce20eb3 100644
--- a/src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java
+++ b/src/main/java/com/zteits/oa/report/mapper/smapper/AsraDailySmapper.java
@@ -1,5 +1,6 @@
 package com.zteits.oa.report.mapper.smapper;
 
+import com.zteits.oa.api.dto.asradaily.AsraProjectAndPersonNumDTO;
 import com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq;
 import com.zteits.oa.report.domain.sdo.AsraDailyDO;
 
@@ -13,6 +14,13 @@ public interface AsraDailySmapper {
 	 * 2018年8月1日  wangfs.<br/>
 	 */
     List<AsraDailyDO> queryAsraDailyAllForList(AsraDailyForTotalNumAndDetailReq request);
+	/**
+	 * 工时查询-所有员工及自己或者自己项目人数.<br/>
+	 * @param request
+	 * @return
+	 * 2018年8月1日  wangfs.<br/>
+	 */
+	List<AsraProjectAndPersonNumDTO> queryAsraDailyAllCountForList(AsraDailyForTotalNumAndDetailReq request);
 
 	/**
 	 * 查询当天填报人数.<br/>
diff --git a/src/main/resources/mybatis/smapper/AsraDailySmapper.xml b/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
index a958b33..3382991 100644
--- a/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
+++ b/src/main/resources/mybatis/smapper/AsraDailySmapper.xml
@@ -32,15 +32,14 @@
   <select id="queryAsraDailyAllForList" parameterType="com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq" 
   resultType="com.zteits.oa.report.domain.sdo.AsraDailyDO">
       SELECT
-		    a.id as id,
+		    max(a.id) as id,
 			a.project_id as projectId,
 			c.projec_name as projectName,
 			a.asar_op_id as asarOpId,
 			a.asar_op_name as asarOpName,
 			a.daily_date as dailyDate,
 			max(a.daily_content) as dailyContent,
-			'8' as asraHours,
-			count(a.asar_op_id) as commitPersonNum
+			'8' as asraHours
 		FROM
 			asra_project c,
 			asra_daily a
@@ -65,8 +64,7 @@
 			c.projec_name,
 			a.asar_op_id,
 			a.asar_op_name,
-			a.daily_date,
-		    a.id
+			a.daily_date
 		order by a.project_id asc,asar_op_id asc,a.daily_date desc
   </select>
 	<!-- 查询当天填报人数-->
@@ -88,4 +86,38 @@
 		group by a.asar_op_id,a.daily_date)c
 
 	</select>
+	<!--工时查询-所有员工及自己或者自己项目人数 -->
+    <select id="queryAsraDailyAllCountForList" parameterType="com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq"
+			resultType="com.zteits.oa.api.dto.asradaily.AsraProjectAndPersonNumDTO">
+		SELECT
+
+		a.project_id as projectId,
+		c.projec_name as projectName,
+		count(DISTINCT a.asar_op_id) as commitPersonNum
+		FROM
+		asra_project c,
+		asra_daily a
+		WHERE
+		1 = 1
+		AND a.project_id = c.id
+		AND  a.asar_op_id  in
+		<foreach collection="opIds" item="opId" open="(" close=")" separator=",">
+			#{opId}
+		</foreach>
+		AND a.data_state =1
+		<![CDATA[AND a.daily_date >= #{beginTime} ]]>
+		<![CDATA[AND a.daily_date <= #{endTime}]]>
+		<if test="projectId != null and projectId !=''">
+			and a.project_id=#{projectId}
+		</if>
+		<if test="opName != null and opName !=''">
+			and a.asar_op_name like CONCAT('%',#{opName},'%')
+		</if>
+		GROUP BY
+		a.project_id,
+		c.projec_name
+
+	</select>
+
+
 </mapper>
\ No newline at end of file
--
libgit2 0.21.4