anderx 1 рік тому
батько
коміт
6c96bf9f81

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

@@ -53,4 +53,6 @@ public interface TOrderMidMapper {
     List<TOrderMid> selectAll();
 
     void updateStopProjectByOrderNo(String orderNo);
+
+    void updateBidTypeByOrderNo(String orderNo);
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderMidMapper.xml

@@ -760,5 +760,11 @@
     set a.stop_project =b.ps
     where a.order_no =b.order_no
     </update>
+    <update id="updateBidTypeByOrderNo">
+      update t_order_mid a left join t_order_task b on a.order_no =b.order_no
+        left join business_project c on b.commodity_id =c.id
+      set a.bid_type =1
+      where c.`type` =8 and a.order_no = #{orderNo}
+    </update>
 
 </mapper>

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

@@ -612,7 +612,8 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			pushGeneralSendNoticeAndEmail(aids, type,order, TokenManager.getAdminId(),t.getApproval());
 			//计算公出统计
 			pushOrderPublicReleaseCount(t.getOrderNo(),null);
-
+			//如果有投标,标记成投标订单
+			pushOrderBidType(t.getOrderNo());
 		}
 		//驳回重新发起,需要刷新当天和今天
 		boolean newOrderFlag=false;
@@ -646,6 +647,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		return 1;
 	}
 
+	private void pushOrderBidType(String orderNo) {
+		tOrderMidMapper.updateBidTypeByOrderNo(orderNo);
+	}
+
 	public void pushOrderPublicReleaseCount(String orderNo,Integer prId) {
 			List<PublicRelease> list = publicReleaseMapper.selectByOrderNo(orderNo);
 			TOrderNewBo t = tOrderNewMapper.getOrderNewDetail(orderNo);

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

@@ -1,8 +1,8 @@
 dev.name=local
 jdbc.driverClassName=com.mysql.jdbc.Driver
 
-static.host=//static.jishutao.com/1.3.13
-#static.host=//172.16.1.187/1.3.13
+#static.host=//static.jishutao.com/1.3.13
+static.host=//172.16.1.187/1.3.13
 
 #jdbc.url=jdbc\:mysql://localhost:3306/aft20221026?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
 #jdbc.url=jdbc\:mysql://localhost:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false