|
|
@@ -319,13 +319,13 @@
|
|
|
<insert id="insert1" parameterType="com.goafanti.organization.bo.OrganizationListOut">
|
|
|
insert into department(
|
|
|
id,create_id,create_time,update_time,deleted_sign,
|
|
|
- name,type,manager_id,dep_no,super_id,desc,status)
|
|
|
+ name,type,manager_id,dep_no,super_id,status)
|
|
|
values(#{id,jdbcType=VARCHAR},#{createId,jdbcType=VARCHAR},
|
|
|
#{createTime,jdbcType=VARCHAR},#{updateTime,jdbcType=VARCHAR},
|
|
|
#{deletedSign,jdbcType=VARCHAR},#{name,jdbcType=VARCHAR},
|
|
|
#{type,jdbcType=VARCHAR},#{managerId,jdbcType=VARCHAR},
|
|
|
#{depNo,jdbcType=VARCHAR},#{superId,jdbcType=VARCHAR},
|
|
|
- #{desc,jdbcType=VARCHAR},#{status,jdbcType=VARCHAR})
|
|
|
+ #{status,jdbcType=VARCHAR})
|
|
|
</insert>
|
|
|
<!-- 得到上级 -->
|
|
|
<select id="selectDepNo" resultType="String">
|
|
|
@@ -495,10 +495,11 @@
|
|
|
and transfer_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
group by aid)x left join (select a.aid,sum(if(b.channel=0,1,0))completeCount,
|
|
|
- sum(if(b.channel=1,1,0))channelCompleteCount from public_release a left join `user` b on a.uid =b.id
|
|
|
- where a.clock_in =1
|
|
|
+ sum(if(b.channel=1,1,0))channelCompleteCount from public_release a left join public_release_details prd on a.id=prd.id
|
|
|
+ left join `user` b on prd.uid =b.id
|
|
|
+ where prd.clock_in =1
|
|
|
<if test="startTime != null and endTime != null">
|
|
|
- and clock_in_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
+ and prd.clock_in_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
|
|
|
</if>
|
|
|
group by a.aid ) y on x.aid=y.aid)b on a.id=b.aid
|
|
|
left join department d on a.department_id=d.id
|