Browse Source

金额隐藏

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

+ 5 - 0
src/main/java/com/goafanti/common/dao/TOrderOutsourceMapper.java

@@ -3,8 +3,11 @@ package com.goafanti.common.dao;
 import com.goafanti.common.model.TOrderOutsource;
 import com.goafanti.common.model.TOrderOutsourceExample;
 import com.goafanti.order.bo.OrderOutsourceDtails;
+import com.goafanti.organization.bo.outProjectBo;
 
 import java.util.List;
+import java.util.Map;
+
 import org.apache.ibatis.annotations.Param;
 
 public interface TOrderOutsourceMapper {
@@ -76,4 +79,6 @@ public interface TOrderOutsourceMapper {
 	int updateByPrimaryKey(TOrderOutsource record);
 
 	OrderOutsourceDtails selectByOrderNo( @Param("orderNo") String orderNo,@Param("tid")String tid);
+
+	outProjectBo selectByTid(Integer tid);
 }

+ 6 - 0
src/main/java/com/goafanti/common/mapper/TOrderOutsourceMapper.xml

@@ -628,4 +628,10 @@
 	and b.create_time between #{starTime} and  #{endTime}
 	</if>
   </select>
+  <select id="selectByTid"  parameterType="java.lang.Integer" resultType="com.goafanti.organization.bo.outProjectBo">
+     select a.id,a.patent_type patentType,c.`type`
+    from t_order_outsource a left join t_order_task b on a.tid=b.id
+    left join business_project c on b.commodity_id=c.id
+    where a.tid = #{tid}
+  </select>
 </mapper>

+ 5 - 6
src/main/java/com/goafanti/common/mapper/TOrderPaymentMapper.xml

@@ -574,12 +574,11 @@ select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name com
   </select>
   
   <select id="selectByTid" resultType="com.goafanti.organization.bo.outOrderPayment">
- select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,choose_type chooseType,
-	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks , b.quantity NodeQuantity,
-	  b.party_amount NodePartyAmount,b.total_amount NodeTotalAmount,d.finance_name financeName ,c.order_no orderNo,
-	  date_format(a.create_time,'%Y-%m-%d %H:%i:%s')createTimes,a.application_amount applicationAmount 
-	 from t_order_payment a left join payment_node b on a.node_id=b.id 
-	 left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no where a.tid= #{id}
+		select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,choose_type chooseType,tpc.id tpcId,
+	  a.payment_status paymentStatus, a.status,a.payment_amount paymentAmount,a.remarks ,tpc.company_name tpcName,d.finance_name financeName ,
+	  c.order_no orderNo,date_format(a.create_time,'%Y-%m-%d %H:%i:%s')createTimes,a.application_amount applicationAmount 
+	 from t_order_payment a	 left join t_order_task c on a.tid=c.id left join t_order_mid d on c.order_no=d.order_no 
+	 left join third_party_company tpc on tpc.id=a.tpc_id where  a.tid= #{id}
   </select>
   <select id="selectList" resultType="com.goafanti.organization.bo.outOrderPayment">
   select a.id,a.tid,a.node_id nodeId,a.payment_type paymentType,a.company_name companyName,a.quantity,

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

@@ -331,6 +331,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 				createContractNo(t);
 			}
 			//修改订单中间表信息
+			t.setBuyerId(t2.getBuyerId());
 			updateOrderMid(t);
 			List<String> aids = new ArrayList<>();
 			Integer type=null;
@@ -1308,7 +1309,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		List<OutThirdPartyCompany>tpcs= thirdPartyCompanyMapper.selectByTid(o.getTid());
 		BigDecimal costAmount=new BigDecimal(0);
 		for (OutThirdPartyCompany tpc : tpcs) {
-			costAmount.add(tpc.getTotalAmount());
+			costAmount.add(new BigDecimal(tpc.getTotalAmount()));
 		}
 		TTaskMid ttm=new TTaskMid(o.getTid(),costAmount);
 		tTaskMidMapper.updateByPrimaryKeySelective(ttm);

+ 339 - 2
src/main/java/com/goafanti/organization/bo/OutThirdPartyCompany.java

@@ -1,13 +1,349 @@
 package com.goafanti.organization.bo;
 
-import com.goafanti.common.model.ThirdPartyCompany;
+import java.math.BigDecimal;
+import java.util.Date;
 
-public class OutThirdPartyCompany  extends ThirdPartyCompany{
+
+public class OutThirdPartyCompany  {
 	
 	private Integer costReduction;
 	
 	private Integer officialCost;
 	
+
+
+	
+	
+	
+	private Integer id;
+	
+	
+	
+	private Integer tid;
+	
+	
+	
+	private String companyName;
+	
+	
+	
+	private String unitPrice;
+	
+	
+	
+	private Integer quantity;
+	
+	
+	
+	private String totalAmount;
+	
+	
+	
+	private Integer material;
+	
+	
+	
+	private Integer urgent;
+	
+	
+	
+	private Integer audit;
+	
+	
+	
+	private String assets;
+	
+	
+	
+	private String income;
+	
+	
+	
+	private String remarks;
+	
+	
+	
+	private Date createTime;
+	
+	
+	
+	private Integer cid;
+	
+	
+	
+	private BigDecimal partyAmount;
+	
+	
+	
+	private Integer type;
+	
+	
+	
+	private Integer patentNameType;
+	
+	
+	
+	private BigDecimal officialAmount;
+
+	
+	
+	
+	public Integer getId() {
+		return id;
+	}
+
+	
+	
+	
+	
+	
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	
+	
+	public Integer getTid() {
+		return tid;
+	}
+
+	
+	
+	
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	
+	
+	
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	
+	
+	
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	
+	
+	
+	public String getUnitPrice() {
+		return unitPrice;
+	}
+
+	
+	
+	
+	public void setUnitPrice(String unitPrice) {
+		this.unitPrice = unitPrice;
+	}
+
+	
+	
+	
+	public Integer getQuantity() {
+		return quantity;
+	}
+
+	
+	
+	
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+
+	
+	
+	
+	public String getTotalAmount() {
+		return totalAmount;
+	}
+
+	
+	
+	
+	public void setTotalAmount(String totalAmount) {
+		this.totalAmount = totalAmount;
+	}
+
+	
+	
+	
+	public Integer getMaterial() {
+		return material;
+	}
+
+	
+	
+	
+	public void setMaterial(Integer material) {
+		this.material = material;
+	}
+
+	
+	
+	
+	public Integer getUrgent() {
+		return urgent;
+	}
+
+	
+	
+	
+	public void setUrgent(Integer urgent) {
+		this.urgent = urgent;
+	}
+
+	
+	
+	
+	public Integer getAudit() {
+		return audit;
+	}
+
+	
+	
+	
+	public void setAudit(Integer audit) {
+		this.audit = audit;
+	}
+
+	
+	
+	
+	public String getAssets() {
+		return assets;
+	}
+
+	
+	
+	
+	public void setAssets(String assets) {
+		this.assets = assets;
+	}
+
+	
+	
+	
+	public String getIncome() {
+		return income;
+	}
+
+	
+	
+	
+	public void setIncome(String income) {
+		this.income = income;
+	}
+
+	
+	
+	
+	public String getRemarks() {
+		return remarks;
+	}
+
+	
+	
+	
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	
+	
+	
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	
+	
+	
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	
+	
+	
+	public Integer getCid() {
+		return cid;
+	}
+
+	
+	
+	
+	public void setCid(Integer cid) {
+		this.cid = cid;
+	}
+
+	
+	
+	
+	public BigDecimal getPartyAmount() {
+		return partyAmount;
+	}
+
+	
+	
+	
+	public void setPartyAmount(BigDecimal partyAmount) {
+		this.partyAmount = partyAmount;
+	}
+
+	
+	
+	
+	public Integer getType() {
+		return type;
+	}
+
+	
+	
+	
+	public void setType(Integer type) {
+		this.type = type;
+	}
+
+	
+	
+	
+	public Integer getPatentNameType() {
+		return patentNameType;
+	}
+
+	
+	
+	
+	public void setPatentNameType(Integer patentNameType) {
+		this.patentNameType = patentNameType;
+	}
+
+	
+	 
+	
+	
+	
+	public BigDecimal getOfficialAmount() {
+		return officialAmount;
+	}
+
+	
+	 
+	
+	
+	
+	public void setOfficialAmount(BigDecimal officialAmount) {
+		this.officialAmount = officialAmount;
+	}
+
+	
+	
 	public Integer getCostReduction() {
 		return costReduction;
 	}
@@ -21,5 +357,6 @@ public class OutThirdPartyCompany  extends ThirdPartyCompany{
 		this.officialCost = officialCost;
 	}
 	
+	
 
 }

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

@@ -1,10 +1,393 @@
 package com.goafanti.organization.bo;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
-import com.goafanti.common.model.TOrderPayment;
 
-public class outOrderPayment extends TOrderPayment{
+public class outOrderPayment {
+
+
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer tid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.node_id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer nodeId;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer paymentType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.company_name
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private String companyName;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.quantity
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer quantity;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_status
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer paymentStatus;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.status
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer status;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.payment_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private BigDecimal paymentAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.remarks
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.create_time
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.tpc_id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private Integer tpcId;
+	/**
+	 * 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;
+	/**
+	 * 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
+	 */
+	private Integer chooseType;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private String aid;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	private String aname;
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.id
+	 * @return  the value of t_order_payment.id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getId() {
+		return id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.id
+	 * @param id  the value for t_order_payment.id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tid
+	 * @return  the value of t_order_payment.tid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getTid() {
+		return tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tid
+	 * @param tid  the value for t_order_payment.tid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setTid(Integer tid) {
+		this.tid = tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.node_id
+	 * @return  the value of t_order_payment.node_id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getNodeId() {
+		return nodeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.node_id
+	 * @param nodeId  the value for t_order_payment.node_id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setNodeId(Integer nodeId) {
+		this.nodeId = nodeId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_type
+	 * @return  the value of t_order_payment.payment_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getPaymentType() {
+		return paymentType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_type
+	 * @param paymentType  the value for t_order_payment.payment_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setPaymentType(Integer paymentType) {
+		this.paymentType = paymentType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.company_name
+	 * @return  the value of t_order_payment.company_name
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getCompanyName() {
+		return companyName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.company_name
+	 * @param companyName  the value for t_order_payment.company_name
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setCompanyName(String companyName) {
+		this.companyName = companyName;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.quantity
+	 * @return  the value of t_order_payment.quantity
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getQuantity() {
+		return quantity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.quantity
+	 * @param quantity  the value for t_order_payment.quantity
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setQuantity(Integer quantity) {
+		this.quantity = quantity;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_status
+	 * @return  the value of t_order_payment.payment_status
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getPaymentStatus() {
+		return paymentStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_status
+	 * @param paymentStatus  the value for t_order_payment.payment_status
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setPaymentStatus(Integer paymentStatus) {
+		this.paymentStatus = paymentStatus;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.status
+	 * @return  the value of t_order_payment.status
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getStatus() {
+		return status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.status
+	 * @param status  the value for t_order_payment.status
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setStatus(Integer status) {
+		this.status = status;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.payment_amount
+	 * @return  the value of t_order_payment.payment_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public BigDecimal getPaymentAmount() {
+		return paymentAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.payment_amount
+	 * @param paymentAmount  the value for t_order_payment.payment_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setPaymentAmount(BigDecimal paymentAmount) {
+		this.paymentAmount = paymentAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.remarks
+	 * @return  the value of t_order_payment.remarks
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.remarks
+	 * @param remarks  the value for t_order_payment.remarks
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.create_time
+	 * @return  the value of t_order_payment.create_time
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.create_time
+	 * @param createTime  the value for t_order_payment.create_time
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.tpc_id
+	 * @return  the value of t_order_payment.tpc_id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getTpcId() {
+		return tpcId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.tpc_id
+	 * @param tpcId  the value for t_order_payment.tpc_id
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setTpcId(Integer tpcId) {
+		this.tpcId = tpcId;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.application_amount
+	 * @return  the value of t_order_payment.application_amount
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getApplicationAmount() {
+		return applicationAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.application_amount
+	 * @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) {
+		this.applicationAmount = applicationAmount;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.choose_type
+	 * @return  the value of t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public Integer getChooseType() {
+		return chooseType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.choose_type
+	 * @param chooseType  the value for t_order_payment.choose_type
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setChooseType(Integer chooseType) {
+		this.chooseType = chooseType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aid
+	 * @return  the value of t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getAid() {
+		return aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aid
+	 * @param aid  the value for t_order_payment.aid
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setAid(String aid) {
+		this.aid = aid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_payment.aname
+	 * @return  the value of t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public String getAname() {
+		return aname;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_payment.aname
+	 * @param aname  the value for t_order_payment.aname
+	 * @mbg.generated  Tue Jul 07 11:46:04 CST 2020
+	 */
+	public void setAname(String aname) {
+		this.aname = aname;
+	}
+	
+	public String getAuditNotes() {
+		return auditNotes;
+	}
+
+	public void setAuditNotes(String auditNotes) {
+		this.auditNotes = auditNotes;
+	}
+
+	private String auditNotes;
+
+	
+
 	/**
 	 * 原数量
 	 */
@@ -27,6 +410,7 @@ public class outOrderPayment extends TOrderPayment{
 	 
 	 private String financeName;
 	
+	 private String tpcName;
 	public String getFinanceName() {
 		return financeName;
 	}
@@ -69,6 +453,12 @@ public class outOrderPayment extends TOrderPayment{
 	public void setInitialCompanyName(String initialCompanyName) {
 		this.initialCompanyName = initialCompanyName;
 	}
+	public String getTpcName() {
+		return tpcName;
+	}
+	public void setTpcName(String tpcName) {
+		this.tpcName = tpcName;
+	}
 	
 	
 	/*public String getAuditInformation() {

+ 36 - 0
src/main/java/com/goafanti/organization/bo/outProjectBo.java

@@ -0,0 +1,36 @@
+package com.goafanti.organization.bo;
+
+public class outProjectBo {
+	
+	private Integer id;
+	
+	private Integer patentType;
+	
+	private Integer type;
+
+	public Integer getId() {
+		return id;
+	}
+
+	public void setId(Integer id) {
+		this.id = id;
+	}
+
+	public Integer getPatentType() {
+		return patentType;
+	}
+
+	public void setPatentType(Integer patentType) {
+		this.patentType = patentType;
+	}
+
+	public Integer getType() {
+		return type;
+	}
+
+	public void setType(Integer type) {
+		this.type = type;
+	}
+	
+	
+}

+ 30 - 6
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -62,6 +62,7 @@ import com.goafanti.organization.bo.OutThirdPartyCompany;
 import com.goafanti.organization.bo.outFinancialPayment;
 import com.goafanti.organization.bo.outNodeList;
 import com.goafanti.organization.bo.outPaymentList;
+import com.goafanti.organization.bo.outProjectBo;
 import com.goafanti.organization.bo.outOrderPayment;
 import com.goafanti.organization.service.ThirdPartyCompanyService;
 
@@ -124,10 +125,10 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 
 	private void updateOrderCostAmount(ThirdPartyCompany t) {
-		List<OutThirdPartyCompany>list=selectCompany(t.getTid());
+		List<OutThirdPartyCompany>list=thirdPartyCompanyMapper.selectByTid(t.getTid());
 		BigDecimal count=new BigDecimal(0);
 		for (OutThirdPartyCompany op : list) {
-			count=count.add(op.getTotalAmount());
+			count=count.add(new BigDecimal(op.getTotalAmount()));
 		}
 		
 		tOrderMidMapper.updateCostAmount(t.getTid(),count);
@@ -208,9 +209,20 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public List<OutThirdPartyCompany> selectCompany(Integer tid) {
 		List<OutThirdPartyCompany> list=thirdPartyCompanyMapper.selectByTid(tid);
-		
+		outProjectBo op =null;
+		if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(tid);
+		if (op!=null) {
+			if((op.getType()==1&&op.getPatentType()==0)||(op.getType()==2)) {
+				for (OutThirdPartyCompany oc : list) {
+					oc.setUnitPrice("***");
+					oc.setTotalAmount("***");
+				}
+			}
+		}
 		return list;
 	}
+	
+	
 
 
 	@Override
@@ -387,7 +399,17 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public List<outOrderPayment> selectOrderPayment(Integer id) {
-		return tOrderPaymentMapper.selectByTid(id);
+		List<outOrderPayment> list=tOrderPaymentMapper.selectByTid(id);
+		outProjectBo op =null;
+		if(!list.isEmpty()) op=tOrderOutsourceMapper.selectByTid(id);
+		if (op.getId()!=null) {
+			if((op.getType()==1&&op.getPatentType()==0)||(op.getType()==2)) {
+				for (outOrderPayment oc : list) {
+					oc.setApplicationAmount("***");
+				}
+			}
+		}
+		return list;
 	}
 
 
@@ -455,7 +477,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		}
 		for (outOrderPayment o : list) {
 			if (o.getApplicationAmount()!=null) {
-				a=a.add(o.getApplicationAmount());	
+				a=a.add(new BigDecimal(o.getApplicationAmount()));	
 			}
 		}
 		if (p.getChooseType()==0) {
@@ -657,6 +679,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		List<Integer>elist=new ArrayList<>();
 		List<Integer> list=new ArrayList<>();
 		List<Notice> nlist=new ArrayList<>();
+		Date date=new Date();
 		for (String s : idss) {
 			TOrderPayment top=tOrderPaymentMapper.selectByPrimaryKey(Integer.valueOf(s));
 			if (top!=null&&top.getStatus()==1) {
@@ -669,6 +692,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(Integer.valueOf(s));
 				AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
 				n.setAid(ni.getTechId());
+				n.setCreateTime(date);
 				n.setNoticeType(NoticeStatus.PAYMENT_COMPLETE.getCode());
 				String str=NoticeStatus.getValueByCode(n.getNoticeType())+": 订单编号 -"+ni.getOrderNo()+
 						",客户名称:"+ni.getBuyerName()+", 操作人:"+a.getName()+"-"+a.getDepartmentName()+"。";	
@@ -776,7 +800,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public boolean addCompanyChekeNumber(ThirdPartyCompany t) {
 		TOrderTask tt=tOrderTaskMapper.selectByPrimaryKey(t.getTid());
-		 List<OutThirdPartyCompany> list =selectCompany(t.getTid());
+		 List<OutThirdPartyCompany> list =thirdPartyCompanyMapper.selectByTid(t.getTid());
 		 Integer count=t.getQuantity();
 		 for (OutThirdPartyCompany out : list) {
 			if (t.getId()==null||!t.getId().equals(out.getId())) {