ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAdvertisementController.java
@@ -1,9 +1,21 @@ package com.ruoyi.web.controller.api; import org.springframework.web.bind.annotation.RequestMapping; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BasePage; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.model.TAdvertisement; import com.ruoyi.system.service.TAdvertisementService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * <p> @@ -13,9 +25,89 @@ * @author xiaochen * @since 2025-11-06 */ @Api(tags = "广告管理") @RestController @RequestMapping("/t-advertisement") public class TAdvertisementController { private final TAdvertisementService advertisementService; @Autowired public TAdvertisementController(TAdvertisementService advertisementService) { this.advertisementService = advertisementService; } /** * 获取广告管理管理列表 */ @ApiOperation(value = "获取广告管理分页列表") @PostMapping(value = "/pageList") public R<PageInfo<TAdvertisement>> pageList(@RequestBody BasePage query) { return R.ok(advertisementService.pageList(query)); } /** * 获取广告管理管理列表 */ @ApiOperation(value = "获取广告管理列表") @PostMapping(value = "/list") public R<List<TAdvertisement>> list() { return R.ok(advertisementService.list(Wrappers.lambdaQuery(TAdvertisement.class).orderByDesc(TAdvertisement::getCreateTime))); } /** * 添加广告管理管理 */ @Log(title = "广告管理信息-新增广告管理", businessType = BusinessType.INSERT) @ApiOperation(value = "添加广告管理") @PostMapping(value = "/add") public R<Boolean> add(@Validated @RequestBody TAdvertisement dto) { if (advertisementService.isExit(dto)) { return R.fail("广告名称已存在"); } return R.ok(advertisementService.save(dto)); } /** * 修改广告管理 */ @Log(title = "广告管理信息-修改广告管理", businessType = BusinessType.UPDATE) @ApiOperation(value = "修改广告管理") @PostMapping(value = "/update") public R<Boolean> update(@Validated @RequestBody TAdvertisement dto) { if (advertisementService.isExit(dto)) { return R.fail("广告名称已存在"); } return R.ok(advertisementService.updateById(dto)); } /** * 查看广告管理详情 */ @ApiOperation(value = "查看广告管理详情") @GetMapping(value = "/getDetailById") public R<TAdvertisement> getDetailById(@RequestParam String id) { return R.ok(advertisementService.getById(id)); } /** * 删除广告管理 */ @Log(title = "广告管理信息-删除广告管理", businessType = BusinessType.DELETE) @ApiOperation(value = "删除广告管理") @DeleteMapping(value = "/deleteById") public R<Boolean> deleteById(@RequestParam String id) { return R.ok(advertisementService.removeById(id)); } /** * 批量删除广告管理 */ @Log(title = "广告管理信息-删除广告管理", businessType = BusinessType.DELETE) @ApiOperation(value = "批量删除广告管理") @DeleteMapping(value = "/deleteByIds") public R<Boolean> deleteByIds(@RequestBody List<String> ids) { return R.ok(advertisementService.removeByIds(ids)); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TEmploymentInfoController.java
@@ -1,9 +1,23 @@ package com.ruoyi.web.controller.api; import org.springframework.web.bind.annotation.RequestMapping; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.model.TEmploymentInfo; import com.ruoyi.system.query.TEmploymentInfoQuery; import com.ruoyi.system.service.TEmploymentInfoService; import com.ruoyi.system.vo.TEmploymentInfoVO; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * <p> @@ -13,9 +27,95 @@ * @author xiaochen * @since 2025-11-06 */ @Api(tags = "就业信息管理") @RestController @RequestMapping("/t-employment-info") public class TEmploymentInfoController { private final TEmploymentInfoService employmentInfoService; private final TokenService tokenService; @Autowired public TEmploymentInfoController(TEmploymentInfoService employmentInfoService, TokenService tokenService) { this.employmentInfoService = employmentInfoService; this.tokenService = tokenService; } /** * 获取就业信息管理管理列表 */ @ApiOperation(value = "获取就业信息管理分页列表") @PostMapping(value = "/pageList") public R<PageInfo<TEmploymentInfoVO>> pageList(@RequestBody TEmploymentInfoQuery query) { return R.ok(employmentInfoService.pageList(query)); } /** * 获取就业信息管理管理列表 */ @ApiOperation(value = "获取就业信息管理列表") @PostMapping(value = "/list") public R<List<TEmploymentInfo>> list() { return R.ok(employmentInfoService.list(Wrappers.lambdaQuery(TEmploymentInfo.class).orderByDesc(TEmploymentInfo::getCreateTime))); } /** * 添加就业信息管理管理 */ @Log(title = "就业信息管理信息-新增就业信息管理", businessType = BusinessType.INSERT) @ApiOperation(value = "添加就业信息管理") @PostMapping(value = "/add") public R<Boolean> add(@Validated @RequestBody TEmploymentInfo dto) { if (employmentInfoService.isExit(dto)) { return R.fail("就业信息标题已存在"); } Long userId = tokenService.getLoginUser().getUser().getUserId(); String nickName = tokenService.getLoginUser().getUser().getNickName(); dto.setUserId(userId); dto.setReleasePerson(nickName); return R.ok(employmentInfoService.save(dto)); } /** * 修改就业信息管理 */ @Log(title = "就业信息管理信息-修改就业信息管理", businessType = BusinessType.UPDATE) @ApiOperation(value = "修改就业信息管理") @PostMapping(value = "/update") public R<Boolean> update(@Validated @RequestBody TEmploymentInfo dto) { if (employmentInfoService.isExit(dto)) { return R.fail("就业信息标题已存在"); } return R.ok(employmentInfoService.updateById(dto)); } /** * 查看就业信息管理详情 */ @ApiOperation(value = "查看就业信息管理详情") @GetMapping(value = "/getDetailById") public R<TEmploymentInfo> getDetailById(@RequestParam String id) { return R.ok(employmentInfoService.getById(id)); } /** * 删除就业信息管理 */ @Log(title = "就业信息管理信息-删除就业信息管理", businessType = BusinessType.DELETE) @ApiOperation(value = "删除就业信息管理") @DeleteMapping(value = "/deleteById") public R<Boolean> deleteById(@RequestParam String id) { return R.ok(employmentInfoService.removeById(id)); } /** * 批量删除就业信息管理 */ @Log(title = "就业信息管理信息-删除就业信息管理", businessType = BusinessType.DELETE) @ApiOperation(value = "批量删除就业信息管理") @DeleteMapping(value = "/deleteByIds") public R<Boolean> deleteByIds(@RequestBody List<String> ids) { return R.ok(employmentInfoService.removeByIds(ids)); } } ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantController.java
@@ -1,9 +1,24 @@ package com.ruoyi.web.controller.api; import org.springframework.web.bind.annotation.RequestMapping; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BasePage; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.framework.web.service.TokenService; import com.ruoyi.system.model.TMerchant; import com.ruoyi.system.query.TMerchantQuery; import com.ruoyi.system.service.TMerchantService; import com.ruoyi.system.service.TMerchantTypeService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.RestController; import java.util.List; /** * <p> @@ -13,9 +28,93 @@ * @author xiaochen * @since 2025-11-06 */ @Api(tags = "商户信息管理") @RestController @RequestMapping("/t-merchant") public class TMerchantController { private final TMerchantTypeService merchantTypeService; private final TMerchantService merchantService; private final TokenService tokenService; @Autowired public TMerchantController(TMerchantTypeService merchantTypeService, TMerchantService merchantService, TokenService tokenService) { this.merchantTypeService = merchantTypeService; this.merchantService = merchantService; this.tokenService = tokenService; } /** * 获取商户信息管理管理列表 */ @ApiOperation(value = "获取商户信息管理分页列表") @PostMapping(value = "/pageList") public R<PageInfo<TMerchant>> pageList(@RequestBody TMerchantQuery query) { return R.ok(merchantService.pageList(query)); } /** * 获取商户信息管理管理列表 */ @ApiOperation(value = "获取商户信息管理列表") @PostMapping(value = "/list") public R<List<TMerchant>> list() { return R.ok(merchantService.list(Wrappers.lambdaQuery(TMerchant.class).orderByDesc(TMerchant::getCreateTime))); } /** * 添加商户信息管理管理 */ @Log(title = "商户信息管理信息-新增商户信息管理", businessType = BusinessType.INSERT) @ApiOperation(value = "添加商户信息管理") @PostMapping(value = "/add") public R<Boolean> add(@Validated @RequestBody TMerchant dto) { if (merchantService.isExit(dto)) { return R.fail("商户名称已存在"); } return R.ok(merchantService.save(dto)); } /** * 修改商户信息管理 */ @Log(title = "商户信息管理信息-修改商户信息管理", businessType = BusinessType.UPDATE) @ApiOperation(value = "修改商户信息管理") @PostMapping(value = "/update") public R<Boolean> update(@Validated @RequestBody TMerchant dto) { if (merchantService.isExit(dto)) { return R.fail("商户名称已存在"); } return R.ok(merchantService.updateById(dto)); } /** * 查看商户信息管理详情 */ @ApiOperation(value = "查看商户信息管理详情") @GetMapping(value = "/getDetailById") public R<TMerchant> getDetailById(@RequestParam String id) { return R.ok(merchantService.getById(id)); } /** * 删除商户信息管理 */ @Log(title = "商户信息管理信息-删除商户信息管理", businessType = BusinessType.DELETE) @ApiOperation(value = "删除商户信息管理") @DeleteMapping(value = "/deleteById") public R<Boolean> deleteById(@RequestParam String id) { return R.ok(merchantService.removeById(id)); } /** * 批量删除商户信息管理 */ @Log(title = "商户信息管理信息-删除商户信息管理", businessType = BusinessType.DELETE) @ApiOperation(value = "批量删除商户信息管理") @DeleteMapping(value = "/deleteByIds") public R<Boolean> deleteByIds(@RequestBody List<String> ids) { return R.ok(merchantService.removeByIds(ids)); } } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAdvertisementMapper.java
@@ -1,7 +1,12 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BasePage; import com.ruoyi.system.model.TAdvertisement; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -13,4 +18,8 @@ */ public interface TAdvertisementMapper extends BaseMapper<TAdvertisement> { /** * 获取广告管理列表 */ List<TAdvertisement> pageList(@Param("query") BasePage query, @Param("pageInfo")PageInfo<TAdvertisement> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TEmploymentInfoMapper.java
@@ -1,7 +1,13 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TEmploymentInfo; import com.ruoyi.system.query.TEmploymentInfoQuery; import com.ruoyi.system.vo.TEmploymentInfoVO; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -13,4 +19,8 @@ */ public interface TEmploymentInfoMapper extends BaseMapper<TEmploymentInfo> { /** * 获取就业创业服务管理分页列表 */ List<TEmploymentInfoVO> pageList(@Param("query") TEmploymentInfoQuery query, @Param("pageInfo")PageInfo<TEmploymentInfoVO> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/mapper/TMerchantMapper.java
@@ -1,7 +1,12 @@ package com.ruoyi.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TMerchant; import com.ruoyi.system.query.TMerchantQuery; import org.apache.ibatis.annotations.Param; import java.util.List; /** * <p> @@ -13,4 +18,8 @@ */ public interface TMerchantMapper extends BaseMapper<TMerchant> { /** * 获取商户信息管理分页列表 */ List<TMerchant> pageList(@Param("query") TMerchantQuery query, @Param("pageInfo")PageInfo<TMerchant> pageInfo); } ruoyi-system/src/main/java/com/ruoyi/system/model/TAdvertisement.java
@@ -7,6 +7,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.time.LocalDateTime; @@ -29,6 +30,7 @@ @TableId(value = "id", type = IdType.ASSIGN_ID) private String id; @NotBlank(message = "广告名称不能为空") @ApiModelProperty(value = "广告名称") @TableField("advertisement_name") private String advertisementName; ruoyi-system/src/main/java/com/ruoyi/system/query/TEmploymentInfoQuery.java
New file @@ -0,0 +1,15 @@ package com.ruoyi.system.query; import com.ruoyi.common.core.domain.model.TimeRangeQueryBody; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "就业信息管理查询参数TEmploymentInfoQuery") public class TEmploymentInfoQuery extends TimeRangeQueryBody { @ApiModelProperty(value = "标题") private String infoTitle; } ruoyi-system/src/main/java/com/ruoyi/system/query/TMerchantQuery.java
New file @@ -0,0 +1,18 @@ package com.ruoyi.system.query; import com.ruoyi.common.core.domain.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "商户信息查询参数TMerchantQuery") public class TMerchantQuery extends BasePage { @ApiModelProperty(value = "商户名称") private String merchantName; @ApiModelProperty(value = "商户电话") private String merchantPhone; } ruoyi-system/src/main/java/com/ruoyi/system/service/TAdvertisementService.java
@@ -1,6 +1,8 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BasePage; import com.ruoyi.system.model.TAdvertisement; /** @@ -13,4 +15,17 @@ */ public interface TAdvertisementService extends IService<TAdvertisement> { /** * 判断是否存在 * @param dto * @return */ boolean isExit(TAdvertisement dto); /** * 获取广告管理分页列表 * @param query * @return */ PageInfo<TAdvertisement> pageList(BasePage query); } ruoyi-system/src/main/java/com/ruoyi/system/service/TEmploymentInfoService.java
@@ -1,7 +1,10 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TEmploymentInfo; import com.ruoyi.system.query.TEmploymentInfoQuery; import com.ruoyi.system.vo.TEmploymentInfoVO; /** * <p> @@ -13,4 +16,16 @@ */ public interface TEmploymentInfoService extends IService<TEmploymentInfo> { /** * 判断是否存在 * @param dto * @return */ boolean isExit(TEmploymentInfo dto); /** * 获取就业创业服务管理分页列表 */ PageInfo<TEmploymentInfoVO> pageList(TEmploymentInfoQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/TMerchantService.java
@@ -1,7 +1,9 @@ package com.ruoyi.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.system.model.TMerchant; import com.ruoyi.system.query.TMerchantQuery; /** * <p> @@ -13,4 +15,17 @@ */ public interface TMerchantService extends IService<TMerchant> { /** * 判断商户信息是否存在 * @param dto * @return */ boolean isExit(TMerchant dto); /** * 商户信息列表 * @param query * @return */ PageInfo<TMerchant> pageList(TMerchantQuery query); } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAdvertisementServiceImpl.java
@@ -1,10 +1,18 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.core.domain.BasePage; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.TAdvertisementMapper; import com.ruoyi.system.model.TAdvertisement; import com.ruoyi.system.model.TAdvertisement; import com.ruoyi.system.model.TMerchant; import com.ruoyi.system.service.TAdvertisementService; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -17,4 +25,22 @@ @Service public class TAdvertisementServiceImpl extends ServiceImpl<TAdvertisementMapper, TAdvertisement> implements TAdvertisementService { @Override public boolean isExit(TAdvertisement dto) { if(StringUtils.isNotEmpty(dto.getId())){ // 修改 return this.count(Wrappers.lambdaQuery(TAdvertisement.class).ne(TAdvertisement::getId, dto.getId()).eq(TAdvertisement::getAdvertisementName, dto.getAdvertisementName())) > 0; }else { // 新增 return this.count(Wrappers.lambdaQuery(TAdvertisement.class).eq(TAdvertisement::getAdvertisementName, dto.getAdvertisementName())) > 0; } } @Override public PageInfo<TAdvertisement> pageList(BasePage query) { PageInfo<TAdvertisement> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TAdvertisement> list = this.baseMapper.pageList(query,pageInfo); pageInfo.setRecords(list); return pageInfo; } } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TEmploymentInfoServiceImpl.java
@@ -1,10 +1,19 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.TEmploymentInfoMapper; import com.ruoyi.system.model.TAdvertisement; import com.ruoyi.system.model.TEmploymentInfo; import com.ruoyi.system.model.TEmploymentInfo; import com.ruoyi.system.query.TEmploymentInfoQuery; import com.ruoyi.system.service.TEmploymentInfoService; import com.ruoyi.system.vo.TEmploymentInfoVO; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -17,4 +26,22 @@ @Service public class TEmploymentInfoServiceImpl extends ServiceImpl<TEmploymentInfoMapper, TEmploymentInfo> implements TEmploymentInfoService { @Override public boolean isExit(TEmploymentInfo dto) { if(StringUtils.isNotEmpty(dto.getId())){ // 修改 return this.count(Wrappers.lambdaQuery(TEmploymentInfo.class).ne(TEmploymentInfo::getId, dto.getId()).eq(TEmploymentInfo::getInfoTitle, dto.getInfoTitle())) > 0; }else { // 新增 return this.count(Wrappers.lambdaQuery(TEmploymentInfo.class).eq(TEmploymentInfo::getInfoTitle, dto.getInfoTitle())) > 0; } } @Override public PageInfo<TEmploymentInfoVO> pageList(TEmploymentInfoQuery query) { PageInfo<TEmploymentInfoVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TEmploymentInfoVO> list = this.baseMapper.pageList(query,pageInfo); pageInfo.setRecords(list); return pageInfo; } } ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantServiceImpl.java
@@ -1,10 +1,18 @@ package com.ruoyi.system.service.impl; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.basic.PageInfo; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.system.mapper.TMerchantMapper; import com.ruoyi.system.model.TMerchant; import com.ruoyi.system.model.TMerchant; import com.ruoyi.system.query.TMerchantQuery; import com.ruoyi.system.service.TMerchantService; import com.ruoyi.system.vo.TPartyBuildingVO; import org.springframework.stereotype.Service; import java.util.List; /** * <p> @@ -17,4 +25,22 @@ @Service public class TMerchantServiceImpl extends ServiceImpl<TMerchantMapper, TMerchant> implements TMerchantService { @Override public boolean isExit(TMerchant dto) { if(StringUtils.isNotEmpty(dto.getId())){ // 修改 return this.count(Wrappers.lambdaQuery(TMerchant.class).ne(TMerchant::getId, dto.getId()).eq(TMerchant::getMerchantName, dto.getMerchantName())) > 0; }else { // 新增 return this.count(Wrappers.lambdaQuery(TMerchant.class).eq(TMerchant::getMerchantName, dto.getMerchantName())) > 0; } } @Override public PageInfo<TMerchant> pageList(TMerchantQuery query) { PageInfo<TMerchant> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<TMerchant> list = this.baseMapper.pageList(query,pageInfo); pageInfo.setRecords(list); return pageInfo; } } ruoyi-system/src/main/java/com/ruoyi/system/vo/TEmploymentInfoVO.java
New file @@ -0,0 +1,10 @@ package com.ruoyi.system.vo; import com.ruoyi.system.model.TEmploymentInfo; import io.swagger.annotations.ApiModel; import lombok.Data; @Data @ApiModel(value = "就业信息管理TEmploymentInfo对象", description = "就业信息管理") public class TEmploymentInfoVO extends TEmploymentInfo { } ruoyi-system/src/main/resources/mapper/system/TAdvertisementMapper.xml
@@ -20,5 +20,12 @@ <sql id="Base_Column_List"> id, advertisement_name, pictures, advertisement_detail, read_count, create_time, update_time, create_by, update_by, disabled </sql> <select id="pageList" resultType="com.ruoyi.system.model.TAdvertisement"> SELECT <include refid="Base_Column_List"/> FROM t_advertisement WHERE disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} ORDER BY create_time DESC </select> </mapper> ruoyi-system/src/main/resources/mapper/system/TEmploymentInfoMapper.xml
@@ -23,5 +23,21 @@ <sql id="Base_Column_List"> id, info_title, info_cover, virtual_reading_count, read_count, info_detail, user_id, release_person, create_time, update_time, create_by, update_by, disabled </sql> <select id="pageList" resultType="com.ruoyi.system.vo.TEmploymentInfoVO"> SELECT <include refid="Base_Column_List"/> FROM t_employment_info <where> <if test="query.infoTitle != null and query.infoTitle != ''"> and info_title LIKE concat('%',#{query.infoTitle},'%') </if> <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''"> AND create_time >= #{query.startTime} AND create_time <= #{query.endTime} </if> AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ORDER BY create_time DESC </select> </mapper> ruoyi-system/src/main/resources/mapper/system/TMerchantMapper.xml
@@ -22,5 +22,20 @@ <sql id="Base_Column_List"> id, merchant_name, merchant_phone, type_id, merchant_logo, address, merchant_detail, create_time, update_time, create_by, update_by, disabled </sql> <select id="pageList" resultType="com.ruoyi.system.model.TMerchant"> SELECT <include refid="Base_Column_List"/> FROM t_merchant <where> <if test="query.merchantName != null and query.merchantName != ''"> AND merchant_name LIKE CONCAT('%',#{query.merchantName},'%') </if> <if test="query.merchantPhone != null and query.merchantPhone != ''"> AND merchant_phone LIKE CONCAT('%',#{query.merchantPhone},'%') </if> AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()} </where> ORDER BY create_time DESC </select> </mapper>