Bläddra i källkod

批量通过修改

Signed-off-by: anderx <312518615@qq.com>
anderx 5 år sedan
förälder
incheckning
2020ca3e9c

+ 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="patent_price"/>
+    <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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	int updateByPrimaryKey(ThirdPartyCompany record);
 

+ 4 - 3
src/main/java/com/goafanti/common/mapper/FinancialPaymentMapper.xml

@@ -331,9 +331,10 @@
   </select>
   <select id="selectBypidGetNotice" resultType="com.goafanti.organization.bo.NoticeInformationBo">
 	select b.id pid,d.order_no orderNo,d.salesman_id salesmanId,d.salesman_name salesmanName , d.buyer_name buyerName,
-	d.finance_id financeId,d.finance_name financeName ,sa.email salesmanEmail,fa.email financeEmail
-	from  t_order_payment b left join t_order_task c on b.tid=c.id left join t_order_mid d on c.order_no=d.order_no
-	left join admin sa on d.salesman_id=sa.id left join admin fa on d.finance_id=fa.id
+	d.finance_id financeId,d.finance_name financeName,ta.name techName ,sa.email salesmanEmail,fa.email financeEmail,
+	ta.email techEmail,ta.id techId	from  t_order_payment b left join t_order_task c on b.tid=c.id 
+	left join t_order_mid d on c.order_no=d.order_no left join admin sa on d.salesman_id=sa.id 
+	left join admin fa on d.finance_id=fa.id left join admin ta on c.task_receiver=ta.id
 	where b.id= #{pid}
   </select>
   

+ 7 - 0
src/main/java/com/goafanti/common/mapper/PatentPriceMapper.xml

@@ -325,4 +325,11 @@
 	and 	b.company_name like concat('%',#{name},'%')
 	</if>
   </select>
+  <select id="selectBycid" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+   
+    select 
+    <include refid="Base_Column_List" />
+    from patent_price
+    where cid = #{cid,jdbcType=INTEGER}
+  </select>
 </mapper>

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

@@ -553,7 +553,7 @@
 	<if test="starTime != null and endTime != null">
 	and b.create_time between #{starTime} and  #{endTime}
 	</if>
-	order by b.create_time desc
+	order by a.refund_status,b.create_time desc
   	<if test="page_sql!=null">
 			${page_sql}
 	</if>

+ 40 - 25
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 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="tid" jdbcType="INTEGER" property="tid" />
@@ -23,12 +23,13 @@
     <result column="cid" jdbcType="INTEGER" property="cid" />
     <result column="party_amount" jdbcType="DECIMAL" property="partyAmount" />
     <result column="type" jdbcType="INTEGER" property="type" />
+    <result column="patent_name_type" jdbcType="INTEGER" property="patentNameType" />
   </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 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -62,7 +63,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -96,16 +97,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     id, tid, company_name, unit_price, quantity, total_amount, material, urgent, audit, 
-    assets, income, remarks, create_time, cid, party_amount, type
+    assets, income, remarks, create_time, cid, party_amount, type, patent_name_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 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     select
     <if test="distinct">
@@ -124,7 +125,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -135,7 +136,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     delete from third_party_company
     where id = #{id,jdbcType=INTEGER}
@@ -144,7 +145,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     delete from third_party_company
     <if test="_parameter != null">
@@ -155,26 +156,26 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 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)
+      type, patent_name_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})
+      #{type,jdbcType=INTEGER}, #{patentNameType,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 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     insert into third_party_company
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -226,6 +227,9 @@
       <if test="type != null">
         type,
       </if>
+      <if test="patentNameType != null">
+        patent_name_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -276,13 +280,16 @@
       <if test="type != null">
         #{type,jdbcType=INTEGER},
       </if>
+      <if test="patentNameType != null">
+        #{patentNameType,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 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     select count(*) from third_party_company
     <if test="_parameter != null">
@@ -293,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     update third_party_company
     <set>
@@ -345,6 +352,9 @@
       <if test="record.type != null">
         type = #{record.type,jdbcType=INTEGER},
       </if>
+      <if test="record.patentNameType != null">
+        patent_name_type = #{record.patentNameType,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -354,7 +364,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     update third_party_company
     set id = #{record.id,jdbcType=INTEGER},
@@ -372,7 +382,8 @@
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
       cid = #{record.cid,jdbcType=INTEGER},
       party_amount = #{record.partyAmount,jdbcType=DECIMAL},
-      type = #{record.type,jdbcType=INTEGER}
+      type = #{record.type,jdbcType=INTEGER},
+      patent_name_type = #{record.patentNameType,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -381,7 +392,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     update third_party_company
     <set>
@@ -430,6 +441,9 @@
       <if test="type != null">
         type = #{type,jdbcType=INTEGER},
       </if>
+      <if test="patentNameType != null">
+        patent_name_type = #{patentNameType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -437,7 +451,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Sep 08 14:36:38 CST 2020.
+      This element was generated on Mon Sep 14 11:10:10 CST 2020.
     -->
     update third_party_company
     set tid = #{tid,jdbcType=INTEGER},
@@ -454,22 +468,23 @@
       create_time = #{createTime,jdbcType=TIMESTAMP},
       cid = #{cid,jdbcType=INTEGER},
       party_amount = #{partyAmount,jdbcType=DECIMAL},
-      type = #{type,jdbcType=INTEGER}
+      type = #{type,jdbcType=INTEGER},
+      patent_name_type = #{patentNameType,jdbcType=INTEGER}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByTid" resultType="com.goafanti.organization.bo.OutThirdPartyCompany">
    select a.id,a.tid,a.company_name companyName,a.unit_price unitPrice,a.quantity,a.total_amount totalAmount,a.material,a.urgent,
-    a.audit,a.assets,a.income,a.remarks,a.cid,b.cost_reduction costReduction,b.official_cost officialCost,a.type,a.party_amount partyAmount
-   from third_party_company a left join t_order_task b on a.tid=b.id  where tid= #{tid}
+	a.patent_name_type patentNameType,a.audit,a.assets,a.income,a.remarks,a.cid,b.cost_reduction costReduction,b.official_cost officialCost,
+	a.type,a.party_amount partyAmount from third_party_company a left join t_order_task b on a.tid=b.id  where tid= #{tid}
   </select>
    <select id="selectPaymentList" resultType="com.goafanti.organization.bo.outPaymentList">
-		select c.contract_no contractNo,b.order_no orderNo,d.buyer_name userName, d.dep_name depName,f.cost_amount costAmount,
+			select c.contract_no contractNo,b.order_no orderNo,d.buyer_name userName, d.dep_name depName,f.cost_amount costAmount,
 		a.choose_type chooseType,a.payment_amount paymentAmount,a.application_amount applicationAmount,a.tid,
 		date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTime,a.aname,d.finance_name financeName,b.cname,
-		b.commodity_name pname,b.project_status projectStatus,a.status
+		b.commodity_name pname,b.project_status projectStatus,a.status,bp.`type` projectType
 		from t_order_payment a left join t_order_task b on a.tid=b.id left join t_order_new c on b.order_no=c.order_no
+		left join business_project bp on b.commodity_id=bp.id
 		left join t_order_mid d on b.order_no=d.order_no left join t_task_mid f on a.tid=f.tid
-		where 1=1
 		<if test="lvl==0">
 		and c.finance_id= #{aid}
 		</if>

+ 71 - 48
src/main/java/com/goafanti/common/model/ThirdPartyCompany.java

@@ -12,93 +12,98 @@ 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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  Mon Sep 14 11:10:10 CST 2020
+	 */
+	private Integer patentNameType;
 
 	/**
 	 * 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Integer getId() {
 		return id;
@@ -107,7 +112,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -116,7 +121,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Integer getTid() {
 		return tid;
@@ -125,7 +130,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setTid(Integer tid) {
 		this.tid = tid;
@@ -134,7 +139,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public String getCompanyName() {
 		return companyName;
@@ -143,7 +148,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setCompanyName(String companyName) {
 		this.companyName = companyName;
@@ -152,7 +157,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public BigDecimal getUnitPrice() {
 		return unitPrice;
@@ -161,7 +166,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setUnitPrice(BigDecimal unitPrice) {
 		this.unitPrice = unitPrice;
@@ -170,7 +175,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Integer getQuantity() {
 		return quantity;
@@ -179,7 +184,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setQuantity(Integer quantity) {
 		this.quantity = quantity;
@@ -188,7 +193,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public BigDecimal getTotalAmount() {
 		return totalAmount;
@@ -197,7 +202,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setTotalAmount(BigDecimal totalAmount) {
 		this.totalAmount = totalAmount;
@@ -206,7 +211,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Integer getMaterial() {
 		return material;
@@ -215,7 +220,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setMaterial(Integer material) {
 		this.material = material;
@@ -224,7 +229,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Integer getUrgent() {
 		return urgent;
@@ -233,7 +238,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setUrgent(Integer urgent) {
 		this.urgent = urgent;
@@ -242,7 +247,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Integer getAudit() {
 		return audit;
@@ -251,7 +256,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setAudit(Integer audit) {
 		this.audit = audit;
@@ -260,7 +265,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public String getAssets() {
 		return assets;
@@ -269,7 +274,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setAssets(String assets) {
 		this.assets = assets;
@@ -278,7 +283,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public String getIncome() {
 		return income;
@@ -287,7 +292,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setIncome(String income) {
 		this.income = income;
@@ -296,7 +301,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -305,7 +310,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -314,7 +319,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -323,7 +328,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -332,7 +337,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Integer getCid() {
 		return cid;
@@ -341,7 +346,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setCid(Integer cid) {
 		this.cid = cid;
@@ -350,7 +355,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public BigDecimal getPartyAmount() {
 		return partyAmount;
@@ -359,7 +364,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setPartyAmount(BigDecimal partyAmount) {
 		this.partyAmount = partyAmount;
@@ -368,7 +373,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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public Integer getType() {
 		return type;
@@ -377,9 +382,27 @@ 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public void setType(Integer type) {
 		this.type = type;
 	}
+
+	/**
+	 * 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  Mon Sep 14 11:10:10 CST 2020
+	 */
+	public Integer getPatentNameType() {
+		return patentNameType;
+	}
+
+	/**
+	 * 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  Mon Sep 14 11:10:10 CST 2020
+	 */
+	public void setPatentNameType(Integer patentNameType) {
+		this.patentNameType = patentNameType;
+	}
 }

+ 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 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 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -1163,11 +1163,71 @@ public class ThirdPartyCompanyExample {
 			addCriterion("type not between", value1, value2, "type");
 			return (Criteria) this;
 		}
+
+		public Criteria andPatentNameTypeIsNull() {
+			addCriterion("patent_name_type is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeIsNotNull() {
+			addCriterion("patent_name_type is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeEqualTo(Integer value) {
+			addCriterion("patent_name_type =", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeNotEqualTo(Integer value) {
+			addCriterion("patent_name_type <>", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeGreaterThan(Integer value) {
+			addCriterion("patent_name_type >", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeGreaterThanOrEqualTo(Integer value) {
+			addCriterion("patent_name_type >=", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeLessThan(Integer value) {
+			addCriterion("patent_name_type <", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeLessThanOrEqualTo(Integer value) {
+			addCriterion("patent_name_type <=", value, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeIn(List<Integer> values) {
+			addCriterion("patent_name_type in", values, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeNotIn(List<Integer> values) {
+			addCriterion("patent_name_type not in", values, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeBetween(Integer value1, Integer value2) {
+			addCriterion("patent_name_type between", value1, value2, "patentNameType");
+			return (Criteria) this;
+		}
+
+		public Criteria andPatentNameTypeNotBetween(Integer value1, Integer value2) {
+			addCriterion("patent_name_type not between", value1, value2, "patentNameType");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table third_party_company
-	 * @mbg.generated  Tue Sep 08 14:36:38 CST 2020
+	 * @mbg.generated  Mon Sep 14 11:10:10 CST 2020
 	 */
 	public static class Criterion {
 		private String condition;

+ 90 - 70
src/main/java/com/goafanti/organization/bo/NoticeInformationBo.java

@@ -1,70 +1,90 @@
-package com.goafanti.organization.bo;
-
-public class NoticeInformationBo {
-	private Integer pid;
-	private String salesmanId;
-	private String salesmanName;
-	private String orderNo;
-	private String buyerName;
-	private String financeId;
-	private String financeName;
-	private String salesmanEmail;
-	private String financeEmail;
-	
-	public Integer getPid() {
-		return pid;
-	}
-	public void setPid(Integer pid) {
-		this.pid = pid;
-	}
-	public String getSalesmanId() {
-		return salesmanId;
-	}
-	public void setSalesmanId(String salesmanId) {
-		this.salesmanId = salesmanId;
-	}
-	public String getSalesmanName() {
-		return salesmanName;
-	}
-	public void setSalesmanName(String salesmanName) {
-		this.salesmanName = salesmanName;
-	}
-	public String getOrderNo() {
-		return orderNo;
-	}
-	public void setOrderNo(String orderNo) {
-		this.orderNo = orderNo;
-	}
-	public String getBuyerName() {
-		return buyerName;
-	}
-	public void setBuyerName(String buyerName) {
-		this.buyerName = buyerName;
-	}
-	public String getFinanceId() {
-		return financeId;
-	}
-	public void setFinanceId(String financeId) {
-		this.financeId = financeId;
-	}
-	public String getFinanceName() {
-		return financeName;
-	}
-	public void setFinanceName(String financeName) {
-		this.financeName = financeName;
-	}
-	public String getSalesmanEmail() {
-		return salesmanEmail;
-	}
-	public void setSalesmanEmail(String salesmanEmail) {
-		this.salesmanEmail = salesmanEmail;
-	}
-	public String getFinanceEmail() {
-		return financeEmail;
-	}
-	public void setFinanceEmail(String financeEmail) {
-		this.financeEmail = financeEmail;
-	}
-	
-	
-}
+package com.goafanti.organization.bo;
+
+public class NoticeInformationBo {
+	private Integer pid;
+	private String salesmanId;
+	private String salesmanName;
+	private String orderNo;
+	private String buyerName;
+	private String financeId;
+	private String financeName;
+	private String salesmanEmail;
+	private String financeEmail;
+	private String techName;
+	private String techEmail;
+	private String techId;
+	public Integer getPid() {
+		return pid;
+	}
+	public void setPid(Integer pid) {
+		this.pid = pid;
+	}
+	public String getSalesmanId() {
+		return salesmanId;
+	}
+	public void setSalesmanId(String salesmanId) {
+		this.salesmanId = salesmanId;
+	}
+	public String getSalesmanName() {
+		return salesmanName;
+	}
+	public void setSalesmanName(String salesmanName) {
+		this.salesmanName = salesmanName;
+	}
+	public String getOrderNo() {
+		return orderNo;
+	}
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+	public String getBuyerName() {
+		return buyerName;
+	}
+	public void setBuyerName(String buyerName) {
+		this.buyerName = buyerName;
+	}
+	public String getFinanceId() {
+		return financeId;
+	}
+	public void setFinanceId(String financeId) {
+		this.financeId = financeId;
+	}
+	public String getFinanceName() {
+		return financeName;
+	}
+	public void setFinanceName(String financeName) {
+		this.financeName = financeName;
+	}
+	public String getSalesmanEmail() {
+		return salesmanEmail;
+	}
+	public void setSalesmanEmail(String salesmanEmail) {
+		this.salesmanEmail = salesmanEmail;
+	}
+	public String getFinanceEmail() {
+		return financeEmail;
+	}
+	public void setFinanceEmail(String financeEmail) {
+		this.financeEmail = financeEmail;
+	}
+	public String getTechName() {
+		return techName;
+	}
+	public void setTechName(String techName) {
+		this.techName = techName;
+	}
+	public String getTechEmail() {
+		return techEmail;
+	}
+	public void setTechEmail(String techEmail) {
+		this.techEmail = techEmail;
+	}
+	public String getTechId() {
+		return techId;
+	}
+	public void setTechId(String techId) {
+		this.techId = techId;
+	}
+	
+	
+}

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

@@ -18,6 +18,10 @@ public class outOrderPayment extends TOrderPayment{
 	 * 原单价
 	 */
 	 private BigDecimal initialUnitPrice;
+	 /**
+		 * 原已付
+		 */
+	 private BigDecimal initialPaymentAmount;
 	 private String createTimes;
 	 
 	 private String financeName;
@@ -52,6 +56,12 @@ public class outOrderPayment extends TOrderPayment{
 	public void setInitialUnitPrice(BigDecimal initialUnitPrice) {
 		this.initialUnitPrice = initialUnitPrice;
 	}
+	public BigDecimal getInitialPaymentAmount() {
+		return initialPaymentAmount;
+	}
+	public void setInitialPaymentAmount(BigDecimal initialPaymentAmount) {
+		this.initialPaymentAmount = initialPaymentAmount;
+	}
 	
 	
 	/*public String getAuditInformation() {

+ 7 - 0
src/main/java/com/goafanti/organization/bo/outPaymentList.java

@@ -16,6 +16,7 @@ public class outPaymentList {
 		private String pname;
 		private Integer tid;
 		private Integer projectStatus;
+		private Integer projectType;
 		private Integer status;
 		public String getContractNo() {
 			return contractNo;
@@ -114,5 +115,11 @@ public class outPaymentList {
 		public void setChooseType(Integer chooseType) {
 			this.chooseType = chooseType;
 		}
+		public Integer getProjectType() {
+			return projectType;
+		}
+		public void setProjectType(Integer projectType) {
+			this.projectType = projectType;
+		}
 		
 }

+ 4 - 3
src/main/java/com/goafanti/organization/controller/ThirdPartyCompanyApiController.java

@@ -68,6 +68,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		if (!res.getError().isEmpty()) {
             return res;
         }
+		t.setPatentNameType(patentType);
 		res.data(thirdPartyCompanyService.addCompany(t,calculation));
 		return res;
 	}
@@ -104,7 +105,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 		if (!res.getError().isEmpty()) {
             return res;
         }
-		
+		t.setPatentNameType(patentType);
 		res.data(thirdPartyCompanyService.updateCompany(t,calculation));
 		return res;
 	}
@@ -267,7 +268,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"编号","编号"));
 			return res;
 		}
-		if (null==p.getPaymentType()) {
+		if (null==p.getChooseType()) {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR,"类型","类型"));
 			return res;
 		}
@@ -276,7 +277,7 @@ public class ThirdPartyCompanyApiController extends BaseApiController{
 			return res;
 		}
 		
-		if (p.getPaymentType()==1&&thirdPartyCompanyService.checkprojectDun(p)) {
+		if (p.getChooseType()==1&&thirdPartyCompanyService.checkprojectDun(p)) {
 			res.getError().add(buildError("项目节点未达到可付款状态。","项目节点未达到可付款状态。"));
 			return res;
 		}

+ 40 - 25
src/main/java/com/goafanti/organization/service/impl/ThirdPartyCompanyServiceImpl.java

@@ -40,7 +40,6 @@ import com.goafanti.common.model.PatentPrice;
 import com.goafanti.common.model.PaymentLog;
 import com.goafanti.common.model.PaymentNode;
 import com.goafanti.common.model.SoftWritingPrice;
-import com.goafanti.common.model.TOrderOutsource;
 import com.goafanti.common.model.TOrderPayment;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.common.model.ThirdPartyCompany;
@@ -154,7 +153,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public int addPaymentNode(InputPaymentNode p) {
-		
 		if (StringUtils.isNoneBlank(p.getPartyTimes())) {
 			p.setPartyTime(DateUtils.StringToDate(p.getPartyTimes(), AFTConstants.YYYYMMDD));
 		}
@@ -164,6 +162,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 	@Override
 	public boolean addNodeCheck(InputPaymentNode p) {
 		ThirdPartyCompany t=thirdPartyCompanyMapper.selectByPrimaryKey(p.getCid());
+		
+		if(p.getTotalAmount()==null)p.setTotalAmount(new BigDecimal(0));
 		if (p.getTotalAmount().compareTo(t.getTotalAmount())>0) {
 			return true;
 		}
@@ -172,6 +172,8 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		for (OutPaymentNode pn : list) {
 			if (!pn.getId().equals(p.getId())) sum=sum.add(pn.getTotalAmount());
 		}
+		if(p.getUnitPrice()==null)p.setUnitPrice(t.getUnitPrice());
+		if(p.getTotalAmount()==null)p.setTotalAmount(p.getUnitPrice().multiply(new BigDecimal(p.getQuantity())));
 		if (sum.compareTo(t.getTotalAmount())>0) {
 			return true;
 		}
@@ -245,17 +247,20 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		TOrderPayment tp=tOrderPaymentMapper.selectByPrimaryKey(id);
 		Integer type=tp.getChooseType();
 		outOrderPayment op=tOrderPaymentMapper.selectByidGetDetails(id);
+		op.setChooseType(type);
 		if (type==0) {//支付种类 0第三方 1催款 2官费
 			ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
 			op.setInitialQuantity(tpc.getQuantity());
 			op.setInitialTotalAmount(tpc.getTotalAmount());
 			op.setInitialUnitPrice(tpc.getUnitPrice());
+			op.setInitialPaymentAmount(tpc.getPartyAmount());
 			 
 		}else if (type==1) {
 			PaymentNode pn=paymentNodeMapper.selectByPrimaryKey(tp.getNodeId());
 			op.setInitialQuantity(pn.getQuantity());
 			op.setInitialTotalAmount(pn.getTotalAmount());
 			op.setInitialUnitPrice(pn.getUnitPrice());
+			op.setInitialPaymentAmount(pn.getPartyAmount());
 		}else if (type==2) {
 			ThirdPartyCompany tpc=thirdPartyCompanyMapper.selectByPrimaryKey(tp.getTpcId());
 			op.setInitialQuantity(tpc.getQuantity());
@@ -289,11 +294,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			tp.setPaymentAmount(p.getPaymentAmount());
 			tp.setQuantity(p.getQuantity());
 			tp.setPaymentStatus(p.getPaymentStatus());
-			NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
-			AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-			addNoticAndSendEmail(ni,a,NoticeStatus.PAYMENT_NODE.getCode());
-			PaymentLog pl=new PaymentLog(p.getId(),0,auditStr+p.getAuditNotes()==null?"":p.getAuditNotes(),a.getId(),a.getName());
-			paymentLogMapper.insertSelective(pl);
 		}else if (p.getStatus()==1) {
 			type= NoticeStatus.PAYMENT_YES.getCode();
 			tp.setApplicationAmount(p.getApplicationAmount());
@@ -303,22 +303,19 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			tp.setApplicationAmount(p.getApplicationAmount());
 			auditStr="审核驳回:";
 		}else if (p.getStatus()==3) {
+			type=NoticeStatus.PAYMENT_COMPLETE.getCode();
 			tp.setPaymentAmount(p.getPaymentAmount()==null?p.getPaymentAmount():p.getApplicationAmount());
 			confirmPayment(p);
 			auditStr="审核完成";
 		}else if(p.getStatus()==4) {
 			auditStr="付款取消";
 		}
-		if (p.getStatus()!=0) {
-			NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
-			AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
-			addNoticAndSendEmail(ni,a,type);
-			PaymentLog pl=new PaymentLog(p.getId(),p.getStatus(),auditStr+p.getAuditNotes()==null?"":p.getAuditNotes(),a.getId(),a.getName());
-			paymentLogMapper.insertSelective(pl);
-		}
-		
+		NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(p.getId());
+		AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
+		addNoticAndSendEmail(ni,a,type);
+		PaymentLog pl=new PaymentLog(p.getId(),p.getStatus(),auditStr+p.getAuditNotes()==null?"":p.getAuditNotes(),a.getId(),a.getName());
+		paymentLogMapper.insertSelective(pl);
 		return tOrderPaymentMapper.updateByPrimaryKeySelective(tp);
-	
 	}
 
 
@@ -394,13 +391,14 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		EmailBo bo = new EmailBo(NoticeStatus.getValueByCode(type), a.getEmail(), a.getDepartmentName(), a.getName(),
 				in.getOrderNo(), in.getSalesmanName());
 		n.setId(UUID.randomUUID().toString());
-		if (type==NoticeStatus.PAYMENT_NODE.getCode()) {
+		if (type==NoticeStatus.PAYMENT_NODE.getCode()||type==NoticeStatus.PAYMENT_NODE.getCode()) {
 			n.setAid(in.getFinanceId());
 			bo.setAddress(in.getFinanceEmail());
-		} else {
-			n.setAid(in.getSalesmanId());
-			bo.setAddress(in.getSalesmanEmail());
-		}
+		} else if(type==NoticeStatus.PAYMENT_NO.getCode()||type==NoticeStatus.PAYMENT_YES.getCode()
+				||type==NoticeStatus.PAYMENT_COMPLETE.getCode()) {
+			n.setAid(in.getTechId());
+			bo.setAddress(in.getTechEmail());
+		} 
 		
 		n.setNoticeType(type);
 		n.setContent(str);
@@ -423,7 +421,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		List<outOrderPayment> list=new ArrayList<>();
 		//支付种类 0第三方 1催款
 		
-		if (p.getChooseType()==0) {
+		if (p.getChooseType()==0||p.getChooseType()==2) {
 			//首先不能大于第三方
 			list=tOrderPaymentMapper.selectList(p.getTpcId(),null);
 		}else if (p.getChooseType()==1) {
@@ -434,7 +432,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 				a=a.add(o.getApplicationAmount());	
 			}
 		}
-		if (p.getChooseType()==0) {
+		if (p.getChooseType()==0||p.getChooseType()==2) {
 			ThirdPartyCompany t=thirdPartyCompanyMapper.selectByPrimaryKey(p.getTpcId());
 			total=t.getTotalAmount();
 		}else if (p.getChooseType()==1) {
@@ -454,6 +452,9 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		TOrderTaskDetailBo tt=tOrderTaskMapper.getOrderTaskDetail(p.getTid().toString());
 //		项目状态 0-项目待提交 1-项目已提交,2-项目评审,3-项目立项,4-项目公示,5-项目抽查,6-项目备案,7-项目下证,8-项目验收,
 //		9-项目拨款 10- 项目进度10% 11- 项目进度30% 12- 项目进度70%
+		if(pn.getDunType()==1) {
+			return false;
+		}
 		if (pn.getDunType()==0&&pn.getPartyTime().getTime()<new Date().getTime()) {//如果自定义则看触发时间
 				return false;
 		}else if (NewOrderDunType.CGZH_WC.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
@@ -489,7 +490,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		}  else if (NewOrderDunType.ZSCQ_XZ.getCode()==Integer.valueOf(""+pn.getProjectType()+pn.getDunType())
 				&&(tt.getProjectStatus()>6&&tt.getProjectStatus()<10)) {
 			return false;
-		}  
+		}
 			
 		return true;
 	}
@@ -576,6 +577,7 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 			if (list.size()<1) {
 				CompanyLibrary c=new CompanyLibrary();
 				c.setCompanyName(companyName);
+				c.setType(i);
 				companyLibraryMapper.insertSelectiveGetId(c);
 				return c.getId();
 			}else {
@@ -625,16 +627,30 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 		String [] idss=ids.split(",");
 		List<Integer>elist=new ArrayList<>();
 		List<Integer> list=new ArrayList<>();
+		List<Notice> nlist=new ArrayList<>();
 		for (String s : idss) {
 			TOrderPayment top=tOrderPaymentMapper.selectByPrimaryKey(Integer.valueOf(s));
 			if (top!=null&&top.getStatus()==1) {
 				list.add(top.getId());
 				//做已付款金额计算
 				confirmPayment(top);
+				//发送站内通知
+				Notice n =new Notice();
+				n.setId(UUID.randomUUID().toString());
+				NoticeInformationBo ni=financialPaymentMapper.selectBypidGetNotice(Integer.valueOf(s));
+				AdminListBo a =adminMapper.getDeptNameByAid(TokenManager.getAdminId());
+				n.setAid(ni.getTechId());
+				n.setNoticeType(NoticeStatus.PAYMENT_YES.getCode());
+				String str=NoticeStatus.getValueByCode(n.getNoticeType())+": 订单编号 -"+ni.getOrderNo()+
+						",客户名称:"+ni.getBuyerName()+", 操作人:"+a.getName()+"-"+a.getDepartmentName()+"。";	
+				n.setContent(str);
+				n.setReaded(0);//未读
+				nlist.add(n);
 			}else {
 				elist.add(Integer.valueOf(s));
 			}
 		}
+		if(!nlist.isEmpty())noticeMapper.insertBatch(nlist);
 		if(!list.isEmpty())tOrderPaymentMapper.updateByids(list);
 		Map<String ,Object> map=new HashMap<>();
 		map.put("OK", list);
@@ -705,7 +721,6 @@ public class ThirdPartyCompanyServiceImpl extends  BaseMybatisDao<ThirdPartyComp
 
 	@Override
 	public int addpatentPrice(PatentPrice p) {
-
 		return patentPriceMapper.insertSelective(p);
 	}