|
|
@@ -62,6 +62,8 @@
|
|
|
<result column="check_status" jdbcType="INTEGER" property="checkStatus" />
|
|
|
<result column="patent_type" jdbcType="INTEGER" property="patentType" />
|
|
|
<result column="pubicity_url" jdbcType="VARCHAR" property="pubicityUrl" />
|
|
|
+ <result column="process_status" jdbcType="INTEGER" property="processStatus" />
|
|
|
+ <result column="member_type" jdbcType="INTEGER" property="memberType" />
|
|
|
</resultMap>
|
|
|
<sql id="Base_Column_List">
|
|
|
id, order_no, main, super_id, commodity_id, commodity_name, commodity_quantity, commodity_mode,
|
|
|
@@ -73,7 +75,8 @@
|
|
|
split_super, split_status, split_id, split_aid, split_time, cname, receiver_name,
|
|
|
declaration_batch, cost_reduction, official_cost, set_up_status, set_up_time, spot_check_status,
|
|
|
high_tech_status, special_comment, if_certification_fee, certification_fee, certification_corporate,
|
|
|
- time_record, if_publicity, check_status, patent_type, pubicity_url
|
|
|
+ time_record, if_publicity, check_status, patent_type, pubicity_url, process_status,
|
|
|
+ member_type
|
|
|
</sql>
|
|
|
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
|
|
|
select
|
|
|
@@ -105,8 +108,8 @@
|
|
|
set_up_time, spot_check_status, high_tech_status,
|
|
|
special_comment, if_certification_fee, certification_fee,
|
|
|
certification_corporate, time_record, if_publicity,
|
|
|
- check_status, patent_type, pubicity_url
|
|
|
- )
|
|
|
+ check_status, patent_type, pubicity_url,
|
|
|
+ process_status, member_type)
|
|
|
values (#{orderNo,jdbcType=VARCHAR}, #{main,jdbcType=INTEGER}, #{superId,jdbcType=VARCHAR},
|
|
|
#{commodityId,jdbcType=VARCHAR}, #{commodityName,jdbcType=VARCHAR}, #{commodityQuantity,jdbcType=INTEGER},
|
|
|
#{commodityMode,jdbcType=VARCHAR}, #{commodityPrice,jdbcType=DECIMAL}, #{taskStatus,jdbcType=INTEGER},
|
|
|
@@ -126,8 +129,8 @@
|
|
|
#{setUpTime,jdbcType=TIMESTAMP}, #{spotCheckStatus,jdbcType=INTEGER}, #{highTechStatus,jdbcType=INTEGER},
|
|
|
#{specialComment,jdbcType=VARCHAR}, #{ifCertificationFee,jdbcType=INTEGER}, #{certificationFee,jdbcType=DECIMAL},
|
|
|
#{certificationCorporate,jdbcType=VARCHAR}, #{timeRecord,jdbcType=VARCHAR}, #{ifPublicity,jdbcType=INTEGER},
|
|
|
- #{checkStatus,jdbcType=INTEGER}, #{patentType,jdbcType=INTEGER}, #{pubicityUrl,jdbcType=VARCHAR}
|
|
|
- )
|
|
|
+ #{checkStatus,jdbcType=INTEGER}, #{patentType,jdbcType=INTEGER}, #{pubicityUrl,jdbcType=VARCHAR},
|
|
|
+ #{processStatus,jdbcType=INTEGER}, #{memberType,jdbcType=INTEGER})
|
|
|
</insert>
|
|
|
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
|
|
|
insert into t_order_task
|
|
|
@@ -309,6 +312,12 @@
|
|
|
<if test="pubicityUrl != null">
|
|
|
pubicity_url,
|
|
|
</if>
|
|
|
+ <if test="processStatus != null">
|
|
|
+ process_status,
|
|
|
+ </if>
|
|
|
+ <if test="memberType != null">
|
|
|
+ member_type,
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
<if test="orderNo != null">
|
|
|
@@ -488,6 +497,12 @@
|
|
|
<if test="pubicityUrl != null">
|
|
|
#{pubicityUrl,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="processStatus != null">
|
|
|
+ #{processStatus,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
+ <if test="memberType != null">
|
|
|
+ #{memberType,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
</trim>
|
|
|
</insert>
|
|
|
<update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.TOrderTask">
|
|
|
@@ -670,6 +685,12 @@
|
|
|
<if test="pubicityUrl != null">
|
|
|
pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
|
|
|
</if>
|
|
|
+ <if test="processStatus != null">
|
|
|
+ process_status = #{processStatus,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
+ <if test="memberType != null">
|
|
|
+ member_type = #{memberType,jdbcType=INTEGER},
|
|
|
+ </if>
|
|
|
</set>
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
@@ -733,374 +754,13 @@
|
|
|
if_publicity = #{ifPublicity,jdbcType=INTEGER},
|
|
|
check_status = #{checkStatus,jdbcType=INTEGER},
|
|
|
patent_type = #{patentType,jdbcType=INTEGER},
|
|
|
- pubicity_url = #{pubicityUrl,jdbcType=VARCHAR}
|
|
|
+ pubicity_url = #{pubicityUrl,jdbcType=VARCHAR},
|
|
|
+ process_status = #{processStatus,jdbcType=INTEGER},
|
|
|
+ member_type = #{memberType,jdbcType=INTEGER}
|
|
|
where id = #{id,jdbcType=INTEGER}
|
|
|
</update>
|
|
|
|
|
|
- <insert id="insertSelectiveGetId" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true">
|
|
|
- insert into t_order_task
|
|
|
- <trim prefix="(" suffix=")" suffixOverrides=",">
|
|
|
- <if test="id != null">
|
|
|
- id,
|
|
|
- </if>
|
|
|
- <if test="orderNo != null">
|
|
|
- order_no,
|
|
|
- </if>
|
|
|
- <if test="main != null">
|
|
|
- main,
|
|
|
- </if>
|
|
|
- <if test="superId != null">
|
|
|
- super_id,
|
|
|
- </if>
|
|
|
- <if test="commodityId != null">
|
|
|
- commodity_id,
|
|
|
- </if>
|
|
|
- <if test="commodityName != null">
|
|
|
- commodity_name,
|
|
|
- </if>
|
|
|
- <if test="commodityQuantity != null">
|
|
|
- commodity_quantity,
|
|
|
- </if>
|
|
|
- <if test="commodityMode != null">
|
|
|
- commodity_mode,
|
|
|
- </if>
|
|
|
- <if test="commodityPrice != null">
|
|
|
- commodity_price,
|
|
|
- </if>
|
|
|
- <if test="taskStatus != null">
|
|
|
- task_status,
|
|
|
- </if>
|
|
|
- <if test="taskDistributionTime != null">
|
|
|
- task_distribution_time,
|
|
|
- </if>
|
|
|
- <if test="taskAllocator != null">
|
|
|
- task_allocator,
|
|
|
- </if>
|
|
|
- <if test="taskReceiver != null">
|
|
|
- task_receiver,
|
|
|
- </if>
|
|
|
- <if test="taskComment != null">
|
|
|
- task_comment,
|
|
|
- </if>
|
|
|
- <if test="taskStartTime != null">
|
|
|
- task_start_time,
|
|
|
- </if>
|
|
|
- <if test="taskEndTime != null">
|
|
|
- task_end_time,
|
|
|
- </if>
|
|
|
- <if test="projectStatus != null">
|
|
|
- project_status,
|
|
|
- </if>
|
|
|
- <if test="acceptTime != null">
|
|
|
- accept_time,
|
|
|
- </if>
|
|
|
- <if test="reviewTime != null">
|
|
|
- review_time,
|
|
|
- </if>
|
|
|
- <if test="publicityTime != null">
|
|
|
- publicity_time,
|
|
|
- </if>
|
|
|
- <if test="licenceTime != null">
|
|
|
- licence_time,
|
|
|
- </if>
|
|
|
- <if test="certificateNumber != null">
|
|
|
- certificate_number,
|
|
|
- </if>
|
|
|
- <if test="status != null">
|
|
|
- `status`,
|
|
|
- </if>
|
|
|
- <if test="formRetrieve != null">
|
|
|
- form_retrieve,
|
|
|
- </if>
|
|
|
- <if test="taskRefund != null">
|
|
|
- task_refund,
|
|
|
- </if>
|
|
|
- <if test="refundContent != null">
|
|
|
- refund_content,
|
|
|
- </if>
|
|
|
- <if test="retrieveContent != null">
|
|
|
- retrieve_content,
|
|
|
- </if>
|
|
|
- <if test="declareUser != null">
|
|
|
- declare_user,
|
|
|
- </if>
|
|
|
- <if test="declarePwd != null">
|
|
|
- declare_pwd,
|
|
|
- </if>
|
|
|
- <if test="setUpAmount != null">
|
|
|
- set_up_amount,
|
|
|
- </if>
|
|
|
- <if test="arrivalMoney != null">
|
|
|
- arrival_money,
|
|
|
- </if>
|
|
|
- <if test="outsourceName != null">
|
|
|
- outsource_name,
|
|
|
- </if>
|
|
|
- <if test="outsourcePrice != null">
|
|
|
- outsource_price,
|
|
|
- </if>
|
|
|
- <if test="consultantId != null">
|
|
|
- consultant_id,
|
|
|
- </if>
|
|
|
- <if test="managerId != null">
|
|
|
- manager_id,
|
|
|
- </if>
|
|
|
- <if test="outsource != null">
|
|
|
- outsource,
|
|
|
- </if>
|
|
|
- <if test="splitSuper != null">
|
|
|
- split_super,
|
|
|
- </if>
|
|
|
- <if test="splitStatus != null">
|
|
|
- split_status,
|
|
|
- </if>
|
|
|
- <if test="splitId != null">
|
|
|
- split_id,
|
|
|
- </if>
|
|
|
- <if test="splitAid != null">
|
|
|
- split_aid,
|
|
|
- </if>
|
|
|
- <if test="splitTime != null">
|
|
|
- split_time,
|
|
|
- </if>
|
|
|
- <if test="cname != null">
|
|
|
- cname,
|
|
|
- </if>
|
|
|
- <if test="receiverName != null">
|
|
|
- receiver_name,
|
|
|
- </if>
|
|
|
- <if test="declarationBatch != null">
|
|
|
- declaration_batch,
|
|
|
- </if>
|
|
|
- <if test="costReduction != null">
|
|
|
- cost_reduction,
|
|
|
- </if>
|
|
|
- <if test="officialCost != null">
|
|
|
- official_cost,
|
|
|
- </if>
|
|
|
- <if test="setUpStatus != null">
|
|
|
- set_up_status,
|
|
|
- </if>
|
|
|
- <if test="setUpTime != null">
|
|
|
- set_up_time,
|
|
|
- </if>
|
|
|
- <if test="spotCheckStatus != null">
|
|
|
- spot_check_status,
|
|
|
- </if>
|
|
|
- <if test="highTechStatus != null">
|
|
|
- high_tech_status,
|
|
|
- </if>
|
|
|
- <if test="specialComment != null">
|
|
|
- special_comment,
|
|
|
- </if>
|
|
|
- <if test="ifCertificationFee != null">
|
|
|
- if_certification_fee,
|
|
|
- </if>
|
|
|
- <if test="certificationFee != null">
|
|
|
- certification_fee,
|
|
|
- </if>
|
|
|
- <if test="certificationCorporate != null">
|
|
|
- certification_corporate,
|
|
|
- </if>
|
|
|
- <if test="ifPublicity != null">
|
|
|
- if_publicity,
|
|
|
- </if>
|
|
|
- <if test="checkStatus != null">
|
|
|
- check_status,
|
|
|
- </if>
|
|
|
- <if test="patentType != null">
|
|
|
- patent_type,
|
|
|
- </if>
|
|
|
- <if test="attachmentUrl != null">
|
|
|
- attachment_url,
|
|
|
- </if>
|
|
|
- <if test="timeRecord != null">
|
|
|
- time_record,
|
|
|
- </if>
|
|
|
- </trim>
|
|
|
- <trim prefix="values (" suffix=")" suffixOverrides=",">
|
|
|
- <if test="id != null">
|
|
|
- #{id,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="orderNo != null">
|
|
|
- #{orderNo,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="main != null">
|
|
|
- #{main,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="superId != null">
|
|
|
- #{superId,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="commodityId != null">
|
|
|
- #{commodityId,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="commodityName != null">
|
|
|
- #{commodityName,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="commodityQuantity != null">
|
|
|
- #{commodityQuantity,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="commodityMode != null">
|
|
|
- #{commodityMode,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="commodityPrice != null">
|
|
|
- #{commodityPrice,jdbcType=DECIMAL},
|
|
|
- </if>
|
|
|
- <if test="taskStatus != null">
|
|
|
- #{taskStatus,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="taskDistributionTime != null">
|
|
|
- #{taskDistributionTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="taskAllocator != null">
|
|
|
- #{taskAllocator,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="taskReceiver != null">
|
|
|
- #{taskReceiver,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="taskComment != null">
|
|
|
- #{taskComment,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="taskStartTime != null">
|
|
|
- #{taskStartTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="taskEndTime != null">
|
|
|
- #{taskEndTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="projectStatus != null">
|
|
|
- #{projectStatus,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="acceptTime != null">
|
|
|
- #{acceptTime,jdbcType=DATE},
|
|
|
- </if>
|
|
|
- <if test="reviewTime != null">
|
|
|
- #{reviewTime,jdbcType=DATE},
|
|
|
- </if>
|
|
|
- <if test="publicityTime != null">
|
|
|
- #{publicityTime,jdbcType=DATE},
|
|
|
- </if>
|
|
|
- <if test="licenceTime != null">
|
|
|
- #{licenceTime,jdbcType=DATE},
|
|
|
- </if>
|
|
|
- <if test="certificateNumber != null">
|
|
|
- #{certificateNumber,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="status != null">
|
|
|
- #{status,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="formRetrieve != null">
|
|
|
- #{formRetrieve,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="taskRefund != null">
|
|
|
- #{taskRefund,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="refundContent != null">
|
|
|
- #{refundContent,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="retrieveContent != null">
|
|
|
- #{retrieveContent,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="declareUser != null">
|
|
|
- #{declareUser,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="declarePwd != null">
|
|
|
- #{declarePwd,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="setUpAmount != null">
|
|
|
- #{setUpAmount,jdbcType=DECIMAL},
|
|
|
- </if>
|
|
|
- <if test="arrivalMoney != null">
|
|
|
- #{arrivalMoney,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="outsourceName != null">
|
|
|
- #{outsourceName,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="outsourcePrice != null">
|
|
|
- #{outsourcePrice,jdbcType=DECIMAL},
|
|
|
- </if>
|
|
|
- <if test="consultantId != null">
|
|
|
- #{consultantId,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="managerId != null">
|
|
|
- #{managerId,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="outsource != null">
|
|
|
- #{outsource,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="splitSuper != null">
|
|
|
- #{splitSuper,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="splitStatus != null">
|
|
|
- #{splitStatus,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="splitId != null">
|
|
|
- #{splitId,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="splitAid != null">
|
|
|
- #{splitAid,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="splitTime != null">
|
|
|
- #{splitTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="cname != null">
|
|
|
- #{cname,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="receiverName != null">
|
|
|
- #{receiverName,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="declarationBatch != null">
|
|
|
- #{declarationBatch,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="costReduction != null">
|
|
|
- #{costReduction,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="officialCost != null">
|
|
|
- #{officialCost,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="setUpStatus != null">
|
|
|
- #{setUpStatus,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="setUpTime != null">
|
|
|
- #{setUpTime,jdbcType=TIMESTAMP},
|
|
|
- </if>
|
|
|
- <if test="spotCheckStatus != null">
|
|
|
- #{spotCheckStatus,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="highTechStatus != null">
|
|
|
- #{highTechStatus,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="specialComment != null">
|
|
|
- #{specialComment,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="ifCertificationFee != null">
|
|
|
- #{ifCertificationFee,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="certificationFee != null">
|
|
|
- #{certificationFee,jdbcType=DECIMAL},
|
|
|
- </if>
|
|
|
- <if test="certificationCorporate != null">
|
|
|
- #{certificationCorporate,jdbcType=VARCHAR},
|
|
|
- </if>
|
|
|
- <if test="ifPublicity != null">
|
|
|
- #{ifPublicity,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="checkStatus != null">
|
|
|
- #{checkStatus,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="patentType != null">
|
|
|
- #{patentType,jdbcType=INTEGER},
|
|
|
- </if>
|
|
|
- <if test="attachmentUrl != null">
|
|
|
- #{attachmentUrl,jdbcType=LONGVARCHAR},
|
|
|
- </if>
|
|
|
- <if test="timeRecord != null">
|
|
|
- #{timeRecord,jdbcType=LONGVARCHAR},
|
|
|
- </if>
|
|
|
- </trim>
|
|
|
- <selectKey keyProperty="id" order="AFTER" resultType="int">
|
|
|
- SELECT LAST_INSERT_ID()
|
|
|
- </selectKey>
|
|
|
- </insert>
|
|
|
+
|
|
|
<select id="selectOrderTask" resultType="com.goafanti.order.bo.TOrderTaskBo">
|
|
|
select a.id,e.contract_no contractNo,a.order_no as orderNo,h.nickname userName,f.name salesmanName,
|
|
|
a.outsource_name outsourceName,a.outsource, a.outsource_price outsourcePrice,g.name depName,
|
|
|
@@ -1119,7 +779,14 @@
|
|
|
left join business_project i on a.commodity_id=i.id left join
|
|
|
business_category c on b.cid=c.id left join admin d on
|
|
|
a.task_receiver=d.id
|
|
|
- where a.super_id is null and a.split_status in(0,1) and a.order_no= #{orderNo,jdbcType=VARCHAR} order by a.id
|
|
|
+ where a.super_id is null and a.split_status in(0,1)
|
|
|
+ <if test="orderNo != null">
|
|
|
+ and a.order_no= #{orderNo,jdbcType=VARCHAR}
|
|
|
+ </if>
|
|
|
+ <if test="type == 1">
|
|
|
+ and a.process_status= 3
|
|
|
+ </if>
|
|
|
+ order by a.id
|
|
|
</select>
|
|
|
|
|
|
<select id="selectOrderTaskAll" resultType="com.goafanti.order.bo.TOrderTaskBo">
|
|
|
@@ -1457,7 +1124,7 @@
|
|
|
</if>
|
|
|
</select>
|
|
|
<!-- 根据订单编号获得所有的任务负责人 -->
|
|
|
- <select id="getReceiverByOid" parameterType="java.lang.String" resultMap="BaseResultMap">
|
|
|
+ <select id="getReceiverByOid" resultType="com.goafanti.order.bo.TOrderTaskBo">
|
|
|
select distinct task_receiver, a.name, a.email, t.id, t.project_status from t_order_task t
|
|
|
inner join admin a on t.task_receiver = a.id
|
|
|
where order_no = #{orderNo,jdbcType=VARCHAR} and task_status > 0 and super_id is null
|