Przeglądaj źródła

财务订单特批相关修改

anderx 1 rok temu
rodzic
commit
16bdc937dc

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

@@ -1081,10 +1081,25 @@
     ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ttm.cost_amount costAmount,tm.salesman_name salesmanName ,
     ttm.party_amount  partyAmount,a.commodity_price commodityPrice,a.outsource,date_format(a.task_end_time,'%Y-%m-%d') taskEndTime,date_format(e.sign_time,'%Y-%m-%d') signTime,
     date_format(e.create_time ,'%Y-%m-%d')creteTime,a.patent_type  patentType,tmer.service_year serviceYear,e.approval_type as approvalType,e.approval_type_explain as approvalTypeExplain
-    from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id
+    from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id,toa.type,toa.type_explain typeExplain
     left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id left join t_order_mid tm on a.order_no =tm.order_no
     left join department h on e.order_dep=h.id  left join task_hours_count k on a.id=k.tid and a.task_receiver=k.aid left join t_order_outsource l
     on a.id=l.tid  left join t_task_mid ttm  on a.id=ttm.tid left join t_task_member tmer on a.id=tmer.tid
+    <if test="type !=null">
+      inner join
+    </if>
+    <if test="type ==null">
+      left join
+    </if>
+    (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
+    from t_order_approval
+    <if test="type !=null">
+      where `type` in
+      <foreach collection="type" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+    </if>
+    group by order_no) toa on e.order_no=toa.order_no
     where  e.delete_sign in (0,2,3)  and e.order_status in (2,4)
     and a.outsource= #{outsource,jdbcType=INTEGER}
     <include refid="selectOrderTaskListSql"/>
@@ -1169,6 +1184,16 @@
     <if test="outsourceStatus !=null">
       left join t_order_outsource l on a.id=l.tid
     </if>
+    <if test="type !=null">
+      inner join
+      (select order_no ,GROUP_CONCAT(`type`)`type` ,GROUP_CONCAT(type_explain)type_explain
+      from t_order_approval
+      where `type` in
+      <foreach collection="type" item="item" separator="," open="(" close=")">
+        #{item}
+      </foreach>
+      group by order_no) toa on o.order_no=toa.order_no
+    </if>
     where e.delete_sign in (0,2,3)  and e.order_status in (2,4)
     and a.outsource= #{outsource,jdbcType=INTEGER}
     <include refid="selectOrderTaskListSql"/>

+ 10 - 10
src/main/java/com/goafanti/order/bo/TOrderTaskListBo.java

@@ -100,23 +100,23 @@ public class TOrderTaskListBo {
 
 	private String receiverMobile;
 
-	private Integer approvalType;
-	private String approvalTypeExplain;
+	private Integer type;
+	private String typeExplain;
 
-	public Integer getApprovalType() {
-		return approvalType;
+	public Integer getType() {
+		return type;
 	}
 
-	public void setApprovalType(Integer approvalType) {
-		this.approvalType = approvalType;
+	public void setType(Integer type) {
+		this.type = type;
 	}
 
-	public String getApprovalTypeExplain() {
-		return approvalTypeExplain;
+	public String getTypeExplain() {
+		return typeExplain;
 	}
 
-	public void setApprovalTypeExplain(String approvalTypeExplain) {
-		this.approvalTypeExplain = approvalTypeExplain;
+	public void setTypeExplain(String typeExplain) {
+		this.typeExplain = typeExplain;
 	}
 
 	public String getReceiverMobile() {