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

新增外包客户等相关接口开发

anderx лет назад: 6
Родитель
Сommit
90da8bf176

+ 62 - 77
src/main/java/com/goafanti/common/dao/OutsourceOrganizationMapper.java

@@ -2,95 +2,80 @@ package com.goafanti.common.dao;
 
 import com.goafanti.common.model.OutsourceOrganization;
 import com.goafanti.common.model.OutsourceOrganizationExample;
+import com.goafanti.order.bo.OutsourceOrganizationBo;
+
 import java.util.List;
 import org.apache.ibatis.annotations.Param;
 
 public interface OutsourceOrganizationMapper {
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    long countByExample(OutsourceOrganizationExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    int deleteByExample(OutsourceOrganizationExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	long countByExample(OutsourceOrganizationExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	int deleteByExample(OutsourceOrganizationExample example);
+
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	int deleteByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    int deleteByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	int insert(OutsourceOrganization record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    int insert(OutsourceOrganization record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	int insertSelective(OutsourceOrganization record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    int insertSelective(OutsourceOrganization record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	List<OutsourceOrganization> selectByExample(OutsourceOrganizationExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    List<OutsourceOrganization> selectByExample(OutsourceOrganizationExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	OutsourceOrganization selectByPrimaryKey(Integer id);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    OutsourceOrganization selectByPrimaryKey(Integer id);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	int updateByExampleSelective(@Param("record") OutsourceOrganization record,
+			@Param("example") OutsourceOrganizationExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    int updateByExampleSelective(@Param("record") OutsourceOrganization record, @Param("example") OutsourceOrganizationExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	int updateByExample(@Param("record") OutsourceOrganization record,
+			@Param("example") OutsourceOrganizationExample example);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    int updateByExample(@Param("record") OutsourceOrganization record, @Param("example") OutsourceOrganizationExample example);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	int updateByPrimaryKeySelective(OutsourceOrganization record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    int updateByPrimaryKeySelective(OutsourceOrganization record);
+	/**
+	 * This method was generated by MyBatis Generator. This method corresponds to the database table outsource_organization
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	int updateByPrimaryKey(OutsourceOrganization record);
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method corresponds to the database table outsource_organization
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    int updateByPrimaryKey(OutsourceOrganization record);
+	List<OutsourceOrganizationBo> selectOutsourceOrg(String orderNo);
 }

+ 41 - 20
src/main/java/com/goafanti/common/mapper/OutsourceOrganizationMapper.xml

@@ -5,7 +5,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -17,12 +17,13 @@
     <result column="address" jdbcType="VARCHAR" property="address" />
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
+    <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
   </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 Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -56,7 +57,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -90,15 +91,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
-    id, name, contacts, contacts_mobile, province, city, area, address, remarks, create_time
+    id, name, contacts, contacts_mobile, province, city, area, address, remarks, create_time, 
+    order_no
   </sql>
   <select id="selectByExample" parameterType="com.goafanti.common.model.OutsourceOrganizationExample" resultMap="BaseResultMap">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     select
     <if test="distinct">
@@ -117,7 +119,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -128,7 +130,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     delete from outsource_organization
     where id = #{id,jdbcType=INTEGER}
@@ -137,7 +139,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     delete from outsource_organization
     <if test="_parameter != null">
@@ -148,22 +150,22 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     insert into outsource_organization (id, name, contacts, 
       contacts_mobile, province, city, 
       area, address, remarks, 
-      create_time)
+      create_time, order_no)
     values (#{id,jdbcType=INTEGER}, #{name,jdbcType=VARCHAR}, #{contacts,jdbcType=VARCHAR}, 
       #{contactsMobile,jdbcType=VARCHAR}, #{province,jdbcType=INTEGER}, #{city,jdbcType=INTEGER}, 
       #{area,jdbcType=INTEGER}, #{address,jdbcType=VARCHAR}, #{remarks,jdbcType=VARCHAR}, 
-      #{createTime,jdbcType=TIMESTAMP})
+      #{createTime,jdbcType=TIMESTAMP}, #{orderNo,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.goafanti.common.model.OutsourceOrganization">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     insert into outsource_organization
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -197,6 +199,9 @@
       <if test="createTime != null">
         create_time,
       </if>
+      <if test="orderNo != null">
+        order_no,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -229,13 +234,16 @@
       <if test="createTime != null">
         #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="orderNo != null">
+        #{orderNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.OutsourceOrganizationExample" resultType="java.lang.Long">
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     select count(*) from outsource_organization
     <if test="_parameter != null">
@@ -246,7 +254,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     update outsource_organization
     <set>
@@ -280,6 +288,9 @@
       <if test="record.createTime != null">
         create_time = #{record.createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.orderNo != null">
+        order_no = #{record.orderNo,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -289,7 +300,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     update outsource_organization
     set id = #{record.id,jdbcType=INTEGER},
@@ -301,7 +312,8 @@
       area = #{record.area,jdbcType=INTEGER},
       address = #{record.address,jdbcType=VARCHAR},
       remarks = #{record.remarks,jdbcType=VARCHAR},
-      create_time = #{record.createTime,jdbcType=TIMESTAMP}
+      create_time = #{record.createTime,jdbcType=TIMESTAMP},
+      order_no = #{record.orderNo,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -310,7 +322,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     update outsource_organization
     <set>
@@ -341,6 +353,9 @@
       <if test="createTime != null">
         create_time = #{createTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="orderNo != null">
+        order_no = #{orderNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -348,7 +363,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Mon Jun 17 15:40:01 CST 2019.
+      This element was generated on Tue Jun 18 08:19:20 CST 2019.
     -->
     update outsource_organization
     set name = #{name,jdbcType=VARCHAR},
@@ -359,7 +374,13 @@
       area = #{area,jdbcType=INTEGER},
       address = #{address,jdbcType=VARCHAR},
       remarks = #{remarks,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+      create_time = #{createTime,jdbcType=TIMESTAMP},
+      order_no = #{orderNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
+  <select id="selectOutsourceOrg" resultType="com.goafanti.order.bo.OutsourceOrganizationBo">
+  select id, name, contacts, contacts_mobile as contactsMobile, province, city, area, address, remarks, create_time as createTime,
+  	date_format(create_time,'%Y-%m-%d %H:%i:%S') as createTimes, order_no as orderNo from outsource_organization
+    where order_no=#{orderNo,jdbcType=VARCHAR}
+  </select>
 </mapper>

+ 2 - 0
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -1141,6 +1141,7 @@ where super_id is null )  e on e.order_no=a.order_no
   	left join admin f on e.task_receiver=f.id
   	</if>
   	where a.delete_sign = 0 
+  	and a.outsource= #{outsource,jdbcType=INTEGER}
   	<if test="specially == 0">
   	and a.order_status not in(3,5,6,7) and a.approval !=3
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}
@@ -1225,6 +1226,7 @@ where super_id is null ) e on e.order_no=a.order_no
   	left join admin f on e.task_receiver=f.id
   	</if>
   	where a.delete_sign = 0 
+  	and a.outsource= #{outsource,jdbcType=INTEGER}
   	<if test="specially == 0">
   	and a.order_status not in(3,5,6,7) and a.approval !=3
   	and a.salesman_id = #{aid,jdbcType=VARCHAR}

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

@@ -849,6 +849,7 @@
   	left join admin d on a.task_receiver=d.id left join t_order_new e on a.order_no=e.order_no left join user f on e.buyer_id=f.id
     left join department h on e.order_dep=h.id left join (select task_id , sum(already_number) as alreadyNumber from task_progress 
     group by task_id) i on a.id=i.task_id where e.delete_sign=0  and e.order_status not in (5,7)
+    and e.outsource= #{outsource,jdbcType=INTEGER}
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>
@@ -893,6 +894,7 @@
     left join admin g on e.salesman_id=g.id
     left join department h on g.department_id=h.id
     where e.delete_sign=0  and e.order_status not in (5,7)
+    and e.outsource= #{outsource,jdbcType=INTEGER}
     <if test="specially == 0">
     and a.task_receiver= #{aid,jdbcType=VARCHAR}
     </if>

+ 231 - 306
src/main/java/com/goafanti/common/model/OutsourceOrganization.java

@@ -3,333 +3,258 @@ package com.goafanti.common.model;
 import java.util.Date;
 
 public class OutsourceOrganization {
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.id
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private Integer id;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.name
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private String name;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.id
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private Integer id;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.name
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private String name;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.contacts
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private String contacts;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.contacts_mobile
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private String contactsMobile;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.province
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private Integer province;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.city
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private Integer city;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.area
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private Integer area;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.address
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private String address;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.remarks
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private String remarks;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.create_time
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private Date createTime;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.order_no
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	private String orderNo;
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.contacts
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private String contacts;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.id
+	 * @return  the value of outsource_organization.id
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public Integer getId() {
+		return id;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.contacts_mobile
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private String contactsMobile;
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.id
+	 * @param id  the value for outsource_organization.id
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setId(Integer id) {
+		this.id = id;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.province
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private Integer province;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.name
+	 * @return  the value of outsource_organization.name
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.city
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private Integer city;
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.name
+	 * @param name  the value for outsource_organization.name
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setName(String name) {
+		this.name = name;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.area
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private Integer area;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.contacts
+	 * @return  the value of outsource_organization.contacts
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public String getContacts() {
+		return contacts;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.address
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private String address;
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.contacts
+	 * @param contacts  the value for outsource_organization.contacts
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setContacts(String contacts) {
+		this.contacts = contacts;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.remarks
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private String remarks;
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.contacts_mobile
+	 * @return  the value of outsource_organization.contacts_mobile
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public String getContactsMobile() {
+		return contactsMobile;
+	}
 
-    /**
-     *
-     * This field was generated by MyBatis Generator.
-     * This field corresponds to the database column outsource_organization.create_time
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    private Date createTime;
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.contacts_mobile
+	 * @param contactsMobile  the value for outsource_organization.contacts_mobile
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setContactsMobile(String contactsMobile) {
+		this.contactsMobile = contactsMobile;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.id
-     *
-     * @return the value of outsource_organization.id
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public Integer getId() {
-        return id;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.province
+	 * @return  the value of outsource_organization.province
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public Integer getProvince() {
+		return province;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.id
-     *
-     * @param id the value for outsource_organization.id
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setId(Integer id) {
-        this.id = id;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.province
+	 * @param province  the value for outsource_organization.province
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setProvince(Integer province) {
+		this.province = province;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.name
-     *
-     * @return the value of outsource_organization.name
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.city
+	 * @return  the value of outsource_organization.city
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public Integer getCity() {
+		return city;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.name
-     *
-     * @param name the value for outsource_organization.name
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.city
+	 * @param city  the value for outsource_organization.city
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setCity(Integer city) {
+		this.city = city;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.contacts
-     *
-     * @return the value of outsource_organization.contacts
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public String getContacts() {
-        return contacts;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.area
+	 * @return  the value of outsource_organization.area
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public Integer getArea() {
+		return area;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.contacts
-     *
-     * @param contacts the value for outsource_organization.contacts
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setContacts(String contacts) {
-        this.contacts = contacts;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.area
+	 * @param area  the value for outsource_organization.area
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setArea(Integer area) {
+		this.area = area;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.contacts_mobile
-     *
-     * @return the value of outsource_organization.contacts_mobile
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public String getContactsMobile() {
-        return contactsMobile;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.address
+	 * @return  the value of outsource_organization.address
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public String getAddress() {
+		return address;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.contacts_mobile
-     *
-     * @param contactsMobile the value for outsource_organization.contacts_mobile
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setContactsMobile(String contactsMobile) {
-        this.contactsMobile = contactsMobile;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.address
+	 * @param address  the value for outsource_organization.address
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setAddress(String address) {
+		this.address = address;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.province
-     *
-     * @return the value of outsource_organization.province
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public Integer getProvince() {
-        return province;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.remarks
+	 * @return  the value of outsource_organization.remarks
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public String getRemarks() {
+		return remarks;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.province
-     *
-     * @param province the value for outsource_organization.province
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setProvince(Integer province) {
-        this.province = province;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.remarks
+	 * @param remarks  the value for outsource_organization.remarks
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setRemarks(String remarks) {
+		this.remarks = remarks;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.city
-     *
-     * @return the value of outsource_organization.city
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public Integer getCity() {
-        return city;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.create_time
+	 * @return  the value of outsource_organization.create_time
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public Date getCreateTime() {
+		return createTime;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.city
-     *
-     * @param city the value for outsource_organization.city
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setCity(Integer city) {
-        this.city = city;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.create_time
+	 * @param createTime  the value for outsource_organization.create_time
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setCreateTime(Date createTime) {
+		this.createTime = createTime;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.area
-     *
-     * @return the value of outsource_organization.area
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public Integer getArea() {
-        return area;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.order_no
+	 * @return  the value of outsource_organization.order_no
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public String getOrderNo() {
+		return orderNo;
+	}
 
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.area
-     *
-     * @param area the value for outsource_organization.area
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setArea(Integer area) {
-        this.area = area;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.address
-     *
-     * @return the value of outsource_organization.address
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public String getAddress() {
-        return address;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.address
-     *
-     * @param address the value for outsource_organization.address
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.remarks
-     *
-     * @return the value of outsource_organization.remarks
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public String getRemarks() {
-        return remarks;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.remarks
-     *
-     * @param remarks the value for outsource_organization.remarks
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method returns the value of the database column outsource_organization.create_time
-     *
-     * @return the value of outsource_organization.create_time
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    /**
-     * This method was generated by MyBatis Generator.
-     * This method sets the value of the database column outsource_organization.create_time
-     *
-     * @param createTime the value for outsource_organization.create_time
-     *
-     * @mbg.generated Mon Jun 17 15:40:01 CST 2019
-     */
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.order_no
+	 * @param orderNo  the value for outsource_organization.order_no
+	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 */
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
 }

Разница между файлами не показана из-за своего большого размера
+ 962 - 933
src/main/java/com/goafanti/common/model/OutsourceOrganizationExample.java


+ 16 - 0
src/main/java/com/goafanti/order/bo/OutsourceOrganizationBo.java

@@ -0,0 +1,16 @@
+package com.goafanti.order.bo;
+
+import com.goafanti.common.model.OutsourceOrganization;
+
+public class OutsourceOrganizationBo extends OutsourceOrganization{
+	private String createTimes;
+
+	public String getCreateTimes() {
+		return createTimes;
+	}
+
+	public void setCreateTimes(String createTimes) {
+		this.createTimes = createTimes;
+	}
+
+}

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

@@ -238,9 +238,9 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 订单列表
 	 */
 	@RequestMapping(value="/orderNewList", method = RequestMethod.GET)
-	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer distribution,String depId,Integer pageNo,Integer pageSize){
+	public Result orderNewList(String name,String orderNo,String starTime,String endTime ,Integer specially ,Integer distribution,String depId,Integer pageNo,Integer pageSize,Integer outsource){
 		Result res=new Result();
-		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , distribution,depId, pageNo, pageSize));
+		res.data(orderNewService.orderNewList(name, orderNo, starTime, endTime, specially , distribution,depId, pageNo, pageSize,outsource));
 		return res;
 	}
 	

+ 2 - 3
src/main/java/com/goafanti/order/controller/OrderProjectApiController.java

@@ -20,7 +20,6 @@ import com.goafanti.common.bo.Result;
 import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.controller.CertifyApiController;
 import com.goafanti.common.model.TTaskHours;
-import com.goafanti.common.model.TaskProgress;
 import com.goafanti.common.utils.StringUtils;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
@@ -53,9 +52,9 @@ public class OrderProjectApiController extends CertifyApiController {
 	 * 任务派单列表
 	 */
 	@RequestMapping(value="/orderTaskList" ,method = RequestMethod.GET)
-	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,Integer pageNo,Integer pageSize){
+	public Result orderTaskList(String name,String orderNo,String taskId,Integer taskStatus,String adminName,Integer specially,String depId  ,Integer pageNo,Integer pageSize,Integer outsource){
 		Result res=new Result();
-		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,pageNo, pageSize));
+		res.setData(orderProjectService.orderTaskList( name, orderNo, taskId, taskStatus, adminName,specially ,  depId,pageNo, pageSize, outsource));
 		return res;
 	}
 	

+ 19 - 5
src/main/java/com/goafanti/order/controller/outsourceOrgApiController.java

@@ -17,7 +17,7 @@ import com.goafanti.order.service.OutsourceOrgService;
 
 @RestController
 @RequestMapping(value = "/api/admin/outsourceOrg")
-public class outsourceOrgApiController extends CertifyApiController {
+public class OutsourceOrgApiController extends CertifyApiController {
 	
 	@Resource
 	private OutsourceOrgService	outsourceOrgService;
@@ -29,8 +29,9 @@ public class outsourceOrgApiController extends CertifyApiController {
 				StringUtils.isBlank(o.getContacts())||
 					StringUtils.isBlank(o.getContactsMobile())) {
 			res.getError().add(buildError("", "名称、联系人、电话不能为空"));
+			return res;
 		}
-		outsourceOrgService.addOutsourceOrg(o);
+		res.data(outsourceOrgService.addOutsourceOrg(o));
 		return res;
 	}
 	@RequestMapping(value = "/updateOutsourceOrg", method=RequestMethod.POST)
@@ -40,17 +41,30 @@ public class outsourceOrgApiController extends CertifyApiController {
 				StringUtils.isBlank(o.getContacts())||
 					StringUtils.isBlank(o.getContactsMobile())) {
 			res.getError().add(buildError("", "名称、联系人、电话不能为空"));
+			return res;
 		}
-		outsourceOrgService.updateOutsourceOrg(o);
+		res.data(outsourceOrgService.updateOutsourceOrg(o));
+		
 		return res;
 	}
 	@RequestMapping(value = "/deleteOutsourceOrg", method=RequestMethod.POST)
 	public Result deleteOutsourceOrg(Integer id) {
 		Result res=new Result();
-		if (id!=null) {
+		if (id==null) {
 			res.getError().add(buildError("", "必须选择外包公司"));
+			return res;
 		}
-		outsourceOrgService.deleteOutsourceOrg(id);
+		res.data(outsourceOrgService.deleteOutsourceOrg(id));
+		return res;
+	}
+	@RequestMapping(value = "/selectOutsourceOrg", method=RequestMethod.GET)
+	public Result selectOutsourceOrg(String  orderNo) {
+		Result res=new Result();
+		if (orderNo==null) {
+			res.getError().add(buildError("", "必须选择订单"));
+			return res;
+		}
+		res.data(outsourceOrgService.selectOutsourceOrg(orderNo));
 		return res;
 	}
 }

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

@@ -8,15 +8,11 @@ import javax.mail.MessagingException;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.goafanti.common.model.TOrderDun;
-import com.goafanti.common.model.TOrderLog;
 import com.goafanti.common.model.TOrderNew;
 import com.goafanti.common.model.TOrderRefundWithBLOBs;
 import com.goafanti.common.model.TOrderTask;
 import com.goafanti.core.mybatis.page.Pagination;
-import com.goafanti.order.bo.BackOrderListBo;
-import com.goafanti.order.bo.BillListBo;
 import com.goafanti.order.bo.OrderDunTaskBo;
-import com.goafanti.order.bo.OrderRefundBo;
 import com.goafanti.order.bo.OrderRefundDetailBo;
 import com.goafanti.order.bo.TDunLogListBo;
 import com.goafanti.order.bo.TOrderLogBo;
@@ -86,7 +82,7 @@ public interface OrderNewService {
 	 * @param pageSize
 	 * @return
 	 */
-	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer distribution,String depId,Integer pageNo, Integer pageSize);
+	Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially ,Integer distribution,String depId,Integer pageNo, Integer pageSize,Integer outsource);
 	/**
 	 * 订单审核
 	 * @param orderNo

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

@@ -5,8 +5,6 @@ import java.util.List;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 
 import com.goafanti.common.model.TTaskHours;
-import com.goafanti.common.model.TaskLog;
-import com.goafanti.common.model.TaskProgress;
 import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.order.bo.TOrderTaskDetailBo;
 import com.goafanti.order.bo.TOrderTaskListBo;
@@ -18,7 +16,7 @@ public interface OrderProjectService {
 	int updateProjectDistribution(Integer taskId, String taskReceiverId,Integer specially);
 
 	Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus, String adminName,Integer specially, String depId,
-			Integer pageNo, Integer pageSize);
+			Integer pageNo, Integer pageSize,Integer outsource);
 
 	TOrderTaskDetailBo orderTaskDetail(String id);
 

+ 7 - 0
src/main/java/com/goafanti/order/service/OutsourceOrgService.java

@@ -1,6 +1,9 @@
 package com.goafanti.order.service;
 
+import java.util.List;
+
 import com.goafanti.common.model.OutsourceOrganization;
+import com.goafanti.order.bo.OutsourceOrganizationBo;
 
 public interface OutsourceOrgService {
 	
@@ -9,4 +12,8 @@ public interface OutsourceOrgService {
 	int updateOutsourceOrg(OutsourceOrganization o);
 	
 	int deleteOutsourceOrg(Integer id);
+
+	List<OutsourceOrganizationBo> selectOutsourceOrg(String orderNo);
+
+	
 }

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

@@ -369,7 +369,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderNewBo> orderNewList(String name, String orderNo, String starTime, String endTime,Integer specially,Integer distribution,String depId, Integer pageNo,
-			Integer pageSize) {
+			Integer pageSize,Integer outsource) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -389,6 +389,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
 		if (StringUtils.isNotBlank(starTime)) params.put("starTime", starTime);
 		if (StringUtils.isNotBlank(endTime)) params.put("endTime", endTime+" 23:59:59");
+		params.put("outsource", outsource==null?0:outsource);
 		Pagination<TOrderNewBo> p = (Pagination<TOrderNewBo>)findPage("selectOrderNewListByPage", "selectOrderNewListCount", params, pageNo, pageSize);
 		return p;
 	}

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

@@ -1,7 +1,5 @@
 package com.goafanti.order.service.impl;
 
-import java.lang.reflect.InvocationTargetException;
-import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -10,13 +8,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.beanutils.converters.DateConverter;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.DateUtil;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,7 +17,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import com.goafanti.common.bo.Error;
 import com.goafanti.common.constant.AFTConstants;
-import com.goafanti.common.constant.ErrorConstants;
 import com.goafanti.common.dao.OrganizationContactBookMapper;
 import com.goafanti.common.dao.OrganizationIdentityMapper;
 import com.goafanti.common.dao.TOrderBonusMapper;
@@ -147,7 +138,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 	@SuppressWarnings("unchecked")
 	@Override
 	public Pagination<TOrderTaskListBo> orderTaskList(String name, String orderNo, String taskId, Integer taskStatus,
-			String adminName,Integer specially, String depId, Integer pageNo, Integer pageSize) {
+			String adminName,Integer specially, String depId, Integer pageNo, Integer pageSize,Integer outsource) {
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
@@ -159,6 +150,7 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
 		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
 		if (null != taskStatus) params.put("taskStatus", taskStatus);
+		params.put("outsource", outsource==null?0:outsource);
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectOrderTaskListByPage", "selectOrderTaskListCount", params, pageNo, pageSize);
 		return p;
 	}

+ 10 - 1
src/main/java/com/goafanti/order/service/impl/OutsourceOrgServiceImpl.java

@@ -1,11 +1,15 @@
 package com.goafanti.order.service.impl;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import com.goafanti.common.dao.OutsourceOrganizationMapper;
 import com.goafanti.common.model.OutsourceOrganization;
+import com.goafanti.order.bo.OutsourceOrganizationBo;
 import com.goafanti.order.service.OutsourceOrgService;
-
+@Service
 public class OutsourceOrgServiceImpl implements OutsourceOrgService {
 	@Autowired
 	private OutsourceOrganizationMapper  outsourceOrganizationMapper;
@@ -21,5 +25,10 @@ public class OutsourceOrgServiceImpl implements OutsourceOrgService {
 	public int deleteOutsourceOrg(Integer id) {
 		return outsourceOrganizationMapper.deleteByPrimaryKey(id);
 	}
+	@Override
+	public List<OutsourceOrganizationBo> selectOutsourceOrg(String orderNo) {
+		List<OutsourceOrganizationBo> l=outsourceOrganizationMapper.selectOutsourceOrg(orderNo);
+		return l;
+	}
 
 }

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

@@ -60,7 +60,7 @@ template.cacheable=false
 portal.host=//sf.jishutao.com/portal/2.0.6
 avatar.upload.host=//sb.jishutao.com/upload
 #连接开发
-static.host=//sb.jishutao.com/1.1.06
+static.host=//sb.jishutao.com/1.1.07
 avatar.host=//sb.jishutao.com
 
 #连生产