anderx лет назад: 5
Родитель
Сommit
7ffadb90d5

+ 1 - 1
src/main/java/com/goafanti/common/dao/TOrderOutsourceMapper.java

@@ -75,5 +75,5 @@ public interface TOrderOutsourceMapper {
 	 */
 	int updateByPrimaryKey(TOrderOutsource record);
 
-	OrderOutsourceDtails selectByOrderNo(String orderNo);
+	OrderOutsourceDtails selectByOrderNo( @Param("orderNo") String orderNo,@Param("tid")String tid);
 }

+ 14 - 1
src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml

@@ -446,16 +446,29 @@
      select id, order_no orderNo, refund_status refundStatus, date_format(create_time,'%Y-%m-%d %H:%i:%S') createTimes , remarks,
 	 date_format(audit_time,'%Y-%m-%d %H:%i:%S') auditTimes,attachment_url attachmentUrl, picture_url pictureUrl, amount,
 	 company_name companyName ,unit_price unitPrice,unit_number unitNumber,outsource_remarks outsourceRemarks from t_order_outsource
-	  where order_no =  #{orderNo}
+	 where 1=1
+	  <if test="orderNo != null">
+	  and  order_no =  #{orderNo}
+	  </if>
+	  <if test="tid != null">
+	  and tid =  #{tid}
+	  </if>
   </select>
   <select id="orderOutsourceList" resultType="com.goafanti.order.bo.OrderOutsourceBo">
   select a.order_no orderNo,b.contract_no contractNo,date_format(b.create_time,'%Y-%m-%d %H:%i:%S') createTime,a.type,a.tid,
 	date_format(b.sign_time,'%Y-%m-%d') signTime,c.nickname userName, e.name depName,b.total_amount totalAmount,
 	b.liquidation_status liquidationStatus,a.refund_status refundStatus,d.name adminName,g.name financeName
+	<if test="type == 1">
+	,bc.cname,pa.name pname
+	</if>
 	from t_order_outsource a
 	left join t_order_new b on a.order_no=b.order_no left join `user` c on b.buyer_id=c.id
 	left join admin d on b.salesman_id=d.id left join department e on d.department_id=e.id
 	left join department f on b.order_dep=f.id left join admin g on f.finance_id=g.id
+	<if test="type == 1">
+	left join t_order_task h on a.tid=h.id left join business_project bp on h.commodity_id=bp.id
+	left join business_category bc on bp.cid=bc.id left join admin pa on  h.task_receiver=pa.id
+	</if>
 	where b.approval in (0,2)
 	<if test="type != null">
 	and a.type = #{type}

+ 2 - 2
src/main/java/com/goafanti/order/controller/OutsourceOrgApiController.java

@@ -161,9 +161,9 @@ public class OutsourceOrgApiController extends CertifyApiController {
 	 * 外包审核详情
 	 */
 	@RequestMapping(value="/orderOutsourceDtails", method = RequestMethod.GET)
-	public Result orderOutsourceDtails(String orderNo){
+	public Result orderOutsourceDtails(String orderNo,String tid){
 		Result res=new Result();
-		res.data(outsourceOrgService.orderOutsourceDtails(orderNo));
+		res.data(outsourceOrgService.orderOutsourceDtails(orderNo,tid));
 		return res;
 	}
 	/**

+ 1 - 1
src/main/java/com/goafanti/order/service/OutsourceOrgService.java

@@ -23,7 +23,7 @@ public interface OutsourceOrgService {
 	Pagination<OrderOutsourceBo> orderOutsourceList(String name, String contractNo, String starTime, String endTime,Integer refundStatus,Integer type, Integer pageNo,
 			Integer pageSize);
 	
-	OrderOutsourceDtails orderOutsourceDtails(String orderNo);
+	OrderOutsourceDtails orderOutsourceDtails(String orderNo, String tid);
 	
 	int updateAuditOutsource(OrderOutsourceDtails o);
 

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -99,8 +99,8 @@ public class OutsourceOrgServiceImpl  extends BaseMybatisDao<TOrderOutsourceMapp
 
 
 	@Override
-	public OrderOutsourceDtails orderOutsourceDtails(String orderNo) {
-		return tOrderOutsourceMapper.selectByOrderNo(orderNo);
+	public OrderOutsourceDtails orderOutsourceDtails(String orderNo,String tid) {
+		return tOrderOutsourceMapper.selectByOrderNo(orderNo,tid);
 	}
 
 

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -60,12 +60,12 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com/1.1.32
+#static.host=//sb.jishutao.com/1.1.33
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.32
+static.host=//static.jishutao.com/1.1.33
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -54,7 +54,7 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.jishutao.com/1.1.31
+static.host=//static.jishutao.com/1.1.33
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload