Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_c...

liujie

2025-11-06 c2f0603d45c6ed4e189329f6460f94af1eb3df53

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TChildcareServicesController.java

@@ -1,9 +1,22 @@
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.system.model.TChildcareServices;
import com.ruoyi.system.query.TChildcareServicesQuery;
import com.ruoyi.system.service.TChildcareServicesService;
import com.ruoyi.system.vo.TChildcareServicesVO;
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 +26,63 @@
 * @author xiaochen
 * @since 2025-11-06
 */
@Api(tags = "托育服务需求管理")
@RestController
@RequestMapping("/t-childcare-services")
public class TChildcareServicesController {

    private final TChildcareServicesService childcareServicesService;
    @Autowired
    public TChildcareServicesController(TChildcareServicesService childcareServicesService) {
        this.childcareServicesService = childcareServicesService;
    }

    /**
     * 获取托育服务需求管理管理列表
     */
    @ApiOperation(value = "获取托育服务需求管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TChildcareServicesVO>> pageList(@RequestBody TChildcareServicesQuery query) {
        return R.ok(childcareServicesService.pageList(query));
    }

    /**
     * 获取托育服务需求管理管理列表
     */
    @ApiOperation(value = "获取托育服务需求管理列表")
    @PostMapping(value = "/list")
    public R<List<TChildcareServices>> list() {
        return R.ok(childcareServicesService.list(Wrappers.lambdaQuery(TChildcareServices.class).orderByDesc(TChildcareServices::getCreateTime)));
    }

    /**
     * 查看托育服务需求管理详情
     */
    @ApiOperation(value = "查看托育服务需求管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TChildcareServices> getDetailById(@RequestParam String id) {
        return R.ok(childcareServicesService.getById(id));
    }

    /**
     * 删除托育服务需求管理
     */
    @Log(title = "托育服务需求管理信息-删除托育服务需求管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除托育服务需求管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(childcareServicesService.removeById(id));
    }

    /**
     * 批量删除托育服务需求管理
     */
    @Log(title = "托育服务需求管理信息-删除托育服务需求管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除托育服务需求管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(childcareServicesService.removeByIds(ids));
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TConvenientInformationController.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.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TConvenientInformation;
import com.ruoyi.system.query.TConvenientInformationQuery;
import com.ruoyi.system.service.TConvenientInformationService;
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-convenient-information")
public class TConvenientInformationController {

    private final TConvenientInformationService convenientInformationService;
    @Autowired
    public TConvenientInformationController(TConvenientInformationService convenientInformationService) {
        this.convenientInformationService = convenientInformationService;
    }

    /**
     * 获取便民信息管理管理列表
     */
    @ApiOperation(value = "获取便民信息管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TConvenientInformation>> pageList(@RequestBody TConvenientInformationQuery query) {
        return R.ok(convenientInformationService.pageList(query));
    }

    /**
     * 获取便民信息管理管理列表
     */
    @ApiOperation(value = "获取便民信息管理列表")
    @PostMapping(value = "/list")
    public R<List<TConvenientInformation>> list() {
        return R.ok(convenientInformationService.list(Wrappers.lambdaQuery(TConvenientInformation.class).orderByDesc(TConvenientInformation::getCreateTime)));
    }

    /**
     * 添加便民信息管理管理
     */
    @Log(title = "便民信息管理信息-新增便民信息管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加便民信息管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TConvenientInformation dto) {
        if (convenientInformationService.isExit(dto)) {
            return R.fail("便民信息机构名称已存在");
        }
        return R.ok(convenientInformationService.save(dto));
    }

    /**
     * 修改便民信息管理
     */
    @Log(title = "便民信息管理信息-修改便民信息管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改便民信息管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TConvenientInformation dto) {
        if (convenientInformationService.isExit(dto)) {
            return R.fail("便民信息机构名称已存在");
        }
        return R.ok(convenientInformationService.updateById(dto));
    }

    /**
     * 查看便民信息管理详情
     */
    @ApiOperation(value = "查看便民信息管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TConvenientInformation> getDetailById(@RequestParam String id) {
        return R.ok(convenientInformationService.getById(id));
    }

    /**
     * 删除便民信息管理
     */
    @Log(title = "便民信息管理信息-删除便民信息管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除便民信息管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(convenientInformationService.removeById(id));
    }

    /**
     * 批量删除便民信息管理
     */
    @Log(title = "便民信息管理信息-删除便民信息管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除便民信息管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(convenientInformationService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TEmploymentEntrepreneurshipController.java

@@ -1,8 +1,23 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
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.TEmploymentEntrepreneurship;
import com.ruoyi.system.query.TEmploymentEntrepreneurshipQuery;
import com.ruoyi.system.service.TEmploymentEntrepreneurshipService;
import com.ruoyi.system.vo.TEmploymentEntrepreneurshipVO;
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 java.util.List;

/**
 * <p>
@@ -12,9 +27,95 @@
 * @author xiaochen
 * @since 2025-11-06
 */
@Api(tags = "就业创业服务管理")
@RestController
@RequestMapping("/t-employment-entrepreneurship")
public class TEmploymentEntrepreneurshipController {

    private final TEmploymentEntrepreneurshipService employmentEntrepreneurshipService;
    private final TokenService tokenService;
    @Autowired
    public TEmploymentEntrepreneurshipController(TEmploymentEntrepreneurshipService employmentEntrepreneurshipService, TokenService tokenService) {
        this.employmentEntrepreneurshipService = employmentEntrepreneurshipService;
        this.tokenService = tokenService;
    }

    /**
     * 获取就业创业服务管理管理列表
     */
    @ApiOperation(value = "获取就业创业服务管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TEmploymentEntrepreneurshipVO>> pageList(@RequestBody TEmploymentEntrepreneurshipQuery query) {
        return R.ok(employmentEntrepreneurshipService.pageList(query));
    }

    /**
     * 获取就业创业服务管理管理列表
     */
    @ApiOperation(value = "获取就业创业服务管理列表")
    @PostMapping(value = "/list")
    public R<List<TEmploymentEntrepreneurship>> list() {
        return R.ok(employmentEntrepreneurshipService.list(Wrappers.lambdaQuery(TEmploymentEntrepreneurship.class).orderByDesc(TEmploymentEntrepreneurship::getCreateTime)));
    }

    /**
     * 添加就业创业服务管理管理
     */
    @Log(title = "就业创业服务管理信息-新增就业创业服务管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加就业创业服务管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TEmploymentEntrepreneurship dto) {
        if (employmentEntrepreneurshipService.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(employmentEntrepreneurshipService.save(dto));
    }

    /**
     * 修改就业创业服务管理
     */
    @Log(title = "就业创业服务管理信息-修改就业创业服务管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改就业创业服务管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TEmploymentEntrepreneurship dto) {
        if (employmentEntrepreneurshipService.isExit(dto)) {
            return R.fail("就业创业服务标题已存在");
        }
        return R.ok(employmentEntrepreneurshipService.updateById(dto));
    }

    /**
     * 查看就业创业服务管理详情
     */
    @ApiOperation(value = "查看就业创业服务管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TEmploymentEntrepreneurship> getDetailById(@RequestParam String id) {
        return R.ok(employmentEntrepreneurshipService.getById(id));
    }

    /**
     * 删除就业创业服务管理
     */
    @Log(title = "就业创业服务管理信息-删除就业创业服务管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除就业创业服务管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(employmentEntrepreneurshipService.removeById(id));
    }

    /**
     * 批量删除就业创业服务管理
     */
    @Log(title = "就业创业服务管理信息-删除就业创业服务管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除就业创业服务管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(employmentEntrepreneurshipService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java

@@ -1,9 +1,16 @@
package com.ruoyi.web.controller.api;


import org.springframework.web.bind.annotation.RequestMapping;

import org.springframework.web.bind.annotation.RestController;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.THtmlConfig;
import com.ruoyi.system.service.THtmlConfigService;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;

/**
 * <p>
@@ -17,5 +24,34 @@
@RequestMapping("/t-html-config")
public class THtmlConfigController {

    private final THtmlConfigService htmlConfigService;
    @Autowired
    public THtmlConfigController(THtmlConfigService htmlConfigService) {
        this.htmlConfigService = htmlConfigService;
    }
    /**
     * 修改系统配置-协议管理
     */
    @Log(title = "系统配置-协议管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改系统配置-协议管理管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody THtmlConfig dto) {
        THtmlConfig sysConfig = htmlConfigService.getOne(Wrappers.<THtmlConfig>lambdaQuery().eq(THtmlConfig::getConfigType, dto.getConfigType())
                .last("LIMIT 1"));
        sysConfig.setContent(dto.getContent());
        return R.ok(htmlConfigService.updateById(sysConfig));
    }

    /**
     * 查看系统配置-协议管理详情
     */
    @ApiOperation(value = "查看系统配置-协议管理详情",notes = "配置类型 类型 1=托育服务 2=阅芽计划 3=办事指南图文指引 4=暖心服务图片 5=注册协议 6=隐私政策 7=学习申请书 8=安全告知书 9=购买支付说明 10=微心愿风险提示 11=群众诉求服务说明 12=随手拍说明")
    @GetMapping(value = "/getDetailById")
    public R<THtmlConfig> getDetailById(@RequestParam Integer configType) {
        THtmlConfig sysConfig = htmlConfigService.getOne(Wrappers.<THtmlConfig>lambdaQuery().eq(THtmlConfig::getConfigType, configType)
                .last("LIMIT 1"));
        return R.ok(sysConfig);
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TMerchantTypeController.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.model.TMerchantType;
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,103 @@
 * @author xiaochen
 * @since 2025-11-06
 */
@Api(tags = "商户分类管理")
@RestController
@RequestMapping("/t-merchant-type")
public class TMerchantTypeController {

    private final TMerchantTypeService merchantTypeService;
    private final TMerchantService merchantService;
    private final TokenService tokenService;
    @Autowired
    public TMerchantTypeController(TMerchantTypeService merchantTypeService, TMerchantService merchantService, TokenService tokenService) {
        this.merchantTypeService = merchantTypeService;
        this.merchantService = merchantService;
        this.tokenService = tokenService;
    }

    /**
     * 获取商户分类管理管理列表
     */
    @ApiOperation(value = "获取商户分类管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TMerchantType>> pageList(@RequestBody BasePage query) {
        return R.ok(merchantTypeService.pageList(query));
    }

    /**
     * 获取商户分类管理管理列表
     */
    @ApiOperation(value = "获取商户分类管理列表")
    @PostMapping(value = "/list")
    public R<List<TMerchantType>> list() {
        return R.ok(merchantTypeService.list(Wrappers.lambdaQuery(TMerchantType.class).orderByDesc(TMerchantType::getCreateTime)));
    }

    /**
     * 添加商户分类管理管理
     */
    @Log(title = "商户分类管理信息-新增商户分类管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加商户分类管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TMerchantType dto) {
        if (merchantTypeService.isExit(dto)) {
            return R.fail("商户分类已存在");
        }
        return R.ok(merchantTypeService.save(dto));
    }

    /**
     * 修改商户分类管理
     */
    @Log(title = "商户分类管理信息-修改商户分类管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改商户分类管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TMerchantType dto) {
        if (merchantTypeService.isExit(dto)) {
            return R.fail("商户分类已存在");
        }
        return R.ok(merchantTypeService.updateById(dto));
    }

    /**
     * 查看商户分类管理详情
     */
    @ApiOperation(value = "查看商户分类管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TMerchantType> getDetailById(@RequestParam String id) {
        return R.ok(merchantTypeService.getById(id));
    }

    /**
     * 删除商户分类管理
     */
    @Log(title = "商户分类管理信息-删除商户分类管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除商户分类管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        long count = merchantService.count(Wrappers.lambdaQuery(TMerchant.class)
                .eq(TMerchant::getTypeId, id));
        if (count > 0) {
            return R.fail("该商户分类下有商户，请先删除商户");
        }
        return R.ok(merchantTypeService.removeById(id));
    }

    /**
     * 批量删除商户分类管理
     */
    @Log(title = "商户分类管理信息-删除商户分类管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除商户分类管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        long count = merchantService.count(Wrappers.lambdaQuery(TMerchant.class)
                .in(TMerchant::getTypeId, ids));
        if (count > 0) {
            return R.fail("该商户分类下有商户，请先删除商户");
        }
        return R.ok(merchantTypeService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TNoticeController.java

@@ -1,9 +1,22 @@
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.system.model.TNotice;
import com.ruoyi.system.query.TNoticeQuery;
import com.ruoyi.system.service.TNoticeService;
import com.ruoyi.system.vo.TNoticeVO;
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 +26,89 @@
 * @author xiaochen
 * @since 2025-11-06
 */
@Api(tags = "社区公告管理")
@RestController
@RequestMapping("/t-notice")
public class TNoticeController {

    private final TNoticeService noticeService;
    @Autowired
    public TNoticeController(TNoticeService noticeService) {
        this.noticeService = noticeService;
    }

    /**
     * 获取社区公告管理管理列表
     */
    @ApiOperation(value = "获取社区公告管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TNoticeVO>> pageList(@RequestBody TNoticeQuery query) {
        return R.ok(noticeService.pageList(query));
    }

    /**
     * 获取社区公告管理管理列表
     */
    @ApiOperation(value = "获取社区公告管理列表")
    @PostMapping(value = "/list")
    public R<List<TNotice>> list() {
        return R.ok(noticeService.list(Wrappers.lambdaQuery(TNotice.class).orderByDesc(TNotice::getCreateTime)));
    }

    /**
     * 添加社区公告管理管理
     */
    @Log(title = "社区公告管理信息-新增社区公告管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加社区公告管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TNotice dto) {
        if (noticeService.isExit(dto)) {
            return R.fail("社区公告管理标题已存在");
        }
        return R.ok(noticeService.save(dto));
    }

    /**
     * 修改社区公告管理
     */
    @Log(title = "社区公告管理信息-修改社区公告管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改社区公告管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TNotice dto) {
        if (noticeService.isExit(dto)) {
            return R.fail("社区公告管理标题已存在");
        }
        return R.ok(noticeService.updateById(dto));
    }

    /**
     * 查看社区公告管理详情
     */
    @ApiOperation(value = "查看社区公告管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TNotice> getDetailById(@RequestParam String id) {
        return R.ok(noticeService.getById(id));
    }

    /**
     * 删除社区公告管理
     */
    @Log(title = "社区公告管理信息-删除社区公告管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除社区公告管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(noticeService.removeById(id));
    }

    /**
     * 批量删除社区公告管理
     */
    @Log(title = "社区公告管理信息-删除社区公告管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除社区公告管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(noticeService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TPartyBuildingController.java

@@ -1,9 +1,22 @@
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.system.model.TPartyBuilding;
import com.ruoyi.system.query.TPartyBuildingQuery;
import com.ruoyi.system.service.TPartyBuildingService;
import com.ruoyi.system.vo.TPartyBuildingVO;
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 +26,89 @@
 * @author xiaochen
 * @since 2025-11-06
 */
@Api(tags = "党建引领管理")
@RestController
@RequestMapping("/t-party-building")
public class TPartyBuildingController {

    private final TPartyBuildingService partyBuildingService;
    @Autowired
    public TPartyBuildingController(TPartyBuildingService partyBuildingService) {
        this.partyBuildingService = partyBuildingService;
    }

    /**
     * 获取党建引领管理管理列表
     */
    @ApiOperation(value = "获取党建引领管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TPartyBuildingVO>> pageList(@RequestBody TPartyBuildingQuery query) {
        return R.ok(partyBuildingService.pageList(query));
    }

    /**
     * 获取党建引领管理管理列表
     */
    @ApiOperation(value = "获取党建引领管理列表")
    @PostMapping(value = "/list")
    public R<List<TPartyBuilding>> list() {
        return R.ok(partyBuildingService.list(Wrappers.lambdaQuery(TPartyBuilding.class).orderByDesc(TPartyBuilding::getCreateTime)));
    }

    /**
     * 添加党建引领管理管理
     */
    @Log(title = "党建引领管理信息-新增党建引领管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加党建引领管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TPartyBuilding dto) {
        if (partyBuildingService.isExit(dto)) {
            return R.fail("党建引领管理标题已存在");
        }
        return R.ok(partyBuildingService.save(dto));
    }

    /**
     * 修改党建引领管理
     */
    @Log(title = "党建引领管理信息-修改党建引领管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改党建引领管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TPartyBuilding dto) {
        if (partyBuildingService.isExit(dto)) {
            return R.fail("党建引领管理标题已存在");
        }
        return R.ok(partyBuildingService.updateById(dto));
    }

    /**
     * 查看党建引领管理详情
     */
    @ApiOperation(value = "查看党建引领管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TPartyBuilding> getDetailById(@RequestParam String id) {
        return R.ok(partyBuildingService.getById(id));
    }

    /**
     * 删除党建引领管理
     */
    @Log(title = "党建引领管理信息-删除党建引领管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除党建引领管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(partyBuildingService.removeById(id));
    }

    /**
     * 批量删除党建引领管理
     */
    @Log(title = "党建引领管理信息-删除党建引领管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除党建引领管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(partyBuildingService.removeByIds(ids));
    }
    
}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TServiceGuideFileController.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.R;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.model.TServiceGuideFile;
import com.ruoyi.system.query.TServiceGuideFileQuery;
import com.ruoyi.system.service.TServiceGuideFileService;
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,83 @@
 * @author xiaochen
 * @since 2025-11-06
 */
@Api(tags = "办事指南文件管理")
@RestController
@RequestMapping("/t-service-guide-file")
public class TServiceGuideFileController {

    private final TServiceGuideFileService serviceGuideFileService;
    @Autowired
    public TServiceGuideFileController(TServiceGuideFileService serviceGuideFileService) {
        this.serviceGuideFileService = serviceGuideFileService;
    }

    /**
     * 获取办事指南文件管理管理列表
     */
    @ApiOperation(value = "获取办事指南文件管理分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TServiceGuideFile>> pageList(@RequestBody TServiceGuideFileQuery query) {
        return R.ok(serviceGuideFileService.pageList(query));
    }

    /**
     * 获取办事指南文件管理管理列表
     */
    @ApiOperation(value = "获取办事指南文件管理列表")
    @PostMapping(value = "/list")
    public R<List<TServiceGuideFile>> list() {
        return R.ok(serviceGuideFileService.list(Wrappers.lambdaQuery(TServiceGuideFile.class).orderByDesc(TServiceGuideFile::getCreateTime)));
    }

    /**
     * 添加办事指南文件管理管理
     */
    @Log(title = "办事指南文件管理信息-新增办事指南文件管理", businessType = BusinessType.INSERT)
    @ApiOperation(value = "添加办事指南文件管理")
    @PostMapping(value = "/add")
    public R<Boolean> add(@Validated @RequestBody TServiceGuideFile dto) {
        return R.ok(serviceGuideFileService.save(dto));
    }

    /**
     * 修改办事指南文件管理
     */
    @Log(title = "办事指南文件管理信息-修改办事指南文件管理", businessType = BusinessType.UPDATE)
    @ApiOperation(value = "修改办事指南文件管理")
    @PostMapping(value = "/update")
    public R<Boolean> update(@Validated @RequestBody TServiceGuideFile dto) {
        return R.ok(serviceGuideFileService.updateById(dto));
    }

    /**
     * 查看办事指南文件管理详情
     */
    @ApiOperation(value = "查看办事指南文件管理详情")
    @GetMapping(value = "/getDetailById")
    public R<TServiceGuideFile> getDetailById(@RequestParam String id) {
        return R.ok(serviceGuideFileService.getById(id));
    }

    /**
     * 删除办事指南文件管理
     */
    @Log(title = "办事指南文件管理信息-删除办事指南文件管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "删除办事指南文件管理")
    @DeleteMapping(value = "/deleteById")
    public R<Boolean> deleteById(@RequestParam String id) {
        return R.ok(serviceGuideFileService.removeById(id));
    }

    /**
     * 批量删除办事指南文件管理
     */
    @Log(title = "办事指南文件管理信息-删除办事指南文件管理", businessType = BusinessType.DELETE)
    @ApiOperation(value = "批量删除办事指南文件管理")
    @DeleteMapping(value = "/deleteByIds")
    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
        return R.ok(serviceGuideFileService.removeByIds(ids));
    }
    
}


 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TChildcareServicesMapper.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.TChildcareServices;
import com.ruoyi.system.query.TChildcareServicesQuery;
import com.ruoyi.system.vo.TChildcareServicesVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,8 @@
 */
public interface TChildcareServicesMapper extends BaseMapper<TChildcareServices> {

    /**
     * 获取托育服务需求管理列表
     */
    List<TChildcareServicesVO> pageList(@Param("query") TChildcareServicesQuery query, @Param("pageInfo")PageInfo<TChildcareServicesVO> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TConvenientInformationMapper.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.TConvenientInformation;
import com.ruoyi.system.query.TConvenientInformationQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,12 @@
 */
public interface TConvenientInformationMapper extends BaseMapper<TConvenientInformation> {

    /**
     * 获取便民信息管理列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TConvenientInformation> pageList(@Param("query") TConvenientInformationQuery query, @Param("pageInfo")PageInfo<TConvenientInformation> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TEmploymentEntrepreneurshipMapper.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.TEmploymentEntrepreneurship;
import com.ruoyi.system.query.TEmploymentEntrepreneurshipQuery;
import com.ruoyi.system.vo.TEmploymentEntrepreneurshipVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,8 @@
 */
public interface TEmploymentEntrepreneurshipMapper extends BaseMapper<TEmploymentEntrepreneurship> {

    /**
     * 获取就业创业服务管理分页列表
     */
    List<TEmploymentEntrepreneurshipVO> pageList(@Param("query") TEmploymentEntrepreneurshipQuery query, @Param("pageInfo")PageInfo<TEmploymentEntrepreneurshipVO> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TMerchantTypeMapper.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.TMerchantType;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,11 @@
 */
public interface TMerchantTypeMapper extends BaseMapper<TMerchantType> {

    /**
     * 获取商户分类列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TMerchantType> pageList(@Param("query") BasePage query, @Param("pageInfo") PageInfo<TMerchantType> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TNoticeMapper.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.TNotice;
import com.ruoyi.system.query.TNoticeQuery;
import com.ruoyi.system.vo.TNoticeVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,9 @@
 */
public interface TNoticeMapper extends BaseMapper<TNotice> {

    /**
     * 获取社区公告列表
     */
    List<TNoticeVO> pageList(@Param("query") TNoticeQuery query, @Param("pageInfo")PageInfo<TNoticeVO> pageInfo);

}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TPartyBuildingMapper.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.TPartyBuilding;
import com.ruoyi.system.query.TPartyBuildingQuery;
import com.ruoyi.system.vo.TPartyBuildingVO;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +19,8 @@
 */
public interface TPartyBuildingMapper extends BaseMapper<TPartyBuilding> {

    /**
     * 获取党建引领管理分页列表
     */
    List<TPartyBuildingVO> pageList(@Param("query") TPartyBuildingQuery query, @Param("pageInfo")PageInfo<TPartyBuildingVO> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TServiceGuideFileMapper.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.TServiceGuideFile;
import com.ruoyi.system.query.TServiceGuideFileQuery;
import org.apache.ibatis.annotations.Param;

import java.util.List;

/**
 * <p>
@@ -13,4 +18,8 @@
 */
public interface TServiceGuideFileMapper extends BaseMapper<TServiceGuideFile> {

    /**
     * 获取办事指南文件管理列表
     */
    List<TServiceGuideFile> pageList(@Param("query") TServiceGuideFileQuery query, @Param("pageInfo")PageInfo<TServiceGuideFile> pageInfo);
}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TConvenientInformation.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("convenient_name")
    private String convenientName;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TNotice.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("notice_title")
    private String noticeTitle;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TPartyBuilding.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("party_title")
    private String partyTitle;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TServiceGuideFile.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,10 +30,12 @@
    @TableId(value = "id", type = IdType.ASSIGN_ID)
    private String id;

    @NotBlank(message = "文件名称不能为空")
    @ApiModelProperty(value = "文件名称")
    @TableField("file_name")
    private String fileName;

    @NotBlank(message = "文件地址不能为空")
    @ApiModelProperty(value = "文件地址")
    @TableField("file_url")
    private String fileUrl;

 ruoyi-system/src/main/java/com/ruoyi/system/query/TChildcareServicesQuery.java

New file
@@ -0,0 +1,21 @@
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 = "托育服务需求查询参数TChildcareServicesQuery")
public class TChildcareServicesQuery extends TimeRangeQueryBody {

    @ApiModelProperty(value = "姓名")
    private String userName;

    @ApiModelProperty(value = "监护人姓名")
    private String guardianName;

    @ApiModelProperty(value = "监护人联系方式")
    private String guardianPhone;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TConvenientInformationQuery.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 = "便民信息查询参数TConvenientInformationQuery")
public class TConvenientInformationQuery extends BasePage {

    @ApiModelProperty(value = "机构名称")
    private String convenientName;

    @ApiModelProperty(value = "联系电话")
    private String convenientPhone;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TEmploymentEntrepreneurshipQuery.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 = "就业创业服务查询参数TEmploymentEntrepreneurshipQuery")
public class TEmploymentEntrepreneurshipQuery extends TimeRangeQueryBody {

    @ApiModelProperty(value = "活动标题")
    private String employmentTitle;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TNoticeQuery.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 = "社区公告查询参数TNoticeQuery")
public class TNoticeQuery extends TimeRangeQueryBody {

    @ApiModelProperty(value = "标题")
    private String noticeTitle;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TPartyBuildingQuery.java

New file
@@ -0,0 +1,18 @@
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 = "党建引领查询参数TPartyBuildingQuery")
public class TPartyBuildingQuery extends TimeRangeQueryBody {

    @ApiModelProperty(value = "标题")
    private String partyTitle;

    @ApiModelProperty(value = "活动分类 1=党务公开 2=党建风采 3=党建学习")
    private Integer partyType;

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/TServiceGuideFileQuery.java

New file
@@ -0,0 +1,10 @@
package com.ruoyi.system.query;

import com.ruoyi.common.core.domain.BasePage;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "办事指南文件管理查询参数TServiceGuideFileQuery")
public class TServiceGuideFileQuery extends BasePage {
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TChildcareServicesService.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.TChildcareServices;
import com.ruoyi.system.query.TChildcareServicesQuery;
import com.ruoyi.system.vo.TChildcareServicesVO;

/**
 * <p>
@@ -13,4 +16,11 @@
 */
public interface TChildcareServicesService extends IService<TChildcareServices> {

    /**
     * 获取托育服务需求管理分页列表
     * @param query
     * @return
     */
    PageInfo<TChildcareServicesVO> pageList(TChildcareServicesQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TConvenientInformationService.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.TConvenientInformation;
import com.ruoyi.system.query.TConvenientInformationQuery;

/**
 * <p>
@@ -13,4 +15,17 @@
 */
public interface TConvenientInformationService extends IService<TConvenientInformation> {

    /**
     * 判断是否存在
     * @param dto
     * @return
     */
    boolean isExit(TConvenientInformation dto);

    /**
     * 获取便民信息管理分页列表
     * @param query
     * @return
     */
    PageInfo<TConvenientInformation> pageList(TConvenientInformationQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TEmploymentEntrepreneurshipService.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.TEmploymentEntrepreneurship;
import com.ruoyi.system.query.TEmploymentEntrepreneurshipQuery;
import com.ruoyi.system.vo.TEmploymentEntrepreneurshipVO;

/**
 * <p>
@@ -13,4 +16,18 @@
 */
public interface TEmploymentEntrepreneurshipService extends IService<TEmploymentEntrepreneurship> {

    /**
     * 判断是否存在
     * @param dto
     * @return
     */
    boolean isExit(TEmploymentEntrepreneurship dto);

    /**
     * 获取就业创业服务管理分页列表
     * @param query
     * @return
     */
    PageInfo<TEmploymentEntrepreneurshipVO> pageList(TEmploymentEntrepreneurshipQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TMerchantTypeService.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.TMerchantType;

/**
@@ -13,4 +15,17 @@
 */
public interface TMerchantTypeService extends IService<TMerchantType> {

    /**
     * 判断商户分类是否存在
     * @param dto
     * @return
     */
    boolean isExit(TMerchantType dto);

    /**
     * 商户分类列表
     * @param query
     * @return
     */
    PageInfo<TMerchantType> pageList(BasePage query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TNoticeService.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.TNotice;
import com.ruoyi.system.query.TNoticeQuery;
import com.ruoyi.system.vo.TNoticeVO;

/**
 * <p>
@@ -13,4 +16,17 @@
 */
public interface TNoticeService extends IService<TNotice> {

    /**
     * 判断是否存在
     * @param dto
     * @return
     */
    boolean isExit(TNotice dto);

    /**
     * 获取社区公告管理分页列表
     * @param query
     * @return
     */
    PageInfo<TNoticeVO> pageList(TNoticeQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TPartyBuildingService.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.TPartyBuilding;
import com.ruoyi.system.query.TPartyBuildingQuery;
import com.ruoyi.system.vo.TPartyBuildingVO;

/**
 * <p>
@@ -13,4 +16,17 @@
 */
public interface TPartyBuildingService extends IService<TPartyBuilding> {

    /**
     * 检测数据是否存在
     * @param dto
     * @return
     */
    boolean isExit(TPartyBuilding dto);

    /**
     * 获取党建引领分页列表
     * @param query
     * @return
     */
    PageInfo<TPartyBuildingVO> pageList(TPartyBuildingQuery query);
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/TServiceGuideFileService.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.TServiceGuideFile;
import com.ruoyi.system.query.TServiceGuideFileQuery;

/**
 * <p>
@@ -13,4 +15,11 @@
 */
public interface TServiceGuideFileService extends IService<TServiceGuideFile> {

    /**
     * 获取办事指南文件管理分页列表
     * @param query
     * @return
     */
    PageInfo<TServiceGuideFile> pageList(TServiceGuideFileQuery query);

}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TChildcareServicesServiceImpl.java

@@ -1,10 +1,16 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TChildcareServicesMapper;
import com.ruoyi.system.model.TChildcareServices;
import com.ruoyi.system.query.TChildcareServicesQuery;
import com.ruoyi.system.service.TChildcareServicesService;
import com.ruoyi.system.vo.TChildcareServicesVO;
import com.ruoyi.system.vo.TPartyBuildingVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +23,11 @@
@Service
public class TChildcareServicesServiceImpl extends ServiceImpl<TChildcareServicesMapper, TChildcareServices> implements TChildcareServicesService {

    @Override
    public PageInfo<TChildcareServicesVO> pageList(TChildcareServicesQuery query) {
        PageInfo<TChildcareServicesVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TChildcareServicesVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TConvenientInformationServiceImpl.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.TConvenientInformationMapper;
import com.ruoyi.system.model.TConvenientInformation;
import com.ruoyi.system.model.TConvenientInformation;
import com.ruoyi.system.query.TConvenientInformationQuery;
import com.ruoyi.system.service.TConvenientInformationService;
import com.ruoyi.system.vo.TChildcareServicesVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +25,22 @@
@Service
public class TConvenientInformationServiceImpl extends ServiceImpl<TConvenientInformationMapper, TConvenientInformation> implements TConvenientInformationService {

    @Override
    public boolean isExit(TConvenientInformation dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TConvenientInformation.class).ne(TConvenientInformation::getId, dto.getId()).eq(TConvenientInformation::getConvenientName, dto.getConvenientName())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TConvenientInformation.class).eq(TConvenientInformation::getConvenientName, dto.getConvenientName())) > 0;
        }
    }

    @Override
    public PageInfo<TConvenientInformation> pageList(TConvenientInformationQuery query) {
        PageInfo<TConvenientInformation> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TConvenientInformation> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TEmploymentEntrepreneurshipServiceImpl.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.TEmploymentEntrepreneurshipMapper;
import com.ruoyi.system.model.TConvenientInformation;
import com.ruoyi.system.model.TEmploymentEntrepreneurship;
import com.ruoyi.system.model.TEmploymentEntrepreneurship;
import com.ruoyi.system.query.TEmploymentEntrepreneurshipQuery;
import com.ruoyi.system.service.TEmploymentEntrepreneurshipService;
import com.ruoyi.system.vo.TEmploymentEntrepreneurshipVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +26,22 @@
@Service
public class TEmploymentEntrepreneurshipServiceImpl extends ServiceImpl<TEmploymentEntrepreneurshipMapper, TEmploymentEntrepreneurship> implements TEmploymentEntrepreneurshipService {

    @Override
    public boolean isExit(TEmploymentEntrepreneurship dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TEmploymentEntrepreneurship.class).ne(TEmploymentEntrepreneurship::getId, dto.getId()).eq(TEmploymentEntrepreneurship::getEmploymentTitle, dto.getEmploymentTitle())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TEmploymentEntrepreneurship.class).eq(TEmploymentEntrepreneurship::getEmploymentTitle, dto.getEmploymentTitle())) > 0;
        }
    }

    @Override
    public PageInfo<TEmploymentEntrepreneurshipVO> pageList(TEmploymentEntrepreneurshipQuery query) {
        PageInfo<TEmploymentEntrepreneurshipVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TEmploymentEntrepreneurshipVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TMerchantTypeServiceImpl.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.TMerchantTypeMapper;
import com.ruoyi.system.model.TMerchantType;
import com.ruoyi.system.model.TMerchantType;
import com.ruoyi.system.service.TMerchantTypeService;
import com.ruoyi.system.vo.TNoticeVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +25,22 @@
@Service
public class TMerchantTypeServiceImpl extends ServiceImpl<TMerchantTypeMapper, TMerchantType> implements TMerchantTypeService {

    @Override
    public boolean isExit(TMerchantType dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TMerchantType.class).ne(TMerchantType::getId, dto.getId()).eq(TMerchantType::getTypeName, dto.getTypeName())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TMerchantType.class).eq(TMerchantType::getTypeName, dto.getTypeName())) > 0;
        }
    }

    @Override
    public PageInfo<TMerchantType> pageList(BasePage query) {
        PageInfo<TMerchantType> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TMerchantType> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TNoticeServiceImpl.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.TNoticeMapper;
import com.ruoyi.system.model.TNotice;
import com.ruoyi.system.model.TNotice;
import com.ruoyi.system.query.TNoticeQuery;
import com.ruoyi.system.service.TNoticeService;
import com.ruoyi.system.vo.TChildcareServicesVO;
import com.ruoyi.system.vo.TNoticeVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +26,22 @@
@Service
public class TNoticeServiceImpl extends ServiceImpl<TNoticeMapper, TNotice> implements TNoticeService {

    @Override
    public boolean isExit(TNotice dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TNotice.class).ne(TNotice::getId, dto.getId()).eq(TNotice::getNoticeTitle, dto.getNoticeTitle())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TNotice.class).eq(TNotice::getNoticeTitle, dto.getNoticeTitle())) > 0;
        }
    }

    @Override
    public PageInfo<TNoticeVO> pageList(TNoticeQuery query) {
        PageInfo<TNoticeVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TNoticeVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TPartyBuildingServiceImpl.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.TPartyBuildingMapper;
import com.ruoyi.system.model.TPartyBuilding;
import com.ruoyi.system.query.TPartyBuildingQuery;
import com.ruoyi.system.service.TPartyBuildingService;
import com.ruoyi.system.vo.TPartyBuildingVO;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.util.List;
import java.util.Objects;

/**
 * <p>
@@ -17,4 +26,22 @@
@Service
public class TPartyBuildingServiceImpl extends ServiceImpl<TPartyBuildingMapper, TPartyBuilding> implements TPartyBuildingService {

    @Override
    public boolean isExit(TPartyBuilding dto) {
        if(StringUtils.isNotEmpty(dto.getId())){
            // 修改
            return this.count(Wrappers.lambdaQuery(TPartyBuilding.class).ne(TPartyBuilding::getId, dto.getId()).eq(TPartyBuilding::getPartyTitle, dto.getPartyTitle())) > 0;
        }else {
            // 新增
            return this.count(Wrappers.lambdaQuery(TPartyBuilding.class).eq(TPartyBuilding::getPartyTitle, dto.getPartyTitle())) > 0;
        }
    }

    @Override
    public PageInfo<TPartyBuildingVO> pageList(TPartyBuildingQuery query) {
        PageInfo<TPartyBuildingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TPartyBuildingVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TServiceGuideFileServiceImpl.java

@@ -1,10 +1,15 @@
package com.ruoyi.system.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.mapper.TServiceGuideFileMapper;
import com.ruoyi.system.model.TServiceGuideFile;
import com.ruoyi.system.query.TServiceGuideFileQuery;
import com.ruoyi.system.service.TServiceGuideFileService;
import com.ruoyi.system.vo.TPartyBuildingVO;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * <p>
@@ -17,4 +22,11 @@
@Service
public class TServiceGuideFileServiceImpl extends ServiceImpl<TServiceGuideFileMapper, TServiceGuideFile> implements TServiceGuideFileService {

    @Override
    public PageInfo<TServiceGuideFile> pageList(TServiceGuideFileQuery query) {
        PageInfo<TServiceGuideFile> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TServiceGuideFile> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);
        return pageInfo;
    }
}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TChildcareServicesVO.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TChildcareServices;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "TChildcareServicesVO对象", description = "托育服务需求")
public class TChildcareServicesVO extends TChildcareServices {



}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TEmploymentEntrepreneurshipVO.java

New file
@@ -0,0 +1,13 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TEmploymentEntrepreneurship;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "就业创业服务视图对象TEmploymentEntrepreneurshipVO", description = "就业创业服务视图对象")
public class TEmploymentEntrepreneurshipVO extends TEmploymentEntrepreneurship {



}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TNoticeVO.java

New file
@@ -0,0 +1,12 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TNotice;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "社区公告对象TNoticeVO")
public class TNoticeVO extends TNotice {


}

 ruoyi-system/src/main/java/com/ruoyi/system/vo/TPartyBuildingVO.java

New file
@@ -0,0 +1,10 @@
package com.ruoyi.system.vo;

import com.ruoyi.system.model.TPartyBuilding;
import io.swagger.annotations.ApiModel;
import lombok.Data;

@Data
@ApiModel(value = "党建引领信息TPartyBuildingVO")
public class TPartyBuildingVO extends TPartyBuilding {
}

 ruoyi-system/src/main/resources/mapper/system/TChildcareServicesMapper.xml

@@ -24,5 +24,27 @@
    <sql id="Base_Column_List">
        id, app_user_id, user_name, sex, birth_date, guardian_name, guardian_phone, service_form, remarks, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TChildcareServicesVO">
        SELECT
        <include refid="Base_Column_List"/>
            FROM t_childcare_services
        <where>
            <if test="query.userName != null and query.userName != ''">
                AND user_name LIKE CONCAT('%',#{query.userName},'%')
            </if>
            <if test="query.guardianName != null and query.guardianName != ''">
                AND guardian_name LIKE CONCAT('%',#{query.guardianName},'%')
            </if>
            <if test="query.guardianPhone != null and query.guardianPhone != ''">
                AND guardian_phone LIKE CONCAT('%',#{query.guardianPhone},'%')
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND create_time &gt;= #{query.startTime}
                AND create_time &lt;= #{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/TConvenientInformationMapper.xml

@@ -21,5 +21,20 @@
    <sql id="Base_Column_List">
        id, convenient_name, convenient_phone, convenient_cover, address, convenient_detail, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TConvenientInformation">
        select
            <include refid="Base_Column_List"/>
            from t_convenient_information
        <where>
            <if test="query.convenientName != null and query.convenientName != ''">
                and convenient_name like concat('%',#{query.convenientName},'%')
            </if>
            <if test="query.convenientPhone != null and query.convenientPhone != ''">
                and convenient_phone like concat('%',#{query.convenientPhone},'%')
            </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/TEmploymentEntrepreneurshipMapper.xml

@@ -23,5 +23,21 @@
    <sql id="Base_Column_List">
        id, employment_title, employment_cover, virtual_reading_count, read_count, employment_detail, user_id, release_person, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TEmploymentEntrepreneurshipVO">
        SELECT
        <include refid="Base_Column_List"/>
            FROM t_employment_entrepreneurship
        <where>
            <if test="query.employmentTitle != null and query.employmentTitle != ''">
                AND employment_title LIKE concat('%',#{query.employmentTitle},'%')
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND create_time &gt;= #{query.startTime}
                AND create_time &lt;= #{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/TMerchantTypeMapper.xml

@@ -17,5 +17,12 @@
    <sql id="Base_Column_List">
        id, type_name, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TMerchantType">
        SELECT
        <include refid="Base_Column_List"/>
            FROM t_merchant_type
        WHERE disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        ORDER BY create_time DESC
    </select>

</mapper>

 ruoyi-system/src/main/resources/mapper/system/TNoticeMapper.xml

@@ -21,5 +21,21 @@
    <sql id="Base_Column_List">
        id, notice_title, notice_cover, notice_content, sort_by, read_count, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TNoticeVO">
        select
        <include refid="Base_Column_List"/>
            from t_notice
        <where>
            <if test="query.noticeTitle != null and query.noticeTitle != ''">
                AND notice_title LIKE concat('%',#{query.noticeTitle},'%')
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND create_time &gt;= #{query.startTime}
                AND create_time &lt;= #{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/TPartyBuildingMapper.xml

@@ -22,5 +22,24 @@
    <sql id="Base_Column_List">
        id, party_title, party_type, party_cover, virtual_reading_count, read_count, party_detail, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TPartyBuildingVO">
        SELECT
        <include refid="Base_Column_List"/>
            FROM t_party_building
        <where>
            <if test="query.partyTitle != null and query.partyTitle != ''">
                AND party_title LIKE CONCAT('%',#{query.partyTitle},'%')
            </if>
            <if test="query.partyType != null">
                AND party_type = #{query.partyType}
            </if>
            <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
                AND create_time &gt;= #{query.startTime}
                AND create_time &lt;= #{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/TServiceGuideFileMapper.xml

@@ -19,5 +19,17 @@
    <sql id="Base_Column_List">
        id, file_name, file_url, download_count, create_time, update_time, create_by, update_by, disabled
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.model.TServiceGuideFile">
        SELECT
        <include refid="Base_Column_List"/>
            FROM t_service_guide_file
        <where>
            <if test="fileName != null and fileName != ''">
                AND file_name LIKE concat('%',#{fileName},'%')
            </if>
            AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
        </where>
        ORDER BY create_time DESC
    </select>

</mapper>