+ 考勤组

bd-park/park-backend/park-application/src/main/java/com/huashe/park/application/web/controller/park/ParkAttendGroupUsrController.java

@@ -0,0 +1,99 @@
+package com.huashe.park.application.web.controller.park;
+
+import com.huashe.park.core.service.IParkAttendGroupUsrService;
+import com.huashe.park.domain.entity.ParkAttendGroupUsr;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 考勤组人员Controller
+ *
+ * @author ruoyi
+ * @date 2025-01-08
+ */
+@RestController
+@RequestMapping("/park/attendGroupUsr")
+public class ParkAttendGroupUsrController extends BaseController {
+    @Autowired
+    private IParkAttendGroupUsrService parkAttendGroupUsrService;
+
+    /**
+     * 查询考勤组人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('park:attendGroupUsr:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(ParkAttendGroupUsr parkAttendGroupUsr) {
+        startPage();
+        List<ParkAttendGroupUsr> list = parkAttendGroupUsrService.selectParkAttendGroupUsrList(parkAttendGroupUsr);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出考勤组人员列表
+     */
+    @PreAuthorize("@ss.hasPermi('park:attendGroupUsr:export')")
+    @Log(title = "考勤组人员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ParkAttendGroupUsr parkAttendGroupUsr) {
+        List<ParkAttendGroupUsr> list = parkAttendGroupUsrService.selectParkAttendGroupUsrList(parkAttendGroupUsr);
+        ExcelUtil<ParkAttendGroupUsr> util = new ExcelUtil<ParkAttendGroupUsr>(ParkAttendGroupUsr.class);
+        util.exportExcel(response, list, "考勤组人员数据");
+    }
+
+    /**
+     * 获取考勤组人员详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('park:attendGroupUsr:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
+        return success(parkAttendGroupUsrService.selectParkAttendGroupUsrById(id));
+    }
+
+    /**
+     * 新增考勤组人员
+     */
+    @PreAuthorize("@ss.hasPermi('park:attendGroupUsr:add')")
+    @Log(title = "考勤组人员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ParkAttendGroupUsr parkAttendGroupUsr) {
+        return toAjax(parkAttendGroupUsrService.insertParkAttendGroupUsr(parkAttendGroupUsr));
+    }
+
+    @PreAuthorize("@ss.hasPermi('park:attendGroupUsr:add')")
+    @Log(title = "批量添加考勤组人员", businessType = BusinessType.INSERT)
+    @PostMapping("/addGroupUsr")
+    public AjaxResult batchAddUsr(@RequestBody List<ParkAttendGroupUsr> parkAttendGroupUsr) {
+        parkAttendGroupUsrService.insertParkAttendGroupUsrBatch(parkAttendGroupUsr);
+        return success();
+    }
+
+    /**
+     * 修改考勤组人员
+     */
+    @PreAuthorize("@ss.hasPermi('park:attendGroupUsr:edit')")
+    @Log(title = "考勤组人员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody ParkAttendGroupUsr parkAttendGroupUsr) {
+        return toAjax(parkAttendGroupUsrService.updateParkAttendGroupUsr(parkAttendGroupUsr));
+    }
+
+    /**
+     * 删除考勤组人员
+     */
+    @PreAuthorize("@ss.hasPermi('park:attendGroupUsr:remove')")
+    @Log(title = "考勤组人员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
+        return toAjax(parkAttendGroupUsrService.deleteParkAttendGroupUsrByIds(ids));
+    }
+}

bd-park/park-backend/park-application/src/main/resources/application.yml

@@ -35,7 +35,7 @@ server:
 logging:
   level:
     com.ruoyi: debug
-    com.huashe: debug
+    com.huashe: info
     org.springframework: warn
 
 # 用户配置

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/interceptor/MybatisInterceptor.java

@@ -91,7 +91,9 @@ public class MybatisInterceptor implements Interceptor {
                 MapperMethod.ParamMap<?> p = (ParamMap<?>) parameter;
                 //update-begin-author:scott date:20190729 for:批量更新报错issues/IZA3Q--
                 if (p.containsKey("et")) {
-                    parameter = p.get("et");
+                    parameter = p.get("arg0");
+                } else if (p.containsKey("arg0")) {
+                    parameter = p.get("arg0");
                 } else {
                     parameter = p.get("param1");
                 }

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/mapper/ParkAttendGroupUsrMapper.java

@@ -0,0 +1,64 @@
+package com.huashe.park.core.mapper;
+
+import com.huashe.park.domain.entity.ParkAttendGroupUsr;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 考勤组人员Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-01-08
+ */
+public interface ParkAttendGroupUsrMapper {
+    /**
+     * 查询考勤组人员
+     *
+     * @param id 考勤组人员主键
+     * @return 考勤组人员
+     */
+    public ParkAttendGroupUsr selectParkAttendGroupUsrById(Long id);
+
+    /**
+     * 查询考勤组人员列表
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 考勤组人员集合
+     */
+    public List<ParkAttendGroupUsr> selectParkAttendGroupUsrList(ParkAttendGroupUsr parkAttendGroupUsr);
+
+    /**
+     * 新增考勤组人员
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 结果
+     */
+    public int insertParkAttendGroupUsr(ParkAttendGroupUsr parkAttendGroupUsr);
+
+    public void insertParkAttendGroupUsrBatch(@Param("userList") List<ParkAttendGroupUsr> userList);
+
+    /**
+     * 修改考勤组人员
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 结果
+     */
+    public int updateParkAttendGroupUsr(ParkAttendGroupUsr parkAttendGroupUsr);
+
+    /**
+     * 删除考勤组人员
+     *
+     * @param id 考勤组人员主键
+     * @return 结果
+     */
+    public int deleteParkAttendGroupUsrById(Long id);
+
+    /**
+     * 批量删除考勤组人员
+     *
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteParkAttendGroupUsrByIds(Long[] ids);
+}

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/IParkAttendGroupUsrService.java

@@ -0,0 +1,64 @@
+package com.huashe.park.core.service;
+
+import com.huashe.park.domain.entity.ParkAttendGroupUsr;
+
+import java.util.List;
+
+/**
+ * 考勤组人员Service接口
+ *
+ * @author ruoyi
+ * @date 2025-01-08
+ */
+public interface IParkAttendGroupUsrService {
+    /**
+     * 查询考勤组人员
+     *
+     * @param id 考勤组人员主键
+     * @return 考勤组人员
+     */
+    public ParkAttendGroupUsr selectParkAttendGroupUsrById(Long id);
+
+    /**
+     * 查询考勤组人员列表
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 考勤组人员集合
+     */
+    public List<ParkAttendGroupUsr> selectParkAttendGroupUsrList(ParkAttendGroupUsr parkAttendGroupUsr);
+
+    /**
+     * 新增考勤组人员
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 结果
+     */
+    public int insertParkAttendGroupUsr(ParkAttendGroupUsr parkAttendGroupUsr);
+
+
+    void insertParkAttendGroupUsrBatch(List<ParkAttendGroupUsr> userList);
+
+    /**
+     * 修改考勤组人员
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 结果
+     */
+    public int updateParkAttendGroupUsr(ParkAttendGroupUsr parkAttendGroupUsr);
+
+    /**
+     * 批量删除考勤组人员
+     *
+     * @param ids 需要删除的考勤组人员主键集合
+     * @return 结果
+     */
+    public int deleteParkAttendGroupUsrByIds(Long[] ids);
+
+    /**
+     * 删除考勤组人员信息
+     *
+     * @param id 考勤组人员主键
+     * @return 结果
+     */
+    public int deleteParkAttendGroupUsrById(Long id);
+}

bd-park/park-backend/park-core/src/main/java/com/huashe/park/core/service/impl/ParkAttendGroupUsrServiceImpl.java

@@ -0,0 +1,94 @@
+package com.huashe.park.core.service.impl;
+
+import com.huashe.park.core.mapper.ParkAttendGroupUsrMapper;
+import com.huashe.park.core.service.IParkAttendGroupUsrService;
+import com.huashe.park.domain.entity.ParkAttendGroupUsr;
+import com.ruoyi.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 考勤组人员Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-01-08
+ */
+@Service
+public class ParkAttendGroupUsrServiceImpl implements IParkAttendGroupUsrService {
+    @Autowired
+    private ParkAttendGroupUsrMapper parkAttendGroupUsrMapper;
+
+    /**
+     * 查询考勤组人员
+     *
+     * @param id 考勤组人员主键
+     * @return 考勤组人员
+     */
+    @Override
+    public ParkAttendGroupUsr selectParkAttendGroupUsrById(Long id) {
+        return parkAttendGroupUsrMapper.selectParkAttendGroupUsrById(id);
+    }
+
+    /**
+     * 查询考勤组人员列表
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 考勤组人员
+     */
+    @Override
+    public List<ParkAttendGroupUsr> selectParkAttendGroupUsrList(ParkAttendGroupUsr parkAttendGroupUsr) {
+        return parkAttendGroupUsrMapper.selectParkAttendGroupUsrList(parkAttendGroupUsr);
+    }
+
+    /**
+     * 新增考勤组人员
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 结果
+     */
+    @Override
+    public int insertParkAttendGroupUsr(ParkAttendGroupUsr parkAttendGroupUsr) {
+        return parkAttendGroupUsrMapper.insertParkAttendGroupUsr(parkAttendGroupUsr);
+    }
+
+    @Override
+    public void insertParkAttendGroupUsrBatch(List<ParkAttendGroupUsr> userList) {
+        parkAttendGroupUsrMapper.insertParkAttendGroupUsrBatch(userList);
+    }
+
+    /**
+     * 修改考勤组人员
+     *
+     * @param parkAttendGroupUsr 考勤组人员
+     * @return 结果
+     */
+    @Override
+    public int updateParkAttendGroupUsr(ParkAttendGroupUsr parkAttendGroupUsr) {
+        parkAttendGroupUsr.setUpdateTime(DateUtils.getNowDate());
+        return parkAttendGroupUsrMapper.updateParkAttendGroupUsr(parkAttendGroupUsr);
+    }
+
+    /**
+     * 批量删除考勤组人员
+     *
+     * @param ids 需要删除的考勤组人员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteParkAttendGroupUsrByIds(Long[] ids) {
+        return parkAttendGroupUsrMapper.deleteParkAttendGroupUsrByIds(ids);
+    }
+
+    /**
+     * 删除考勤组人员信息
+     *
+     * @param id 考勤组人员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteParkAttendGroupUsrById(Long id) {
+        return parkAttendGroupUsrMapper.deleteParkAttendGroupUsrById(id);
+    }
+}

bd-park/park-backend/park-core/src/main/resources/mapper/park/ParkAttendGroupUsrMapper.xml

@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huashe.park.core.mapper.ParkAttendGroupUsrMapper">
+
+    <resultMap type="ParkAttendGroupUsr" id="ParkAttendGroupUsrResult">
+        <result property="id" column="id"/>
+        <result property="attendGroupId" column="attend_group_id"/>
+        <result property="usrId" column="usr_id"/>
+        <result property="usrName" column="usr_name"/>
+        <result property="usrDeptId" column="usr_dept_id"/>
+        <result property="usrDept" column="usr_dept"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="tenantId" column="tenant_id"/>
+        <result property="groupName" column="group_name"/>
+    </resultMap>
+
+    <sql id="selectParkAttendGroupUsrVo">
+        select rel.id,
+               rel.attend_group_id,
+               rel.usr_id,
+               rel.usr_name,
+               rel.usr_dept_id,
+               rel.usr_dept,
+               rel.update_time,
+               rel.create_time,
+               rel.create_by,
+               rel.update_by,
+               rel.tenant_id,
+               park_attend_group.name as group_name
+        from park_attend_group_usr rel
+    </sql>
+
+    <select id="selectParkAttendGroupUsrList" parameterType="ParkAttendGroupUsr" resultMap="ParkAttendGroupUsrResult">
+        <include refid="selectParkAttendGroupUsrVo"/>
+        inner join park_attend_group on park_attend_group.id = rel.attend_group_id
+        <where>
+            <if test="usrName != null  and usrName != ''">and usr_name like concat('%', #{usrName}, '%')</if>
+            <if test="usrDept != null  and usrDept != ''">and usr_dept = #{usrDept}</if>
+        </where>
+    </select>
+
+    <select id="selectParkAttendGroupUsrById" parameterType="Long" resultMap="ParkAttendGroupUsrResult">
+        <include refid="selectParkAttendGroupUsrVo"/>
+        inner join park_attend_group on park_attend_group.id = rel.attend_group_id
+        where id = #{id}
+    </select>
+
+    <insert id="insertParkAttendGroupUsr" parameterType="ParkAttendGroupUsr" useGeneratedKeys="true" keyProperty="id">
+        insert into park_attend_group_usr
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="attendGroupId != null">attend_group_id,</if>
+            <if test="usrId != null">usr_id,</if>
+            <if test="usrName != null">usr_name,</if>
+            <if test="usrDeptId != null">usr_dept_id,</if>
+            <if test="usrDept != null">usr_dept,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="tenantId != null">tenant_id,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="attendGroupId != null">#{attendGroupId},</if>
+            <if test="usrId != null">#{usrId},</if>
+            <if test="usrName != null">#{usrName},</if>
+            <if test="usrDeptId != null">#{usrDeptId},</if>
+            <if test="usrDept != null">#{usrDept},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="tenantId != null">#{tenantId},</if>
+        </trim>
+    </insert>
+
+    <insert id="insertParkAttendGroupUsrBatch">
+        INSERT INTO park_attend_group_usr (attend_group_id,
+        usr_id,
+        usr_name,
+        usr_dept_id,
+        usr_dept,
+        update_time,
+        create_time)
+        VALUES
+        <foreach collection="userList" item="user" separator=",">
+            (
+            #{user.attendGroupId},
+            #{user.usrId},
+            #{user.usrName},
+            #{user.usrDeptId},
+            #{user.usrDept},
+            now(),
+            now()
+            )
+        </foreach>
+        on duplicate key update
+        usr_name = values(usr_name),
+        usr_dept = values(usr_dept),
+        update_time = now(),
+        create_time= now()
+    </insert>
+
+    <update id="updateParkAttendGroupUsr" parameterType="ParkAttendGroupUsr">
+        update park_attend_group_usr
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="attendGroupId != null">attend_group_id = #{attendGroupId},</if>
+            <if test="usrId != null">usr_id = #{usrId},</if>
+            <if test="usrName != null">usr_name = #{usrName},</if>
+            <if test="usrDeptId != null">usr_dept_id = #{usrDeptId},</if>
+            <if test="usrDept != null">usr_dept = #{usrDept},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="tenantId != null">tenant_id = #{tenantId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteParkAttendGroupUsrById" parameterType="Long">
+        delete
+        from park_attend_group_usr
+        where id = #{id}
+    </delete>
+
+    <delete id="deleteParkAttendGroupUsrByIds" parameterType="String">
+        delete from park_attend_group_usr where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

bd-park/park-backend/park-domain/src/main/java/com/huashe/park/domain/entity/ParkAttendGroupUsr.java

@@ -0,0 +1,136 @@
+package com.huashe.park.domain.entity;
+
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 考勤组人员对象 park_attend_group_usr
+ *
+ * @author ruoyi
+ * @date 2025-01-08
+ */
+public class ParkAttendGroupUsr extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private Long id;
+
+    /**
+     * 考情组主键
+     */
+    private Long attendGroupId;
+
+    private String groupName;
+
+    /**
+     * 考情组成员id
+     */
+    private String usrId;
+
+    /**
+     * 成员姓名
+     */
+    @Excel(name = "成员姓名")
+    private String usrName;
+
+    /**
+     * 部门id
+     */
+    private String usrDeptId;
+
+    /**
+     * 部门名称
+     */
+    @Excel(name = "部门名称")
+    private String usrDept;
+
+    /**
+     * 租户id
+     */
+    private String tenantId;
+
+    public String getGroupName() {
+        return groupName;
+    }
+
+    public void setGroupName(String groupName) {
+        this.groupName = groupName;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setAttendGroupId(Long attendGroupId) {
+        this.attendGroupId = attendGroupId;
+    }
+
+    public Long getAttendGroupId() {
+        return attendGroupId;
+    }
+
+    public void setUsrId(String usrId) {
+        this.usrId = usrId;
+    }
+
+    public String getUsrId() {
+        return usrId;
+    }
+
+    public void setUsrName(String usrName) {
+        this.usrName = usrName;
+    }
+
+    public String getUsrName() {
+        return usrName;
+    }
+
+    public void setUsrDeptId(String usrDeptId) {
+        this.usrDeptId = usrDeptId;
+    }
+
+    public String getUsrDeptId() {
+        return usrDeptId;
+    }
+
+    public void setUsrDept(String usrDept) {
+        this.usrDept = usrDept;
+    }
+
+    public String getUsrDept() {
+        return usrDept;
+    }
+
+    public void setTenantId(String tenantId) {
+        this.tenantId = tenantId;
+    }
+
+    public String getTenantId() {
+        return tenantId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("attendGroupId", getAttendGroupId())
+                .append("usrId", getUsrId())
+                .append("usrName", getUsrName())
+                .append("usrDeptId", getUsrDeptId())
+                .append("usrDept", getUsrDept())
+                .append("updateTime", getUpdateTime())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateBy", getUpdateBy())
+                .append("tenantId", getTenantId())
+                .toString();
+    }
+}