Преглед изворни кода

测试地址更换jishutao,进入跳转更换

anderx пре 6 година
родитељ
комит
4426b318b5

+ 1 - 1
src/main/java/com/goafanti/common/controller/PortalController.java

@@ -82,7 +82,7 @@ public class PortalController extends BaseController {
 	@RequestMapping(value = "/", method = RequestMethod.GET)
 	public ModelAndView home(HttpServletRequest request, ModelAndView modelview) {
 		RedirectView rv = new RedirectView();
-		rv.setUrl(request.getContextPath() + "/portal/index");
+		rv.setUrl(request.getContextPath() + "/admin/login");
 		rv.setExposeModelAttributes(false);
 		modelview.setView(rv);
 		return modelview;

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

@@ -11,71 +11,71 @@ public interface OutsourceOrganizationMapper {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	int updateByPrimaryKey(OutsourceOrganization record);
 
-	List<OutsourceOrganizationBo> selectOutsourceOrg(String orderNo);
+	List<OutsourceOrganizationBo> selectOutsourceOrg(@Param("orderNo")String orderNo,@Param("tid")String tid);
 }

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

@@ -417,7 +417,7 @@
 			and
 			om.name != '平台超管中心'
 		<if test="name !=null">
-			AND om.name=#{name,jdbcType=VARCHAR}
+			AND om.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 		</if>
 		<if test="superId !=null">
 			AND om.super_id=#{superId,jdbcType=VARCHAR}
@@ -441,7 +441,7 @@
 		where
 			om.deleted_sign='0'
 		<if test="name !=null">
-			AND om.name=#{name,jdbcType=VARCHAR}
+			AND om.name like CONCAT('%',#{name,jdbcType=VARCHAR},'%')
 		</if>
 		<if test="superId !=null">
 			AND om.super_id=#{superId,jdbcType=VARCHAR}

+ 42 - 21
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 Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
@@ -18,12 +18,13 @@
     <result column="remarks" jdbcType="VARCHAR" property="remarks" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="order_no" jdbcType="VARCHAR" property="orderNo" />
+    <result column="tid" jdbcType="VARCHAR" property="tid" />
   </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 Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     <where>
       <foreach collection="oredCriteria" item="criteria" separator="or">
@@ -57,7 +58,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     <where>
       <foreach collection="example.oredCriteria" item="criteria" separator="or">
@@ -91,16 +92,16 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     id, name, contacts, contacts_mobile, province, city, area, address, remarks, create_time, 
-    order_no
+    order_no, tid
   </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 Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     select
     <if test="distinct">
@@ -119,7 +120,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     select 
     <include refid="Base_Column_List" />
@@ -130,7 +131,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     delete from outsource_organization
     where id = #{id,jdbcType=INTEGER}
@@ -139,7 +140,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     delete from outsource_organization
     <if test="_parameter != null">
@@ -150,22 +151,24 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     insert into outsource_organization (id, name, contacts, 
       contacts_mobile, province, city, 
       area, address, remarks, 
-      create_time, order_no)
+      create_time, order_no, tid
+      )
     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}, #{orderNo,jdbcType=VARCHAR})
+      #{createTime,jdbcType=TIMESTAMP}, #{orderNo,jdbcType=VARCHAR}, #{tid,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 Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     insert into outsource_organization
     <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -202,6 +205,9 @@
       <if test="orderNo != null">
         order_no,
       </if>
+      <if test="tid != null">
+        tid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -237,13 +243,16 @@
       <if test="orderNo != null">
         #{orderNo,jdbcType=VARCHAR},
       </if>
+      <if test="tid != null">
+        #{tid,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 Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     select count(*) from outsource_organization
     <if test="_parameter != null">
@@ -254,7 +263,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     update outsource_organization
     <set>
@@ -291,6 +300,9 @@
       <if test="record.orderNo != null">
         order_no = #{record.orderNo,jdbcType=VARCHAR},
       </if>
+      <if test="record.tid != null">
+        tid = #{record.tid,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -300,7 +312,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     update outsource_organization
     set id = #{record.id,jdbcType=INTEGER},
@@ -313,7 +325,8 @@
       address = #{record.address,jdbcType=VARCHAR},
       remarks = #{record.remarks,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=TIMESTAMP},
-      order_no = #{record.orderNo,jdbcType=VARCHAR}
+      order_no = #{record.orderNo,jdbcType=VARCHAR},
+      tid = #{record.tid,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -322,7 +335,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     update outsource_organization
     <set>
@@ -356,6 +369,9 @@
       <if test="orderNo != null">
         order_no = #{orderNo,jdbcType=VARCHAR},
       </if>
+      <if test="tid != null">
+        tid = #{tid,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -363,7 +379,7 @@
     <!--
       WARNING - @mbg.generated
       This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Tue Jun 18 08:19:20 CST 2019.
+      This element was generated on Fri Jun 21 10:02:00 CST 2019.
     -->
     update outsource_organization
     set name = #{name,jdbcType=VARCHAR},
@@ -375,12 +391,17 @@
       address = #{address,jdbcType=VARCHAR},
       remarks = #{remarks,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
-      order_no = #{orderNo,jdbcType=VARCHAR}
+      order_no = #{orderNo,jdbcType=VARCHAR},
+      tid = #{tid,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}
+  	where 1=1
+  	and tid= #{tid}
+  	<if test="orderNo != null">
+    and  order_no= #{orderNo}
+  	</if>
   </select>
 </mapper>

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

@@ -110,7 +110,7 @@
     from role 
     where role_type <![CDATA[ < ]]> 999999
     <if test="roleName !=null">
-		AND role_name=#{roleName,jdbcType=VARCHAR}
+		AND role_name like CONCAT('%',#{roleName,jdbcType=VARCHAR},'%')
 	</if>
 	<if test="page_sql != null">
     		${page_sql}
@@ -123,7 +123,7 @@
 		where
 		1=1
 		<if test="roleName !=null">
-		AND role_name=#{roleName,jdbcType=VARCHAR}
+		AND role_name like CONCAT('%',#{roleName,jdbcType=VARCHAR},'%')
 		</if>
   </select>
   

+ 9 - 11
src/main/java/com/goafanti/common/mapper/TOrderNewMapper.xml

@@ -888,9 +888,10 @@
   <select id="getAllUnassignedListOrder" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
   		  select o.order_no as orderNo, o.order_type orderType, o.create_time as createTime, o.process_status as processStatus,
   	o.sign_time as signTime, u.nickname as buyerName,o.total_amount signTotalAmount, o.approval , a.name sellerName
-  	,liquidation_status,o.finance_id as financeId,contract_no as contractNo,d.name as departmentName
+  	,liquidation_status,o.finance_id as financeId,contract_no as contractNo,d.name as departmentName,e.name as outsourceName
   	from t_order_new o left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id
-  	left join department d on o.order_dep=d.id where delete_sign = 0 and order_status = 2
+  	left join department d on o.order_dep=d.id left join (select order_no,name from outsource_organization group by order_no) e
+  	on o.order_no=e.order_no where delete_sign = 0 and order_status = 2
   	and approval in (0,2) and outsource=#{o.outsource,jdbcType=INTEGER}
   	<if test="o.processStatus == 2">
   	and process_status = #{o.processStatus,jdbcType=INTEGER}
@@ -1022,17 +1023,14 @@
   </select>
   <!-- 财务专员查看需要待收款的数据 -->
   <select id="financeList" parameterType="Map" resultType="com.goafanti.order.bo.OrderListBo">
-   select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,
+    	 select  o.order_no as orderNo, o.sign_time as signTime, u.nickname as buyerName, o.order_status as orderStatus,
    o.process_status as processStatus,ifnull(b.amount,0) as actuallyTotalAmount, o.contract_no as contractNo,o.approval,
   a.name as sellerName, o.salesman_id as sellerId, o.buyer_id as buyerId, o.liquidation_status as liquidationStatus , 
-  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,o.create_time as createTime,
-  0 as companyId, "湖南科德信息咨询有限公司" as companyName,d.name as departmentName
-  	 from t_order_new o 
-  	 left join department d on o.order_dep=d.id
-  	 left join `user` u on o.buyer_id = u.id 
-  	 left join admin a on o.salesman_id = a.id
-  	 left join (select sum(transaction_amount) as amount ,order_no from t_order_bill_new
-  				group by order_no ) b on b.order_no = o.order_no
+  o.first_amount as signFirstPayment, o.total_amount as signTotalAmount,o.create_time as createTime,e.name as outsourceName,
+  0 as companyId, "湖南科德信息咨询有限公司" as companyName,d.name as departmentName from t_order_new o left join department d 
+  on o.order_dep=d.id left join `user` u on o.buyer_id = u.id left join admin a on o.salesman_id = a.id left join 
+  (select sum(transaction_amount) as amount ,order_no from t_order_bill_new group by order_no ) b on b.order_no = o.order_no 
+  left join (select order_no,name from outsource_organization 	group by order_no) e on o.order_no=e.order_no  				
   	 where delete_sign = 0 and outsource=#{o.outsource,jdbcType=INTEGER}
   	 	<if test="o.processStatus == 3">
 	  	and process_status = #{o.processStatus,jdbcType=INTEGER}

+ 56 - 33
src/main/java/com/goafanti/common/model/OutsourceOrganization.java

@@ -6,64 +6,69 @@ public class OutsourceOrganization {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	private String orderNo;
+	/**
+	 * This field was generated by MyBatis Generator. This field corresponds to the database column outsource_organization.tid
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
+	 */
+	private String tid;
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public Integer getId() {
 		return id;
@@ -72,7 +77,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setId(Integer id) {
 		this.id = id;
@@ -81,7 +86,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public String getName() {
 		return name;
@@ -90,7 +95,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setName(String name) {
 		this.name = name;
@@ -99,7 +104,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public String getContacts() {
 		return contacts;
@@ -108,7 +113,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setContacts(String contacts) {
 		this.contacts = contacts;
@@ -117,7 +122,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public String getContactsMobile() {
 		return contactsMobile;
@@ -126,7 +131,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setContactsMobile(String contactsMobile) {
 		this.contactsMobile = contactsMobile;
@@ -135,7 +140,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public Integer getProvince() {
 		return province;
@@ -144,7 +149,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setProvince(Integer province) {
 		this.province = province;
@@ -153,7 +158,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public Integer getCity() {
 		return city;
@@ -162,7 +167,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setCity(Integer city) {
 		this.city = city;
@@ -171,7 +176,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public Integer getArea() {
 		return area;
@@ -180,7 +185,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setArea(Integer area) {
 		this.area = area;
@@ -189,7 +194,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public String getAddress() {
 		return address;
@@ -198,7 +203,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setAddress(String address) {
 		this.address = address;
@@ -207,7 +212,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public String getRemarks() {
 		return remarks;
@@ -216,7 +221,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setRemarks(String remarks) {
 		this.remarks = remarks;
@@ -225,7 +230,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public Date getCreateTime() {
 		return createTime;
@@ -234,7 +239,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setCreateTime(Date createTime) {
 		this.createTime = createTime;
@@ -243,7 +248,7 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public String getOrderNo() {
 		return orderNo;
@@ -252,9 +257,27 @@ public class OutsourceOrganization {
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setOrderNo(String orderNo) {
 		this.orderNo = orderNo;
 	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method returns the value of the database column outsource_organization.tid
+	 * @return  the value of outsource_organization.tid
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
+	 */
+	public String getTid() {
+		return tid;
+	}
+
+	/**
+	 * This method was generated by MyBatis Generator. This method sets the value of the database column outsource_organization.tid
+	 * @param tid  the value for outsource_organization.tid
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
+	 */
+	public void setTid(String tid) {
+		this.tid = tid;
+	}
 }

+ 86 - 16
src/main/java/com/goafanti/common/model/OutsourceOrganizationExample.java

@@ -7,23 +7,23 @@ import java.util.List;
 public class OutsourceOrganizationExample {
     /**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table outsource_organization
-	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	protected String orderByClause;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table outsource_organization
-	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	protected boolean distinct;
 	/**
 	 * This field was generated by MyBatis Generator. This field corresponds to the database table outsource_organization
-	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	protected List<Criteria> oredCriteria;
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public OutsourceOrganizationExample() {
 		oredCriteria = new ArrayList<Criteria>();
@@ -31,7 +31,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setOrderByClause(String orderByClause) {
 		this.orderByClause = orderByClause;
@@ -39,7 +39,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public String getOrderByClause() {
 		return orderByClause;
@@ -47,7 +47,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void setDistinct(boolean distinct) {
 		this.distinct = distinct;
@@ -55,7 +55,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public boolean isDistinct() {
 		return distinct;
@@ -63,7 +63,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public List<Criteria> getOredCriteria() {
 		return oredCriteria;
@@ -71,7 +71,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void or(Criteria criteria) {
 		oredCriteria.add(criteria);
@@ -79,7 +79,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public Criteria or() {
 		Criteria criteria = createCriteriaInternal();
@@ -89,7 +89,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public Criteria createCriteria() {
 		Criteria criteria = createCriteriaInternal();
@@ -101,7 +101,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	protected Criteria createCriteriaInternal() {
 		Criteria criteria = new Criteria();
@@ -110,7 +110,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * 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
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public void clear() {
 		oredCriteria.clear();
@@ -120,7 +120,7 @@ public class OutsourceOrganizationExample {
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table outsource_organization
-	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	protected abstract static class GeneratedCriteria {
 		protected List<Criterion> criteria;
@@ -882,11 +882,81 @@ public class OutsourceOrganizationExample {
 			addCriterion("order_no not between", value1, value2, "orderNo");
 			return (Criteria) this;
 		}
+
+		public Criteria andTidIsNull() {
+			addCriterion("tid is null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidIsNotNull() {
+			addCriterion("tid is not null");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidEqualTo(String value) {
+			addCriterion("tid =", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotEqualTo(String value) {
+			addCriterion("tid <>", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidGreaterThan(String value) {
+			addCriterion("tid >", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidGreaterThanOrEqualTo(String value) {
+			addCriterion("tid >=", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidLessThan(String value) {
+			addCriterion("tid <", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidLessThanOrEqualTo(String value) {
+			addCriterion("tid <=", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidLike(String value) {
+			addCriterion("tid like", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotLike(String value) {
+			addCriterion("tid not like", value, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidIn(List<String> values) {
+			addCriterion("tid in", values, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotIn(List<String> values) {
+			addCriterion("tid not in", values, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidBetween(String value1, String value2) {
+			addCriterion("tid between", value1, value2, "tid");
+			return (Criteria) this;
+		}
+
+		public Criteria andTidNotBetween(String value1, String value2) {
+			addCriterion("tid not between", value1, value2, "tid");
+			return (Criteria) this;
+		}
 	}
 
 	/**
 	 * This class was generated by MyBatis Generator. This class corresponds to the database table outsource_organization
-	 * @mbg.generated  Tue Jun 18 08:19:20 CST 2019
+	 * @mbg.generated  Fri Jun 21 10:02:00 CST 2019
 	 */
 	public static class Criterion {
 		private String condition;

+ 8 - 0
src/main/java/com/goafanti/order/bo/OrderListBo.java

@@ -74,6 +74,8 @@ public class OrderListBo {
 	private String departmentId;
 	/** 外包*/
 	private Integer outsource;
+	/** 外包名称*/
+	private String outsourceName;
 	
 	public String getOrderNo() {
 		return orderNo;
@@ -279,4 +281,10 @@ public class OrderListBo {
 	public void setOutsource(Integer outsource) {
 		this.outsource = outsource;
 	}
+	public String getOutsourceName() {
+		return outsourceName;
+	}
+	public void setOutsourceName(String outsourceName) {
+		this.outsourceName = outsourceName;
+	}
 }

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

@@ -58,13 +58,13 @@ public class OutsourceOrgApiController extends CertifyApiController {
 		return res;
 	}
 	@RequestMapping(value = "/selectOutsourceOrg", method=RequestMethod.GET)
-	public Result selectOutsourceOrg(String  orderNo) {
+	public Result selectOutsourceOrg(String  orderNo,String tid) {
 		Result res=new Result();
 		if (orderNo==null) {
 			res.getError().add(buildError("", "必须选择订单"));
 			return res;
 		}
-		res.data(outsourceOrgService.selectOutsourceOrg(orderNo));
+		res.data(outsourceOrgService.selectOutsourceOrg(orderNo,tid));
 		return res;
 	}
 }

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

@@ -13,7 +13,7 @@ public interface OutsourceOrgService {
 	
 	int deleteOutsourceOrg(Integer id);
 
-	List<OutsourceOrganizationBo> selectOutsourceOrg(String orderNo);
+	List<OutsourceOrganizationBo> selectOutsourceOrg(String orderNo,String tid);
 
 	
 }

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

@@ -26,8 +26,8 @@ public class OutsourceOrgServiceImpl implements OutsourceOrgService {
 		return outsourceOrganizationMapper.deleteByPrimaryKey(id);
 	}
 	@Override
-	public List<OutsourceOrganizationBo> selectOutsourceOrg(String orderNo) {
-		List<OutsourceOrganizationBo> l=outsourceOrganizationMapper.selectOutsourceOrg(orderNo);
+	public List<OutsourceOrganizationBo> selectOutsourceOrg(String orderNo,String tid) {
+		List<OutsourceOrganizationBo> l=outsourceOrganizationMapper.selectOutsourceOrg(orderNo,tid);
 		return l;
 	}
 

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

@@ -54,10 +54,10 @@ session.validate.timespan=18000000
 app.name=AFT
 template.cacheable=false
 
-static.host=//static.kedexinxi.com/1.1.06
-portal.host=//static.kedexinxi.com/portal/2.0.6
-avatar.host=//static.kedexinxi.com
-avatar.upload.host=//static.kedexinxi.com/upload
+static.host=//static.jishutao.com/1.1.06
+portal.host=//static.jishutao.com/portal/2.0.6
+avatar.host=//static.jishutao.com
+avatar.upload.host=//static.jishutao.com/upload
 
 upload.path=/data/static/public/upload
 upload.private.path=/data/static/private/upload