anderx пре 2 година
родитељ
комит
14d8cd677a

+ 13 - 18
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -2100,25 +2100,20 @@ 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,zc.name zc,fzc.name fzc, zxsgly.name zxsgly,dsz.name dsz
+           yxgly.name yxgly,d.name cwzy, zxsgly.name zxsgly,dsz.name dsz,dep.approval approvalStatus ,da.name approvalName
     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
-        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 ='9996' and a.status ='0' group by a.department_id )yxgly on c.id =yxgly.depId
-     left join (select order_no ,group_concat(aname)name from t_order_examine WHERE type=0 group by order_no ) d on a.order_no=d.order_no
-     left join (select group_concat(a.name) name
-        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 ('99998','99988') and a.status ='0' ) zc on 1=1
-     left join (select group_concat(a.name) name
-                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 ('99996') and a.status ='0' ) fzc on 1=1
-     left join (select group_concat(a.name) name
-        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 ('99999','99989') and a.status ='0' ) dsz on 1=1
-     left join (select group_concat(a.name) name
-        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 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
+                                  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 ='9996' and a.status ='0' group by a.department_id )yxgly on c.id =yxgly.depId
+                       left join (select order_no ,group_concat(aname)name from t_order_examine WHERE type=0 group by order_no ) d on a.order_no=d.order_no
+                       left join (select group_concat(a.name) name
+                                  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 ('99999','99989') and a.status ='0' ) dsz on 1=1
+                       left join (select group_concat(a.name) name
+                                  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
     where a.order_no = #{orderNo}
   </select>
   <select id="selectByuidandAid" resultType="com.goafanti.order.bo.TOrderNewBo">

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

@@ -9,17 +9,25 @@ public class OrderProcessName {
     private String yxjl;
     private String yxgly;
     private String cwzy;
-    private String zc;
-    private String fzc;
+    private String approvalStatus;
+    private String approvalName;
     private String zxsgly;
     private String dsz;
 
-    public String getFzc() {
-        return fzc;
+    public String getApprovalStatus() {
+        return approvalStatus;
     }
 
-    public void setFzc(String fzc) {
-        this.fzc = fzc;
+    public void setApprovalStatus(String approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
     }
 
     public String getYxjl() {
@@ -78,14 +86,6 @@ public class OrderProcessName {
         this.cwzy = cwzy;
     }
 
-    public String getZc() {
-        return zc;
-    }
-
-    public void setZc(String zc) {
-        this.zc = zc;
-    }
-
     public String getZxsgly() {
         return zxsgly;
     }