组织架构考勤规则修改二次提交

This commit is contained in:
fl 2024-12-02 18:42:45 +08:00
parent b2eef36c70
commit 62956c14eb
5 changed files with 36 additions and 0 deletions

View File

@ -141,4 +141,19 @@ public class OrgChangeController extends BaseController {
return error("系统异常"); return error("系统异常");
} }
/**
* 获取考勤组
*/
@RequiresPermissions("att:org:change:edit")
@PutMapping("getAttGroupList")
@Log(title = "考勤设置->组织架构变更->组织架构审核", businessType = BusinessType.UPDATE)
public AjaxResult getAttGroupList() {
try{
return success(orgChangeService.getAttGroupList());
}catch (Exception e){
log.error(e.toString(),e);
}
return error("系统异常");
}
} }

View File

@ -1,5 +1,6 @@
package com.bonus.system.att.dao; package com.bonus.system.att.dao;
import com.bonus.system.api.domain.MapVo;
import com.bonus.system.att.entity.AttGroupBean; import com.bonus.system.att.entity.AttGroupBean;
import com.bonus.system.att.entity.AttGroupCheckOrgBean; import com.bonus.system.att.entity.AttGroupCheckOrgBean;
import com.bonus.system.att.entity.OrgChangeBean; import com.bonus.system.att.entity.OrgChangeBean;
@ -61,4 +62,6 @@ public interface OrgChangeDao {
* @return * @return
*/ */
int orgChangeCheck(OrgChangeBean o); int orgChangeCheck(OrgChangeBean o);
MapVo getAttGroupList();
} }

View File

@ -1,5 +1,6 @@
package com.bonus.system.att.service; package com.bonus.system.att.service;
import com.bonus.system.api.domain.MapVo;
import com.bonus.system.att.entity.AttGroupBean; import com.bonus.system.att.entity.AttGroupBean;
import com.bonus.system.att.entity.OrgChangeBean; import com.bonus.system.att.entity.OrgChangeBean;
import com.bonus.system.basic.domain.SysTree; import com.bonus.system.basic.domain.SysTree;
@ -54,4 +55,6 @@ public interface OrgChangeService {
* @return * @return
*/ */
int orgChangeCheck(OrgChangeBean o); int orgChangeCheck(OrgChangeBean o);
MapVo getAttGroupList();
} }

View File

@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil;
import com.alibaba.cloud.commons.lang.StringUtils; import com.alibaba.cloud.commons.lang.StringUtils;
import com.bonus.common.core.constant.Constants; import com.bonus.common.core.constant.Constants;
import com.bonus.common.security.utils.SecurityUtils; import com.bonus.common.security.utils.SecurityUtils;
import com.bonus.system.api.domain.MapVo;
import com.bonus.system.api.domain.SysUser; import com.bonus.system.api.domain.SysUser;
import com.bonus.system.att.dao.OrgChangeDao; import com.bonus.system.att.dao.OrgChangeDao;
import com.bonus.system.att.entity.AttGroupBean; import com.bonus.system.att.entity.AttGroupBean;
@ -91,5 +92,10 @@ public class OrgChangeServiceImpl implements OrgChangeService {
return i; return i;
} }
@Override
public MapVo getAttGroupList() {
return orgChangeDao.getAttGroupList();
}
} }

View File

@ -55,6 +55,15 @@
oc.is_active = '1' oc.is_active = '1'
and oc.id = #{id} and oc.id = #{id}
</select> </select>
<select id="getAttGroupList" resultType="com.bonus.system.api.domain.MapVo">
SELECT
id,
group_name AS `name`
FROM
att_group
WHERE
is_active = '1'
</select>
<delete id="deleteAttGroup"> <delete id="deleteAttGroup">
update org_change update org_change