BJ_ZTEITS-Developers / zteits-oa

Commit a0a26437508c25a92d7721e97bde101d11dbdb15

Authored by 王富生
1 parent 5e455e3d

提交

Inline Side-by-side
Showing 2 changed files with 12 additions and 14 deletions
src/main/java/com/zteits/oa/api/base/bean/ResultBean.java
  View file @a0a2643
@@ -13,7 +13,7 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable { @@ -13,7 +13,7 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable {
13 boolean success; 13 boolean success;
14 String errMsg; 14 String errMsg;
15 DATA data; 15 DATA data;
16 - String errCode; 16 + String code;
17 String helpMsg; 17 String helpMsg;
18 18
19 public ResultBean() { 19 public ResultBean() {
@@ -28,24 +28,24 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable { @@ -28,24 +28,24 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable {
28 this.success = success; 28 this.success = success;
29 } 29 }
30 public ResultBean(CODE errCode) { 30 public ResultBean(CODE errCode) {
31 - this.errCode = errCode.getCode(); 31 + this.code = errCode.getCode();
32 this.success = false; 32 this.success = false;
33 } 33 }
34 public ResultBean(CODE errCode,String errMsg) { 34 public ResultBean(CODE errCode,String errMsg) {
35 - this.errCode = errCode.getCode(); 35 + this.code = errCode.getCode();
36 this.errMsg = errMsg; 36 this.errMsg = errMsg;
37 this.success = false; 37 this.success = false;
38 } 38 }
39 39
40 public ResultBean(CODE errCode,String errMsg, DATA data) { 40 public ResultBean(CODE errCode,String errMsg, DATA data) {
41 - this.errCode = errCode.getCode(); 41 + this.code = errCode.getCode();
42 this.errMsg = errMsg; 42 this.errMsg = errMsg;
43 this.data = data; 43 this.data = data;
44 this.success = false; 44 this.success = false;
45 } 45 }
46 46
47 public ResultBean(boolean success, CODE errCode,String errMsg, DATA data) { 47 public ResultBean(boolean success, CODE errCode,String errMsg, DATA data) {
48 - this.errCode = errCode.getCode(); 48 + this.code = errCode.getCode();
49 this.errMsg = errMsg; 49 this.errMsg = errMsg;
50 this.data = data; 50 this.data = data;
51 this.success = success; 51 this.success = success;
@@ -88,7 +88,7 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable { @@ -88,7 +88,7 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable {
88 * 重新初始化bean的所有属性 88 * 重新初始化bean的所有属性
89 */ 89 */
90 public void init(boolean success, CODE errCode,String errMsg, DATA data) { 90 public void init(boolean success, CODE errCode,String errMsg, DATA data) {
91 - this.errCode = errCode.getCode(); 91 + this.code = errCode.getCode();
92 this.errMsg = errMsg; 92 this.errMsg = errMsg;
93 this.data = data; 93 this.data = data;
94 this.success = success; 94 this.success = success;
@@ -119,11 +119,12 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable { @@ -119,11 +119,12 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable {
119 119
120 120
121 } 121 }
122 - public String getErrCode() {  
123 - return errCode; 122 +
  123 + public String getCode() {
  124 + return code;
124 } 125 }
125 - public void setErrCode(String errCode) {  
126 - this.errCode = errCode; 126 + public void setCode(String code) {
  127 + this.code = code;
127 } 128 }
128 /** 129 /**
129 * @return the helpMsg 130 * @return the helpMsg
@@ -139,7 +140,7 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable { @@ -139,7 +140,7 @@ public class ResultBean<CODE extends ErrorCode,DATA> implements Serializable {
139 } 140 }
140 @Override 141 @Override
141 public String toString() { 142 public String toString() {
142 - return "ResultBean [success=" + success + ", errMsg=" + errMsg + ", data=" + data + ", errCode=" + errCode 143 + return "ResultBean [success=" + success + ", errMsg=" + errMsg + ", data=" + data + ", code=" + code
143 + ", helpMsg=" + helpMsg + "]"; 144 + ", helpMsg=" + helpMsg + "]";
144 } 145 }
145 146
src/main/java/com/zteits/oa/report/biz/AsraProjectServiceImpl.java
  View file @a0a2643
@@ -38,9 +38,6 @@ public class AsraProjectServiceImpl implements AsraProjectService { @@ -38,9 +38,6 @@ public class AsraProjectServiceImpl implements AsraProjectService {
38 List<AsraProject> list = asraProjectDao.queryAsraProjectForList(asraProjecQueryReq); 38 List<AsraProject> list = asraProjectDao.queryAsraProjectForList(asraProjecQueryReq);
39 ListCopyUtil.listCopyProperties(list, listDTO, AsraProjectDTO.class); 39 ListCopyUtil.listCopyProperties(list, listDTO, AsraProjectDTO.class);
40 logger.info("---begin查询项目信息list"); 40 logger.info("---begin查询项目信息list");
41 - if(true){  
42 - throw new BizException(ErrorType.BIZ_ERROR,"adadsad");  
43 - }  
44 return new BizResult<List<AsraProjectDTO>>(listDTO); 41 return new BizResult<List<AsraProjectDTO>>(listDTO);
45 } 42 }
46 43