Browse Source

特批订单列表去处已锁定的订单

anderx 7 years ago
parent
commit
8d7154b61d

+ 2 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -235,8 +235,8 @@ public class WebpageController extends BaseController {
 		List<MarketingManagementBo> demandList = marketingManagementService.selectMarketList(request,
 				MarketingPage.mainDemand.getBoothType(),MarketingPage.mainDemand.getBoothSize());
 		List<MarketingManagementBo> speciaList = marketingManagementService.selectMarketList(request,
-				MarketingPage.specialist.getBoothType(), MarketingPage.specialist.getBoothSize());*/
-		/*modelview.addObject("achievementList", achievementList);
+				MarketingPage.specialist.getBoothType(), MarketingPage.specialist.getBoothSize());
+		modelview.addObject("achievementList", achievementList);
 		modelview.addObject("demandList", demandList);
 		modelview.addObject("speciaList", speciaList);
 		modelview.addObject("projectList", projectList);*/

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

@@ -1063,7 +1063,7 @@
 			a.finance_id = d.id left join admin e on
 			a.technician_id = e.id left join department f on 
 			c.department_id = f.id
-		where a.order_type = 0
+		where a.order_type = 0 and a.delete_sign=0
 		<if test="orderNo != null">
 			and a.order_no= #{orderNo,jdbcType=VARCHAR}
 		</if>