Browse Source

订单催款中间表值不对修改

anderx 4 years ago
parent
commit
9b26564bb9

+ 0 - 3
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -367,7 +367,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	}
 	/**
 	 * 	客户项目列表
-	 * @param tid
 	 * @return
 	 */
 	@RequestMapping(value = "/selectUidByproject",method = RequestMethod.GET)
@@ -415,7 +414,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	
 	/**
 	 * 	获取专利分类
-	 * @param tid
 	 * @return
 	 */
 	@RequestMapping(value = "/getPatentType",method = RequestMethod.GET)
@@ -427,7 +425,6 @@ public class OrderProjectApiController extends CertifyApiController {
 	
 	/**
 	 * 	核对列表
-	 * @param tid
 	 * @return
 	 */
 	@RequestMapping(value = "/selectProjectCheck",method = RequestMethod.GET)

+ 7 - 7
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -464,13 +464,13 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		t.setCertificateNumber(b.getCertificateNumber());
 		t.setSetUpAmount(b.getSetUpAmount());
 		TOrderTask task2=tOrderTaskMapper.selectByPrimaryKey(b.getTid());//查询出项目信息
-		if(b.getProjectStatus()!=task2.getProjectStatus()&&
-				b.getProjectStatus()==NewProjectStatus.YLX.getCode()) t.setSetUpStatus(1);
-		if(b.getProjectStatus()!=task2.getProjectStatus()&&
-				b.getProjectStatus()==NewProjectStatus.YNGS.getCode()) t.setSetUpStatus(1);
-		tOrderTaskMapper.updateByPrimaryKeySelective(t);
-		projectSplitPush(b.getTid(), b.getProjectStatus(),task2);
-		if(b.getProjectStatus()!=task2.getProjectStatus())pushTaskLog(b.getTid(), b.getProjectStatus());
+		if(b.getProjectStatus()!=task2.getProjectStatus()){
+			if(b.getProjectStatus()==NewProjectStatus.YLX.getCode()) t.setSetUpStatus(1);
+			if(b.getProjectStatus()==NewProjectStatus.YNGS.getCode()) t.setSetUpStatus(1);
+			tOrderTaskMapper.updateByPrimaryKeySelective(t);
+			projectSplitPush(b.getTid(), b.getProjectStatus(),task2);
+			pushTaskLog(b.getTid(), b.getProjectStatus());
+		}
 		return 1;
 	}