소스 검색

订单列表修改

anderx 1 년 전
부모
커밋
0a1064e744

+ 2 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseDetailsMapper.xml

@@ -182,7 +182,8 @@
     <select id="selectByPrid" resultType="com.goafanti.weChat.bo.OutPublicReleaseDetails">
         select
             a.id,a.prid, a.`uid`, a.ufid, a.new_user newUser,a.longitude,a.latitude,b.nickname userName,a.main_status mainStatus,a.duration,
-            a.district_name districtName ,a.clock_in clockIn,date_format(a.clock_in_time, '%Y-%m-%d %H:%i:%S')  clockInTimes,a.photo_url photoUrl
+            a.address_name addressName,a.district_name districtName ,a.clock_in clockIn,
+            date_format(a.clock_in_time, '%Y-%m-%d %H:%i:%S')  clockInTimes,a.photo_url photoUrl
         from public_release_details a left join user b on a.uid=b.id
         where prid = #{id,jdbcType=INTEGER} order by a.update_time desc
     </select>

+ 1 - 1
src/main/java/com/goafanti/common/mapper/PublicReleaseMapper.xml

@@ -488,7 +488,7 @@
         select  a.id,c.name  aname,date_format(a.release_start,'%Y-%m-%d %H:%i:%S') releaseStarts,a.update_time updateTime,a.user_names userNames,
         date_format(a.release_end ,'%Y-%m-%d %H:%i:%S') releaseEnds,date_format(a.create_time ,'%Y-%m-%d %H:%i:%S') createTimes,a.status,
         a.annex_url annexUrl ,a.remarks,a.duration ,a.valid_date validDate ,a.aid ,c.superior_id suprId,a.tech_start_process techStartProcess,
-        a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,
+        a.plan ,a.expected_effect expectedEffect,a.next_plan nextPlan,c.reviewer,a.type,a.order_no orderNo,d.contract_no contractNo,a.address_name addressName,
         date_format(a.update_time ,'%Y-%m-%d %H:%i:%S') updateTimes,a.update_Status updateStatus,a.assist,a.assist_aid assistAid,a.assist_aid_name assistAidName,
         a.main_name mainName,a.assistant_aid assistantAid,a.assistant_name assistantName,a.public_again publicAhain,x.uids,a.public_type publicType,c2.name reviewerName
         from public_release a  left join admin c on a.aid =c.id  left join admin c2 on c.reviewer =c2.id

+ 12 - 0
src/main/java/com/goafanti/weChat/bo/OutPublicRelease.java

@@ -38,12 +38,24 @@ public class OutPublicRelease extends PublicRelease {
 	 * 协单人员
 	 */
 	private String assistAidName;
+
+	private String addressName;
 	private String uids;
 	private String adminExamine;
 	private String reviewerName;
 	private List<OutPublicReleaseDetails> prdList;
 	private List<PublicExamine> peList;
 
+	@Override
+	public String getAddressName() {
+		return addressName;
+	}
+
+	@Override
+	public void setAddressName(String addressName) {
+		this.addressName = addressName;
+	}
+
 	public String getReviewerName() {
 		return reviewerName;
 	}