ソースを参照

订单流程列表修改

anderx 1 年間 前
コミット
3e4922cccd

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

@@ -1960,7 +1960,8 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
   </select>
   <select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
     select a.order_no orderNo,a.approval,a.process_status processStatus  ,b.name yxy,mg.name yxjl,
-           yxgly.name yxgly,d.name cwzy, zxsgly.name zxsgly,dsz.name dsz,dep.approval approvalStatus ,da.name approvalName
+           yxgly.name yxgly,d.name cwzy, zxsgly.name zxsgly,dsz.name dsz,dep.approval approvalStatus ,da.name approvalName,
+           dep.operation_guarantee_id, ad2.name yybz
     from t_order_new a left join admin b on a.salesman_id =b.id
                        left join admin mg on b.manager_id =mg.id left join department c on a.order_dep =c.id
                        left join (select a.department_id depId,group_concat(a.name) name
@@ -1974,6 +1975,7 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
                                   from admin a left join user_role b on a.id=b.uid left join `role` c on b.rid =c.id
                                   where c.role_type in ('9998') and a.status ='0' ) zxsgly on 1=1
                        left join department dep on a.order_dep =dep.id left join admin da on dep.approval_aid=da.id
+                        left join admin ad2 on dep.operation_guarantee_id=ad2.id
     where a.order_no = #{orderNo}
   </select>
   <select id="selectByuidandAid" resultType="com.goafanti.order.bo.TOrderNewBo">

+ 9 - 0
src/main/java/com/goafanti/order/bo/OrderProcessName.java

@@ -13,6 +13,15 @@ public class OrderProcessName {
     private String approvalName;
     private String zxsgly;
     private String dsz;
+    private String yybz;
+
+    public String getYybz() {
+        return yybz;
+    }
+
+    public void setYybz(String yybz) {
+        this.yybz = yybz;
+    }
 
     public Integer getApprovalStatus() {
         return approvalStatus;

+ 1 - 0
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -2330,6 +2330,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (names.getApprovalStatus()==0){
 			names.setApprovalName("未设置特批审核人员");
 		}
+		names.setYybz(names.getYybz()==null?"未设置运营保障审核":names.getYybz());
 		return names;
 	}