|
|
@@ -25,12 +25,15 @@
|
|
|
<result column="operation_time" jdbcType="DATE" property="operationTime" />
|
|
|
<result column="legal_affairs_status" jdbcType="INTEGER" property="legalAffairsStatus" />
|
|
|
<result column="project_type" jdbcType="INTEGER" property="projectType" />
|
|
|
+ <result column="service_type" jdbcType="VARCHAR" property="serviceType" />
|
|
|
+ <result column="service_project" jdbcType="VARCHAR" property="serviceProject" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
id, order_no, salesman_id, finance_id, salesman_name, finance_name, final_receivables,
|
|
|
final_Receivables_time, invoice_amount, create_time, buyer_name, order_receivables,
|
|
|
order_arrears, payment_amount, cost_amount, dep_name, province_name, legal_affairs,
|
|
|
- dun_start_time, legal_affairs_type, operation_time, legal_affairs_status, project_type
|
|
|
+ dun_start_time, legal_affairs_type, operation_time, legal_affairs_status, project_type,
|
|
|
+ service_type, service_project
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -50,7 +53,8 @@
|
|
|
order_arrears, payment_amount, cost_amount,
|
|
|
dep_name, province_name, legal_affairs,
|
|
|
dun_start_time, legal_affairs_type, operation_time,
|
|
|
- legal_affairs_status, project_type)
|
|
|
+ legal_affairs_status, project_type, service_type,
|
|
|
+ service_project)
|
|
|
values (#{orderNo,jdbcType=VARCHAR}, #{salesmanId,jdbcType=VARCHAR}, #{financeId,jdbcType=VARCHAR},
|
|
|
#{salesmanName,jdbcType=VARCHAR}, #{financeName,jdbcType=VARCHAR}, #{finalReceivables,jdbcType=DECIMAL},
|
|
|
#{finalReceivablesTime,jdbcType=TIMESTAMP}, #{invoiceAmount,jdbcType=DECIMAL},
|
|
|
@@ -58,7 +62,8 @@
|
|
|
#{orderArrears,jdbcType=DECIMAL}, #{paymentAmount,jdbcType=DECIMAL}, #{costAmount,jdbcType=DECIMAL},
|
|
|
#{depName,jdbcType=VARCHAR}, #{provinceName,jdbcType=VARCHAR}, #{legalAffairs,jdbcType=INTEGER},
|
|
|
#{dunStartTime,jdbcType=TIMESTAMP}, #{legalAffairsType,jdbcType=INTEGER}, #{operationTime,jdbcType=DATE},
|
|
|
- #{legalAffairsStatus,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER})
|
|
|
+ #{legalAffairsStatus,jdbcType=INTEGER}, #{projectType,jdbcType=INTEGER}, #{serviceType,jdbcType=VARCHAR},
|
|
|
+ #{serviceProject,jdbcType=VARCHAR})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderMid" useGeneratedKeys="true">
|
|
|
insert into t_order_mid
|
|
|
@@ -129,6 +134,12 @@
|
|
|
<if test="projectType != null">
|
|
|
project_type,
|
|
|
</if>
|
|
|
+ <if test="serviceType != null">
|
|
|
+ service_type,
|
|
|
+ </if>
|
|
|
+ <if test="serviceProject != null">
|
|
|
+ service_project,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="orderNo != null">
|
|
|
@@ -197,6 +208,12 @@
|
|
|
<if test="projectType != null">
|
|
|
#{projectType,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
+ <if test="serviceType != null">
|
|
|
+ #{serviceType,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="serviceProject != null">
|
|
|
+ #{serviceProject,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderMid">
|
|
|
@@ -268,6 +285,12 @@
|
|
|
<if test="projectType != null">
|
|
|
project_type = #{projectType,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
+ <if test="serviceType != null">
|
|
|
+ service_type = #{serviceType,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="serviceProject != null">
|
|
|
+ service_project = #{serviceProject,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
@@ -294,9 +317,12 @@
|
|
|
legal_affairs_type = #{legalAffairsType,jdbcType=INTEGER},
|
|
|
operation_time = #{operationTime,jdbcType=DATE},
|
|
|
legal_affairs_status = #{legalAffairsStatus,jdbcType=INTEGER},
|
|
|
- project_type = #{projectType,jdbcType=INTEGER}
|
|
|
+ project_type = #{projectType,jdbcType=INTEGER},
|
|
|
+ service_type = #{serviceType,jdbcType=VARCHAR},
|
|
|
+ service_project = #{serviceProject,jdbcType=VARCHAR}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
+
|
|
|
<select id="selectByOrderNo" resultMap="BaseResultMap">
|
|
|
select
|
|
|
<include refid="Base_Column_List" />
|
|
|
@@ -413,6 +439,12 @@
|
|
|
<if test="projectType != null">
|
|
|
project_type = #{projectType,jdbcType=INTEGER},
|
|
|
</if>
|
|
|
+ <if test="serviceType != null">
|
|
|
+ service_type = #{serviceType,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
+ <if test="serviceProject != null">
|
|
|
+ service_project = #{serviceProject,jdbcType=VARCHAR},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where order_no = #{orderNo,jdbcType=VARCHAR}
|
|
|
</update>
|
|
|
@@ -423,7 +455,7 @@
|
|
|
b.order_arrears orderArrears,b.dun_start_time dunStartTime,date_format(b.dun_start_time,'%Y-%m-%d %H:%i:%S')dunStartTimes
|
|
|
<if test="type==1 or type==2 or type==3">
|
|
|
,b.operation_time operationTime,date_format(b.operation_time,'%Y-%m-%d')operationDate,b.legal_affairs_type `type`,
|
|
|
- b.legal_affairs_status status
|
|
|
+ b.legal_affairs_status status
|
|
|
</if>
|
|
|
from t_order_new a left join t_order_mid b on a.order_no =b.order_no
|
|
|
<if test="shiro == 2">
|
|
|
@@ -540,7 +572,7 @@
|
|
|
<select id="selectErrorDun" resultType="com.goafanti.common.bo.ErrorDunListBo">
|
|
|
select a.order_no orderNo,a.order_receivables orderReceivables ,a.order_arrears orderArrears,b.money,a.create_time createTime
|
|
|
from t_order_mid a left join (select order_no ,ifnull(sum(money),0)money from new_order_dun where status =1 group by order_no)b
|
|
|
- on a.order_no =b.order_no
|
|
|
+ on a.order_no =b.order_no
|
|
|
where a.order_receivables !=b.money order by a.create_time;
|
|
|
</select>
|
|
|
<update id="updateErrorDun">
|