Przeglądaj źródła

变更新增合同期

anderx 3 lat temu
rodzic
commit
6ae53be6a5

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

@@ -325,7 +325,7 @@
 	a.official_cost officialCost, a.commodity_quantity as commodityQuantity,i.price,a.commodity_id as commodityId,a.type,a.tid,
 	a.receiver_name receiverName, a.task_comment as taskComment ,a.commodity_price as commodityPrice,a.split_status splitStatus,
 	a.split_super splitSuper, a.service_life serviceLife ,a.service_year serviceYear,a.year_sum yearSum,
-    a.declaration_batch declarationBatch,a.patent_type patentType
+    a.declaration_batch declarationBatch,a.patent_type patentType,a.contract_term contractTerm
     from t_change_task a left join business_project i on a.commodity_id=i.id
   	left join business_category c on i.cid=c.id
   	where 1=1

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

@@ -353,7 +353,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				t.setCertificateNumber("****");
 				}else if (TokenManager.hasRole(AFTConstants.TECH)) {
 					//设置隐藏金额
-					t.setCommodityPrice(new BigDecimal(-1));
+					t.setCommodityPrice(null);
 					}
 				if(t.getPatentType()!=null) {
 					t.setPatentTypeName(OfficialPatentType.getValueByCode(t.getPatentType()));