Просмотр исходного кода

update

Signed-off-by: anderx <312518615@qq.com>
anderx лет назад: 5
Родитель
Сommit
862857b496

+ 1 - 1
GeneratorConfig.xml

@@ -9,6 +9,6 @@
     <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="t_change_task"/>
+    <table schema="aft" tableName="third_party_company"/>
   </context>
 </generatorConfiguration>

+ 11 - 11
src/main/java/com/goafanti/common/dao/ThirdPartyCompanyMapper.java

@@ -11,68 +11,68 @@ public interface ThirdPartyCompanyMapper {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	long countByExample(ThirdPartyCompanyExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	int deleteByExample(ThirdPartyCompanyExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	int deleteByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	int insert(ThirdPartyCompany record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	int insertSelective(ThirdPartyCompany record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	List<ThirdPartyCompany> selectByExample(ThirdPartyCompanyExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	ThirdPartyCompany selectByPrimaryKey(Integer id);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	int updateByExampleSelective(@Param("record") ThirdPartyCompany record,
 			@Param("example") ThirdPartyCompanyExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	int updateByExample(@Param("record") ThirdPartyCompany record, @Param("example") ThirdPartyCompanyExample example);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	int updateByPrimaryKeySelective(ThirdPartyCompany record);
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	int updateByPrimaryKey(ThirdPartyCompany record);
 

+ 37 - 22
src/main/java/com/goafanti/common/mapper/ThirdPartyCompanyMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -25,12 +25,13 @@
     <result column="type" jdbcType="INTEGER" property="type" />
     <result column="patent_name_type" jdbcType="INTEGER" property="patentNameType" />
     <result column="official_amount" jdbcType="DECIMAL" property="officialAmount" />
+    <result column="start_type" jdbcType="INTEGER" property="startType" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -64,7 +65,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -98,17 +99,17 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     id, tid, company_name, unit_price, quantity, total_amount, material, urgent, audit, 
     assets, income, remarks, create_time, cid, party_amount, type, patent_name_type, 
-    official_amount
+    official_amount, start_type
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.ThirdPartyCompanyExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     select
     <if test="distinct">
@@ -127,7 +128,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -138,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     delete from third_party_company
     where id = #{id,jdbcType=INTEGER}
@@ -147,7 +148,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     delete from third_party_company
     <if test="_parameter != null">
@@ -158,28 +159,28 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     insert into third_party_company (id, tid, company_name, 
       unit_price, quantity, total_amount, 
       material, urgent, audit, 
       assets, income, remarks, 
       create_time, cid, party_amount, 
-      type, patent_name_type, official_amount
-      )
+      type, patent_name_type, official_amount, 
+      start_type)
     values (#{id,jdbcType=INTEGER}, #{tid,jdbcType=INTEGER}, #{companyName,jdbcType=VARCHAR}, 
       #{unitPrice,jdbcType=DECIMAL}, #{quantity,jdbcType=INTEGER}, #{totalAmount,jdbcType=DECIMAL}, 
       #{material,jdbcType=INTEGER}, #{urgent,jdbcType=INTEGER}, #{audit,jdbcType=INTEGER}, 
       #{assets,jdbcType=VARCHAR}, #{income,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
       #{createTime,jdbcType=TIMESTAMP}, #{cid,jdbcType=INTEGER}, #{partyAmount,jdbcType=DECIMAL}, 
-      #{type,jdbcType=INTEGER}, #{patentNameType,jdbcType=INTEGER}, #{officialAmount,jdbcType=DECIMAL}
-      )
+      #{type,jdbcType=INTEGER}, #{patentNameType,jdbcType=INTEGER}, #{officialAmount,jdbcType=DECIMAL}, 
+      #{startType,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.ThirdPartyCompany">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     insert into third_party_company
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -237,6 +238,9 @@
       <if test="officialAmount != null">
         official_amount,
       </if>
+      <if test="startType != null">
+        start_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -293,13 +297,16 @@
       <if test="officialAmount != null">
         #{officialAmount,jdbcType=DECIMAL},
       </if>
+      <if test="startType != null">
+        #{startType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.ThirdPartyCompanyExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     select count(*) from third_party_company
     <if test="_parameter != null">
@@ -310,7 +317,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     update third_party_company
     <set>
@@ -368,6 +375,9 @@
       <if test="record.officialAmount != null">
         official_amount = #{record.officialAmount,jdbcType=DECIMAL},
       </if>
+      <if test="record.startType != null">
+        start_type = #{record.startType,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -377,7 +387,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     update third_party_company
     set id = #{record.id,jdbcType=INTEGER},
@@ -397,7 +407,8 @@
       party_amount = #{record.partyAmount,jdbcType=DECIMAL},
       type = #{record.type,jdbcType=INTEGER},
       patent_name_type = #{record.patentNameType,jdbcType=INTEGER},
-      official_amount = #{record.officialAmount,jdbcType=DECIMAL}
+      official_amount = #{record.officialAmount,jdbcType=DECIMAL},
+      start_type = #{record.startType,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -406,7 +417,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     update third_party_company
     <set>
@@ -461,6 +472,9 @@
       <if test="officialAmount != null">
         official_amount = #{officialAmount,jdbcType=DECIMAL},
       </if>
+      <if test="startType != null">
+        start_type = #{startType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -468,7 +482,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 15 15:56:36 CST 2020.
+      This element was generated on Wed Oct 21 11:29:02 CST 2020.
     -->
     update third_party_company
     set tid = #{tid,jdbcType=INTEGER},
@@ -487,7 +501,8 @@
       party_amount = #{partyAmount,jdbcType=DECIMAL},
       type = #{type,jdbcType=INTEGER},
       patent_name_type = #{patentNameType,jdbcType=INTEGER},
-      official_amount = #{officialAmount,jdbcType=DECIMAL}
+      official_amount = #{officialAmount,jdbcType=DECIMAL},
+      start_type = #{startType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByTid" resultType="com.goafanti.organization.bo.OutThirdPartyCompany">

+ 77 - 54
src/main/java/com/goafanti/common/model/ThirdPartyCompany.java

@@ -12,103 +12,108 @@ public class ThirdPartyCompany {
 
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.id
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer id;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.tid
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer tid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.company_name
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private String companyName;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.unit_price
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	@DecimalMax(value = "999999", message = "{" + ErrorConstants.DECIMAL_PARAM_MAX_ERROR + "}")
 	@DecimalMin(value = "0", message = "{" + ErrorConstants.DECIMAL_PARAM_MIN_ERROR + "}")
 	private BigDecimal unitPrice;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.quantity
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer quantity;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.total_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	@DecimalMax(value = "999999", message = "{" + ErrorConstants.DECIMAL_PARAM_MAX_ERROR + "}")
 	@DecimalMin(value = "0", message = "{" + ErrorConstants.DECIMAL_PARAM_MIN_ERROR + "}")
 	private BigDecimal totalAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.material
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer material;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.urgent
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer urgent;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.audit
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer audit;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.assets
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private String assets;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.income
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private String income;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.remarks
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private String remarks;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.create_time
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Date createTime;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.cid
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer cid;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.party_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private BigDecimal partyAmount;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.type
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer type;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.patent_name_type
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private Integer patentNameType;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.official_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	private BigDecimal officialAmount;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column third_party_company.start_type
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
+	 */
+	private Integer startType;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.id
 	 * @return  the value of third_party_company.id
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -117,7 +122,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.id
 	 * @param id  the value for third_party_company.id
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -126,7 +131,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.tid
 	 * @return  the value of third_party_company.tid
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -135,7 +140,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.tid
 	 * @param tid  the value for third_party_company.tid
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -144,7 +149,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.company_name
 	 * @return  the value of third_party_company.company_name
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -153,7 +158,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.company_name
 	 * @param companyName  the value for third_party_company.company_name
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -162,7 +167,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.unit_price
 	 * @return  the value of third_party_company.unit_price
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public BigDecimal getUnitPrice() {
 		return unitPrice;
@@ -171,7 +176,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.unit_price
 	 * @param unitPrice  the value for third_party_company.unit_price
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setUnitPrice(BigDecimal unitPrice) {
 		this.unitPrice = unitPrice;
@@ -180,7 +185,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.quantity
 	 * @return  the value of third_party_company.quantity
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getQuantity() {
 		return quantity;
@@ -189,7 +194,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.quantity
 	 * @param quantity  the value for third_party_company.quantity
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setQuantity(Integer quantity) {
 		this.quantity = quantity;
@@ -198,7 +203,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.total_amount
 	 * @return  the value of third_party_company.total_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -207,7 +212,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.total_amount
 	 * @param totalAmount  the value for third_party_company.total_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -216,7 +221,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.material
 	 * @return  the value of third_party_company.material
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getMaterial() {
 		return material;
@@ -225,7 +230,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.material
 	 * @param material  the value for third_party_company.material
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setMaterial(Integer material) {
 		this.material = material;
@@ -234,7 +239,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.urgent
 	 * @return  the value of third_party_company.urgent
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getUrgent() {
 		return urgent;
@@ -243,7 +248,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.urgent
 	 * @param urgent  the value for third_party_company.urgent
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setUrgent(Integer urgent) {
 		this.urgent = urgent;
@@ -252,7 +257,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.audit
 	 * @return  the value of third_party_company.audit
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getAudit() {
 		return audit;
@@ -261,7 +266,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.audit
 	 * @param audit  the value for third_party_company.audit
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setAudit(Integer audit) {
 		this.audit = audit;
@@ -270,7 +275,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.assets
 	 * @return  the value of third_party_company.assets
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public String getAssets() {
 		return assets;
@@ -279,7 +284,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.assets
 	 * @param assets  the value for third_party_company.assets
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setAssets(String assets) {
 		this.assets = assets;
@@ -288,7 +293,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.income
 	 * @return  the value of third_party_company.income
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public String getIncome() {
 		return income;
@@ -297,7 +302,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.income
 	 * @param income  the value for third_party_company.income
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setIncome(String income) {
 		this.income = income;
@@ -306,7 +311,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.remarks
 	 * @return  the value of third_party_company.remarks
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -315,7 +320,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.remarks
 	 * @param remarks  the value for third_party_company.remarks
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -324,7 +329,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.create_time
 	 * @return  the value of third_party_company.create_time
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -333,7 +338,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.create_time
 	 * @param createTime  the value for third_party_company.create_time
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -342,7 +347,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.cid
 	 * @return  the value of third_party_company.cid
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -351,7 +356,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.cid
 	 * @param cid  the value for third_party_company.cid
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -360,7 +365,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.party_amount
 	 * @return  the value of third_party_company.party_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public BigDecimal getPartyAmount() {
 		return partyAmount;
@@ -369,7 +374,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.party_amount
 	 * @param partyAmount  the value for third_party_company.party_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setPartyAmount(BigDecimal partyAmount) {
 		this.partyAmount = partyAmount;
@@ -378,7 +383,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.type
 	 * @return  the value of third_party_company.type
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -387,7 +392,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.type
 	 * @param type  the value for third_party_company.type
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
@@ -396,7 +401,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.patent_name_type
 	 * @return  the value of third_party_company.patent_name_type
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Integer getPatentNameType() {
 		return patentNameType;
@@ -405,7 +410,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.patent_name_type
 	 * @param patentNameType  the value for third_party_company.patent_name_type
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setPatentNameType(Integer patentNameType) {
 		this.patentNameType = patentNameType;
@@ -414,7 +419,7 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.official_amount
 	 * @return  the value of third_party_company.official_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public BigDecimal getOfficialAmount() {
 		return officialAmount;
@@ -423,9 +428,27 @@ public class ThirdPartyCompany {
 	/**
 	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.official_amount
 	 * @param officialAmount  the value for third_party_company.official_amount
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setOfficialAmount(BigDecimal officialAmount) {
 		this.officialAmount = officialAmount;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column third_party_company.start_type
+	 * @return  the value of third_party_company.start_type
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
+	 */
+	public Integer getStartType() {
+		return startType;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column third_party_company.start_type
+	 * @param startType  the value for third_party_company.start_type
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
+	 */
+	public void setStartType(Integer startType) {
+		this.startType = startType;
+	}
 }

+ 76 - 16
src/main/java/com/goafanti/common/model/ThirdPartyCompanyExample.java

@@ -8,23 +8,23 @@ import java.util.List;
 public class ThirdPartyCompanyExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public ThirdPartyCompanyExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -32,7 +32,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -40,7 +40,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -48,7 +48,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -56,7 +56,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -64,7 +64,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -72,7 +72,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -80,7 +80,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -90,7 +90,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -102,7 +102,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -111,7 +111,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This method was generated by MyBatis Generator. This method corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -121,7 +121,7 @@ public class ThirdPartyCompanyExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1283,11 +1283,71 @@ public class ThirdPartyCompanyExample {
 			addCriterion("official_amount not between", value1, value2, "officialAmount");
 			return (Criteria) this;
 		}
+
+		public Criteria andStartTypeIsNull() {
+			addCriterion("start_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeIsNotNull() {
+			addCriterion("start_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeEqualTo(Integer value) {
+			addCriterion("start_type =", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeNotEqualTo(Integer value) {
+			addCriterion("start_type <>", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeGreaterThan(Integer value) {
+			addCriterion("start_type >", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("start_type >=", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeLessThan(Integer value) {
+			addCriterion("start_type <", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("start_type <=", value, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeIn(List<Integer> values) {
+			addCriterion("start_type in", values, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeNotIn(List<Integer> values) {
+			addCriterion("start_type not in", values, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeBetween(Integer value1, Integer value2) {
+			addCriterion("start_type between", value1, value2, "startType");
+			return (Criteria) this;
+		}
+
+		public Criteria andStartTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("start_type not between", value1, value2, "startType");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 15 15:56:36 CST 2020
+	 * @mbg.generated  Wed Oct 21 11:29:02 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

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

@@ -134,11 +134,13 @@ public class OutsourceOrgApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "项目外包信息","项目外包信息"));
 			return res;
 		}
-		if(orderNewService.checkOutAudit(o.getTid())) {
-			res.getError().add(buildError(ErrorConstants.DATA_EMPTY_ERROR, "第三方信息","第三方信息"));
+		int i=orderNewService.checkOutAudit(o.getTid());
+		if(i==1) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "第三方信息","第三方信息"));
 			return res;
 		}
 		
+		
 		return res.data(orderNewService.pushOutsourceProjectAudit(o));
 	}
 	/**

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

@@ -203,6 +203,6 @@ public interface OrderNewService {
 	Pagination<OutArrearsDunListBo> arrearsDunList(InputArrearsDunListBo in);
 	void exportArrearsDunListData(InputArrearsDunListBo in, HttpServletResponse response) throws IOException;
 	void pushOrderDun(String orderNo);
-	boolean checkOutAudit(Integer id);
+	int checkOutAudit(Integer id);
 	
 }

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

@@ -96,6 +96,7 @@ 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;
@@ -1320,11 +1321,14 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (o.getStartType()==1) {//供应商无需审核
 			o.setRefundStatus(1);
 		}
-		if (o.getId()!=null) {
-			tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
-		}else {
-			tOrderOutsourceMapper.insertSelective(o);
+		//查询时候存在
+		OrderOutsourceDtails oo=null;
+		if (o.getId()==null) {
+			oo=tOrderOutsourceMapper.selectByOrderNo(null,String.valueOf(o.getTid()));
 		}
+		if (oo==null) tOrderOutsourceMapper.insertSelective(o);
+		else tOrderOutsourceMapper.updateByPrimaryKeySelective(o);
+			
 		updateOrderCostAmount(o.getTid(),o.getStartType());
 		return 1;
 	}
@@ -1458,9 +1462,12 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 
 
 	@Override
-	public boolean checkOutAudit(Integer id) {
+	public int checkOutAudit(Integer id) {
 		List<OutThirdPartyCompany> list=thirdPartyCompanyMapper.selectByTid(id);
-		return list.isEmpty();
+		if (list.isEmpty())return 1;
+//		OrderOutsourceDtails o=tOrderOutsourceMapper.selectByOrderNo(null,String.valueOf(id));
+//		if (o==null)return 2;
+		return 0;
 	}
 
 

+ 20 - 0
src/main/java/com/goafanti/organization/bo/OutThirdPartyCompany.java

@@ -88,6 +88,8 @@ public class OutThirdPartyCompany  {
 	private BigDecimal officialAmount;
 
 	
+	private Integer startType;
+	
 	
 	
 	public Integer getId() {
@@ -394,6 +396,24 @@ public class OutThirdPartyCompany  {
 	public void setReductionAmount(String reductionAmount) {
 		this.reductionAmount = reductionAmount;
 	}
+
+
+
+
+
+
+	public Integer getStartType() {
+		return startType;
+	}
+
+
+
+
+
+
+	public void setStartType(Integer startType) {
+		this.startType = startType;
+	}
 	
 	
 

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

@@ -1,13 +1,13 @@
 #Driver
 jdbc.driverClassName=com.mysql.jdbc.Driver
 #本地
-jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
-jdbc.username=dev
-jdbc.password=123456
+#jdbc.url=jdbc\:mysql\://localhost\:3306/aft?useUnicode\=true&characterEncoding\=UTF-8&autoReconnect\=true&useSSL\=false
+#jdbc.username=dev
+#jdbc.password=123456
 #测试
-#jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
-#jdbc.username=root
-#jdbc.password=aftdev
+jdbc.url=jdbc:mysql://101.37.32.31:3306/aft?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false
+jdbc.username=root
+jdbc.password=aftdev
 #\u68c0\u6d4b\u6570\u636e\u5e93\u94fe\u63a5\u662f\u5426\u6709\u6548\uff0c\u5fc5\u987b\u914d\u7f6e
 jdbc.validationQuery=SELECT 'x'
 #\u521d\u59cb\u8fde\u63a5\u6570