Browse Source

专家信息部门和职称修改为可为空,资源申请业务查询的返回值增加资源所属人信息。

zzy.zhiyuan.foxmail 8 years ago
parent
commit
128f6f01bc

+ 31 - 53
src/main/java/com/ekexiu/portal/dao/OperationDao.java

@ -41,7 +41,7 @@ public abstract class OperationDao {
41 41
	
42 42
	public com.ekexiu.portal.po.Operation query(java.sql.Connection con,java.lang.String operationId) throws java.sql.SQLException{
43 43
        int _m_1 = 1;
44
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID WHERE OPERATION_ID = ?";
44
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID WHERE OPERATION_ID = ?";
45 45
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
46 46
        try{
47 47
            ps.setString(_m_1++,operationId);
@ -65,6 +65,10 @@ public abstract class OperationDao {
65 65
                    professor.setName(rs.getString(12));
66 66
                    _result.setProfessor(professor);
67 67
                    resource.setResourceName(rs.getString(13));
68
                    Professor professor2 = new Professor();
69
                    professor2.setId(rs.getString(14));
70
                    professor2.setName(rs.getString(15));
71
                    resource.setProfessor(professor2);
68 72
                    _result.setResource(resource);
69 73
                    return _result;
70 74
                }else{
@ -79,7 +83,7 @@ public abstract class OperationDao {
79 83
    }
80 84
	
81 85
	public java.util.List<com.ekexiu.portal.po.Operation> query(java.sql.Connection con) throws java.sql.SQLException{
82
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID";
86
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID";
83 87
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
84 88
        try{
85 89
            java.sql.ResultSet rs = ps.executeQuery();
@ -103,6 +107,10 @@ public abstract class OperationDao {
103 107
                    professor.setName(rs.getString(12));
104 108
                    _obj.setProfessor(professor);
105 109
                    resource.setResourceName(rs.getString(13));
110
                    Professor professor2 = new Professor();
111
                    professor2.setId(rs.getString(14));
112
                    professor2.setName(rs.getString(15));
113
                    resource.setProfessor(professor2);
106 114
                    _obj.setResource(resource);
107 115
                    _result.add(_obj);
108 116
                }
@ -124,7 +132,7 @@ public abstract class OperationDao {
124 132
	 */
125 133
	public java.util.List<com.ekexiu.portal.po.Operation> queryPro(java.sql.Connection con,java.lang.String demandId) throws java.sql.SQLException{
126 134
        int _m_1 = 1;
127
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID WHERE DEMAND_ID = ?";
135
        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID WHERE DEMAND_ID = ?";
128 136
        java.sql.PreparedStatement ps = con.prepareStatement(sql);
129 137
        try{
130 138
            ps.setString(_m_1++,demandId);
@ -149,6 +157,10 @@ public abstract class OperationDao {
149 157
                    professor.setName(rs.getString(12));
150 158
                    _obj.setProfessor(professor);
151 159
                    resource.setResourceName(rs.getString(13));
160
                    Professor professor2 = new Professor();
161
                    professor2.setId(rs.getString(14));
162
                    professor2.setName(rs.getString(15));
163
                    resource.setProfessor(professor2);
152 164
                    _obj.setResource(resource);
153 165
                    _result.add(_obj);
154 166
                }
@ -170,7 +182,7 @@ public abstract class OperationDao {
170 182
	 */
171 183
	public java.util.List<com.ekexiu.portal.po.Operation> queryDem(java.sql.Connection con,java.lang.String professorId) throws java.sql.SQLException{
172 184
		int _m_1 = 1;
173
		String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID WHERE RESOURCE.PROFESSOR_ID = ?";
185
		String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID WHERE RESOURCE.PROFESSOR_ID = ?";
174 186
		java.sql.PreparedStatement ps = con.prepareStatement(sql);
175 187
		try{
176 188
			ps.setString(_m_1++,professorId);
@ -195,6 +207,10 @@ public abstract class OperationDao {
195 207
					professor.setName(rs.getString(12));
196 208
					_obj.setProfessor(professor);
197 209
					resource.setResourceName(rs.getString(13));
210
					Professor professor2 = new Professor();
211
                    professor2.setId(rs.getString(14));
212
                    professor2.setName(rs.getString(15));
213
                    resource.setProfessor(professor2);
198 214
					_obj.setResource(resource);
199 215
					_result.add(_obj);
200 216
				}
@ -207,52 +223,6 @@ public abstract class OperationDao {
207 223
		}
208 224
	}
209 225
	
210
//	/**
211
//	 * 按资源ID查资源申请,返回资源所有者姓名和资源名称
212
//	 * @param con
213
//	 * @param resourceId 资源ID
214
//	 * @return
215
//	 * @throws java.sql.SQLException
216
//	 */
217
//	public java.util.List<com.ekexiu.portal.po.Operation> queryRes(java.sql.Connection con,java.lang.String resourceId) throws java.sql.SQLException{
218
//        int _m_1 = 1;
219
//        String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,RESOURCE_NAME,PROFESSOR.NAME FROM OPERATION LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID LEFT JOIN PROFESSOR ON RESOURCE.PROFESSOR_ID = PROFESSOR.ID WHERE OPERATION.RESOURCE_ID = ?";
220
//        java.sql.PreparedStatement ps = con.prepareStatement(sql);
221
//        try{
222
//            ps.setString(_m_1++,resourceId);
223
//            java.sql.ResultSet rs = ps.executeQuery();
224
//            try{
225
//                java.util.List<com.ekexiu.portal.po.Operation> _result = new java.util.ArrayList<com.ekexiu.portal.po.Operation>();
226
//                while(rs.next()){
227
//                    com.ekexiu.portal.po.Operation _obj =  new com.ekexiu.portal.po.Operation();
228
//                    _obj.setReplyNotes(rs.getString(1));
229
//                    _obj.setCreateTime(rs.getString(2));
230
//                    _obj.setOperationId(rs.getString(3));
231
//                    _obj.setOperationStatus(rs.getInt(4));
232
//                    Professor professor = new Professor();
233
//                    professor.setId(rs.getString(5));
234
//                    _obj.setDetailDemand(rs.getString(6));
235
//                    _obj.setDeliverTime(rs.getString(7));
236
//                    Resource resource = new Resource();
237
//                    resource.setResourceId(rs.getString(8));
238
//                    _obj.setDealPrice(rs.getBigDecimal(9));
239
//                    _obj.setDealTime(rs.getString(10));
240
//                    _obj.setPayMethod(rs.getString(11));
241
//                    resource.setResourceName(rs.getString(12));
242
//                    _obj.setResource(resource);
243
//                    professor.setName(rs.getString(13));
244
//                    _obj.setProfessor(professor);
245
//                    _result.add(_obj);
246
//                }
247
//                return _result;
248
//            }finally{
249
//                try{rs.close();}catch(Exception _m_2){}
250
//            }
251
//        }finally{
252
//            try{ps.close();}catch(Exception _m_3){}
253
//        }
254
//    }
255
	
256 226
	/**
257 227
	 * 按资源ID查资源申请,返回资申请人姓名和资源名称
258 228
	 * @param con
@ -262,7 +232,7 @@ public abstract class OperationDao {
262 232
	 */
263 233
	public java.util.List<com.ekexiu.portal.po.Operation> queryRes(java.sql.Connection con,java.lang.String resourceId) throws java.sql.SQLException{
264 234
		int _m_1 = 1;
265
		String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION INNER JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID WHERE OPERATION.RESOURCE_ID = ?";
235
		String sql = "SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION INNER JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID INNER JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID INNER JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID WHERE OPERATION.RESOURCE_ID = ?";
266 236
		java.sql.PreparedStatement ps = con.prepareStatement(sql);
267 237
		try{
268 238
			ps.setString(_m_1++,resourceId);
@ -287,6 +257,10 @@ public abstract class OperationDao {
287 257
					professor.setName(rs.getString(12));
288 258
					_obj.setProfessor(professor);
289 259
					resource.setResourceName(rs.getString(13));
260
					Professor professor2 = new Professor();
261
                    professor2.setId(rs.getString(14));
262
                    professor2.setName(rs.getString(15));
263
                    resource.setProfessor(professor2);
290 264
					_obj.setResource(resource);
291 265
					_result.add(_obj);
292 266
				}
@ -425,7 +399,7 @@ public abstract class OperationDao {
425 399
        if(_m_8){
426 400
            _result.setPageNo(1);
427 401
            sql = new StringBuilder();
428
            sql.append("SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION LEFT JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID");
402
            sql.append("SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION LEFT JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID LEFT JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID");
429 403
            if(_m_4.length()>0){
430 404
                sql.append(_m_4);
431 405
            }
@ -443,7 +417,7 @@ public abstract class OperationDao {
443 417
            --pageNo;
444 418
            int _m_10 = (pageNo * pageSize);
445 419
            sql = new StringBuilder();
446
            sql.append("SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,PROFESSOR.NAME,RESOURCE_NAME FROM OPERATION LEFT JOIN PROFESSOR ON DEMAND_ID = PROFESSOR.ID LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID");
420
            sql.append("SELECT REPLY_NOTES,OPERATION.CREATE_TIME,OPERATION_ID,OPERATION_STATUS,DEMAND_ID,DETAIL_DEMAND,DELIVER_TIME,OPERATION.RESOURCE_ID,DEAL_PRICE,DEAL_TIME,PAY_METHOD,P1.NAME,RESOURCE_NAME,RESOURCE.PROFESSOR_ID,P2.NAME FROM OPERATION LEFT JOIN PROFESSOR P1 ON DEMAND_ID = P1.ID LEFT JOIN RESOURCE ON OPERATION.RESOURCE_ID = RESOURCE.RESOURCE_ID LEFT JOIN PROFESSOR P2 ON RESOURCE.PROFESSOR_ID = P2.ID");
447 421
            if(_m_4.length()>0){
448 422
                sql.append(_m_4);
449 423
            }
@ -494,6 +468,10 @@ public abstract class OperationDao {
494 468
                    professor.setName(rs.getString(12));
495 469
                    _obj.setProfessor(professor);
496 470
                    resource.setResourceName(rs.getString(13));
471
                    Professor professor2 = new Professor();
472
                    professor2.setId(rs.getString(14));
473
                    professor2.setName(rs.getString(15));
474
                    resource.setProfessor(professor2);
497 475
                    _obj.setResource(resource);
498 476
                    _m_11.add(_obj);
499 477
                }

+ 13 - 3
src/main/java/com/ekexiu/portal/po/Operation.java

@ -6,6 +6,7 @@ import org.jfw.apt.orm.annotation.entry.Column;
6 6
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
7 7
import org.jfw.apt.orm.annotation.entry.Table;
8 8
import org.jfw.apt.orm.core.defaultImpl.FixLenStringHandler;
9
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
9 10
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
10 11
import org.jfw.apt.orm.core.enums.DE;
11 12

@ -32,6 +33,7 @@ public class Operation {
32 33
	private String payMethod;//支付方式
33 34
	private String replyNotes; //回复备注
34 35
	private String createTime;//创建时间
36
	private int applysquare;//申请方 0代表本人,1代表所属机构
35 37
	private Professor professor;
36 38
	private Resource resource;
37 39
	
@ -49,7 +51,7 @@ public class Operation {
49 51
		this.resource = resource;
50 52
	}
51 53
	
52
	@Column(DE.string_de)
54
	@Column(DE.String_de)
53 55
	public String getReplyNotes() {
54 56
		return replyNotes;
55 57
	}
@ -65,6 +67,14 @@ public class Operation {
65 67
		this.createTime = createTime;
66 68
	}
67 69
	
70
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=false,queryable=true)
71
	public int getApplysquare() {
72
		return applysquare;
73
	}
74
	public void setApplysquare(int applysquare) {
75
		this.applysquare = applysquare;
76
	}
77
	
68 78
	@Column(DE.id_32)
69 79
	public String getOperationId() {
70 80
		return operationId;
@ -113,7 +123,7 @@ public class Operation {
113 123
		this.resourceId = resourceId;
114 124
	}
115 125
	
116
	@Column(DE.bigDecmimal_de)
126
	@Column(DE.BigDecmimal_de)
117 127
	public BigDecimal getDealPrice() {
118 128
		return dealPrice;
119 129
	}
@ -129,7 +139,7 @@ public class Operation {
129 139
		this.dealTime = dealTime;
130 140
	}
131 141
	
132
	@Column(DE.string_de)
142
	@Column(DE.String_de)
133 143
	public String getPayMethod() {
134 144
		return payMethod;
135 145
	}

+ 7 - 6
src/main/java/com/ekexiu/portal/po/PayHistory.java

@ -5,6 +5,7 @@ import java.math.BigDecimal;
5 5
import org.jfw.apt.orm.annotation.entry.Column;
6 6
import org.jfw.apt.orm.annotation.entry.PrimaryKey;
7 7
import org.jfw.apt.orm.annotation.entry.Table;
8
import org.jfw.apt.orm.core.defaultImpl.IntHandler;
8 9
import org.jfw.apt.orm.core.defaultImpl.StringHandler;
9 10
import org.jfw.apt.orm.core.enums.DE;
10 11

@ -56,7 +57,7 @@ public class PayHistory implements CreateTimeSupported {
56 57
		this.operationId = operationId;
57 58
	}
58 59
	
59
	@Column(DE.bigDecmimal_de)
60
	@Column(DE.BigDecmimal_de)
60 61
	public BigDecimal getPaidMoney() {
61 62
		return paidMoney;
62 63
	}
@ -64,7 +65,7 @@ public class PayHistory implements CreateTimeSupported {
64 65
		this.paidMoney = paidMoney;
65 66
	}
66 67
	
67
	@Column(DE.bigDecmimal_de)
68
	@Column(DE.BigDecmimal_de)
68 69
	public BigDecimal getReturnMoney() {
69 70
		return returnMoney;
70 71
	}
@ -79,7 +80,7 @@ public class PayHistory implements CreateTimeSupported {
79 80
		this.createTime = createTime;
80 81
	}
81 82
	
82
	@Column(handlerClass=StringHandler.class,dbType="TEXT",insertable=true,nullable=true,renewable=false,queryable=true)
83
	@Column(handlerClass=StringHandler.class,dbType="TEXT",nullable=true,insertable=true,renewable=false,queryable=true)
83 84
	public String getRemark() {
84 85
		return remark;
85 86
	}
@ -87,7 +88,7 @@ public class PayHistory implements CreateTimeSupported {
87 88
		this.remark = remark;
88 89
	}
89 90
	
90
	@Column(DE.int_de)
91
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=false,queryable=true)
91 92
	public int getIsonline() {
92 93
		return isonline;
93 94
	}
@ -95,7 +96,7 @@ public class PayHistory implements CreateTimeSupported {
95 96
		this.isonline = isonline;
96 97
	}
97 98
	
98
	@Column(DE.int_de)
99
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=false,queryable=true)
99 100
	public int getPayType() {
100 101
		return payType;
101 102
	}
@ -103,7 +104,7 @@ public class PayHistory implements CreateTimeSupported {
103 104
		this.payType = payType;
104 105
	}
105 106
	
106
	@Column(DE.int_de)
107
	@Column(handlerClass=IntHandler.class,dbType="INT",nullable=true,insertable=true,renewable=false,queryable=true)
107 108
	public int getPayStatus() {
108 109
		return payStatus;
109 110
	}

+ 3 - 3
src/main/java/com/ekexiu/portal/po/Professor.java

@ -71,7 +71,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
71 71
		this.industry = industry;
72 72
	}
73 73
	
74
	@Column(DE.string_de)
74
	@Column(DE.String_de)
75 75
	public String getAddress() {
76 76
		return address;
77 77
	}
@ -84,7 +84,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
84 84
	 * 机构部门
85 85
	 * @return
86 86
	 */
87
	@Column(DE.string_de)
87
	@Column(DE.String_de)
88 88
	public String getDepartment() {
89 89
		return department;
90 90
	}
@ -110,7 +110,7 @@ public class Professor implements CreateTimeSupported, ModifyTimeSupported{
110 110
	 * 职称
111 111
	 * @return
112 112
	 */
113
	@Column(DE.string_de)
113
	@Column(DE.String_de)
114 114
	public String getTitle() {
115 115
		return title;
116 116
	}

+ 2 - 2
src/main/java/com/ekexiu/portal/po/Resource.java

@ -108,7 +108,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
108 108
		this.professorId = professorId;
109 109
	}
110 110
	
111
	@Column(DE.string_de)
111
	@Column(DE.String_de)
112 112
	public String getAscription() {
113 113
		return ascription;
114 114
	}
@ -130,7 +130,7 @@ public class Resource implements CreateTimeSupported, ModifyTimeSupported{
130 130
		this.modifyTime = modifyTime;
131 131
	}
132 132
	
133
	@Column(DE.string_de)
133
	@Column(DE.String_de)
134 134
	public String getHopePayMethod() {
135 135
		return hopePayMethod;
136 136
	}