整合模块，新增志愿者排班与预约

leromro-admin/pom.xml

@@ -66,12 +66,6 @@
             <artifactId>leromro-core</artifactId>
         </dependency>
 
-        <!-- 乐融融 系统-->
-        <dependency>
-            <groupId>com.leromro</groupId>
-            <artifactId>leromro_service</artifactId>
-            <version>3.8.9</version>
-        </dependency>
     </dependencies>
 
     <build>

leromro-common/src/main/java/com/leromro/common/core/page/TableDataInfo.java

@@ -8,7 +8,7 @@ import java.util.List;
  * 
  * @author ruoyi
  */
-public class TableDataInfo implements Serializable
+public class TableDataInfo<T> implements Serializable
 {
     private static final long serialVersionUID = 1L;
 
@@ -16,7 +16,7 @@ public class TableDataInfo implements Serializable
     private long total;
 
     /** 列表数据 */
-    private List<?> rows;
+    private List<T> rows;
 
     /** 消息状态码 */
     private int code;
@@ -37,7 +37,7 @@ public class TableDataInfo implements Serializable
      * @param list 列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, long total)
+    public TableDataInfo(List<T> list, long total)
     {
         this.rows = list;
         this.total = total;
@@ -58,7 +58,7 @@ public class TableDataInfo implements Serializable
         return rows;
     }
 
-    public void setRows(List<?> rows)
+    public void setRows(List<T> rows)
     {
         this.rows = rows;
     }

leromro_service/src/main/java/com/leromro/serve/controller/VolunteerInfoController.java

@@ -1,11 +1,10 @@
-package com.leromro.serve.controller;
+package com.leromro.core.controller;
 
 
 import com.leromro.common.core.domain.R;
 import com.leromro.common.utils.SecurityUtils;
-import com.leromro.common.utils.uuid.IdUtils;
-import com.leromro.serve.domain.vos.VolunteerInfoVO;
-import com.leromro.serve.service.IVolunteerInfoService;
+import com.leromro.core.domain.vo.VolunteerInfoVO;
+import com.leromro.core.service.IVolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2025-04-07
  */
 @RestController
-@RequestMapping("/serve/l-volunteer-info")
+@RequestMapping("/core/l-volunteer-info")
 public class VolunteerInfoController {
     @Autowired
     private IVolunteerInfoService volunteerInfoService;

leromro-core/src/main/java/com/leromro/core/controller/VolunteerWorkDateController.java

@@ -0,0 +1,115 @@
+package com.leromro.core.controller;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.leromro.common.core.domain.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.leromro.common.annotation.Log;
+import com.leromro.common.core.controller.BaseController;
+import com.leromro.common.core.domain.AjaxResult;
+import com.leromro.common.enums.BusinessType;
+import com.leromro.core.domain.VolunteerWorkDate;
+import com.leromro.core.service.IVolunteerWorkDateService;
+import com.leromro.common.utils.poi.ExcelUtil;
+import com.leromro.common.core.page.TableDataInfo;
+
+/**
+ * 志愿者排班日期Controller
+ * 
+ * @author ruoyi
+ * @date 2025-04-07
+ */
+@RestController
+@Api(tags = "志愿者排班日期")
+@RequestMapping("/core/volunteer/work-date")
+public class VolunteerWorkDateController extends BaseController
+{
+    @Autowired
+    private IVolunteerWorkDateService volunteerWorkDateService;
+
+    /**
+     * 查询志愿者排班日期列表
+     */
+    @ApiOperation("查询志愿者排班日期列表")
+    @PreAuthorize("@ss.hasPermi('volunteer:work-date:list')")
+    @GetMapping("/list")
+    public TableDataInfo<VolunteerWorkDate> list(VolunteerWorkDate volunteerWorkDate)
+    {
+        startPage();
+        List<VolunteerWorkDate> list = volunteerWorkDateService.selectVolunteerWorkDateList(volunteerWorkDate);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出志愿者排班日期列表
+     */
+    @ApiOperation("导出志愿者排班日期列表")
+    @PreAuthorize("@ss.hasPermi('volunteer:work-date:export')")
+    @Log(title = "志愿者排班日期", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, VolunteerWorkDate volunteerWorkDate)
+    {
+        List<VolunteerWorkDate> list = volunteerWorkDateService.selectVolunteerWorkDateList(volunteerWorkDate);
+        ExcelUtil<VolunteerWorkDate> util = new ExcelUtil<VolunteerWorkDate>(VolunteerWorkDate.class);
+        util.exportExcel(response, list, "志愿者排班日期数据");
+    }
+
+    /**
+     * 获取志愿者排班日期详细信息
+     */
+    @ApiOperation("获取志愿者排班日期详细信息")
+    @PreAuthorize("@ss.hasPermi('volunteer:work-date:query')")
+    @GetMapping(value = "/{volunteerWorkDateId}")
+    public R<VolunteerWorkDate> getInfo(@PathVariable("volunteerWorkDateId") Long volunteerWorkDateId)
+    {
+        return R.ok(volunteerWorkDateService.selectVolunteerWorkDateByVolunteerWorkDateId(volunteerWorkDateId));
+    }
+
+    /**
+     * 新增志愿者排班日期
+     */
+    @ApiOperation("新增志愿者排班日期")
+    @PreAuthorize("@ss.hasPermi('volunteer:work-date:add')")
+    @Log(title = "志愿者排班日期", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody VolunteerWorkDate volunteerWorkDate)
+    {
+        return toAjax(volunteerWorkDateService.insertVolunteerWorkDate(volunteerWorkDate));
+    }
+
+    /**
+     * 修改志愿者排班日期
+     */
+    @ApiOperation("修改志愿者排班日期")
+    @PreAuthorize("@ss.hasPermi('volunteer:work-date:edit')")
+    @Log(title = "志愿者排班日期", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody VolunteerWorkDate volunteerWorkDate)
+    {
+        return toAjax(volunteerWorkDateService.updateVolunteerWorkDate(volunteerWorkDate));
+    }
+
+    /**
+     * 删除志愿者排班日期
+     */
+    @ApiOperation("删除志愿者排班日期")
+    @PreAuthorize("@ss.hasPermi('volunteer:work-date:remove')")
+    @Log(title = "志愿者排班日期", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{volunteerWorkDateIds}")
+    public R<Integer> remove(@PathVariable Long[] volunteerWorkDateIds)
+    {
+        return R.ok(volunteerWorkDateService.deleteVolunteerWorkDateByVolunteerWorkDateIds(volunteerWorkDateIds));
+    }
+}

leromro_service/src/main/java/com/leromro/serve/domain/VolunteerInfo.java

@@ -1,4 +1,4 @@
-package com.leromro.serve.domain;
+package com.leromro.core.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;

leromro-core/src/main/java/com/leromro/core/domain/VolunteerWorkDate.java

@@ -0,0 +1,65 @@
+package com.leromro.core.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import com.leromro.common.annotation.Excel;
+import com.leromro.common.core.domain.BaseEntity;
+
+/**
+ * 志愿者排班日期对象 l_volunteer_work_date
+ * 
+ * @author ruoyi
+ * @date 2025-04-07
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@TableName("l_volunteer_work_date")
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "VolunteerWorkDate", description = "志愿者排班日期")
+public class VolunteerWorkDate extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 志愿者排班日期id */
+    @TableId(type = IdType.AUTO)
+    @ApiModelProperty("志愿者排班日期id")
+    private Long volunteerWorkDateId;
+
+    /** 志愿者id */
+    @Excel(name = "志愿者id")
+    @ApiModelProperty("志愿者id")
+    private Long volunteerId;
+
+    /** 排班日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "排班日期", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("排班日期")
+    private Date workDate;
+
+    /** 工作开始时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "工作开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("工作开始时间")
+    private Date workStartTime;
+
+    /** 工作结束时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "工作结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("工作结束时间")
+    private Date workEndTime;
+
+    /** 是否预约0否1是 */
+    @Excel(name = "是否预约0否1是")
+    @ApiModelProperty("是否预约0否1是")
+    private Long hasReservation;
+
+
+}

leromro-core/src/main/java/com/leromro/core/domain/vo/VolunteerInfoVO.java

@@ -0,0 +1,7 @@
+package com.leromro.core.domain.vo;
+
+import com.leromro.core.domain.VolunteerInfo;
+
+public class VolunteerInfoVO extends VolunteerInfo {
+
+}

leromro_service/src/main/java/com/leromro/serve/mapper/VolunteerInfoMapper.java

@@ -1,9 +1,8 @@
-package com.leromro.serve.mapper;
+package com.leromro.core.mapper;
 
-import com.leromro.serve.domain.VolunteerInfo;
+import com.leromro.core.domain.VolunteerInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.leromro.serve.domain.vos.VolunteerInfoVO;
-import org.apache.ibatis.annotations.Param;
+import com.leromro.core.domain.vo.VolunteerInfoVO;
 
 /**
  * <p>

leromro-core/src/main/java/com/leromro/core/mapper/VolunteerWorkDateMapper.java

@@ -0,0 +1,62 @@
+package com.leromro.core.mapper;
+
+import java.util.List;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.leromro.core.domain.VolunteerWorkDate;
+
+/**
+ * 志愿者排班日期Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2025-04-07
+ */
+public interface VolunteerWorkDateMapper extends BaseMapper<VolunteerWorkDate>
+{
+    /**
+     * 查询志愿者排班日期
+     * 
+     * @param volunteerWorkDateId 志愿者排班日期主键
+     * @return 志愿者排班日期
+     */
+    public VolunteerWorkDate selectVolunteerWorkDateByVolunteerWorkDateId(Long volunteerWorkDateId);
+
+    /**
+     * 查询志愿者排班日期列表
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 志愿者排班日期集合
+     */
+    public List<VolunteerWorkDate> selectVolunteerWorkDateList(VolunteerWorkDate volunteerWorkDate);
+
+    /**
+     * 新增志愿者排班日期
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 结果
+     */
+    public int insertVolunteerWorkDate(VolunteerWorkDate volunteerWorkDate);
+
+    /**
+     * 修改志愿者排班日期
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 结果
+     */
+    public int updateVolunteerWorkDate(VolunteerWorkDate volunteerWorkDate);
+
+    /**
+     * 删除志愿者排班日期
+     * 
+     * @param volunteerWorkDateId 志愿者排班日期主键
+     * @return 结果
+     */
+    public int deleteVolunteerWorkDateByVolunteerWorkDateId(Long volunteerWorkDateId);
+
+    /**
+     * 批量删除志愿者排班日期
+     * 
+     * @param volunteerWorkDateIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteVolunteerWorkDateByVolunteerWorkDateIds(Long[] volunteerWorkDateIds);
+}

leromro_service/src/main/java/com/leromro/serve/service/IVolunteerInfoService.java

@@ -1,8 +1,8 @@
-package com.leromro.serve.service;
+package com.leromro.core.service;
 
-import com.leromro.serve.domain.VolunteerInfo;
+import com.leromro.core.domain.VolunteerInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.leromro.serve.domain.vos.VolunteerInfoVO;
+import com.leromro.core.domain.vo.VolunteerInfoVO;
 
 /**
  * <p>

leromro-core/src/main/java/com/leromro/core/service/IVolunteerWorkDateService.java

@@ -0,0 +1,62 @@
+package com.leromro.core.service;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.leromro.core.domain.VolunteerWorkDate;
+
+/**
+ * 志愿者排班日期Service接口
+ * 
+ * @author ruoyi
+ * @date 2025-04-07
+ */
+public interface IVolunteerWorkDateService extends IService<VolunteerWorkDate>
+{
+    /**
+     * 查询志愿者排班日期
+     * 
+     * @param volunteerWorkDateId 志愿者排班日期主键
+     * @return 志愿者排班日期
+     */
+    public VolunteerWorkDate selectVolunteerWorkDateByVolunteerWorkDateId(Long volunteerWorkDateId);
+
+    /**
+     * 查询志愿者排班日期列表
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 志愿者排班日期集合
+     */
+    public List<VolunteerWorkDate> selectVolunteerWorkDateList(VolunteerWorkDate volunteerWorkDate);
+
+    /**
+     * 新增志愿者排班日期
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 结果
+     */
+    public Boolean insertVolunteerWorkDate(VolunteerWorkDate volunteerWorkDate);
+
+    /**
+     * 修改志愿者排班日期
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 结果
+     */
+    public Boolean updateVolunteerWorkDate(VolunteerWorkDate volunteerWorkDate);
+
+    /**
+     * 批量删除志愿者排班日期
+     * 
+     * @param volunteerWorkDateIds 需要删除的志愿者排班日期主键集合
+     * @return 结果
+     */
+    public int deleteVolunteerWorkDateByVolunteerWorkDateIds(Long[] volunteerWorkDateIds);
+
+    /**
+     * 删除志愿者排班日期信息
+     * 
+     * @param volunteerWorkDateId 志愿者排班日期主键
+     * @return 结果
+     */
+    public int deleteVolunteerWorkDateByVolunteerWorkDateId(Long volunteerWorkDateId);
+}

leromro_service/src/main/java/com/leromro/serve/service/impl/VolunteerInfoServiceImpl.java

@@ -1,17 +1,14 @@
-package com.leromro.serve.service.impl;
+package com.leromro.core.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.leromro.serve.domain.VolunteerInfo;
-import com.leromro.serve.domain.vos.VolunteerInfoVO;
-import com.leromro.serve.mapper.VolunteerInfoMapper;
-import com.leromro.serve.service.IVolunteerInfoService;
+import com.leromro.core.domain.VolunteerInfo;
+import com.leromro.core.domain.vo.VolunteerInfoVO;
+import com.leromro.core.mapper.VolunteerInfoMapper;
+import com.leromro.core.service.IVolunteerInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 志愿者信息表 服务实现类

leromro-core/src/main/java/com/leromro/core/service/impl/VolunteerWorkDateServiceImpl.java

@@ -0,0 +1,96 @@
+package com.leromro.core.service.impl;
+
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.leromro.core.mapper.VolunteerWorkDateMapper;
+import com.leromro.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.leromro.core.mapper.VolunteerWorkDateMapper;
+import com.leromro.core.domain.VolunteerWorkDate;
+import com.leromro.core.service.IVolunteerWorkDateService;
+
+/**
+ * 志愿者排班日期Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2025-04-07
+ */
+@Service
+public class VolunteerWorkDateServiceImpl extends ServiceImpl<VolunteerWorkDateMapper, VolunteerWorkDate> implements IVolunteerWorkDateService
+{
+    @Autowired
+    private VolunteerWorkDateMapper volunteerWorkDateMapper;
+
+    /**
+     * 查询志愿者排班日期
+     * 
+     * @param volunteerWorkDateId 志愿者排班日期主键
+     * @return 志愿者排班日期
+     */
+    @Override
+    public VolunteerWorkDate selectVolunteerWorkDateByVolunteerWorkDateId(Long volunteerWorkDateId)
+    {
+        return volunteerWorkDateMapper.selectVolunteerWorkDateByVolunteerWorkDateId(volunteerWorkDateId);
+    }
+
+    /**
+     * 查询志愿者排班日期列表
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 志愿者排班日期
+     */
+    @Override
+    public List<VolunteerWorkDate> selectVolunteerWorkDateList(VolunteerWorkDate volunteerWorkDate)
+    {
+        return volunteerWorkDateMapper.selectVolunteerWorkDateList(volunteerWorkDate);
+    }
+
+    /**
+     * 新增志愿者排班日期
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 结果
+     */
+    @Override
+    public Boolean insertVolunteerWorkDate(VolunteerWorkDate volunteerWorkDate)
+    {
+        return this.save(volunteerWorkDate);
+    }
+
+    /**
+     * 修改志愿者排班日期
+     * 
+     * @param volunteerWorkDate 志愿者排班日期
+     * @return 结果
+     */
+    @Override
+    public Boolean updateVolunteerWorkDate(VolunteerWorkDate volunteerWorkDate)
+    {
+        return this.updateById(volunteerWorkDate);
+    }
+
+    /**
+     * 批量删除志愿者排班日期
+     * 
+     * @param volunteerWorkDateIds 需要删除的志愿者排班日期主键
+     * @return 结果
+     */
+    @Override
+    public int deleteVolunteerWorkDateByVolunteerWorkDateIds(Long[] volunteerWorkDateIds)
+    {
+        return volunteerWorkDateMapper.deleteVolunteerWorkDateByVolunteerWorkDateIds(volunteerWorkDateIds);
+    }
+
+    /**
+     * 删除志愿者排班日期信息
+     * 
+     * @param volunteerWorkDateId 志愿者排班日期主键
+     * @return 结果
+     */
+    @Override
+    public int deleteVolunteerWorkDateByVolunteerWorkDateId(Long volunteerWorkDateId)
+    {
+        return volunteerWorkDateMapper.deleteVolunteerWorkDateByVolunteerWorkDateId(volunteerWorkDateId);
+    }
+}

leromro_service/src/main/resources/mapper/serve/VolunteerInfoMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.leromro.serve.mapper.VolunteerInfoMapper">
+<mapper namespace="com.leromro.core.mapper.VolunteerInfoMapper">
     <insert id="newVolunteerByUserId">
         INSERT INTO l_volunteer_info (
         <if test="userId != null">user_id,</if>

leromro-core/src/main/resources/mapper/core/VolunteerWorkDateMapper.xml

@@ -0,0 +1,96 @@
+<?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.leromro.core.mapper.VolunteerWorkDateMapper">
+    
+    <resultMap type="VolunteerWorkDate" id="VolunteerWorkDateResult">
+        <result property="volunteerWorkDateId"    column="volunteer_work_date_id"    />
+        <result property="volunteerId"    column="volunteer_id"    />
+        <result property="workDate"    column="work_date"    />
+        <result property="workStartTime"    column="work_start_time"    />
+        <result property="workEndTime"    column="work_end_time"    />
+        <result property="hasReservation"    column="has_reservation"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectVolunteerWorkDateVo">
+        select volunteer_work_date_id, volunteer_id, work_date, work_start_time, work_end_time, has_reservation, create_by, create_time, update_by, update_time, remark from l_volunteer_work_date
+    </sql>
+
+    <select id="selectVolunteerWorkDateList" parameterType="VolunteerWorkDate" resultMap="VolunteerWorkDateResult">
+        <include refid="selectVolunteerWorkDateVo"/>
+        <where>  
+            <if test="volunteerId != null "> and volunteer_id = #{volunteerId}</if>
+            <if test="workDate != null "> and work_date = #{workDate}</if>
+            <if test="workStartTime != null "> and work_start_time = #{workStartTime}</if>
+            <if test="workEndTime != null "> and work_end_time = #{workEndTime}</if>
+            <if test="hasReservation != null "> and has_reservation = #{hasReservation}</if>
+        </where>
+    </select>
+    
+    <select id="selectVolunteerWorkDateByVolunteerWorkDateId" parameterType="Long" resultMap="VolunteerWorkDateResult">
+        <include refid="selectVolunteerWorkDateVo"/>
+        where volunteer_work_date_id = #{volunteerWorkDateId}
+    </select>
+
+    <insert id="insertVolunteerWorkDate" parameterType="VolunteerWorkDate" useGeneratedKeys="true" keyProperty="volunteerWorkDateId">
+        insert into l_volunteer_work_date
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="volunteerId != null">volunteer_id,</if>
+            <if test="workDate != null">work_date,</if>
+            <if test="workStartTime != null">work_start_time,</if>
+            <if test="workEndTime != null">work_end_time,</if>
+            <if test="hasReservation != null">has_reservation,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="volunteerId != null">#{volunteerId},</if>
+            <if test="workDate != null">#{workDate},</if>
+            <if test="workStartTime != null">#{workStartTime},</if>
+            <if test="workEndTime != null">#{workEndTime},</if>
+            <if test="hasReservation != null">#{hasReservation},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateVolunteerWorkDate" parameterType="VolunteerWorkDate">
+        update l_volunteer_work_date
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="volunteerId != null">volunteer_id = #{volunteerId},</if>
+            <if test="workDate != null">work_date = #{workDate},</if>
+            <if test="workStartTime != null">work_start_time = #{workStartTime},</if>
+            <if test="workEndTime != null">work_end_time = #{workEndTime},</if>
+            <if test="hasReservation != null">has_reservation = #{hasReservation},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where volunteer_work_date_id = #{volunteerWorkDateId}
+    </update>
+
+    <delete id="deleteVolunteerWorkDateByVolunteerWorkDateId" parameterType="Long">
+        delete from l_volunteer_work_date where volunteer_work_date_id = #{volunteerWorkDateId}
+    </delete>
+
+    <delete id="deleteVolunteerWorkDateByVolunteerWorkDateIds" parameterType="String">
+        delete from l_volunteer_work_date where volunteer_work_date_id in 
+        <foreach item="volunteerWorkDateId" collection="array" open="(" separator="," close=")">
+            #{volunteerWorkDateId}
+        </foreach>
+    </delete>
+</mapper>

leromro-generator/src/main/resources/vm/java/serviceImpl.java.vm

@@ -2,7 +2,7 @@ package ${packageName}.service.impl;
 
 import java.util.List;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.leromro.equity.mapper.${ClassName}Mapper;
+import com.leromro.core.mapper.${ClassName}Mapper;
 #foreach ($column in $columns)
 #if($column.javaField == 'createTime' || $column.javaField == 'updateTime')
 import com.leromro.common.utils.DateUtils;

leromro_service/pom.xml

@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.leromro</groupId>
-        <artifactId>leromro</artifactId>
-        <version>3.8.9</version>
-    </parent>
-
-    <artifactId>leromro_service</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-    <dependencies>
-        <!-- 核心模块-->
-        <dependency>
-            <groupId>com.leromro</groupId>
-            <artifactId>leromro-framework</artifactId>
-        </dependency>
-
-        <!-- swagger3-->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-boot-starter</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-websocket</artifactId>
-        </dependency>
-
-
-    </dependencies>
-
-</project>

leromro_service/src/main/java/com/leromro/serve/domain/vos/VolunteerInfoVO.java

@@ -1,7 +0,0 @@
-package com.leromro.serve.domain.vos;
-
-import com.leromro.serve.domain.VolunteerInfo;
-
-public class VolunteerInfoVO extends VolunteerInfo {
-
-}

pom.xml

@@ -263,7 +263,6 @@
         <module>leromro-generator</module>
         <module>leromro-common</module>
         <module>leromro-core</module>
-        <module>leromro_service</module>
     </modules>
     <packaging>pom</packaging>