Browse Source

项目中间表开发

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

+ 4 - 0
src/main/java/com/goafanti/common/dao/TTaskMidMapper.java

@@ -2,6 +2,8 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.TTaskMid;
 import com.goafanti.common.model.TTaskMidExample;
+
+import java.math.BigDecimal;
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
@@ -93,4 +95,6 @@ public interface TTaskMidMapper {
      * @mbg.generated Thu Jun 18 15:57:30 CST 2020
      */
     int updateByPrimaryKey(TTaskMid record);
+
+	int updateCostAmount(@Param("tid")Integer tid, @Param("costAmount")BigDecimal costAmount, @Param("type")Integer type);
 }

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

@@ -1422,10 +1422,11 @@
   
   
    <select id="selectOrderTaskListByPage" resultType="com.goafanti.order.bo.TOrderTaskListBo">
-	  	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,a.receiver_name receiverName,a.project_status as projectStatus,e.contract_no contractNo,
+	select  a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,a.receiver_name receiverName,a.project_status as projectStatus,e.contract_no contractNo,
 a.task_receiver taskReceiver,a.task_status as taskStatus,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate, a.commodity_quantity as commodityQuantity,
 e.approval,l.refund_status outsourceStatus,ifnull(i.alreadyNumber,0) as alreadyNumber,f.nickname as userName,h.name as depName, l.company_name as outsourceName ,
-ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ttm.cost_amount costAmount,ttm.party_amount partyAmount
+ifnull(k.hours,0) hours,a.split_status splitStatus,a.split_super splitSuper, a.split_id splitId,b.`type` projectType,ttm.cost_amount costAmount,ttm.party_amount partyAmount,
+a.commodity_price commodityPrice
     from t_order_task a left join business_project b on a.commodity_id=b.id left join business_category c on b.cid=c.id 
   	left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 

+ 11 - 0
src/main/java/com/goafanti/common/mapper/TTaskMidMapper.xml

@@ -283,4 +283,15 @@
       create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  
+  <update id="updateCostAmount">
+   update t_task_mid
+    <if test="type != 0">
+    set cost_amount = cost_amount + #{costAmount,jdbcType=DECIMAL}
+    </if>
+    <if test="type != 1">
+    set cost_amount = cost_amount - #{costAmount,jdbcType=DECIMAL}
+    </if>
+    where tid = #{tid,jdbcType=INTEGER}
+  </update>
 </mapper>

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

@@ -126,8 +126,7 @@ public class OutsourceOrgApiController extends CertifyApiController {
 	@RequestMapping(value="/outsourceProjectAudit", method = RequestMethod.POST)
 	public Result outsourceProjectAudit(TOrderOutsource o){
 		Result res=new Result();
-		if(StringUtils.isBlank(o.getOrderNo())||StringUtils.isBlank(o.getCompanyName())||
-				o.getAmount()==null){
+		if(StringUtils.isBlank(o.getOrderNo())){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "外包信息","外包信息"));
 			return res;
 		}

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

@@ -24,6 +24,7 @@ import com.goafanti.common.dao.PaymentLogMapper;
 import com.goafanti.common.dao.PaymentNodeMapper;
 import com.goafanti.common.dao.TOrderPaymentMapper;
 import com.goafanti.common.dao.TOrderTaskMapper;
+import com.goafanti.common.dao.TTaskMidMapper;
 import com.goafanti.common.dao.ThirdPartyCompanyMapper;
 import com.goafanti.common.enums.NoticeStatus;
 import com.goafanti.common.model.CompanyLibrary;
@@ -32,6 +33,7 @@ import com.goafanti.common.model.PaymentLog;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.TOrderTask;
+import com.goafanti.common.model.TTaskMid;
 import com.goafanti.common.model.ThirdPartyCompany;
 import com.goafanti.common.utils.DateUtils;
 import com.goafanti.common.utils.SendEmailUtil;
@@ -101,6 +103,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			companyLibraryMapper.insertSelectiveGetId(c);
 			t.setCid(c.getId());
 		}
+		
 		return thirdPartyCompanyMapper.updateByPrimaryKeySelective(t);
 	}