Skip to content

8
8timerapiv200
Commit e702a93d by ilal Committed by chenzg
Options

提交

parent d87bf527
Showing with 201 additions and 39 deletions
src/main/java/cn/timer/api/bean/kqmk/KqglAssoLeaveBalance.java
...@@ -61,7 +61,10 @@ public class KqglAssoLeaveBalance extends Model<KqglAssoLeaveBalance> { ...@@ -61,7 +61,10 @@ public class KqglAssoLeaveBalance extends Model<KqglAssoLeaveBalance> {
@ApiModelProperty(value = "修改序号 修改序号", example = "101") @ApiModelProperty(value = "修改序号 修改序号", example = "101")
private Integer modifyNumber; private Integer modifyNumber;
@ApiModelProperty(value="企业组织代码 企业组织代码",example="101") @ApiModelProperty(value = "企业组织代码 企业组织代码", example = "101")
private Integer orgCode; private Integer orgCode;
@ApiModelProperty(value = "是否为系统自动 0：否；1：是", example = "101")
private Integer isAutomatic;
} }
\ No newline at end of file
src/main/java/cn/timer/api/controller/kqgl/AttController.java
This source diff could not be displayed because it is too large. You can view the blob instead.
src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveBalanceMapper.java
package cn.timer.api.dao.kqmk; package cn.timer.api.dao.kqmk;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance; import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance;
import cn.timer.api.dto.kqmk.AttqueryCriteriaDto;
import cn.timer.api.dto.kqmk.EmployeeLeaveBalanceDto;
/** /**
* 员工假期余额 * 员工假期余额
...@@ -13,4 +18,5 @@ import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance; ...@@ -13,4 +18,5 @@ import cn.timer.api.bean.kqmk.KqglAssoLeaveBalance;
@Repository @Repository
public interface KqglAssoLeaveBalanceMapper extends BaseMapper<KqglAssoLeaveBalance> { public interface KqglAssoLeaveBalanceMapper extends BaseMapper<KqglAssoLeaveBalance> {
IPage<EmployeeLeaveBalanceDto> selectPageByQueryLeaveBalance(IPage<EmployeeLeaveBalanceDto> page,@Param("param") AttqueryCriteriaDto attquerycriteriadto);
} }
src/main/java/cn/timer/api/dto/kqmk/BalanceSheetDataDto.java 0 → 100644
package cn.timer.api.dto.kqmk;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class BalanceSheetDataDto {
@ApiModelProperty(value = "假期规则id", example = "字段说明")
private Integer leaverulesid;
@ApiModelProperty(value = "余额天数 ", example = "字段说明")
private Integer balancedays;
}
src/main/java/cn/timer/api/dto/kqmk/EmployeeLeaveBalanceDto.java 0 → 100644
package cn.timer.api.dto.kqmk;
import java.util.List;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class EmployeeLeaveBalanceDto {
@ApiModelProperty(value = "员工工号 ", example = "字段说明")
private Integer empnum;
@ApiModelProperty(value = "员工名称 ", example = "字段说明")
private String empname;
@ApiModelProperty(value = "部门 ", example = "字段说明")
private String department;
@ApiModelProperty(value = "入职日期 ", example = "字段说明")
private String rztime;
@ApiModelProperty(value = "表数据", example = "字段说明")
List<BalanceSheetDataDto> balanceTo;
}
src/main/resources/mapping/kqmk/KqglAssoLeaveBalanceMapper.xml
...@@ -14,6 +14,18 @@ ...@@ -14,6 +14,18 @@
<result column="modify_timer" property="modifyTimer" /> <result column="modify_timer" property="modifyTimer" />
<result column="modify_number" property="modifyNumber" /> <result column="modify_number" property="modifyNumber" />
<result column="org_code" property="orgCode" /> <result column="org_code" property="orgCode" />
<result column="is_automatic" property="isAutomatic" />
</resultMap>
<resultMap id="LeaveBalanceMap" type="cn.timer.api.dto.kqmk.EmployeeLeaveBalanceDto" >
<result column="empnum" property="empnum" />
<result column="empname" property="empname" />
<result column="department" property="department" />
<result column="rztime" property="rztime" />
<collection property="balanceTo" ofType="cn.timer.api.dto.kqmk.BalanceSheetDataDto">
<result column="leaverulesid" property="leaverulesid"/>
<result column="balancedays" property="balancedays"/>
</collection>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
...@@ -26,7 +38,8 @@ ...@@ -26,7 +38,8 @@
modify_userid, modify_userid,
modify_timer, modify_timer,
modify_number, modify_number,
org_code org_code,
is_automatic
</sql> </sql>
<sql id="Base_Column_List_Alias"> <sql id="Base_Column_List_Alias">
...@@ -39,9 +52,33 @@ ...@@ -39,9 +52,33 @@
modify_userid KqglAssoLeaveBalance_modify_userid, modify_userid KqglAssoLeaveBalance_modify_userid,
modify_timer KqglAssoLeaveBalance_modify_timer, modify_timer KqglAssoLeaveBalance_modify_timer,
modify_number KqglAssoLeaveBalance_modify_number, modify_number KqglAssoLeaveBalance_modify_number,
org_code KqglAssoLeaveBalance_org_code org_code KqglAssoLeaveBalance_org_code,
is_automatic KqglAssoLeaveBalance_is_automatic
</sql> </sql>
<select id="selectPageByQueryLeaveBalance" resultMap="LeaveBalanceMap">
SELECT emp.emp_num as empnum,
emp.`name` as empname,
IFNULL(c.name,'') as department,
IFNULL(emp.rz_time,'') as rztime,
yz.leave_rules_id as leaverulesid,
yz.balancedays
from yggl_main_emp emp
LEFT JOIN zzgl_bmgw_m as gw on gw.id = emp.bmgw_id
LEFT JOIN zzgl_bmgw_m as c ON c.id = gw.up_id
LEFT JOIN (select bal.leave_rules_id,bal.userid,SUM(bal.balance_days) as balancedays
from kqgl_asso_leave_balance bal
where bal.org_code = #{param.orgCode}
GROUP BY bal.userid,bal.leave_rules_id) as yz on yz.userid = emp.emp_num
where emp.org_code = #{param.orgCode}
<if test="param.query != null and param.query != ''">
and ( emp.`name` like CONCAT('%',#{param.query},'%') or
emp.emp_num like CONCAT('%',#{param.query},'%') or
c.name like CONCAT('%',#{param.query},'%'))
</if>
ORDER BY emp.emp_num DESC
</select>
<!-- <!--
<insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoLeaveBalance"> <insert id="insert" useGeneratedKeys="true" keyColumn="id" parameterType="cn.timer.api.bean.kqmk.KqglAssoLeaveBalance">
...@@ -72,7 +109,10 @@ ...@@ -72,7 +109,10 @@
modify_number, modify_number,
</if> </if>
<if test ='null != orgCode'> <if test ='null != orgCode'>
org_code org_code,
</if>
<if test ='null != isAutomatic'>
is_automatic
</if> </if>
</trim> </trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
...@@ -101,7 +141,10 @@ ...@@ -101,7 +141,10 @@
#{modifyNumber}, #{modifyNumber},
</if> </if>
<if test ='null != orgCode'> <if test ='null != orgCode'>
#{orgCode} #{orgCode},
</if>
<if test ='null != isAutomatic'>
#{isAutomatic}
</if> </if>
</trim> </trim>
</insert> </insert>
...@@ -122,7 +165,8 @@ ...@@ -122,7 +165,8 @@
<if test ='null != modifyUserid'>modify_userid = #{modifyUserid},</if> <if test ='null != modifyUserid'>modify_userid = #{modifyUserid},</if>
<if test ='null != modifyTimer'>modify_timer = #{modifyTimer},</if> <if test ='null != modifyTimer'>modify_timer = #{modifyTimer},</if>
<if test ='null != modifyNumber'>modify_number = #{modifyNumber},</if> <if test ='null != modifyNumber'>modify_number = #{modifyNumber},</if>
<if test ='null != orgCode'>org_code = #{orgCode}</if> <if test ='null != orgCode'>org_code = #{orgCode},</if>
<if test ='null != isAutomatic'>is_automatic = #{isAutomatic}</if>
</set> </set>
WHERE id = #{id} WHERE id = #{id}
</update> </update>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment