ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseAnnextypeController.java

@@ -14,6 +14,7 @@
import com.ruoyi.project.service.IBaseAnnextypeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.Tag;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +31,7 @@
 * @date 2023-11-10
 */
@Slf4j
@Api(description = "捐献附件")
@Api(description = "捐献附件",tags={"捐献附件"})
@RestController
@RequestMapping("/project/annextype")
public class BaseAnnextypeController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseExpertfeetypeController.java

@@ -33,7 +33,7 @@
 * @date 2022-04-19
 */
@Slf4j
@Api(description = "专家费用")
@Api(description = "专家费用",tags={"专家费用"})
@RestController
@RequestMapping("/project/expertfeetype")
public class BaseExpertfeetypeController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java

@@ -25,7 +25,7 @@
 * @date 2022-01-11
 */
@Slf4j
@Api(description = "收入费用科目")
@Api(description = "收入费用科目",tags={"费用科目"})
@RestController
@RequestMapping("/project/financesubject")
public class BaseFinancesubjectController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseItemexpenseController.java

@@ -33,7 +33,7 @@
 * @date 2022-05-11
 */
@Slf4j
@Api(description = "收入费用科目")
@Api(description = "科目费用",tags={"科目费用"})
@RestController
@RequestMapping("/project/itemexpense")
public class BaseItemexpenseController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOnlyValController.java

@@ -27,7 +27,7 @@
 * @date 2022-05-11
 */
@Slf4j
@Api(description = "收入费用科目")
@Api(description = "唯一值",tags={"获取唯一值"})
@RestController
@RequestMapping("/project/baseonlyvalue")
public class BaseOnlyValController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganchargeController.java

@@ -26,7 +26,7 @@
 * @date 2023-10-08
 */
@Slf4j
@Api(description = "人体器官获取费用")
@Api(description = "人体器官获取费用",tags={"捐献附件"})
@RestController
@RequestMapping("/project/organcharge")
public class BaseOrganchargeController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseOrganizationController.java

@@ -28,7 +28,7 @@
 * @date 2021-11-05
 */
@Slf4j
@Api(description = "机构信息管理")
@Api(description = "机构信息管理",tags={"机构信息"})
@RestController
@RequestMapping("/project/organization")
public class BaseOrganizationController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BasePrcaddressDictController.java

@@ -33,7 +33,7 @@
 * @date 2021-11-15
 */
@Slf4j
@Api(description = "省市区管理")
@Api(description = "省市区管理" ,tags = {"省市区管理"})
@RestController
@RequestMapping("/project/dict")
public class BasePrcaddressDictController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseTravelcityController.java

@@ -27,7 +27,7 @@
 * @date 2023-04-23
 */
@Slf4j
@Api(description = "差旅城市和补贴标准")
@Api(description = "差旅城市和补贴标准",tags = {"差旅城市补贴标准"})
@RestController
@RequestMapping("/project/travelcity")
public class BaseTravelcityController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/DingTalkController.java

@@ -26,7 +26,7 @@
 * @date 2023-05-15
 */
@Slf4j
@Api(description = "钉钉接口")
@Api(description = "钉钉接口",tags = {"钉钉接口"})
@RestController
@RequestMapping("/system/dingtalk")
@PropertySource(value = {"classpath:application-druid.yml"})

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/PdfMergeController.java

@@ -35,7 +35,7 @@
 * @date 2022-01-24
 */
@Slf4j
@Api(description = "PDF合并")
@Api(description = "PDF合并",tags = {"PDF合并"})
@RestController
@RequestMapping("/project/pdfmerge")
public class PdfMergeController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceAttendancerecordsController.java

@@ -31,7 +31,7 @@
 * @author ls
 * @date 2025-12-28
 */
@Api(description = "考勤记录")
@Api(description = "考勤记录",tags={"考勤管理"})
@RestController
@RequestMapping("/project/attendancerecords")
public class ServiceAttendancerecordsController extends BaseController {
@@ -44,7 +44,7 @@
    @ApiOperation("查询考勤记录列表")
    // @PreAuthorize("@ss.hasPermi('project:attendancerecords:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceAttendancerecords serviceAttendancerecords) {
    public TableDataInfo list(@RequestBody ServiceAttendancerecords serviceAttendancerecords) {
        startPage();
        List<ServiceAttendancerecords> list = serviceAttendancerecordsService.queryList(serviceAttendancerecords);
        return getDataTable(list);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDeathinfoController.java

@@ -30,7 +30,7 @@
 * @author ls
 * @date 2026-01-20
 */
@Api(description = "患者死亡信息")
@Api(description = "捐献者死亡判定",tags={"捐献者死亡判定"})
@RestController
@RequestMapping("/project/deathinfo")
public class ServiceDeathinfoController extends BaseController {
@@ -40,7 +40,7 @@
    /**
     * 查询患者死亡信息列表
     */
    @ApiOperation("查询患者死亡基本信息")
    @ApiOperation("查询捐赠者死亡基本信息")
    @PostMapping("/queryDathInfoBaseInfo")
    public Map<String, Object> queryDathInfoBaseInfo(@RequestBody DeathBaseInfoVO deathBaseInfoVO) {
        Integer offset = PageUtils.getOffset(deathBaseInfoVO.getPageNum(), deathBaseInfoVO.getPageSize());
@@ -59,7 +59,7 @@
    /**
     * 导出患者死亡信息列表
     */
    @ApiOperation("导出患者死亡信息列表")
    @ApiOperation("导出捐献者死亡信息列表")
    // @PreAuthorize("@ss.hasPermi('project:deathinfo:export')")
    @Log(title = "患者死亡信息", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
@@ -72,7 +72,7 @@
    /**
     * 获取患者死亡信息详细信息
     */
    @ApiOperation("获取患者死亡信息详细信息")
    @ApiOperation("获取捐献者死亡信息详细信息")
    // @PreAuthorize("@ss.hasPermi('project:deathinfo:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
@@ -82,7 +82,7 @@
    /**
     * 新增患者死亡信息
     */
    @ApiOperation("新增患者死亡信息")
    @ApiOperation("新增捐献者死亡信息")
    @UniqueCheck(
            fields = {"infoid"},
            entityClass = ServiceDeathinfo.class,
@@ -98,7 +98,7 @@
    /**
     * 修改患者死亡信息
     */
    @ApiOperation("修改患者死亡信息")
    @ApiOperation("修改捐献死亡信息")
    // @PreAuthorize("@ss.hasPermi('project:deathinfo:edit')")
    @Log(title = "患者死亡信息", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
@@ -110,7 +110,7 @@
    /**
     * 删除患者死亡信息
     */
    @ApiOperation("删除患者死亡信息")
    @ApiOperation("删除捐献者死亡信息")
    // @PreAuthorize("@ss.hasPermi('project:deathinfo:remove')")
    @Log(title = "患者死亡信息", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributedetailController.java

@@ -33,7 +33,7 @@
 * @date 2022-03-01
 */
@Slf4j
@Api(description = "专家费用分发汇总明细")
@Api(description = "专家费用分发汇总明细",tags = {"专家费用分发汇总明细"})
@RestController
@RequestMapping("/project/distributedetail")
public class ServiceDistributedetailController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDistributesummaryController.java

@@ -33,7 +33,7 @@
 * @date 2022-03-01
 */
@Slf4j
@Api(description = "专家费用分发汇总主")
@Api(description = "专家费用分发汇总主",tags = {"专家费用分发汇总主"})
@RestController
@RequestMapping("/project/distributesummary")
public class ServiceDistributesummaryController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDocumentfilesController.java

@@ -33,7 +33,7 @@
 * @date 2022-04-08
 */
@Slf4j
@Api(description = "捐献附件")
@Api(description = "捐献附件",tags = {"捐献附件"})
@RestController
@RequestMapping("/project/documentfiles")
public class ServiceDocumentfilesController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java

@@ -36,7 +36,7 @@
 * @date 2021-11-11
 */
@Slf4j
@Api(description = "附件管理")
@Api(description = "附件管理",tags = {"附件管理"})
@RestController
@RequestMapping("/project/donateannex")
public class ServiceDonateannexController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexrequirementController.java

@@ -33,7 +33,7 @@
 * @date 2021-11-10
 */
@Slf4j
@Api(description = "捐献要求附件管理")
@Api(description = "捐献要求附件管理",tags = {"捐献要求附件管理"})
@RestController
@RequestMapping("/project/donateannexrequirement")
public class ServiceDonateannexrequirementController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoController.java

@@ -51,7 +51,7 @@
 * @date 2021-11-10
 */
@Slf4j
@Api(description = "潜在捐献信息管理")
@Api(description = "潜在捐献信息管理",tags={"潜在捐献信息管理"})
@RestController
@RequestMapping("/project/donatebaseinfo")
public class ServiceDonatebaseinfoController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatebaseinfoReportController.java

@@ -35,7 +35,7 @@
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "捐献上报基础")
@Api(description = "捐献上报基础",tags={"捐献上报"})
@RestController
@RequestMapping("/project/donatebaseinforeport")
public class ServiceDonatebaseinfoReportController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecompletioninfoController.java

@@ -44,7 +44,7 @@
 * @date 2021-11-19
 */
@Slf4j
@Api(description = "捐献完成登记管理")
@Api(description = "捐献完成登记管理",tags={"捐献完成登记"})
@RestController
@RequestMapping("/project/donatecompletioninfo")
public class ServiceDonatecompletioninfoController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatecomporganController.java

@@ -27,7 +27,7 @@
 * @date 2023-12-25
 */
@Slf4j
@Api(description = "捐献器官移植")
@Api(description = "捐献器官移植",tags={"捐献器官完成移植登记"})
@RestController
@RequestMapping("/project/donatecomporgan")
public class ServiceDonatecomporganController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateflowchartController.java

@@ -32,7 +32,7 @@
 * @author ruoyi
 * @date 2021-11-15
 */
@Api(description = "捐献流程管理")
@Api(description = "捐献流程管理",tags={"捐献流程"})
@RestController
@RequestMapping("/project/donateflowchart")
public class ServiceDonateflowchartController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatefollowupController.java

@@ -36,7 +36,7 @@
 * @author ruoyi
 * @date 2021-12-10
 */
@Api(description = "捐献随访")
@Api(description = "捐献随访",tags = {"捐献随访"})
@RestController
@RequestMapping("/project/donatefollowup")
public class ServiceDonatefollowupController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonatemaintenanceController.java

@@ -29,7 +29,7 @@
 * @author ruoyi
 * @date 2025-12-27
 */
@Api(description = "供体维护记录")
@Api(description = "供体维护记录",tags={"供体维护记录"})
@RestController
@RequestMapping("/project/donatemaintenance")
public class ServiceDonatemaintenanceController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganBaseController.java

@@ -30,7 +30,7 @@
 * @author ls
 * @date 2026-01-17
 */
@Api(description = "捐献器官分配基础")
@Api(description = "捐献器官分配基础",tags = {"捐献器官分配基础"})
@RestController
@RequestMapping("/project/donateorganBase")
public class ServiceDonateorganBaseController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganController.java

@@ -35,7 +35,7 @@
 * @date 2021-11-10
 */
@Slf4j
@Api(description = "捐献器官管理分配")
@Api(description = "捐献器官管理分配",tags = {"捐献器官分配"})
@RestController
@RequestMapping("/project/donateorgan")
public class ServiceDonateorganController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateorganstaticsController.java

@@ -24,7 +24,7 @@
 * @author ruoyi
 * @date 2023-12-27
 */
@Api(description = "捐献案例器官列")
@Api(description = "案例捐献器官",tags = {"案例捐献器官"})
@RestController
@RequestMapping("/project/donateorganstatics")
public class ServiceDonateorganstaticsController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessController.java

@@ -46,7 +46,7 @@
 * @date 2021-11-17
 */
@Slf4j
@Api(description = "捐献见证管理")
@Api(description = "捐献见证管理",tags = {"捐献获取见证"})
@RestController
@RequestMapping("/project/donationwitness")
public class ServiceDonationwitnessController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonationwitnessorganController.java

@@ -29,7 +29,7 @@
 * @date 2023-12-25
 */
@Slf4j
@Api(description = "捐献器官获取")
@Api(description = "捐献器官获取",tags={"见证获取捐献器官"})
@RestController
@RequestMapping("/project/donationwitnessorgan")
public class ServiceDonationwitnessorganController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeController.java

@@ -27,7 +27,7 @@
 * @author ruoyi
 * @date 2023-12-27
 */
@Api(description = "捐献案例器官列")
@Api(description = "捐献收费",tags = {"捐献收费"})
@RestController
@RequestMapping("/project/donorcharge")
public class ServiceDonorchargeController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java

@@ -36,7 +36,7 @@
 * @date 2023-12-25
 */
@Slf4j
@Api(description = "捐献器官")
@Api(description = "捐献器官",tags = {"捐献收费-器官"})
@RestController
@RequestMapping("/project/donorchargeorgan")
public class ServiceDonorchargeorganController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorpaymentController.java

@@ -28,7 +28,7 @@
 * @author ruoyi
 * @date 2024-02-27
 */
@Api(description = "费用收款单")
@Api(description = "捐献费用收款",tags={"捐献费用收款"} )
@RestController
@RequestMapping("/project/donorpayment")
public class ServiceDonorpaymentController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceEthicalreviewinitiateController.java

@@ -28,7 +28,7 @@
 * @author ls
 * @date 2025-12-20
 */
@Api(description = "伦理审查发起")
@Api(description = "伦理审查发起",tags = {"伦理审查发起"})
@RestController
@RequestMapping("/project/ethicalreviewinitiate")
public class ServiceEthicalreviewinitiateController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceExpertexpenseController.java

@@ -32,7 +32,7 @@
 * @author ruoyi
 * @date 2022-03-01
 */
@Api(description = "费用申请主")
@Api(description = "费用申请主",tags = {"费用申请"})
@RestController
@RequestMapping("/system/expertexpense")
public class ServiceExpertexpenseController extends BaseController

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationController.java

@@ -32,7 +32,7 @@
 * @date 2021-11-19
 */
@Slf4j
@Api(description = "医疗评估管理")
@Api(description = "医疗评估管理",tags = {"捐献医学评估"})
@RestController
@RequestMapping("/project/medicalevaluation")
public class ServiceMedicalevaluationController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMedicalevaluationorganController.java

@@ -23,7 +23,7 @@
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "捐献器官评估")
@Api(description = "捐献器官评估",tags = {"捐献器官医学评估"})
@RestController
@RequestMapping("/project/medicalevaluationorgan")
public class ServiceMedicalevaluationorganController extends BaseController
@@ -37,7 +37,7 @@
    @ApiOperation("查询捐献器官评估列表")
    // @PreAuthorize("@ss.hasPermi('system:medicalevaluationorgan:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceMedicalevaluationorgan serviceMedicalevaluationorgan)
    public TableDataInfo list(@RequestBody ServiceMedicalevaluationorgan serviceMedicalevaluationorgan)
    {
        startPage();
        List<ServiceMedicalevaluationorgan> list = serviceMedicalevaluationorganService.queryList(serviceMedicalevaluationorgan);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMeetingController.java

@@ -30,7 +30,7 @@
 * @author ls
 * @date 2025-12-28
 */
@Api(description = "会议纪要")
@Api(description = "会议纪要",tags ={"会议纪要"} )
@RestController
@RequestMapping("/project/meeting")
public class ServiceMeetingController extends BaseController
@@ -44,7 +44,7 @@
    @ApiOperation("查询会议纪要列表")
    // @PreAuthorize("@ss.hasPermi('project:meeting:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceMeeting serviceMeeting)
    public TableDataInfo list(@RequestBody ServiceMeeting serviceMeeting)
    {
        startPage();
        List<ServiceMeeting> list = serviceMeetingService.queryList(serviceMeeting);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceMeetingParticipantController.java

@@ -30,7 +30,7 @@
 * @author ls
 * @date 2025-12-28
 */
@Api(description = "参会人员")
@Api(description = "参会人员",tags = {"参会人员"})
@RestController
@RequestMapping("/project/participant")
public class ServiceMeetingParticipantController extends BaseController
@@ -43,7 +43,7 @@
     */
    @ApiOperation("查询参会人员列表")
    // @PreAuthorize("@ss.hasPermi('project:participant:list')")
    @PostMapping("/list")
    @GetMapping("/list")
    public TableDataInfo list(ServiceMeetingParticipant serviceMeetingParticipant)
    {
        startPage();

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceRelativesconfirmationController.java

@@ -44,7 +44,7 @@
 * @date 2021-11-15
 */
@Slf4j
@Api(description = "亲属确认管理")
@Api(description = "亲属确认管理",tags = {"捐献确认"})
@RestController
@RequestMapping("/project/relativesconfirmation")
public class ServiceRelativesconfirmationController extends BaseController {

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTrainingRecordsController.java

@@ -30,7 +30,7 @@
 * @author ls
 * @date 2025-12-28
 */
@Api(description = "人员进修管理")
@Api(description = "人员进修管理",tags = {"人员进修记录"})
@RestController
@RequestMapping("/project/records")
public class ServiceTrainingRecordsController extends BaseController
@@ -44,7 +44,7 @@
    @ApiOperation("查询人员进修管理列表")
    // @PreAuthorize("@ss.hasPermi('project:records:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceTrainingRecords serviceTrainingRecords)
    public TableDataInfo list(@RequestBody ServiceTrainingRecords serviceTrainingRecords)
    {
        startPage();
        List<ServiceTrainingRecords> list = serviceTrainingRecordsService.queryList(serviceTrainingRecords);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportController.java

@@ -26,7 +26,7 @@
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "供者转运登记")
@Api(description = "供者转运登记",tags = {"供者转运登记"})
@RestController
@RequestMapping("/project/transport")
public class ServiceTransportController extends BaseController {
@@ -42,7 +42,7 @@
    @ApiOperation("查询供者转运登记列表")
    // @PreAuthorize("@ss.hasPermi('system:transport:list')")
    @PostMapping("/list")
    public Map<String, Object> list(ServiceTransport serviceTransport) {
    public Map<String, Object> list(@RequestBody ServiceTransport serviceTransport) {
        Page<ServiceTransport> serviceTransportPage = serviceTransportService.queryList(serviceTransport);
        return getDataTable(serviceTransportPage.getRecords(), (int) serviceTransportPage.getTotal());
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTransportFileController.java

@@ -24,7 +24,7 @@
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "供者转运登记附件")
@Api(description = "供者转运登记附件",tags = {"供者转运登记附件"})
@RestController
@RequestMapping("/project/transportfile")
public class ServiceTransportFileController extends BaseController {
@@ -37,7 +37,7 @@
    @ApiOperation("查询供者转运登记附件列表")
    // @PreAuthorize("@ss.hasPermi('system:file:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceTransportFile serviceTransportFile) {
    public TableDataInfo list(@RequestBody ServiceTransportFile serviceTransportFile) {
        startPage();
        List<ServiceTransportFile> list = serviceTransportFileService.queryList(serviceTransportFile);
        return getDataTable(list);

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceTravelexpensestandardController.java

@@ -33,7 +33,7 @@
 * @author ruoyi
 * @date 2022-04-26
 */
@Api(description = "住宿费限额标准")
@Api(description = "住宿费限额标准",tags = {"住宿费限额标准"})
@RestController
@RequestMapping("/system/travelexpensestandard")
public class ServiceTravelexpensestandardController extends BaseController

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/VUserOrgController.java

@@ -37,7 +37,7 @@
    @ApiOperation("查询VIEW列表")
    // @PreAuthorize("@ss.hasPermi('system:org:list')")
    @PostMapping("/list")
    public TableDataInfo list(VUserOrg vUserOrg) {
    public TableDataInfo list(@RequestBody VUserOrg vUserOrg) {
        startPage();
        List<VUserOrg> list = vUserOrgService.queryList(vUserOrg);
        return getDataTable(list);

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,7 @@
      # 主库数据源
      master:
        # 开发环境
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        url: jdbc:mysql://192.168.100.10:3306/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023

@@ -60,7 +60,7 @@
            multi-statement-allow: true
  redis:
    # 地址、密码、端口（默认为6379）：开发环境
    host: 127.0.0.1
    host: 192.168.100.10
    password: Smartor
    port: 6020


 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceMeeting.java

@@ -142,27 +142,7 @@
    @Excel(name = "审核时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date approvalTime;

    /** 创建人 */
    @ApiModelProperty("创建人")
    @Excel(name = "创建人")
    private String createdBy;

    /** 创建时间 */
    @ApiModelProperty("创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date createdTime;

    /** 更新人 */
    @ApiModelProperty("更新人")
    @Excel(name = "更新人")
    private String updatedBy;

    /** 更新时间 */
    @ApiModelProperty("更新时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date updatedTime;

}


 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceMeetingServiceImpl.java

@@ -48,12 +48,10 @@
        if (serviceMeeting.getOrganizerId() != null){
            wrappers.eq(ServiceMeeting::getOrganizerId ,serviceMeeting.getOrganizerId());
        }
        if (serviceMeeting.getStartTime() != null){
            wrappers.eq(ServiceMeeting::getStartTime ,serviceMeeting.getStartTime());
        if (serviceMeeting.getStartTime() != null&&serviceMeeting.getEndTime() != null){
            wrappers.between(ServiceMeeting::getStartTime ,serviceMeeting.getStartTime(),serviceMeeting.getEndTime() );
        }
        if (serviceMeeting.getEndTime() != null){
            wrappers.eq(ServiceMeeting::getEndTime ,serviceMeeting.getEndTime());
        }

        if (StringUtils.isNotBlank(serviceMeeting.getSummary())){
            wrappers.eq(ServiceMeeting::getSummary ,serviceMeeting.getSummary());
        }
@@ -99,18 +97,7 @@
        if (serviceMeeting.getApprovalTime() != null){
            wrappers.eq(ServiceMeeting::getApprovalTime ,serviceMeeting.getApprovalTime());
        }
        if (StringUtils.isNotBlank(serviceMeeting.getCreatedBy())){
            wrappers.eq(ServiceMeeting::getCreatedBy ,serviceMeeting.getCreatedBy());
        }
        if (serviceMeeting.getCreatedTime() != null){
            wrappers.eq(ServiceMeeting::getCreatedTime ,serviceMeeting.getCreatedTime());
        }
        if (StringUtils.isNotBlank(serviceMeeting.getUpdatedBy())){
            wrappers.eq(ServiceMeeting::getUpdatedBy ,serviceMeeting.getUpdatedBy());
        }
        if (serviceMeeting.getUpdatedTime() != null){
            wrappers.eq(ServiceMeeting::getUpdatedTime ,serviceMeeting.getUpdatedTime());
        }

        return this.list(wrappers);
    }


 ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml

@@ -315,7 +315,7 @@
                #{treatmenthospitalname}
            </if>
            <if test="name != null and name != ''">AND sd.Name = #{name}</if>
            <if test="inpatientno != null ">AND sd.InpatientNo = #{inpatientno}</if>
            <if test="inpatientno != null and inpatientno != ''">AND sd.InpatientNo = #{inpatientno}</if>
            <if test="responsibleusername != null and responsibleusername != ''">AND sd.ResponsibleUserName =
                #{responsibleusername}
            </if>
@@ -333,6 +333,7 @@
                and sr.SignDate &lt;= #{endSigndate}
            </if>
        </where>
        order by sr.id desc,sd.id desc
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>