|
|
@@ -1471,15 +1471,15 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tOrderTask.setProcessStatus(1);
|
|
|
tOrderTask.setMemberType(memberType);
|
|
|
tOrderTask.setPictureUrl(pictureUrl);
|
|
|
- if(memberType==1||memberType==2){
|
|
|
- //判定项目省内外
|
|
|
- Department dep = tOrderNewMapper.selectDepByOrderNo(tOrderTask.getOrderNo());
|
|
|
- if (dep!=null&&dep.getProvince()==AFTConstants.HN_PROVINCE){
|
|
|
- tOrderTask.setApproval(2);
|
|
|
- }else {
|
|
|
- tOrderTask.setApproval(1);
|
|
|
- }
|
|
|
- }
|
|
|
+// if(memberType==1||memberType==2){
|
|
|
+// //判定项目省内外
|
|
|
+// Department dep = tOrderNewMapper.selectDepByOrderNo(tOrderTask.getOrderNo());
|
|
|
+// if (dep!=null&&dep.getProvince()==AFTConstants.HN_PROVINCE){
|
|
|
+// tOrderTask.setApproval(2);
|
|
|
+// }else {
|
|
|
+// tOrderTask.setApproval(1);
|
|
|
+// }
|
|
|
+// }
|
|
|
}
|
|
|
Integer i=tOrderTaskMapper.getSplitCount(tid);
|
|
|
i++;
|
|
|
@@ -1489,7 +1489,6 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
|
|
|
tOrderTask.setMain(0);
|
|
|
tOrderTask.setCommodityPrice(new BigDecimal(0));
|
|
|
tOrderTaskMapper.insertSelective(tOrderTask);
|
|
|
-
|
|
|
TTaskMember t = tTaskMemberMapper.selectByTid(tid);
|
|
|
TOrderTaskBo tb=new TOrderTaskBo();
|
|
|
BeanUtils.copyProperties(tOrderTask,tb);
|