anderx 3 lat temu
rodzic
commit
a09a6a8d66

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

@@ -2016,7 +2016,10 @@
         and a.`type` =1 and a.status =1
       </if>
       <if test="status==4">
-        and a.status=2
+        and a.`type` =0 and a.status =2
+      </if>
+      <if test="status==5">
+        and a.`type` =1 and a.status =2
       </if>
     </if>
     <if test="receiverId !=null">

+ 4 - 2
src/main/java/com/goafanti/common/mapper/TaskLogMapper.xml

@@ -97,7 +97,9 @@
   </update>
 
   <select id="selectTaskLogList" resultType="com.goafanti.order.bo.TaskLogBo">
-    select a.id,a.task_id taskId,a.content,date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTimes,b.name as aName
-    from task_log a left join admin b on a.aid=b.id where a.task_id= #{id,jdbcType=INTEGER} order by a.create_time
+    select a.id,a.task_id taskId,a.content,date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTimes,b.name as aName,
+           a.sotp_id ,c.reason
+    from task_log a left join admin b on a.aid=b.id left join task_sopt c on a.sotp_id =c.id
+    where a.task_id= #{id,jdbcType=INTEGER} order by a.create_time
   </select>
 </mapper>

+ 12 - 2
src/main/java/com/goafanti/order/bo/TaskLogBo.java

@@ -4,10 +4,20 @@ import com.goafanti.common.model.TaskLog;
 
 public class TaskLogBo extends TaskLog{
 		private String aName;
-		
+
 		private String createTimes;
 
-		public String getaName() {
+		private String reason;
+
+	public String getReason() {
+		return reason;
+	}
+
+	public void setReason(String reason) {
+		this.reason = reason;
+	}
+
+	public String getaName() {
 			return aName;
 		}