Explorar o código

财务列表新增相关字段

anderx %!s(int64=3) %!d(string=hai) anos
pai
achega
492360ffe5

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

@@ -19,7 +19,7 @@ public interface TTaskMidMapper {
 
     int updateByPrimaryKey(TTaskMid record);
 
-    int updateCostAmount(@Param("tid")Integer tid, @Param("count") BigDecimal costAmount);
+    int updateCostAmount(@Param("tid")Integer tid, @Param("count") BigDecimal costAmount,@Param("party") BigDecimal party);
 
     int updatePaymentAmount(@Param("tid")Integer tid, @Param("paymentAmount")BigDecimal paymentAmount, @Param("type")Integer type);
 

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

@@ -351,7 +351,7 @@
 
   <update id="updateCostAmount">
     update t_order_task a ,t_task_mid c
-    set c.cost_amount=#{count}
+    set c.cost_amount=#{count},c.party_amount=#{party}
     where  a.id=c.tid and a.id= #{tid}
   </update>
 

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

@@ -133,9 +133,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	private OrderProjectService orderProjectService;
 	@Autowired
 	private TTaskMemberMapper tTaskMemberMapper;
-
 	@Autowired
 	private DepartmentService departmentService;
+	@Autowired
+	private TOrderPaymentMapper tOrderPaymentMapper;
 	@Value(value = "${upload.path}")
 	private String					uploadPath			= null;
 
@@ -1709,7 +1710,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				}
 			}
 		}
-		tTaskMidMapper.updateCostAmount(tid,tCount);
+		BigDecimal party=new BigDecimal(0);
+		List<outOrderPayment> paymentList = tOrderPaymentMapper.selectByTid(tid, null, null);
+		for (outOrderPayment oo : paymentList) {
+			if (oo.getStatus()==3){
+				party=party.add(oo.getApplicationAmount());
+			}
+		}
+		tTaskMidMapper.updateCostAmount(tid,tCount,party);
 		// //计算订单成本 分类成本
 		ProjectTypePuls projectTypePuls = tOrderTaskMapper.selectByTidGetDtails(tid);
 		tOrderMidMapper.updateCostAmount(projectTypePuls.getOrderNo());

+ 13 - 13
src/main/java/com/goafanti/organization/bo/outOrderPayment.java

@@ -71,7 +71,7 @@ public class outOrderPayment {
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.application_amount
 	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
-	private String applicationAmount;
+	private BigDecimal applicationAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.choose_type
 	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
@@ -87,7 +87,7 @@ public class outOrderPayment {
 	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
 	private String aname;
-	
+
 	/**
 	 * Database Column Remarks: 流程状态 0发起 1咨询师管理员 2财务 This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.process_status
 	 * @mbg.generated  Tue Jul 20 09:16:18 CST 2021
@@ -315,7 +315,7 @@ public class outOrderPayment {
 	 * @return  the value of t_order_payment.application_amount
 	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
-	public String getApplicationAmount() {
+	public BigDecimal getApplicationAmount() {
 		return applicationAmount;
 	}
 
@@ -324,7 +324,7 @@ public class outOrderPayment {
 	 * @param applicationAmount  the value for t_order_payment.application_amount
 	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
 	 */
-	public void setApplicationAmount(String applicationAmount) {
+	public void setApplicationAmount(BigDecimal applicationAmount) {
 		this.applicationAmount = applicationAmount;
 	}
 
@@ -381,7 +381,7 @@ public class outOrderPayment {
 	public void setAname(String aname) {
 		this.aname = aname;
 	}
-	
+
 	public String getAuditNotes() {
 		return auditNotes;
 	}
@@ -392,13 +392,13 @@ public class outOrderPayment {
 
 	private String auditNotes;
 
-	
+
 
 	/**
 	 * 原数量
 	 */
 	 private Integer initialQuantity;
-	 
+
 	 /**
 	 * 原总价
 	 */
@@ -413,9 +413,9 @@ public class outOrderPayment {
 	 private String initialPaymentAmount;
 	 private String initialCompanyName;
 	 private String createTimes;
-	 
+
 	 private String financeName;
-	
+
 	 private String tpcName;
 	public String getFinanceName() {
 		return financeName;
@@ -473,8 +473,8 @@ public class outOrderPayment {
 	public void setProcessStatus(Integer processStatus) {
 		this.processStatus = processStatus;
 	}
-	
-	
+
+
 	/*public String getAuditInformation() {
 		if (getStatus()==null) return "";
 		else if (getStatus()==0) return "待"+financeName+"审核";
@@ -486,6 +486,6 @@ public class outOrderPayment {
 
 
 
-	 
-	 
+
+
 }

+ 32 - 14
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -257,32 +257,42 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public int deleteCompany(String id) {
+		Integer tpcId=null;
+		Integer tid=null;
 		if (id.contains(",")) {
 			String []ids =id.split(",");
 			for (String s : ids) {
-				thirdPartyCompanyMapper.deleteByPrimaryKey(Integer.valueOf(s));
+				tpcId=Integer.valueOf(s);
+				ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tpcId);
+				tid=tpc.getTid();
+				thirdPartyCompanyMapper.deleteByPrimaryKey(tpcId);
+				pushDeleteCompany(tpc);
 			}
 		}else {
-			Integer tpcId=Integer.valueOf(id);
+			tpcId=Integer.valueOf(id);
 			ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tpcId);
+			tid=tpc.getTid();
 			thirdPartyCompanyMapper.deleteByPrimaryKey(tpcId);
+			pushDeleteCompany(tpc);
 
-			List<outOrderPayment> list=tOrderPaymentMapper.selectList(tpcId, null, null);
-			for (outOrderPayment o : list) {
-					TOrderPayment t=new TOrderPayment();
-					t.setId(o.getId());
-					t.setStatus(4);
-					tOrderPaymentMapper.updateByPrimaryKeySelective(t);
-			}
-			paymentNodeMapper.deleteByParam(tpcId,null);
-			sumTaskCost(tpc.getTid());
-			updateCountByTid(tpc.getTid());
 		}
+		sumTaskCost(tid);
+		updateCountByTid(tid);
 		return 1;
 	}
 
+	private void pushDeleteCompany(ThirdPartyCompany tpc) {
 
+		List<outOrderPayment> list=tOrderPaymentMapper.selectList(tpc.getId(), null, null);
+		for (outOrderPayment o : list) {
+			TOrderPayment t=new TOrderPayment();
+			t.setId(o.getId());
+			t.setStatus(4);
+			tOrderPaymentMapper.updateByPrimaryKeySelective(t);
+		}
+		paymentNodeMapper.deleteByParam(tpc.getId(),null);
 
+	}
 
 
 	public void sumTaskCost(Integer tid) {
@@ -291,7 +301,15 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		for (OutThirdPartyCompany op : list) {
 			tCount=tCount.add(new BigDecimal(op.getTotalAmount()));
 		}
-		tTaskMidMapper.updateCostAmount(tid,tCount);
+		BigDecimal party=new BigDecimal(0);
+		List<outOrderPayment> paymentList = tOrderPaymentMapper.selectByTid(tid, null, null);
+		for (outOrderPayment oo : paymentList) {
+			if (oo.getStatus()==3){
+				party=party.add(oo.getApplicationAmount());
+			}
+		}
+
+		tTaskMidMapper.updateCostAmount(tid,tCount,party);
 	}
 
 
@@ -564,7 +582,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				list=tOrderPaymentMapper.selectList(null,p.getNodeId(),p.getChooseType());
 			}
 			for (outOrderPayment o : list) {
-					a=a.add(new BigDecimal(o.getApplicationAmount()));
+					a=a.add(o.getApplicationAmount());
 			}
 			if (p.getChooseType()==0) {
 				ThirdPartyCompany t=thirdPartyCompanyMapper.selectByPrimaryKey(p.getTpcId());