Browse Source

获取订单审核名称列表

anderx 3 years ago
parent
commit
a8a508eb21

+ 13 - 11
src/main/java/com/goafanti/ambSystem/controller/AmbPaymentApiController.java

@@ -44,17 +44,19 @@ public class AmbPaymentApiController extends CertifyApiController {
 		res.data(ambPaymentService.add(in));
 		return res;
 	}
-//
-//	@RequestMapping(value="/update",method = RequestMethod.POST)
-//	public Result updateAmb( InputAmb in){
-//		Result res =new Result();
-//		if (in.getId()==null){
-//			res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"巴编号"));
-//			return res;
-//		}
-//		res.data(ambService.updateAmb(in));
-//		return res;
-//	}
+
+	/**
+	 * 修改巴付款
+	 * @param in
+	 * @return
+	 */
+	@RequestMapping(value="/update",method = RequestMethod.POST)
+	public Result update( InputAmbPayment in){
+		Result res =new Result();
+
+		res.data(ambPaymentService.update(in));
+		return res;
+	}
 //
 //	@RequestMapping(value="/delete",method = RequestMethod.POST)
 //	public Result deleteAmb( InputAmb in){

+ 2 - 0
src/main/java/com/goafanti/ambSystem/service/AmbPaymentService.java

@@ -12,4 +12,6 @@ public interface AmbPaymentService {
     AmbPaymentApplication selectByid(Long id);
 
     int updateById(AmbPaymentApplication newBo);
+
+    int update(InputAmbPayment in);
 }

+ 7 - 0
src/main/java/com/goafanti/ambSystem/service/Impl/AmbPaymentServiceImpl.java

@@ -32,6 +32,11 @@ public class AmbPaymentServiceImpl extends BaseMybatisDao<AmbPaymentApplicationM
         return ambPaymentApplicationMapper.insertSelective(in);
     }
 
+    @Override
+    public int update(InputAmbPayment in) {
+
+        return ambPaymentApplicationMapper.updateByPrimaryKeySelective(in);
+    }
 
 
 
@@ -45,4 +50,6 @@ public class AmbPaymentServiceImpl extends BaseMybatisDao<AmbPaymentApplicationM
     public int updateById(AmbPaymentApplication newBo) {
         return ambPaymentApplicationMapper.updateByPrimaryKeySelective(newBo);
     }
+
+
 }

+ 2 - 0
src/main/java/com/goafanti/common/dao/TOrderNewMapper.java

@@ -69,4 +69,6 @@ public interface TOrderNewMapper {
                           @Param("names")String names);
 
     List<TOrderNew> selectgetAll();
+
+    OrderProcessName getProcessName(String orderNo);
 }

+ 20 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1966,5 +1966,25 @@ left join department d on o.order_dep = d.id   left join t_order_mid a on o.orde
     select order_no orderNo,contract_picture_url contractPictureUrl ,agreement_url agreementUrl ,service_content serviceContent
     from t_order_new where delete_sign in (0,2)
   </select>
+  <select id="getProcessName" resultType="com.goafanti.order.bo.OrderProcessName">
+    select a.order_no orderNo,a.approval ,b.name ,yxgly.name yxgly,d.name cwzy,zc.name zc,
+           zxsgly.name zxsgly,dsz.name dsz
+    from t_order_new a left join admin b on a.salesman_id =b.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 admin d on c.finance_id =d.id
+     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 ('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
+    where a.order_no = #{orderNo}
+  </select>
 
 </mapper>

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

@@ -0,0 +1,77 @@
+package com.goafanti.order.bo;
+
+public class OrderProcessName {
+
+    private String orderNo;
+    private Integer approval;
+    private String name;
+    private String yxgly;
+    private String cwzy;
+    private String zc;
+    private String zxsgly;
+    private String dsz;
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public Integer getApproval() {
+        return approval;
+    }
+
+    public void setApproval(Integer approval) {
+        this.approval = approval;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getYxgly() {
+        return yxgly;
+    }
+
+    public void setYxgly(String yxgly) {
+        this.yxgly = yxgly;
+    }
+
+    public String getCwzy() {
+        return cwzy;
+    }
+
+    public void setCwzy(String cwzy) {
+        this.cwzy = cwzy;
+    }
+
+    public String getZc() {
+        return zc;
+    }
+
+    public void setZc(String zc) {
+        this.zc = zc;
+    }
+
+    public String getZxsgly() {
+        return zxsgly;
+    }
+
+    public void setZxsgly(String zxsgly) {
+        this.zxsgly = zxsgly;
+    }
+
+    public String getDsz() {
+        return dsz;
+    }
+
+    public void setDsz(String dsz) {
+        this.dsz = dsz;
+    }
+}

+ 15 - 0
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -240,6 +240,21 @@ public class AdminNewOrderApiController extends CertifyApiController {
 		res.setData(orderNewService.getOrderNewDetail(orderNo));
 		return res;
 	}
+	/**
+	 * 订单详情
+	 * @param orderNo
+	 * @return
+	 */
+	@RequestMapping(value = "/getProcessName", method = RequestMethod.GET)
+	public Result getProcessName(String orderNo){
+		Result res = new Result();
+		if(StringUtils.isBlank(orderNo)){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号","订单编号"));
+			return res;
+		}
+		res.setData(orderNewService.getProcessName(orderNo));
+		return res;
+	}
 
 	@RequestMapping(value = "/updateSalesType",method = RequestMethod.POST)
 	public Result updateSalesType(TOrderNew in ){

+ 2 - 0
src/main/java/com/goafanti/order/service/OrderNewService.java

@@ -217,4 +217,6 @@ public interface OrderNewService {
 	void pushExamineName(TOrderNew t);
 
     int updateOrderUrl(String orderNo, String contractPictureUrl, String agreementUrl, String serviceContent);
+
+    OrderProcessName getProcessName(String orderNo);
 }

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

@@ -1897,4 +1897,9 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return 0;
 	}
 
+	@Override
+	public OrderProcessName getProcessName(String orderNo) {
+		return tOrderNewMapper.getProcessName(orderNo);
+	}
+
 }