变更

liusheng

2024-07-26 32d4054619138c34062fb6bdcfed27caf5d0f97f

变更

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,109 @@
package com.ruoyi.web.controller.project;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.VDonationworkflow;
import com.ruoyi.project.service.IVDonationworkflowService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.Arrays;
import java.util.List;

/**
 * VIEWController
 *
 * @author ruoyi
 * @date 2024-07-26
 */
@Api("VIEW")
@RestController
@RequestMapping("/VDonationworkflow/donationworkflow")
public class VDonationworkflowController extends BaseController
{
    @Autowired
    private IVDonationworkflowService vDonationworkflowService;

    /**
     * æŸ¥è¯¢VIEW列表
     */
    @ApiOperation("查询VIEW列表")
    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:list')")
    @GetMapping("/list")
    public TableDataInfo list(VDonationworkflow vDonationworkflow)
    {
        startPage();
        List<VDonationworkflow> list = vDonationworkflowService.queryList(vDonationworkflow);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºVIEW列表
     */
    @ApiOperation("导出VIEW列表")
    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:export')")
    @Log(title = "VIEW", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(VDonationworkflow vDonationworkflow)
    {
        List<VDonationworkflow> list = vDonationworkflowService.queryList(vDonationworkflow);
        ExcelUtil<VDonationworkflow> util = new ExcelUtil<VDonationworkflow>(VDonationworkflow.class);
        return util.exportExcel(list, "VIEW数据");
    }

    /**
     * èŽ·å–VIEW详细信息
     */
    @ApiOperation("获取VIEW详细信息")
    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
        return AjaxResult.success(vDonationworkflowService.getById(id));
    }

    /**
     * æ–°å¢žVIEW
     */
    @ApiOperation("新增VIEW")
    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:add')")
    @Log(title = "VIEW", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody VDonationworkflow vDonationworkflow)
    {
        return toAjax(vDonationworkflowService.save(vDonationworkflow));
    }

    /**
     * ä¿®æ”¹VIEW
     */
    @ApiOperation("修改VIEW")
    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:edit')")
    @Log(title = "VIEW", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit
    public AjaxResult edit(@RequestBody VDonationworkflow vDonationworkflow)
    {
        return toAjax(vDonationworkflowService.updateById(vDonationworkflow));
    }

    /**
     * åˆ é™¤VIEW
     */
    @ApiOperation("删除VIEW")
    // @PreAuthorize("@ss.hasPermi('system:donationworkflow:remove')")
    @Log(title = "VIEW", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids)
    {
        return toAjax(vDonationworkflowService.removeByIds(Arrays.asList(ids)));
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,127 @@
package com.ruoyi.project.domain;

import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * VIEW对象 v_donationworkflow
 *
 * @author ruoyi
 * @date 2024-07-26
 */
@Data
@ApiModel("VIEW")
public class VDonationworkflow extends BaseEntity
{
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    private Long id;

    /** å§“名 */
    @ApiModelProperty("姓名")
    @Excel(name = "姓名")
    private String name;

    /** è¯ä»¶å·ç  */
    @ApiModelProperty("证件号码")
    @Excel(name = "证件号码")
    private String idcardno;

    /** å·¥ä½œæµ */
    @ApiModelProperty("工作流")
    @Excel(name = "工作流")
    private Long workflow;

    /** ç»ˆæ­¢æ¡ˆä¾‹ï¼š0开启   1终止   é»˜è®¤ 0 */
    @ApiModelProperty("终止案例：0开启   1终止   é»˜è®¤ 0")
    @Excel(name = "终止案例：0开启   1终止   é»˜è®¤ 0")
    private Long terminationcase;

    /** éƒ¨é—¨/组编号 */
    @ApiModelProperty("部门/组编号")
    @Excel(name = "部门/组编号")
    private Long deptid;

    /** éƒ¨é—¨/组名称 */
    @ApiModelProperty("部门/组名称")
    @Excel(name = "部门/组名称")
    private String deptname;

    /** æŠ¥å‘Šè€…编号 */
    @ApiModelProperty("报告者编号")
    @Excel(name = "报告者编号")
    private String reporterno;

    /** æŠ¥å‘Šè€…姓名 */
    @ApiModelProperty("报告者姓名")
    @Excel(name = "报告者姓名")
    private String reportername;

    /** æ¡ˆä¾‹æ—¶é—´ */
    @ApiModelProperty("案例时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "案例时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date donatetime;

    /** æŠ¥å‘Šæ—¶é—´ */
    @ApiModelProperty("报告时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "报告时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date reporttime;

    /** çœçº§è¯„估组核心成员结论 è§å­—å…¸sys_CoreAssessConclusion */
    @ApiModelProperty("省级评估组核心成员结论 è§å­—å…¸sys_CoreAssessConclusion")
    @Excel(name = "省级评估组核心成员结论 è§å­—å…¸sys_CoreAssessConclusion")
    private String coreteamassessconclusion;

    /** çœçº§è¯„估组核心成员评估时间 */
    @ApiModelProperty("省级评估组核心成员评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "省级评估组核心成员评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date coreteamassesstime;

    /** ç­¾ç½²æ—¥æœŸ */
    @ApiModelProperty("签署日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "签署日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date signdate;

    /** ä¸“家结论  è§å­—典伦理结论 */
    @ApiModelProperty("专家结论  è§å­—典伦理结论")
    @Excel(name = "专家结论  è§å­—典伦理结论")
    private Long expertconclusion;

    /** ç»“论时间 */
    @ApiModelProperty("结论时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "结论时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date conclusiontime;

    /** $column.columnComment */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "结论时间")
    private Long organcount;

    /** æ‰‹æœ¯å¼€å§‹æ—¶é—´ */
    @ApiModelProperty("手术开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "手术开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date operationbegtime;

    /** å®Œæˆæ—¶é—´ */
    @ApiModelProperty("完成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date completetime;

}


 ruoyi-project/src/main/java/com/ruoyi/project/mapper/VDonationworkflowMapper.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,25 @@
package com.ruoyi.project.mapper;


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.VDonationworkflow;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * VIEWMapper接口
 *
 * @author ruoyi
 * @date 2024-07-26
 */
@Mapper
public interface VDonationworkflowMapper extends BaseMapper<VDonationworkflow> {
    /**
     * æŸ¥è¯¢VIEW列表
     *
     * @param vDonationworkflow VIEW
     * @return VIEW集合
     */
    public List<VDonationworkflow> selectVDonationworkflowList(VDonationworkflow vDonationworkflow);
}

 ruoyi-project/src/main/java/com/ruoyi/project/service/IVDonationworkflowService.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,24 @@
package com.ruoyi.project.service;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.VDonationworkflow;

import java.util.List;

/**
 * VIEWService接口
 *
 * @author ruoyi
 * @date 2024-07-26
 */
public interface IVDonationworkflowService extends IService<VDonationworkflow>
{

    /**
     * æŸ¥è¯¢VIEW列表
     *
     * @param vDonationworkflow VIEW
     * @return VIEW集合
     */
    public List<VDonationworkflow> queryList(VDonationworkflow vDonationworkflow);
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,91 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.VDonationworkflow;
import com.ruoyi.project.mapper.VDonationworkflowMapper;
import com.ruoyi.project.service.IVDonationworkflowService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * VIEWService业务层处理
 *
 * @author ruoyi
 * @date 2024-07-26
 */
@Service
public class VDonationworkflowServiceImpl extends ServiceImpl<VDonationworkflowMapper, VDonationworkflow> implements IVDonationworkflowService
{


    /**
     * æŸ¥è¯¢VIEW列表
     *
     * @param vDonationworkflow VIEW
     * @return VIEW
     */
    @Override
    public List<VDonationworkflow> queryList(VDonationworkflow vDonationworkflow) {
        LambdaQueryWrapper<VDonationworkflow> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(vDonationworkflow.getName())){
            wrappers.like(VDonationworkflow::getName ,vDonationworkflow.getName());
        }
        if (StringUtils.isNotBlank(vDonationworkflow.getIdcardno())){
            wrappers.eq(VDonationworkflow::getIdcardno ,vDonationworkflow.getIdcardno());
        }
        if (vDonationworkflow.getWorkflow() != null){
            wrappers.eq(VDonationworkflow::getWorkflow ,vDonationworkflow.getWorkflow());
        }
        if (vDonationworkflow.getTerminationcase() != null){
            wrappers.eq(VDonationworkflow::getTerminationcase ,vDonationworkflow.getTerminationcase());
        }
        if (vDonationworkflow.getDeptid() != null){
            wrappers.eq(VDonationworkflow::getDeptid ,vDonationworkflow.getDeptid());
        }
        if (StringUtils.isNotBlank(vDonationworkflow.getDeptname())){
            wrappers.like(VDonationworkflow::getDeptname ,vDonationworkflow.getDeptname());
        }
        if (StringUtils.isNotBlank(vDonationworkflow.getReporterno())){
            wrappers.eq(VDonationworkflow::getReporterno ,vDonationworkflow.getReporterno());
        }
        if (StringUtils.isNotBlank(vDonationworkflow.getReportername())){
            wrappers.like(VDonationworkflow::getReportername ,vDonationworkflow.getReportername());
        }
        if (vDonationworkflow.getDonatetime() != null){
            wrappers.eq(VDonationworkflow::getDonatetime ,vDonationworkflow.getDonatetime());
        }
        if (vDonationworkflow.getReporttime() != null){
            wrappers.eq(VDonationworkflow::getReporttime ,vDonationworkflow.getReporttime());
        }
        if (StringUtils.isNotBlank(vDonationworkflow.getCoreteamassessconclusion())){
            wrappers.eq(VDonationworkflow::getCoreteamassessconclusion ,vDonationworkflow.getCoreteamassessconclusion());
        }
        if (vDonationworkflow.getCoreteamassesstime() != null){
            wrappers.eq(VDonationworkflow::getCoreteamassesstime ,vDonationworkflow.getCoreteamassesstime());
        }
        if (vDonationworkflow.getSigndate() != null){
            wrappers.eq(VDonationworkflow::getSigndate ,vDonationworkflow.getSigndate());
        }
        if (vDonationworkflow.getExpertconclusion() != null){
            wrappers.eq(VDonationworkflow::getExpertconclusion ,vDonationworkflow.getExpertconclusion());
        }
        if (vDonationworkflow.getConclusiontime() != null){
            wrappers.eq(VDonationworkflow::getConclusiontime ,vDonationworkflow.getConclusiontime());
        }
        if (vDonationworkflow.getOrgancount() != null){
            wrappers.eq(VDonationworkflow::getOrgancount ,vDonationworkflow.getOrgancount());
        }
        if (vDonationworkflow.getOperationbegtime() != null){
            wrappers.eq(VDonationworkflow::getOperationbegtime ,vDonationworkflow.getOperationbegtime());
        }
        if (vDonationworkflow.getCompletetime() != null){
            wrappers.eq(VDonationworkflow::getCompletetime ,vDonationworkflow.getCompletetime());
        }
        return this.list(wrappers);
    }

}

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

@@ -161,13 +161,11 @@
        `service_donationwitness`.`update_by` AS `updateby`,
        `service_donationwitness`.`update_time` AS `updatetime`
        FROM

        `service_donatebaseinfo`
        LEFT JOIN `service_donationwitness` ON
        `service_donatebaseinfo`.`ID` = `service_donationwitness`.`InfoID`
        LEFT JOIN `base_organization` ON
        `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`

        <where>
            service_donationwitness.del_flag=0
            and service_donatebaseinfo.del_flag=0

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.VDonationworkflowMapper">

    <resultMap type="com.ruoyi.project.domain.VDonationworkflow" id="VDonationworkflowResult">
        <result property="id"    column="id"    />
        <result property="name"    column="name"    />
        <result property="idcardno"    column="IDCardNo"    />
        <result property="workflow"    column="workflow"    />
        <result property="terminationcase"    column="terminationCase"    />
        <result property="deptid"    column="deptid"    />
        <result property="deptname"    column="deptname"    />
        <result property="reporterno"    column="reporterNo"    />
        <result property="reportername"    column="reporterName"    />
        <result property="donatetime"    column="donatetime"    />
        <result property="reporttime"    column="ReportTime"    />
        <result property="coreteamassessconclusion"    column="CoreTeamAssessConclusion"    />
        <result property="coreteamassesstime"    column="coreTeamAssessTime"    />
        <result property="signdate"    column="signdate"    />
        <result property="expertconclusion"    column="ExpertConclusion"    />
        <result property="conclusiontime"    column="conclusionTime"    />
        <result property="organcount"    column="organcount"    />
        <result property="operationbegtime"    column="operationBegTime"    />
        <result property="completetime"    column="completeTime"    />
    </resultMap>

    <sql id="selectVDonationworkflowVo">
        select id, name, IDCardNo, workflow, terminationCase, deptid, deptname, reporterNo, reporterName, donatetime, ReportTime, CoreTeamAssessConclusion, coreTeamAssessTime, signdate, ExpertConclusion, conclusionTime, organcount, operationBegTime, completeTime from v_donationworkflow
    </sql>

    <select id="selectVDonationworkflowList" parameterType="com.ruoyi.project.domain.VDonationworkflow" resultMap="VDonationworkflowResult">
        <include refid="selectVDonationworkflowVo"/>
        <where>
            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
            <if test="idcardno != null  and idcardno != ''"> and IDCardNo = #{idcardno}</if>
            <if test="workflow != null "> and workflow = #{workflow}</if>
            <if test="terminationcase != null "> and terminationCase = #{terminationcase}</if>
            <if test="deptid != null "> and deptid = #{deptid}</if>
            <if test="deptname != null  and deptname != ''"> and deptname like concat('%', #{deptname}, '%')</if>
            <if test="reporterno != null  and reporterno != ''"> and reporterNo = #{reporterno}</if>
            <if test="reportername != null  and reportername != ''"> and reporterName like concat('%', #{reportername}, '%')</if>
            <if test="donatetime != null "> and donatetime = #{donatetime}</if>
            <if test="reporttime != null "> and ReportTime = #{reporttime}</if>
            <if test="coreteamassessconclusion != null  and coreteamassessconclusion != ''"> and CoreTeamAssessConclusion = #{coreteamassessconclusion}</if>
            <if test="coreteamassesstime != null "> and coreTeamAssessTime = #{coreteamassesstime}</if>
            <if test="signdate != null "> and signdate = #{signdate}</if>
            <if test="expertconclusion != null "> and ExpertConclusion = #{expertconclusion}</if>
            <if test="conclusiontime != null "> and conclusionTime = #{conclusiontime}</if>
            <if test="organcount != null "> and organcount = #{organcount}</if>
            <if test="operationbegtime != null "> and operationBegTime = #{operationbegtime}</if>
            <if test="completetime != null "> and completeTime = #{completetime}</if>
        </where>
    </select>

</mapper>