Browse Source

修改导出的项目列表参数

Signed-off-by: anderx <312518615@qq.com>
anderx 6 years ago
parent
commit
720580b885

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

@@ -1563,7 +1563,7 @@ where super_id is null ) e on e.order_no=a.order_no
 	  	and o.order_no = #{o.orderNo,jdbcType=VARCHAR}
 	  	</if>
 	  	<if test="o.buyerName != null and o.buyerName != &quot;&quot;">
-	  	<bind name="n" value="'%' + buyerName + '%'" />
+	  	<bind name="n" value="'%' + o.buyerName + '%'" />
 	  	and u.nickname  like #{n,jdbcType=VARCHAR}
 	  	</if>
 	  	<if test="o.startTime != null and o.startTime != &quot;&quot; and o.endTime != null and o.endTime != &quot;&quot;">

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

@@ -507,7 +507,6 @@ public class AdminNewOrderApiController extends CertifyApiController {
 			e.printStackTrace();
 			return res;
 		}
- 		res.data(1); 
  		return res;
 	}
 	

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

@@ -1063,7 +1063,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
     				case "项目别类": o = ob.getCname(); break;
     				case "项目名称": o = ob.getCommodityName(); break;
     				case "项目数量": o = ob.getCommodityQuantity().toString(); break;
-    				case "服务市价": o = ob.getPrice().toString(); break;
+    				case "服务市价": o = ob.getCommodityPrice()!=null?ob.getCommodityPrice().toString():""; break;
     				case "证书編号": o = ob.getCertificateNumber(); break;
     				case "项目状态": o = ProjectNewStage.getValueByCode(ob.getProjectStatus()); break;
     				case "项目说明": o = ob.getTaskComment(); break;