diff --git a/src/main/java/com/zteits/oa/api/dto/asraproject/AsraProjectDTO.java b/src/main/java/com/zteits/oa/api/dto/asraproject/AsraProjectDTO.java
new file mode 100644
index 0000000..ca63ed3
--- /dev/null
+++ b/src/main/java/com/zteits/oa/api/dto/asraproject/AsraProjectDTO.java
@@ -0,0 +1,195 @@
+package com.zteits.oa.api.dto.asraproject;
+
+import java.util.Date;
+
+import com.zteits.oa.api.base.bean.BaiscDTO;
+
+public class AsraProjectDTO extends BaiscDTO{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3152174907885812120L;
+
+ /**主键*/
+ private Long id;
+
+ /**项目名称*/
+ private String projecName;
+
+ /**省份ID*/
+ private Long provId;
+
+ /**省份名称*/
+ private String provName;
+
+ /**地市ID*/
+ private Long cityId;
+
+ /**地市名称*/
+ private String cityName;
+
+ /**排序*/
+ private Integer sortNum;
+
+ /**数据状态：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;
+
+ /**获取主键*/
+ public Long getId() {
+ return id;
+ }
+
+ /**设置主键*/
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+ /**获取项目名称*/
+ public String getProjecName() {
+ return projecName;
+ }
+
+ /**设置项目名称*/
+ public void setProjecName(String projecName) {
+ this.projecName = projecName == null ? null : projecName.trim();
+ }
+
+ /**获取省份ID*/
+ public Long getProvId() {
+ return provId;
+ }
+
+ /**设置省份ID*/
+ public void setProvId(Long provId) {
+ this.provId = provId;
+ }
+
+ /**获取省份名称*/
+ public String getProvName() {
+ return provName;
+ }
+
+ /**设置省份名称*/
+ public void setProvName(String provName) {
+ this.provName = provName == null ? null : provName.trim();
+ }
+
+ /**获取地市ID*/
+ public Long getCityId() {
+ return cityId;
+ }
+
+ /**设置地市ID*/
+ public void setCityId(Long cityId) {
+ this.cityId = cityId;
+ }
+
+ /**获取地市名称*/
+ public String getCityName() {
+ return cityName;
+ }
+
+ /**设置地市名称*/
+ public void setCityName(String cityName) {
+ this.cityName = cityName == null ? null : cityName.trim();
+ }
+
+ /**获取排序*/
+ public Integer getSortNum() {
+ return sortNum;
+ }
+
+ /**设置排序*/
+ public void setSortNum(Integer sortNum) {
+ this.sortNum = sortNum;
+ }
+
+ /**获取数据状态：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;
+ }
+}
diff --git a/src/main/java/com/zteits/oa/api/dto/param/AsraProjecQueryReq.java b/src/main/java/com/zteits/oa/api/dto/param/AsraProjecQueryReq.java
new file mode 100644
index 0000000..4d87063
--- /dev/null
+++ b/src/main/java/com/zteits/oa/api/dto/param/AsraProjecQueryReq.java
@@ -0,0 +1,22 @@
+package com.zteits.oa.api.dto.param;
+
+import java.io.Serializable;
+
+public class AsraProjecQueryReq implements Serializable{
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -1027953868018050888L;
+ /**主键*/
+ private Long id;
+
+ public Long getId() {
+ return id;
+ }
+
+ public void setId(Long id) {
+ this.id = id;
+ }
+
+}
diff --git a/src/main/java/com/zteits/oa/api/service/report/query/AsraProjectService.java b/src/main/java/com/zteits/oa/api/service/report/query/AsraProjectService.java
new file mode 100644
index 0000000..2c27a4c
--- /dev/null
+++ b/src/main/java/com/zteits/oa/api/service/report/query/AsraProjectService.java
@@ -0,0 +1,19 @@
+package com.zteits.oa.api.service.report.query;
+
+import java.util.List;
+
+import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.dto.asraproject.AsraProjectDTO;
+import com.zteits.oa.api.dto.param.AsraProjecQueryReq;
+
+public interface AsraProjectService {
+
+
+ /**
+ * 项目信息查询.
+ * @param asraOpQueryReq
+ * @return
+ * 2018年7月30日 wangfs.
+ */
+ BizResult> queryAsraProjectForList(AsraProjecQueryReq asraProjecQueryReq);
+}
diff --git a/src/main/java/com/zteits/oa/report/biz/AsraProjectServiceImpl.java b/src/main/java/com/zteits/oa/report/biz/AsraProjectServiceImpl.java
new file mode 100644
index 0000000..3a71367
--- /dev/null
+++ b/src/main/java/com/zteits/oa/report/biz/AsraProjectServiceImpl.java
@@ -0,0 +1,42 @@
+package com.zteits.oa.report.biz;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.dto.asraproject.AsraProjectDTO;
+import com.zteits.oa.api.dto.param.AsraProjecQueryReq;
+import com.zteits.oa.api.service.report.query.AsraProjectService;
+import com.zteits.oa.report.dao.AsraProjectDao;
+import com.zteits.oa.report.domain.AsraProject;
+import com.zteits.oa.util.ListCopyUtil;
+@Service("com.zteits.oa.report.biz.AsraProjectServiceImpl")
+public class AsraProjectServiceImpl implements AsraProjectService {
+
+ private static final Logger logger = LoggerFactory.getLogger(AsraProjectServiceImpl.class);
+
+ @Autowired
+ private AsraProjectDao asraProjectDao;
+ /**
+ * 项目信息查询.
+ * @param asraOpQueryReq
+ * @return
+ * 2018年7月30日 wangfs.
+ */
+ @Override
+ public BizResult> queryAsraProjectForList(AsraProjecQueryReq asraProjecQueryReq) {
+ logger.info("---begin查询项目信息list,入参={}",JSONObject.toJSON(asraProjecQueryReq));
+ List listDTO = new ArrayList<>();
+ List list = asraProjectDao.queryAsraProjectForList(asraProjecQueryReq);
+ ListCopyUtil.listCopyProperties(list, listDTO, AsraProjectDTO.class);
+ logger.info("---begin查询项目信息list");
+ return new BizResult>(listDTO);
+ }
+
+}
diff --git a/src/main/java/com/zteits/oa/report/dao/AsraProjectDao.java b/src/main/java/com/zteits/oa/report/dao/AsraProjectDao.java
new file mode 100644
index 0000000..f7f0a9c
--- /dev/null
+++ b/src/main/java/com/zteits/oa/report/dao/AsraProjectDao.java
@@ -0,0 +1,17 @@
+package com.zteits.oa.report.dao;
+
+import java.util.List;
+
+import com.zteits.oa.api.dto.param.AsraProjecQueryReq;
+import com.zteits.oa.report.domain.AsraProject;
+
+public interface AsraProjectDao {
+
+ /**
+ * 项目信息查询.
+ * @param asraOpQueryReq
+ * @return
+ * 2018年7月30日 wangfs.
+ */
+ public List queryAsraProjectForList(AsraProjecQueryReq asraProjecQueryReq);
+}
diff --git a/src/main/java/com/zteits/oa/report/dao/impl/AsraProjectDaoImpl.java b/src/main/java/com/zteits/oa/report/dao/impl/AsraProjectDaoImpl.java
new file mode 100644
index 0000000..80f387a
--- /dev/null
+++ b/src/main/java/com/zteits/oa/report/dao/impl/AsraProjectDaoImpl.java
@@ -0,0 +1,37 @@
+package com.zteits.oa.report.dao.impl;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.zteits.oa.api.dto.param.AsraProjecQueryReq;
+import com.zteits.oa.report.dao.AsraProjectDao;
+import com.zteits.oa.report.domain.AsraProject;
+import com.zteits.oa.report.domain.AsraProjectExample;
+import com.zteits.oa.report.domain.AsraProjectExample.Criteria;
+import com.zteits.oa.report.mapper.AsraProjectMapper;
+@Component
+public class AsraProjectDaoImpl implements AsraProjectDao{
+
+ @Autowired
+ private AsraProjectMapper asraProjectMapper;
+ /**
+ * 项目信息查询.
+ * @param asraOpQueryReq
+ * @return
+ * 2018年7月30日 wangfs.
+ */
+ @Override
+ public List queryAsraProjectForList(AsraProjecQueryReq asraProjecQueryReq) {
+ AsraProjectExample example = new AsraProjectExample();
+ Criteria createCriteria = example.createCriteria();
+ if(asraProjecQueryReq.getId() != null){
+ createCriteria.andIdEqualTo(asraProjecQueryReq.getId());
+ }
+ example.setOrderByClause(" sort_num asc");
+ List list = asraProjectMapper.selectByExample(example);
+ return list;
+ }
+
+}
diff --git a/src/main/java/com/zteits/oa/report/web/AsraProjectController.java b/src/main/java/com/zteits/oa/report/web/AsraProjectController.java
new file mode 100644
index 0000000..bc2e078
--- /dev/null
+++ b/src/main/java/com/zteits/oa/report/web/AsraProjectController.java
@@ -0,0 +1,41 @@
+package com.zteits.oa.report.web;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.RestController;
+
+import com.alibaba.fastjson.JSONObject;
+import com.zteits.oa.api.base.bean.BizResult;
+import com.zteits.oa.api.dto.asraproject.AsraProjectDTO;
+import com.zteits.oa.api.dto.param.AsraProjecQueryReq;
+import com.zteits.oa.api.service.report.query.AsraProjectService;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+@Api(value = "日报系统-项目管理", description = "日报系统-项目管理")
+@RestController
+@RequestMapping("/asraProject")
+public class AsraProjectController {
+ private Logger logger = LoggerFactory.getLogger(AsraProjectController.class);
+
+ @Autowired
+ private AsraProjectService asraProjectService;
+
+ @RequestMapping("/queryAsraProjectForList")
+ @ApiOperation("查询项目信息list")
+ public BizResult> queryAsraProjectForList(@RequestBody AsraProjecQueryReq asraProjecQueryReq,HttpServletRequest request){
+ logger.info("---begin调用项目信息service,入参={}",JSONObject.toJSON(asraProjecQueryReq));
+ BizResult> result = asraProjectService.queryAsraProjectForList(asraProjecQueryReq);
+ logger.info("---begin调用项目信息service...");
+
+ return result;
+ }
+}
diff --git a/src/main/java/com/zteits/oa/report/web/OAuthController.java b/src/main/java/com/zteits/oa/report/web/OAuthController.java
index 40f49a7..6c85feb 100644
--- a/src/main/java/com/zteits/oa/report/web/OAuthController.java
+++ b/src/main/java/com/zteits/oa/report/web/OAuthController.java
@@ -11,10 +11,8 @@ import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
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 com.alibaba.fastjson.JSONObject;
import com.zteits.oa.api.base.bean.BizResult;
import com.zteits.oa.api.base.constants.ErrorType;
import com.zteits.oa.api.base.constants.SessionEnum;