Explorar o código

Merge remote-tracking branch 'origin/test'

anderx %!s(int64=5) %!d(string=hai) anos
pai
achega
c3f166a95e

+ 4 - 4
GeneratorConfig.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE generatorConfiguration PUBLIC "-//mybatis.org//DTD MyBatis Generator Configuration 1.0//EN" "http://mybatis.org/dtd/mybatis-generator-config_1_0.dtd">
 <generatorConfiguration>
-   <classPathEntry location="C:/Users/Administrator/.dbeaver-drivers/maven/maven-central/mysql/mysql-connector-java-5.1.39.jar" /> 
+   <classPathEntry location="C:\Users\Administrator.SC-202009251130\AppData\Roaming\DBeaverData\drivers\maven\maven-central\mysql\mysql-connector-java-8.0.17.jar" /> 
    <!-- <classPathEntry location="C:\Users\Administrator\.dbeaver-drivers\maven\maven-central\mysql\mysql-connector-java-5.1.44.jar" /> -->
   <context id="context1">	
-     <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft"  
-    	driverClass="com.mysql.jdbc.Driver" password="123456" userId="root" />
+     <jdbcConnection connectionURL="jdbc:mysql://localhost:3306/aft?serverTimezone=UTC"  
+    	driverClass="com.mysql.cj.jdbc.Driver" password="123456" userId="root" />
     <javaModelGenerator targetPackage="com.goafanti.common.model" targetProject="kede-server" />
     <sqlMapGenerator targetPackage="com.goafanti.common.mapper" targetProject="kede-server" />
     <javaClientGenerator  targetPackage="com.goafanti.common.dao"  type="XMLMAPPER" targetProject="kede-server"  />
-    <table schema="aft" tableName="third_party_company"/>
+    <table schema="aft" tableName="t_order_outsource"/>
   </context>
 </generatorConfiguration>

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

@@ -241,6 +241,9 @@
       <if test="patentType != null">
         patent_type,
       </if>
+      <if test="actualOfficial != null">
+        actual_official,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -300,6 +303,9 @@
       <if test="patentType != null">
         #{patentType,jdbcType=INTEGER},
       </if>
+      <if test="actualOfficial != null">
+        #{actualOfficial,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderOutsourceExample" resultType="java.lang.Long">
@@ -475,6 +481,9 @@
       <if test="patentType != null">
         patent_type = #{patentType,jdbcType=INTEGER},
       </if>
+      <if test="actualOfficial != null">
+        actual_official = #{actualOfficial,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -509,7 +518,7 @@
      	select id, order_no orderNo, refund_status refundStatus, date_format(create_time,'%Y-%m-%d %H:%i:%S') createTimes , remarks,
 	 date_format(audit_time,'%Y-%m-%d %H:%i:%S') auditTimes,attachment_url attachmentUrl, picture_url pictureUrl, amount,
 	 company_name companyName ,unit_price unitPrice,unit_number unitNumber,outsource_remarks outsourceRemarks,start_type startType,
-	 patent_name patentName,patent_type patentType,patent_name_type patentNameType
+	 patent_name patentName,patent_type patentType,patent_name_type patentNameType,actual_official actualOfficial
 	 from t_order_outsource
 	 where 1=1
 	  <if test="orderNo != null">

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

@@ -1559,7 +1559,7 @@ ifnull(ttm.party_amount,0) partyAmount,a.commodity_price commodityPrice,a.outsou
   	</if>
   </select>
   <select id="getOrderTaskDetail" resultType="com.goafanti.order.bo.TOrderTaskDetailBo">
-select  
+ select  
 	a.id,a.commodity_name as taskName,a.order_no as orderNo,c.cname,d.name as receiverName,a.task_comment as taskComment,a.project_status as projectStatus,
 	a.task_status as taskStatus,e.contacts,a.attachment_url as attachmentUrl,a.outsource_name outsourceName, f.nickname as userName,a.set_up_amount as setUpAmount,
 	g.name as salesmanName,date_format(a.task_start_time,'%Y-%m-%d') as startDate,a.retrieve_content as retrieveContent, a.arrival_money as arrivalMoney,
@@ -1568,7 +1568,8 @@ select
 	date_format(a.task_end_time,'%Y-%m-%d') as endDate,date_format(a.accept_time,'%Y-%m-%d') as acceptDate,h.name as depName,e.contact_mobile as contactMobile ,
 	date_format(a.review_time,'%Y-%m-%d') as reviewDate,date_format(a.publicity_time,'%Y-%m-%d') as publicityDate,a.outsource_price outsourcePrice,
 	date_format(a.licence_time,'%Y-%m-%d') as licenceDate,date_format(a.task_distribution_time,'%Y-%m-%d') as taskDate,e.legal_person as legalPerson,
-	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch
+	e.legal_person_tel as legalPersonTel, a.split_status splitStatus, a.split_super splitSuper, a.split_id splitId,a.declaration_batch declarationBatch,
+	a.cost_reduction costReduction,  a.official_cost officialCost
 	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 admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no
     left join department h on e.order_dep=h.id left join user f on e.buyer_id=f.id

+ 86 - 284
src/main/java/com/goafanti/common/model/TOrderOutsource.java

@@ -2,451 +2,253 @@ package com.goafanti.common.model;
 
 import java.math.BigDecimal;
 import java.util.Date;
+import javax.annotation.Generated;
 
 public class TOrderOutsource {
 
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.id
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.id")
 	private Integer id;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.order_no
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.order_no")
 	private String orderNo;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.refund_status
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.refund_status")
 	private Integer refundStatus;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.create_time
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.create_time")
 	private Date createTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.remarks
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.remarks")
 	private String remarks;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.attachment_url
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.attachment_url")
 	private String attachmentUrl;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.picture_url
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
-	private String pictureUrl;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.amount
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.amount")
 	private BigDecimal amount;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.company_name
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.company_name")
 	private String companyName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.audit_time
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.audit_time")
 	private Date auditTime;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.unit_price
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.unit_price")
 	private BigDecimal unitPrice;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.unit_number
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.unit_number")
 	private Integer unitNumber;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.outsource_remarks
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.outsource_remarks")
 	private String outsourceRemarks;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.type")
 	private Integer type;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.tid
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.tid")
 	private Integer tid;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.start_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.start_type")
 	private Integer startType;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_name_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_type")
+	private Integer patentType;
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_name_type")
 	private Integer patentNameType;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_name
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_name")
 	private String patentName;
-	/**
-	 * This field was generated by MyBatis Generator. This field corresponds to the database column t_order_outsource.patent_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
-	private Integer patentType;
-	
-	
-	
-	private String reason;
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.628+08:00", comments = "Source field: t_order_outsource.actual_official")
+	private Integer actualOfficial;
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.628+08:00", comments = "Source field: t_order_outsource.picture_url")
+	private String pictureUrl;
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.id
-	 * @return  the value of t_order_outsource.id
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.id")
 	public Integer getId() {
 		return id;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.id
-	 * @param id  the value for t_order_outsource.id
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.id")
 	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_outsource.order_no
-	 * @return  the value of t_order_outsource.order_no
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.order_no")
 	public String getOrderNo() {
 		return orderNo;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.order_no
-	 * @param orderNo  the value for t_order_outsource.order_no
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.order_no")
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.refund_status
-	 * @return  the value of t_order_outsource.refund_status
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.refund_status")
 	public Integer getRefundStatus() {
 		return refundStatus;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.refund_status
-	 * @param refundStatus  the value for t_order_outsource.refund_status
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.refund_status")
 	public void setRefundStatus(Integer refundStatus) {
 		this.refundStatus = refundStatus;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.create_time
-	 * @return  the value of t_order_outsource.create_time
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.create_time")
 	public Date getCreateTime() {
 		return createTime;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.create_time
-	 * @param createTime  the value for t_order_outsource.create_time
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.create_time")
 	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_outsource.remarks
-	 * @return  the value of t_order_outsource.remarks
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.remarks")
 	public String getRemarks() {
 		return remarks;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.remarks
-	 * @param remarks  the value for t_order_outsource.remarks
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.remarks")
 	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_outsource.attachment_url
-	 * @return  the value of t_order_outsource.attachment_url
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.attachment_url")
 	public String getAttachmentUrl() {
 		return attachmentUrl;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.attachment_url
-	 * @param attachmentUrl  the value for t_order_outsource.attachment_url
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.attachment_url")
 	public void setAttachmentUrl(String attachmentUrl) {
 		this.attachmentUrl = attachmentUrl;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.picture_url
-	 * @return  the value of t_order_outsource.picture_url
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
-	public String getPictureUrl() {
-		return pictureUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.picture_url
-	 * @param pictureUrl  the value for t_order_outsource.picture_url
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
-	public void setPictureUrl(String pictureUrl) {
-		this.pictureUrl = pictureUrl;
-	}
-
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.amount
-	 * @return  the value of t_order_outsource.amount
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.amount")
 	public BigDecimal getAmount() {
 		return amount;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.amount
-	 * @param amount  the value for t_order_outsource.amount
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.amount")
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.company_name
-	 * @return  the value of t_order_outsource.company_name
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.company_name")
 	public String getCompanyName() {
 		return companyName;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.company_name
-	 * @param companyName  the value for t_order_outsource.company_name
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.company_name")
 	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_outsource.audit_time
-	 * @return  the value of t_order_outsource.audit_time
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.audit_time")
 	public Date getAuditTime() {
 		return auditTime;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.audit_time
-	 * @param auditTime  the value for t_order_outsource.audit_time
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.audit_time")
 	public void setAuditTime(Date auditTime) {
 		this.auditTime = auditTime;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.unit_price
-	 * @return  the value of t_order_outsource.unit_price
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.unit_price")
 	public BigDecimal getUnitPrice() {
 		return unitPrice;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.unit_price
-	 * @param unitPrice  the value for t_order_outsource.unit_price
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.unit_price")
 	public void setUnitPrice(BigDecimal unitPrice) {
 		this.unitPrice = unitPrice;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.unit_number
-	 * @return  the value of t_order_outsource.unit_number
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.unit_number")
 	public Integer getUnitNumber() {
 		return unitNumber;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.unit_number
-	 * @param unitNumber  the value for t_order_outsource.unit_number
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.unit_number")
 	public void setUnitNumber(Integer unitNumber) {
 		this.unitNumber = unitNumber;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.outsource_remarks
-	 * @return  the value of t_order_outsource.outsource_remarks
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.outsource_remarks")
 	public String getOutsourceRemarks() {
 		return outsourceRemarks;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.outsource_remarks
-	 * @param outsourceRemarks  the value for t_order_outsource.outsource_remarks
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.outsource_remarks")
 	public void setOutsourceRemarks(String outsourceRemarks) {
 		this.outsourceRemarks = outsourceRemarks;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.type
-	 * @return  the value of t_order_outsource.type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.type")
 	public Integer getType() {
 		return type;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.type
-	 * @param type  the value for t_order_outsource.type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.type")
 	public void setType(Integer type) {
 		this.type = type;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.tid
-	 * @return  the value of t_order_outsource.tid
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.tid")
 	public Integer getTid() {
 		return tid;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.tid
-	 * @param tid  the value for t_order_outsource.tid
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.tid")
 	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_outsource.start_type
-	 * @return  the value of t_order_outsource.start_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.start_type")
 	public Integer getStartType() {
 		return startType;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.start_type
-	 * @param startType  the value for t_order_outsource.start_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.start_type")
 	public void setStartType(Integer startType) {
 		this.startType = startType;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_name_type
-	 * @return  the value of t_order_outsource.patent_name_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_type")
+	public Integer getPatentType() {
+		return patentType;
+	}
+
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_type")
+	public void setPatentType(Integer patentType) {
+		this.patentType = patentType;
+	}
+
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_name_type")
 	public Integer getPatentNameType() {
 		return patentNameType;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_name_type
-	 * @param patentNameType  the value for t_order_outsource.patent_name_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_name_type")
 	public void setPatentNameType(Integer patentNameType) {
 		this.patentNameType = patentNameType;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_name
-	 * @return  the value of t_order_outsource.patent_name
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_name")
 	public String getPatentName() {
 		return patentName;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_name
-	 * @param patentName  the value for t_order_outsource.patent_name
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.627+08:00", comments = "Source field: t_order_outsource.patent_name")
 	public void setPatentName(String patentName) {
 		this.patentName = patentName;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method returns the value of the database column t_order_outsource.patent_type
-	 * @return  the value of t_order_outsource.patent_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
-	public Integer getPatentType() {
-		return patentType;
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.628+08:00", comments = "Source field: t_order_outsource.actual_official")
+	public Integer getActualOfficial() {
+		return actualOfficial;
 	}
 
-	/**
-	 * This method was generated by MyBatis Generator. This method sets the value of the database column t_order_outsource.patent_type
-	 * @param patentType  the value for t_order_outsource.patent_type
-	 * @mbg.generated  Fri Jun 12 13:38:21 CST 2020
-	 */
-	public void setPatentType(Integer patentType) {
-		this.patentType = patentType;
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.628+08:00", comments = "Source field: t_order_outsource.actual_official")
+	public void setActualOfficial(Integer actualOfficial) {
+		this.actualOfficial = actualOfficial;
 	}
 
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.628+08:00", comments = "Source field: t_order_outsource.picture_url")
+	public String getPictureUrl() {
+		return pictureUrl;
+	}
+
+	@Generated(value = "org.mybatis.generator.api.MyBatisGenerator", date = "2020-11-25T17:04:15.628+08:00", comments = "Source field: t_order_outsource.picture_url")
+	public void setPictureUrl(String pictureUrl) {
+		this.pictureUrl = pictureUrl;
+	}
+
+	private String reason;
+
 	public String getReason() {
 		return reason;
 	}

+ 17 - 0
src/main/java/com/goafanti/order/bo/TOrderTaskDetailBo.java

@@ -83,6 +83,11 @@ public class TOrderTaskDetailBo {
 	 */
 	private Integer bpType;
 	
+	/** 官费 */
+	private Integer officialCost;
+	/** 费减 */
+	private Integer costReduction;
+	
 	
 	public Integer getSplitStatus() {
 		return splitStatus;
@@ -361,6 +366,18 @@ public class TOrderTaskDetailBo {
 	public void setBpType(Integer bpType) {
 		this.bpType = bpType;
 	}
+	public Integer getOfficialCost() {
+		return officialCost;
+	}
+	public void setOfficialCost(Integer officialCost) {
+		this.officialCost = officialCost;
+	}
+	public Integer getCostReduction() {
+		return costReduction;
+	}
+	public void setCostReduction(Integer costReduction) {
+		this.costReduction = costReduction;
+	}
 	
 	
 }

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

@@ -96,7 +96,6 @@ import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.customer.bo.LockingReleaseBo;
 import com.goafanti.order.bo.InputArrearsDunListBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
-import com.goafanti.order.bo.OrderOutsourceDtails;
 import com.goafanti.order.bo.OrderRefundDetailBo;
 import com.goafanti.order.bo.OutArrearsDunListBo;
 import com.goafanti.order.bo.OutNewOrderDunBo;
@@ -1329,7 +1328,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			//旧项目变更,如果驳回修改成新的项目变更
 			if(o.getUnitNumber()!=null)tOrderOutsourceMapper.updateByidNull(o.getId());
 		}
-		updateOrderCostAmount(o.getTid(),o.getStartType());
+		updateOrderCostAmount(o.getTid(),o.getStartType(),o.getActualOfficial());
 		return 1;
 	}
 
@@ -1337,13 +1336,13 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	 * 发起外包时,通过计算获取项目的成本,订单的成本
 	 * @param tid
 	 */
-	private void updateOrderCostAmount(Integer tid,Integer startType) {
+	private void updateOrderCostAmount(Integer tid,Integer startType,Integer actualOfficial) {
 		//计算项目成本
 		List<OutThirdPartyCompany>list=thirdPartyCompanyMapper.selectByTid(tid);
 		BigDecimal tCount=new BigDecimal(0);
 		for (OutThirdPartyCompany op : list) {
 			tCount=tCount.add(new BigDecimal(op.getTotalAmount()));
-			if(op.getOfficialCost()==1 && startType==1) {
+			if(op.getOfficialCost()==1 && startType==1 && actualOfficial==0) {
 				BigDecimal sum= new BigDecimal(0);
 				if (op.getCostReduction()==0) {
 					sum= new BigDecimal(op.getOfficialUnitPrice()).multiply(new BigDecimal(op.getQuantity()));

+ 2 - 2
src/main/resources/props/config_local.properties

@@ -64,12 +64,12 @@ user_remind_days=15
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-#static.host=//sb.jishutao.com:3000/1.1.57
+#static.host=//sb.jishutao.com:3000/1.1.58
 #avatar.host=//sb.jishutao.com
 
 #连测试
 avatar.host=//static.jishutao.com
-static.host=//static.jishutao.com/1.1.57
+static.host=//static.jishutao.com/1.1.58
 
 upload.path=F:/data/public/upload
 upload.private.path=F:/data/private/upload

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -59,7 +59,7 @@ user.private.max=1000
 #客户释放提醒
 user_remind_days=15
 
-static.host=//static.jishutao.com/1.1.57
+static.host=//static.jishutao.com/1.1.58
 portal.host=//static.jishutao.com/portal/2.0.6
 avatar.host=//static.jishutao.com
 avatar.upload.host=//static.jishutao.com/upload

+ 5 - 5
src/main/webapp/WEB-INF/web.xml

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee  
-                             http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-	version="3.1">
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee 
+         http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+         version="3.1">
 
 	<display-name>AFT</display-name>