Merge branch 'branch0730' of

http://192.168.1.195:9998/ZTEITS-Developers/zteits-oa.git into branch0730 Conflicts: src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java src/main/java/com/zteits/oa/report/web/AsraDailyController.java

Merge branch 'branch0730' of
http://192.168.1.195:9998/ZTEITS-Developers/zteits-oa.git into branch0730 Conflicts: src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java src/main/java/com/zteits/oa/report/web/AsraDailyController.java
王富生
2 parents 237a75b5 4804a480
Showing 12 changed files with 745 additions and 62 deletions
src/main/java/com/zteits/oa/api/dto/asradaily/AsraDailyDateChangeDTO.java
src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailyQueryReq.java
src/main/java/com/zteits/oa/api/dto/asradaily/param/AsraDailySaveOrUpdateReq.java
src/main/java/com/zteits/oa/api/service/report/query/AsraDailyQueryService.java
src/main/java/com/zteits/oa/report/biz/AsraDailyQueryServiceImpl.java
src/main/java/com/zteits/oa/report/dao/AsraDailyDao.java
src/main/java/com/zteits/oa/report/dao/impl/AsraDailyDaoImpl.java
src/main/java/com/zteits/oa/report/web/AsraDailyController.java
src/main/java/com/zteits/oa/report/web/AsraOpController.java
src/main/java/com/zteits/oa/report/web/BizController.java
src/main/java/com/zteits/oa/util/pagepaper/DateForObjectUtil.java
src/main/resources/mybatis/smapper/AsraOpSmapper.xml
+package com.zteits.oa.api.dto.asradaily;
+
+import com.zteits.oa.api.base.bean.BaiscDTO;
+
+import java.util.Date;
+
+public class AsraDailyDateChangeDTO extends BaiscDTO{
+
+    /**年:2018*/
+    private Integer years;
+
+    /**周:1-54周*/
+    private Integer weeks;
+
+    /**星期:1-7*/
+    private Integer weeksNum;
+
+    public Integer getYears() {
+        return years;
+    }
+
+    public void setYears(Integer years) {
+        this.years = years;
+    }
+
+    public Integer getWeeks() {
+        return weeks;
+    }
+
+    public void setWeeks(Integer weeks) {
+        this.weeks = weeks;
+    }
+
+    public Integer getWeeksNum() {
+        return weeksNum;
+    }
+
+    public void setWeeksNum(Integer weeksNum) {
+        this.weeksNum = weeksNum;
+    }
+}
 \ No newline at end of file
 package com.zteits.oa.api.dto.asradaily.param;
+import com.sun.istack.internal.NotNull;
 import com.zteits.oa.api.base.bean.BaseRequest;
 import java.util.Date;
 public class AsraDailyQueryReq extends BaseRequest{
+    /**工时填写日期*/
+    @NotNull
+    private String dailyDate;
     /**所属员工ID*/
     private Long asarOpId;
-    /**工时填写日期*/
-    private Date dailyDate;
     /**年:2018*/
     private Integer years;
@@ -27,11 +29,11 @@ public class AsraDailyQueryReq extends BaseRequest{
         this.asarOpId = asarOpId;
     }
-    public Date getDailyDate() {
+    public String getDailyDate() {
         return dailyDate;
     }
-    public void setDailyDate(Date dailyDate) {
+    public void setDailyDate(String dailyDate) {
         this.dailyDate = dailyDate;
     }
+package com.zteits.oa.api.dto.asradaily.param;
+
+import com.zteits.oa.api.base.bean.BaiscDTO;
+
+import java.util.Date;
+
+public class AsraDailySaveOrUpdateReq extends BaiscDTO{
+    /**主键*/
+    private Long id;
+
+    /**所属项目ID*/
+    private Long projectId;
+
+    /**所属员工ID*/
+    private Long asarOpId;
+
+    /**操作员姓名*/
+    private String asarOpName;
+
+    /**年:2018*/
+    private Integer years;
+
+    /**周:1-54周*/
+    private Integer weeks;
+
+    /**星期:1-7*/
+    private Integer weeksNum;
+
+    /**工时填写日期*/
+    private String dailyDate;
+
+    /**数据状态：1有效，0无效,2:锁定*/
+    private Integer dataState;
+
+    /**创建人ID*/
+    private String createEmpid;
+
+    /**创建人*/
+    private String createEmpName;
+
+    /**创建时间*/
+    private Date createDate;
+
+    /**修改人*/
+    private String modfiyEmpid;
+
+    /**修改人*/
+    private String modfiyEmpName;
+
+    /**修改时间*/
+    private Date modfiyDate;
+
+    /**工时内容*/
+    private String dailyContent;
+
+    /**获取主键*/
+    public Long getId() {
+        return id;
+    }
+
+    /**设置主键*/
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    /**获取所属项目ID*/
+    public Long getProjectId() {
+        return projectId;
+    }
+
+    /**设置所属项目ID*/
+    public void setProjectId(Long projectId) {
+        this.projectId = projectId;
+    }
+
+    /**获取所属员工ID*/
+    public Long getAsarOpId() {
+        return asarOpId;
+    }
+
+    /**设置所属员工ID*/
+    public void setAsarOpId(Long asarOpId) {
+        this.asarOpId = asarOpId;
+    }
+
+    /**获取操作员姓名*/
+    public String getAsarOpName() {
+        return asarOpName;
+    }
+
+    /**设置操作员姓名*/
+    public void setAsarOpName(String asarOpName) {
+        this.asarOpName = asarOpName == null ? null : asarOpName.trim();
+    }
+
+    /**获取年:2018*/
+    public Integer getYears() {
+        return years;
+    }
+
+    /**设置年:2018*/
+    public void setYears(Integer years) {
+        this.years = years;
+    }
+
+    /**获取周:1-54周*/
+    public Integer getWeeks() {
+        return weeks;
+    }
+
+    /**设置周:1-54周*/
+    public void setWeeks(Integer weeks) {
+        this.weeks = weeks;
+    }
+
+    /**获取星期:1-7*/
+    public Integer getWeeksNum() {
+        return weeksNum;
+    }
+
+    /**设置星期:1-7*/
+    public void setWeeksNum(Integer weeksNum) {
+        this.weeksNum = weeksNum;
+    }
+
+    /**获取工时填写日期*/
+    public String getDailyDate() {
+        return dailyDate;
+    }
+
+    /**设置工时填写日期*/
+    public void setDailyDate(String dailyDate) {
+        this.dailyDate = dailyDate;
+    }
+
+    /**获取数据状态：1有效，0无效,2:锁定*/
+    public Integer getDataState() {
+        return dataState;
+    }
+
+    /**设置数据状态：1有效，0无效,2:锁定*/
+    public void setDataState(Integer dataState) {
+        this.dataState = dataState;
+    }
+
+    /**获取创建人ID*/
+    public String getCreateEmpid() {
+        return createEmpid;
+    }
+
+    /**设置创建人ID*/
+    public void setCreateEmpid(String createEmpid) {
+        this.createEmpid = createEmpid == null ? null : createEmpid.trim();
+    }
+
+    /**获取创建人*/
+    public String getCreateEmpName() {
+        return createEmpName;
+    }
+
+    /**设置创建人*/
+    public void setCreateEmpName(String createEmpName) {
+        this.createEmpName = createEmpName == null ? null : createEmpName.trim();
+    }
+
+    /**获取创建时间*/
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    /**设置创建时间*/
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    /**获取修改人*/
+    public String getModfiyEmpid() {
+        return modfiyEmpid;
+    }
+
+    /**设置修改人*/
+    public void setModfiyEmpid(String modfiyEmpid) {
+        this.modfiyEmpid = modfiyEmpid == null ? null : modfiyEmpid.trim();
+    }
+
+    /**获取修改人*/
+    public String getModfiyEmpName() {
+        return modfiyEmpName;
+    }
+
+    /**设置修改人*/
+    public void setModfiyEmpName(String modfiyEmpName) {
+        this.modfiyEmpName = modfiyEmpName == null ? null : modfiyEmpName.trim();
+    }
+
+    /**获取修改时间*/
+    public Date getModfiyDate() {
+        return modfiyDate;
+    }
+
+    /**设置修改时间*/
+    public void setModfiyDate(Date modfiyDate) {
+        this.modfiyDate = modfiyDate;
+    }
+
+    /**获取工时内容*/
+    public String getDailyContent() {
+        return dailyContent;
+    }
+
+    /**设置工时内容*/
+    public void setDailyContent(String dailyContent) {
+        this.dailyContent = dailyContent == null ? null : dailyContent.trim();
+    }
+}
 \ No newline at end of file
 package com.zteits.oa.api.service.report.query;
+import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.base.bean.PageBean;
+import com.zteits.oa.api.dto.asradaily.AsraDailyDTO;
+import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
+import com.zteits.oa.api.dto.asradaily.param.AsraDailySaveOrUpdateReq;
+import com.zteits.oa.api.dto.asraop.AsraOpDTO;
+import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
+
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import com.zteits.oa.api.base.bean.BizResult;
@@ -49,6 +58,14 @@ public interface AsraDailyQueryService {
 	 * 2018年8月1日  wangfs.<br/>
 	 */
 	BizResult<QueryAsraDailyAllForListReqDTO> queryAsraDailyAllForList(AsraDailyForTotalNumAndDetailReq request);
-	
-	
+
+	/**
+	 * 提交工时日报
+	 * @param
+	 * @return
+	 * @Author: xiejianpeng
+	 * @Date: 2018/8/1 17:02
+	 *
+	 */
+	BizResult<Integer> saveOrUpdateAsraDaily(AsraDailySaveOrUpdateReq request);
 }
@@ -4,25 +4,28 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
+import com.alibaba.fastjson.JSONObject;
 import com.xiaoleilu.hutool.date.DateUtil;
 import com.xiaoleilu.hutool.util.CollectionUtil;
 import com.zteits.oa.api.base.bean.BizResult;
 import com.zteits.oa.api.dto.asradaily.AsraDailyDTO;
+import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
+import com.zteits.oa.api.dto.asradaily.param.AsraDailySaveOrUpdateReq;
+import com.zteits.oa.api.service.report.query.AsraDailyQueryService;
+import com.zteits.oa.report.dao.AsraDailyDao;
+import com.zteits.oa.report.domain.AsraDaily;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.zteits.oa.api.dto.asradaily.AsraDailyOpNumForCurrentDayDTO;
 import com.zteits.oa.api.dto.asradaily.AsraProjectAndPersonNumDTO;
 import com.zteits.oa.api.dto.asradaily.QueryAsraDailyAllDetailForListReqDTO;
 import com.zteits.oa.api.dto.asradaily.QueryAsraDailyAllForListReqDTO;
 import com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq;
-import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
-import com.zteits.oa.api.service.report.query.AsraDailyQueryService;
-import com.zteits.oa.report.dao.AsraDailyDao;
-import com.zteits.oa.report.domain.AsraDaily;
 import com.zteits.oa.report.domain.sdo.AsraDailyDO;
 import com.zteits.oa.report.domain.sdo.AsraDailyOpNumForCurrentDayDO;
+import java.util.Date;
 /**
  * Copyright: Copyright (c) 2018  zteits
@@ -47,7 +50,11 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
         List<AsraDailyDTO> asraDailyDTOs = new ArrayList<>();
         List<AsraDaily> asraDailies = asraDailyDao.queryAsraDailyList(asraDailyQueryReq);
         if(CollectionUtil.isNotEmpty(asraDailies)){
-            BeanUtils.copyProperties(asraDailies,asraDailyDTOs,AsraDailyDTO.class);
+            for(AsraDaily asraDaily:asraDailies){
+                AsraDailyDTO asraDailyDTO = new AsraDailyDTO();
+                BeanUtils.copyProperties(asraDaily,asraDailyDTO);
+                asraDailyDTOs.add(asraDailyDTO);
+            }
         }
         return new BizResult<>(asraDailyDTOs);
     }
@@ -123,4 +130,30 @@ public class AsraDailyQueryServiceImpl implements AsraDailyQueryService {
 	}
+    @Override
+    public BizResult<Integer> 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);
+
+        int num;
+        if (null == request.getId()) {
+            //新增
+            asraDaily.setDataState(1);
+            asraDaily.setCreateDate(new Date());
+            asraDaily.setCreateEmpid(request.getAsarOpId()+"");
+            asraDaily.setCreateEmpName(request.getAsarOpName() + "");
+            num = asraDailyDao.saveAsraDaily(asraDaily);
+        } else {
+            //更新
+            num = asraDailyDao.updateAsraDaily(asraDaily);
+
+        }
+
+        return new BizResult<>(num);
+    }
 }
@@ -46,4 +46,24 @@ public interface AsraDailyDao {
 	 * 2018年8月1日  wangfs.<br/>
 	 */
     List<AsraDailyDO> queryAsraDailyAllForList(AsraDailyForTotalNumAndDetailReq request);
+
+    /**
+     * 保存日报信息
+     * @param
+     * @return
+     * @Author: xiejianpeng
+     * @Date: 2018/8/1 17:11
+     *
+     */
+    int saveAsraDaily(AsraDaily asraDaily);
+
+    /**
+     * 修改日报信息
+     * @param
+     * @return
+     * @Author: xiejianpeng
+     * @Date: 2018/8/1 17:11
+     *
+     */
+    int updateAsraDaily(AsraDaily asraDaily);
 }
@@ -50,7 +50,17 @@ public class AsraDailyDaoImpl implements AsraDailyDao{
         example.createCriteria().andAsarOpIdEqualTo(asraDailyQueryReq.getAsarOpId())
                 .andYearsEqualTo(asraDailyQueryReq.getYears())
                 .andWeeksEqualTo(asraDailyQueryReq.getWeeks());
-        return asraDailyMapper.selectByExample(example);
+        return asraDailyMapper.selectByExampleWithBLOBs(example);
+    }
+
+    @Override
+    public int saveAsraDaily(AsraDaily asraDaily) {
+        return asraDailyMapper.insertSelective(asraDaily);
+    }
+
+    @Override
+    public int updateAsraDaily(AsraDaily asraDaily) {
+        return asraDailyMapper.updateByPrimaryKeySelective(asraDaily);
     }
     /**
@@ -12,29 +12,21 @@ import com.zteits.oa.api.dto.asradaily.AsraDailyDTO;
 import com.zteits.oa.api.dto.asradaily.AsraDailyOpNumForCurrentDayDTO;
 import com.zteits.oa.api.dto.asradaily.QueryAsraDailyAllForListReqDTO;
 import com.zteits.oa.api.dto.asradaily.param.AsraDailyForTotalNumAndDetailReq;
+import com.zteits.oa.api.dto.asradaily.AsraDailyDateChangeDTO;
 import com.zteits.oa.api.dto.asradaily.param.AsraDailyQueryReq;
+import com.zteits.oa.api.dto.asradaily.param.AsraDailySaveOrUpdateReq;
 import com.zteits.oa.api.dto.asraop.AsraOpDTO;
-import com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq;
-import com.zteits.oa.api.dto.asraoprelations.AsraOpRelationsDTO;
-import com.zteits.oa.api.dto.asraoprelations.param.AsraOpRelationsQueryReq;
 import com.zteits.oa.api.service.report.query.AsraDailyQueryService;
-import com.zteits.oa.api.service.report.query.AsraOpQueryService;
-import com.zteits.oa.api.service.report.query.AsraOpRelationsQueryService;
-import com.zteits.oa.report.domain.AsraDaily;
+import com.zteits.oa.util.pagepaper.DateForObjectUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -46,27 +38,23 @@ public class AsraDailyController {
 	private static final Logger logger = LoggerFactory.getLogger(AsraDailyController.class);
 	@Autowired
-	private AsraOpQueryService asraOpQueryService;
-
-	@Autowired
 	private AsraDailyQueryService asraDailyQueryService;
 	@RequestMapping(value="/queryAsraDailyList",method = RequestMethod.POST)
 	public BizResult<List<AsraDailyDTO>> queryAsraDailyList(@RequestBody AsraDailyQueryReq asraDailyQueryReq, HttpServletRequest request){
-		logger.info("日报系统-日报管理-根据登录人分页查询员工信息入参:{}", JSONObject.toJSON(asraDailyQueryReq));
+		logger.info("日报系统-日报管理-根据登录人查询日报信息入参:{}", JSONObject.toJSON(asraDailyQueryReq));
 		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
 		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
 		/**2.判断登录人和时间查询日报*/
-		Date dailyDate = asraDailyQueryReq.getDailyDate();
-		Integer week = DateUtil.weekOfYear(dailyDate);//第N周
-		Integer year = DateUtil.year(dailyDate);//第N周
+		Date dailyDate = DateUtil.parseDate(asraDailyQueryReq.getDailyDate());
+		AsraDailyDateChangeDTO asraDailyDateChangeDTO = DateForObjectUtil.getAsraDailyDTO(dailyDate);
 		asraDailyQueryReq.setAsarOpId(asraOpDTO.getId());
-		asraDailyQueryReq.setWeeks(week);
-		asraDailyQueryReq.setYears(year);
+		BeanUtils.copyProperties(asraDailyDateChangeDTO,asraDailyQueryReq);
+		logger.info("日报系统-日报管理-根据登录人查询日报信息入参:{}", JSONObject.toJSON(asraDailyDateChangeDTO));
 		BizResult<List<AsraDailyDTO>> result = asraDailyQueryService.queryAsraDailyList(asraDailyQueryReq);
-		logger.info("日报系统-日报管理-根据登录人分页查询员工信息结束");
+		logger.info("日报系统-日报管理-根据登录人查询日报信息结束");
 		return result;
 	}
@@ -112,4 +100,23 @@ public class AsraDailyController {
 	}
+	@ApiOperation("保存或者修改工时日报")
+	@PostMapping("/saveOrUpdateAsraDaily")
+	public BizResult<Integer> saveOrUpdateAsraDaily(@RequestBody AsraDailySaveOrUpdateReq asraDailySaveOrUpdateReq,HttpServletRequest request) {
+		logger.info("日报系统-日报管理-根据登录人提交日报信息入参:{}", JSONObject.toJSON(asraDailySaveOrUpdateReq));
+		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
+		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
+
+		/**2.判断登录人和时间查询日报*/
+		Date dailyDate = DateUtil.parseDate(asraDailySaveOrUpdateReq.getDailyDate());
+		AsraDailyDateChangeDTO asraDailyDateChangeDTO = DateForObjectUtil.getAsraDailyDTO(dailyDate);
+		asraDailySaveOrUpdateReq.setAsarOpId(asraOpDTO.getId());
+		asraDailySaveOrUpdateReq.setAsarOpName(asraOpDTO.getOpName());
+		asraDailySaveOrUpdateReq.setDataState(1);
+		BeanUtils.copyProperties(asraDailyDateChangeDTO,asraDailySaveOrUpdateReq);
+
+		BizResult<Integer> bizResult = asraDailyQueryService.saveOrUpdateAsraDaily(asraDailySaveOrUpdateReq);
+		return bizResult;
+	}
+
 }
@@ -11,6 +11,7 @@ import com.zteits.oa.api.dto.asraoprelations.AsraOpRelationsDTO;
 import com.zteits.oa.api.dto.asraoprelations.param.AsraOpRelationsQueryReq;
 import com.zteits.oa.api.service.report.query.AsraOpQueryService;
 import com.zteits.oa.api.service.report.query.AsraOpRelationsQueryService;
+import com.zteits.oa.report.web.vo.EasyUIDataGridVO;
 import io.swagger.annotations.Api;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -29,45 +30,26 @@ import java.util.List;
 @Api(value = "日报系统-员工管理", description = "日报系统-员工管理")
 @RestController
 @RequestMapping("/asraOp")
-public class AsraOpController {
+public class AsraOpController extends BizController {
 	private static final Logger logger = LoggerFactory.getLogger(AsraOpController.class);
 	@Autowired
 	private AsraOpQueryService asraOpQueryService;
-	@Autowired
-	private AsraOpRelationsQueryService asraOpRelationsQueryService;
-
 	@RequestMapping(value="/queryAsraOpPage",method = RequestMethod.POST)
-	public BizResult<PageBean<AsraOpDTO>> queryAsraOpPage(@RequestBody AsraOpQueryReq asraOpQueryReq, HttpServletRequest request){
+	public BizResult<EasyUIDataGridVO<AsraOpDTO>> queryAsraOpPage(@RequestBody AsraOpQueryReq asraOpQueryReq, HttpServletRequest request) throws IllegalAccessException, InstantiationException {
 		logger.info("日报系统-员工管理-根据登录人分页查询员工信息入参:{}", JSONObject.toJSON(asraOpQueryReq));
 		/**1.根据当前登录人查询登录人下面管理的员工-缓存中获取*/
 		AsraOpDTO asraOpDTO = (AsraOpDTO)request.getSession().getAttribute(SessionEnum.USER_INFO.key());
-
-//		/**2.判断登录人是领导还是员工 ,2:员工,1:领导*/
-//		List<Long> opIdLists = new ArrayList<>();
-//		opIdLists.add(asraOpDTO.getId());
-//		if(asraOpDTO.getRoleId() == 1){
-//			/**如果是领导,获取领导下面的员工信息*/
-//			AsraOpRelationsQueryReq asraOpRelationsQueryReq = new AsraOpRelationsQueryReq();
-//			asraOpRelationsQueryReq.setParentId(asraOpDTO.getId());
-//			BizResult<List<AsraOpRelationsDTO>> listBizResult = asraOpRelationsQueryService.queryAsraOpRelations(asraOpRelationsQueryReq);
-//			if(listBizResult.isSuccess() && CollectionUtil.isNotEmpty(listBizResult.getData())){
-//				for(AsraOpRelationsDTO asraOpRelationsDTO : listBizResult.getData()){
-//					opIdLists.add(asraOpRelationsDTO.getOpId());
-//				}
-//			}
-//		}
-//		asraOpQueryReq.setOpIdLists(opIdLists);
 		asraOpQueryReq.setId(asraOpDTO.getId());
 		BizResult<PageBean<AsraOpDTO>>  result = asraOpQueryService.queryAsraOpForPage(asraOpQueryReq);
 		logger.info("日报系统-员工管理-根据登录人分页查询员工信息结果:{}", JSONObject.toJSON(result));
-		return result;
+		return returnJqGridData(result, AsraOpDTO.class);
 	}
 }
+package com.zteits.oa.report.web;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.base.bean.PageBean;
+import com.zteits.oa.api.base.constants.ErrorType;
+import com.zteits.oa.api.base.exception.BizException;
+import com.zteits.oa.report.web.vo.EasyUIDataGridVO;
+import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @描述:
+ * Copyright: Copyright (c) 2017 Alibb
+ * 
+ * @ClassName: BizController.java
+ * @Description: 所有基于Spring MVC的Web控制器类（Action）的统一父类，提供一些便利的请求处理方法，如返回Json、文本数据等
+ * @version: v1.0.0
+ * @author: wangbiao
+ * @date: 2017年2月23日  下午1:26:50
+ *
+ * Modification History:
+ * Date        Author        Version        Description
+ *---------------------------------------------------------*
+ * 2017年2月23日     wangbiao       v1.0.0         创建
+ */
+public class BizController {
+	private static final String MIME_JSON = "application/json;charset=UTF-8";
+
+	
+	/**
+	 * 返回jqgrid格式数据
+	 * @param bizResult
+	 * @param voClass
+	 * @return
+	 * @throws InstantiationException
+	 * @throws IllegalAccessException
+	 * 2017年5月12日 zhaowg
+	 */
+	protected <DTO,VO> BizResult<EasyUIDataGridVO<VO>> returnJqGridData(BizResult<PageBean<DTO>> bizResult, Class<VO> voClass) throws InstantiationException, IllegalAccessException {
+		PageBean<DTO> pageBean = getBizResultData(bizResult);
+		//将DTO转换为VO
+		List<VO> vos = new ArrayList<>();
+		if(!CollectionUtils.isEmpty(pageBean.getDataList())){
+			for (DTO dto : pageBean.getDataList()) {
+				VO vo = voClass.newInstance();
+				BeanUtils.copyProperties(dto, vo);
+				vos.add(vo);
+			}
+		}
+		//返回jqGrid数据
+		EasyUIDataGridVO<VO> jqGridDatas = new EasyUIDataGridVO<>();
+		jqGridDatas.setTotal(pageBean.getPageTotals()==null?0:pageBean.getPageTotals());
+		jqGridDatas.setRows(vos);
+		
+		BizResult<EasyUIDataGridVO<VO>> bizResultVO = new BizResult<>();
+		bizResultVO.setCode(bizResult.getCode());
+		bizResultVO.setErrMsg(bizResult.getErrMsg());
+		bizResultVO.setData(jqGridDatas);
+		
+		return bizResultVO;
+	}
+	
+	/**
+	 * 返回jqgrid格式数据
+	 * @param bizResult
+	 * @return
+	 * 2017年5月12日 zhaowg
+	 */
+	protected <DTO> BizResult<EasyUIDataGridVO<DTO>> returnJqGridData(BizResult<PageBean<DTO>> bizResult) {
+		PageBean<DTO> pageBean = getBizResultData(bizResult);
+		//返回jqGrid数据
+		EasyUIDataGridVO<DTO> jqGridDatas = new EasyUIDataGridVO<>();
+		jqGridDatas.setTotal(pageBean.getPageTotals()==null?0:pageBean.getPageTotals());
+		jqGridDatas.setRows(pageBean.getDataList());
+
+		BizResult<EasyUIDataGridVO<DTO>> bizResultVO = new BizResult<>();
+		bizResultVO.setCode(bizResult.getCode());
+		bizResultVO.setErrMsg(bizResult.getErrMsg());
+		bizResultVO.setData(jqGridDatas);
+		
+		return bizResultVO;
+	}
+	/**
+	 * 分页结果封装后返回标准格式JSON串.<br/>
+	 * @param response
+	 * @param result
+	 */
+	@SuppressWarnings("unused")
+	public  void returnJsonDataGrid(HttpServletResponse response,BizResult<?>  result){
+		Map<String,Object> resultMap = new HashMap<String,Object>();
+		
+		if(result == null){
+			throw new NullPointerException("result 为空,不能进行封装!");
+		}else if(result.getData() == null){
+			throw new NullPointerException("pageBean 为空,不能进行封装!");
+		}else{
+			 if(result.getData() instanceof PageBean<?>) {
+				 PageBean<?> pageBean = (PageBean<?>)result.getData();
+					Map<String,Object> map = new HashMap<String,Object>();
+					map.put("total", (null ==pageBean.getPageTotals()? 0 :pageBean.getPageTotals()));
+					map.put("rows", pageBean.getDataList() != null ? pageBean.getDataList() :new ArrayList<Object>() );
+					resultMap.put("code", result.getCode());
+					resultMap.put("msg", result.getErrMsg());
+					resultMap.put("data", map);
+				
+			}else{
+				throw new ClassCastException("result.getData() 类型转换异常");
+			}
+			
+		}
+		this.returnJson(response, resultMap);
+	}
+	
+	/**
+	 * 
+	 * @param data
+	 * @param totalCount
+	 * @return
+	 * 2017年5月12日 zhaowg
+	 */
+	public <VO> BizResult<EasyUIDataGridVO<VO>> returnGridData4JqGrid(List<VO> data,Integer totalCount) {
+		//返回jqGrid数据
+		EasyUIDataGridVO<VO> jqGridDatas = new EasyUIDataGridVO<>();
+		jqGridDatas.setTotal(totalCount==null?0:totalCount);
+		jqGridDatas.setRows(data);
+		
+		BizResult<EasyUIDataGridVO<VO>> bizResultVO = new BizResult<>();
+		bizResultVO.setCode(ErrorType.BIZ_SUCCESS.getCode());
+		bizResultVO.setErrMsg(ErrorType.BIZ_SUCCESS.getMsg());
+		bizResultVO.setData(jqGridDatas);
+		return bizResultVO;
+	}
+	/**
+	 * 获取返回的数据
+	 * @param bizResult
+	 * @return
+	 * 2017年5月16日 zhaowg
+	 */
+	public <T> T getBizResultData(BizResult<T> bizResult){
+		//有异常，抛出
+		if(!bizResult.isSuccess() || !bizResult.getCode().equals(ErrorType.BIZ_SUCCESS.getCode())){
+
+			throw new BizException(ErrorType.BIZ_ERROR,bizResult.getErrMsg());
+		}
+		return bizResult.getData();
+	}
+	/**
+	 * 返回JSon格式的数据
+	 *
+	 * @param response
+	 * @param data
+	 * @throws Exception
+	 */
+	public String returnJson(HttpServletResponse response, Object data) {
+		
+		return returnText(response, JSONObject.toJSONString(data), MIME_JSON);
+	}
+	
+	/**
+	 * 返回xml格式的数据
+	 *
+	 * @param response
+	 * @param text
+	 * @throws Exception
+	 */
+	public String returnXml(HttpServletResponse response, CharSequence text) {
+		return returnText(response, text, "text/xml;charset=UTF-8");
+	}
+
+	/**
+	 * 返回文本数据
+	 * @param response
+	 * @param text
+	 * @param contenttype 内容类型，如：text/plain、text/xml、application/json、text/json、text/javascript、application/javascript（不支持旧浏览器）
+	 * @param encoding 字符集编码，如：GB18030、UTF-8，不建议使用GB2312和GBK
+	 * @throws Exception
+	 */
+	public String returnText(HttpServletResponse response, CharSequence text,final String contenttype,final String encoding) {
+		return returnText(response, text, contenttype+";charset="+encoding);
+	}
+
+	/**
+	 * 返回文本数据
+	 *
+	 * @param response
+	 * @param text
+	 * @param contenttype
+	 * @throws IOException
+	 * @author lihl2 2011-3-25
+	 */
+	public String returnText(HttpServletResponse response, CharSequence text,final String contenttype) {
+		response.setContentType(contenttype);
+		if (text != null) {
+			try {
+				response.getWriter().write(text.toString());
+			} catch (IOException e) {
+				throw new BizException(ErrorType.BIZ_ERROR,e);
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * 设置文件头格式
+	 * @param response
+	 * @param mimeType
+	 * @param fileName
+	 * @param size
+	 */
+	public void setFileHeader(HttpServletResponse response, CharSequence mimeType,
+			final CharSequence fileName, int size) {
+		response.reset();
+		// 设置response的Header
+		if(mimeType != null){
+			response.setContentType(mimeType.toString()) ;
+		}
+		try {
+			response.addHeader("Content-Disposition","attachment;filename=" + new String(fileName.toString().getBytes("GB18030"),"ISO-8859-1")) ;
+		} catch (UnsupportedEncodingException e) {
+			throw new BizException(ErrorType.BIZ_ERROR,"文件名编码转换失败") ;
+		}
+		if(size > 0){
+			response.addIntHeader("Content-Length", size) ;
+		}
+	}
+
+	/**
+	 * 设置浏览器返回类型为Excel文件
+	 * @param response
+	 * @param mimeType
+	 * @param fileName
+	 * @param size
+	 */
+	public void setExcelFileHeader(HttpServletResponse response, CharSequence mimeType,
+			final CharSequence fileName, int size) {
+		setFileHeader(response, "application/vnd.ms-excel", fileName, size);
+	}
+	/**
+	 * 文件下载
+	 * @param response
+	 * @param mimeType
+	 * @param fileName
+	 * @param file
+	 * @param size
+	 */
+	public void downloadFile(HttpServletResponse response, CharSequence mimeType,
+			final CharSequence fileName, InputStream file, int size) {
+		setFileHeader(response, mimeType, fileName, size) ;
+		try {
+			OutputStream out = response.getOutputStream() ;
+			int l ;
+			while((l=file.read()) >= 0){
+				out.write(l) ;
+			}
+			out.flush() ;
+		} catch (IOException e) {
+			throw new BizException(ErrorType.BIZ_ERROR,"下载文件失败") ;
+		}finally {
+				if (null != file) {
+					try {
+						file.close();
+					} catch (IOException e) {
+						e.printStackTrace();
+					}
+				}
+
+		}
+	}
+	
+	
+	
+	
+	
+	/**
+	 * 返回jqgrid格式数据
+	 * @param bizResult
+	 * @param voClass
+	 * @return
+	 * @throws InstantiationException
+	 * @throws IllegalAccessException
+	 * 2017年5月12日 zhaowg
+	 */
+	protected <DTO,VO> BizResult<EasyUIDataGridVO<VO>> returnJqGridDataByList(BizResult<List<DTO>> bizResult,int total,Class<VO> voClass) throws InstantiationException, IllegalAccessException {
+		//List<DTO> pageBean = getBizResultData(bizResult);
+		//将DTO转换为VO
+		List<VO> vos = new ArrayList<>();
+		if(!CollectionUtils.isEmpty(bizResult.getData())){
+			for (DTO dto : bizResult.getData()) {
+				VO vo = voClass.newInstance();
+				BeanUtils.copyProperties(dto, vo);
+				vos.add(vo);
+			}
+		}
+		//返回jqGrid数据
+		EasyUIDataGridVO<VO> jqGridDatas = new EasyUIDataGridVO<>();
+		
+		jqGridDatas.setTotal(total);
+		jqGridDatas.setRows(vos);
+
+		BizResult<EasyUIDataGridVO<VO>> bizResultVO = new BizResult<>();
+		bizResultVO.setCode(bizResult.getCode());
+		bizResultVO.setErrMsg(bizResult.getErrMsg());
+		bizResultVO.setData(jqGridDatas);
+		
+		return bizResultVO;
+	}
+	
+	
+	
+}
+package com.zteits.oa.util.pagepaper;
+
+import com.xiaoleilu.hutool.date.DateUtil;
+import com.zteits.oa.api.dto.asradaily.AsraDailyDTO;
+import com.zteits.oa.api.dto.asradaily.AsraDailyDateChangeDTO;
+
+import java.util.Date;
+
+/**
+ * Copyright: Copyright (c) 2018  zteits
+ *
+ * @Description:
+ * @version: v1.0.0
+ * @author: xiejianpeng
+ * @date: 2018/8/1 10
+ * Modification History:
+ * Date             Author          Version            Description
+ * ---------------------------------------------------------*
+ * 2018/8/1      xiejianpeng         v1.0.0               创建
+ */
+public class DateForObjectUtil {
+
+    public static AsraDailyDateChangeDTO getAsraDailyDTO(Date dailyDate){
+        AsraDailyDateChangeDTO asraDailyDTO = new AsraDailyDateChangeDTO();
+        Integer week = DateUtil.weekOfYear(dailyDate);//第N周
+        Integer year = DateUtil.year(dailyDate);//年
+        Integer weekNum = DateUtil.dayOfWeek(DateUtil.offsetDay(dailyDate,-1));//星期
+
+        asraDailyDTO.setYears(year);
+        asraDailyDTO.setWeeks(week);
+        asraDailyDTO.setWeeksNum(weekNum);
+
+        return asraDailyDTO;
+    }
+}
@@ -26,7 +26,7 @@
     modfiy_emp_name, modfiy_date, remark
   </sql>
-  <select id="queryAsraOpForList" parameterType="com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq" resultMap="BaseResultMap">
+  <select id="queryAsraOpForList" parameterType="com.zteits.oa.api.dto.asraop.param.AsraOpQueryReq" resultType="com.zteits.oa.api.dto.asraop.AsraOpDTO">
     select
     ap.id id,
     ap.login_code loginCode,