Browse Source

Merge remote-tracking branch 'origin/test' into dev

anderx 7 years ago
parent
commit
64423600fd

+ 2 - 2
src/main/java/com/goafanti/common/mapper/TechProjectMapper.xml

@@ -1050,7 +1050,7 @@ from
 		from
 			(select *
 		from contract_task_log
-		where task_receiver='1') x left join contract_task a on 
+		where task_receiver=#{taskReceiver,jdbcType=VARCHAR}) x left join contract_task a on 
 			x.contract_task_id=a.id	left join business_project b on
 			a.commodity_id = b.id left join business_varieties c on
 			b.cid = c.id left join contract d on
@@ -1101,7 +1101,7 @@ from
 		from
 			(select *
 		from contract_task_log
-		where task_receiver='1') x left join contract_task a on 
+		where task_receiver=#{taskReceiver,jdbcType=VARCHAR}) x left join contract_task a on 
 			x.contract_task_id=a.id	left join business_project b on
 			a.commodity_id = b.id left join business_varieties c on
 			b.cid = c.id left join contract d on

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

@@ -1926,7 +1926,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
 	public void addContractTaskLog() {
 		List<ContractTask> list=contractTaskMapper.selectlistContractTask();
 		Admin aa=adminMapper.selectAdminName(AFTConstants.DEFAULT_INITIATOR);
-		Admin ab=adminMapper.selectAdminName("AFTConstants.CONSULTANT_MANAGER");
+		Admin ab=adminMapper.selectAdminName(AFTConstants.CONSULTANT_MANAGER);
 		for (ContractTask ct : list) {
 			ContractTaskLog c=new ContractTaskLog();
 			c.setId(UUID.randomUUID().toString());