|
|
@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
import com.goafanti.common.dao.*;
|
|
|
import com.goafanti.common.model.*;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
+import com.goafanti.organization.bo.*;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFCell;
|
|
|
import org.apache.poi.xssf.usermodel.XSSFRow;
|
|
|
@@ -67,10 +68,6 @@ import com.goafanti.order.enums.TaskState;
|
|
|
import com.goafanti.order.enums.refundState;
|
|
|
import com.goafanti.order.service.OrderNewService;
|
|
|
import com.goafanti.order.service.OrderService;
|
|
|
-import com.goafanti.organization.bo.OrganizationListOut;
|
|
|
-import com.goafanti.organization.bo.OutPaymentNode;
|
|
|
-import com.goafanti.organization.bo.OutThirdPartyCompany;
|
|
|
-import com.goafanti.organization.bo.ProjectTypePuls;
|
|
|
import com.goafanti.patent.service.PatentNewService;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
@@ -1305,6 +1302,11 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
@Override
|
|
|
@Transactional
|
|
|
public int pushOutsourceProjectAudit(TOrderOutsource o) {
|
|
|
+ //前端加载缓慢避免重复提交
|
|
|
+ OrderOutsourceDtails ood=tOrderOutsourceMapper.selectByOrderNo(null,o.getTid().toString());
|
|
|
+ if (ood!=null){
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
o.setRefundStatus(0);
|
|
|
o.setCreateTime(new Date());
|
|
|
if(o.getAmount()==null)o.setAmount(new BigDecimal(0));
|
|
|
@@ -1333,7 +1335,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
|
|
|
o.setRefundStatus(1);
|
|
|
}
|
|
|
if (o.getId()==null) {
|
|
|
- tOrderOutsourceMapper.insertSelective(o);
|
|
|
+ tOrderOutsourceMapper.insertSelective(o);
|
|
|
}else {
|
|
|
tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
|
|
|
//旧项目变更,如果驳回修改成新的项目变更
|