Browse Source

update

Signed-off-by: anderx <312518615@qq.com>
anderx 5 years ago
parent
commit
1754b132a2

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

@@ -513,6 +513,7 @@
 		from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
 		left join business_project bp on b.commodity_id=bp.id
 		left join t_order_mid d on b.order_no=d.order_no left join t_task_mid f on a.tid=f.tid
+		where 1=1
 		<if test="lvl==0">
 		and c.finance_id= #{aid}
 		</if>

+ 1 - 1
src/main/java/com/goafanti/order/controller/OutsourceOrgApiController.java

@@ -121,7 +121,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
 	}
 	
 	/**
-	 * 项目发起外包
+	 * 项目发起外包(发起外包项目)
 	 */
 	@RequestMapping(value="/outsourceProjectAudit", method = RequestMethod.POST)
 	public Result outsourceProjectAudit(TOrderOutsource o){

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

@@ -1351,7 +1351,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		BigDecimal oCount=new BigDecimal(0);
 		List <TTaskMid> tlist=tTaskMidMapper.selectByTid(tid);
 		for (TTaskMid tm : tlist) {
-			oCount=oCount.add(tm.getCostAmount()==null?new BigDecimal(0):tm.getCostAmount());
+			if (tm!=null&&tm.getCostAmount()!=null)oCount=oCount.add(tm.getCostAmount()==null?new BigDecimal(0):tm.getCostAmount());
 		}
 		tOrderMidMapper.updateCostAmount(tid,oCount);
 	}

+ 2 - 3
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -60,7 +60,6 @@ import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.OrderOutsourceDtails;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
-import com.goafanti.order.bo.TOrderTaskListBo;
 import com.goafanti.order.enums.NewOrderDunType;
 import com.goafanti.order.enums.ProjectNewStage;
 import com.goafanti.organization.bo.InputNodeList;
@@ -77,7 +76,6 @@ import com.goafanti.organization.bo.outPaymentList;
 import com.goafanti.organization.bo.outProjectBo;
 import com.goafanti.organization.bo.outOrderPayment;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
-import com.goafanti.techproject.enums.TaskState;
 
 @Service
 public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyCompanyMapper> implements ThirdPartyCompanyService {
@@ -905,7 +903,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
     				case "申请人": o = ob.getAname(); break;
     				case "财务名称": o = ob.getFinanceName(); break;
     				case "状态": o = ob.getStatus()==0?"审核":ob.getStatus()==1?"待支付":
-    						ob.getStatus()==2?"驳回":ob.getStatus()==3?"已支付":"";
+    						ob.getStatus()==2?"驳回":ob.getStatus()==3?"已支付":
+    							ob.getStatus()==4?"已取消":"";
     					break;
     				case "创建时间": o = ob.getCreateTime(); break;
     				default: o = ""; break;