diff --git a/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java b/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java index 373e259..ce5a43c 100644 --- a/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java +++ b/src/main/java/cn/timer/api/controller/kqgl/TimeCardController.java @@ -776,8 +776,9 @@ public class TimeCardController { @ApiOperation(value = "29:根据 组织机构代码获取员工假期余额表头", httpMethod = "GET", notes = "接口发布说明") @ApiOperationSupport(order = 29) public Result<Object> BalanceHeader(@CurrentUser UserBean userBean) { - List<KqglAssoLeaveRules> balheas = new LambdaQueryChainWrapper<KqglAssoLeaveRules>(kqglassoleaverulesmapper).eq(KqglAssoLeaveRules :: getOrgCode,userBean.getOrgCode()) - .eq(KqglAssoLeaveRules :: getLeaveType, 2).or().eq(KqglAssoLeaveRules :: getIsOpen, 1).list(); +// List<KqglAssoLeaveRules> balheas = new LambdaQueryChainWrapper<KqglAssoLeaveRules>(kqglassoleaverulesmapper).eq(KqglAssoLeaveRules :: getOrgCode,userBean.getOrgCode()) +// .eq(KqglAssoLeaveRules :: getLeaveType, 2).or().eq(KqglAssoLeaveRules :: getIsOpen, 1).list(); + List<KqglAssoLeaveRules> balheas = kqglassoleaverulesmapper.selHeaderdata(userBean.getOrgCode(), 2, 1); return ResultUtil.data(balheas, "操作成功!"); } @@ -1849,6 +1850,9 @@ public class TimeCardController { return ResultUtil.data(pageAs, listAs, "操作成功!"); } + + + /**************************/ /** * 查询列表-加班补偿方式 diff --git a/src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveRulesMapper.java b/src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveRulesMapper.java index e1981f3..8b8dd37 100644 --- a/src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveRulesMapper.java +++ b/src/main/java/cn/timer/api/dao/kqmk/KqglAssoLeaveRulesMapper.java @@ -17,4 +17,6 @@ import cn.timer.api.bean.kqmk.KqglAssoLeaveRules; public interface KqglAssoLeaveRulesMapper extends BaseMapper<KqglAssoLeaveRules> { int insertleaverulesList(List<KqglAssoLeaveRules> kqglassoleaverules); + + List<KqglAssoLeaveRules> selHeaderdata(int orgcode,int leavetype,int isopen); } diff --git a/src/main/resources/mapping/kqmk/KqglAssoLeaveRulesMapper.xml b/src/main/resources/mapping/kqmk/KqglAssoLeaveRulesMapper.xml index 8a46cfa..641a22f 100644 --- a/src/main/resources/mapping/kqmk/KqglAssoLeaveRulesMapper.xml +++ b/src/main/resources/mapping/kqmk/KqglAssoLeaveRulesMapper.xml @@ -41,6 +41,13 @@ is_open KqglAssoLeaveRules_is_open, leave_balance KqglAssoLeaveRules_leave_balance </sql> + + <select id="selHeaderdata" resultMap="BaseResultMap"> + SELECT <include refid="Base_Column_List" /> + FROM kqgl_asso_leave_rules + WHERE org_code = #{orgcode} + AND (leave_type = #{leavetype} OR is_open = #{isopen}) + </select> <insert id="insertleaverulesList" parameterType="java.util.List" > insert into kqgl_asso_leave_rules (name,company,leave_type,apply,create_time,create_userid,org_code,is_open,leave_balance)