fix 统计查询导出PDF

ruoyi-admin/src/main/java/com/ruoyi/web/controller/assessment/ZxAssessmentController.java

@@ -0,0 +1,116 @@
+package com.ruoyi.web.controller.assessment;
+
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.assessment.ZxAssessment;
+import org.apache.commons.lang3.ArrayUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.service.IZxAssessmentService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 政协评价考核Controller
+ *
+ * @author boman
+ * @date 2024-03-19
+ */
+@RestController
+@RequestMapping("/zx/assessment")
+public class ZxAssessmentController extends BaseController
+{
+    @Autowired
+    private IZxAssessmentService zxAssessmentService;
+
+/**
+ * 查询政协评价考核列表
+ */
+@PreAuthorize("@ss.hasPermi('zxAssessment:assessment:list')")
+@GetMapping("/list")
+    public TableDataInfo list(ZxAssessment zxAssessment)
+    {
+
+        startPage();
+        List<ZxAssessment> list = zxAssessmentService.selectZxAssessmentList(zxAssessment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询政协评价考核列表（排除节点）
+     */
+    @PreAuthorize("@ss.hasPermi('zxAssessment:assessment:list')")
+    @GetMapping("/list/exclude/{assessmentId}")
+    public AjaxResult excludeChild(@PathVariable(value = "assessmentId", required = false) Long assessmentId)
+    {
+        List<ZxAssessment> zxAssessments = zxAssessmentService.selectZxAssessmentList(new ZxAssessment());
+        zxAssessments.removeIf(d -> d.getAssessmentId().intValue() == assessmentId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), assessmentId + ""));
+        return success(zxAssessments);
+    }
+
+    /**
+     * 获取政协评价考核详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('zxAssessment:assessment:query')")
+    @GetMapping(value = "/{assessmentId}")
+    public AjaxResult getInfo(@PathVariable("assessmentId") Long assessmentId)
+    {
+        return success(zxAssessmentService.selectZxAssessmentByAssessmentId(assessmentId));
+    }
+
+    /**
+     * 新增政协评价考核
+     */
+    @PreAuthorize("@ss.hasPermi('zxAssessment:assessment:add')")
+    @Log(title = "政协评价考核", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZxAssessment zxAssessment)
+    {
+        if (! zxAssessmentService.checkAssessmentProjectUnique(zxAssessment))
+        {
+            return error("新增考核规则'" + zxAssessment.getAssessmentProject() + "'失败，考核规则已存在");
+        }
+        return toAjax(zxAssessmentService.insertZxAssessment(zxAssessment));
+    }
+
+    /**
+     * 修改政协评价考核
+     */
+    @PreAuthorize("@ss.hasPermi('zxAssessment:assessment:edit')")
+    @Log(title = "政协评价考核", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ZxAssessment zxAssessment)
+    {
+        if (! zxAssessmentService.checkAssessmentProjectUnique(zxAssessment))
+        {
+            return error("修改考核规则'" + zxAssessment.getAssessmentProject() + "'失败，考核规则已存在");
+        }
+        return toAjax(zxAssessmentService.updateZxAssessment(zxAssessment));
+    }
+
+    /**
+     * 删除政协评价考核
+     */
+    @PreAuthorize("@ss.hasPermi('zxAssessment:assessment:remove')")
+    @Log(title = "政协评价考核", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{assessmentIds}")
+    public AjaxResult remove(@PathVariable Long[] assessmentIds)
+    {
+        return toAjax(zxAssessmentService.deleteZxAssessmentByAssessmentIds(assessmentIds));
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/assessment/ZxAssessment.java

@@ -0,0 +1,196 @@
+package com.ruoyi.system.domain.assessment;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.ruoyi.common.annotation.Excel;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 政协评价考核对象 zx_assessment
+ * 
+ * @author boman
+ * @date 2024-03-19
+ */
+public class ZxAssessment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 考核ID */
+    private Long assessmentId;
+
+    /** 父部门id */
+    @Excel(name = "父部门id")
+    private Long parentId;
+
+    /** 祖级列表 */
+    @Excel(name = "祖级列表")
+    private String ancestors;
+
+    /** 考核项目 */
+    @Excel(name = "考核项目")
+    private String assessmentProject;
+
+    /** 考核标准 */
+    @Excel(name = "考核标准")
+    private String assessmentStandard;
+
+    /** 考核类型 */
+    @Excel(name = "考核类型")
+    private String assessmentType;
+
+    /** 项目总分 */
+    @Excel(name = "项目总分")
+    private String assessmentTotal;
+
+    /** 分数类型 1：加分 2：减分 */
+    @Excel(name = "分数类型 1：加分 2：减分")
+    private String scoreType;
+
+    /** 单项分数 */
+    @Excel(name = "单项分数")
+    private String assessmentScore;
+
+    /** 参与次数 */
+    @Excel(name = "参与次数")
+    private String assessmentCount;
+
+    /** 分数说明 */
+    @Excel(name = "分数说明")
+    private String assessmentExplain;
+
+    /** 是否启用（Y代表启用 n代表不启用） */
+    @Excel(name = "是否启用", readConverterExp = "Y=代表启用,n=代表不启用")
+    private String isUse;
+
+    public void setAssessmentId(Long assessmentId) 
+    {
+        this.assessmentId = assessmentId;
+    }
+
+    public Long getAssessmentId() 
+    {
+        return assessmentId;
+    }
+    public void setParentId(Long parentId) 
+    {
+        this.parentId = parentId;
+    }
+
+    public Long getParentId() 
+    {
+        return parentId;
+    }
+    public void setAncestors(String ancestors) 
+    {
+        this.ancestors = ancestors;
+    }
+
+    public String getAncestors() 
+    {
+        return ancestors;
+    }
+    public void setAssessmentProject(String assessmentProject) 
+    {
+        this.assessmentProject = assessmentProject;
+    }
+
+    public String getAssessmentProject() 
+    {
+        return assessmentProject;
+    }
+    public void setAssessmentStandard(String assessmentStandard) 
+    {
+        this.assessmentStandard = assessmentStandard;
+    }
+
+    public String getAssessmentStandard() 
+    {
+        return assessmentStandard;
+    }
+    public void setAssessmentType(String assessmentType) 
+    {
+        this.assessmentType = assessmentType;
+    }
+
+    public String getAssessmentType() 
+    {
+        return assessmentType;
+    }
+    public void setAssessmentTotal(String assessmentTotal) 
+    {
+        this.assessmentTotal = assessmentTotal;
+    }
+
+    public String getAssessmentTotal() 
+    {
+        return assessmentTotal;
+    }
+    public void setScoreType(String scoreType) 
+    {
+        this.scoreType = scoreType;
+    }
+
+    public String getScoreType() 
+    {
+        return scoreType;
+    }
+    public void setAssessmentScore(String assessmentScore) 
+    {
+        this.assessmentScore = assessmentScore;
+    }
+
+    public String getAssessmentScore() 
+    {
+        return assessmentScore;
+    }
+    public void setAssessmentCount(String assessmentCount) 
+    {
+        this.assessmentCount = assessmentCount;
+    }
+
+    public String getAssessmentCount() 
+    {
+        return assessmentCount;
+    }
+    public void setAssessmentExplain(String assessmentExplain) 
+    {
+        this.assessmentExplain = assessmentExplain;
+    }
+
+    public String getAssessmentExplain() 
+    {
+        return assessmentExplain;
+    }
+    public void setIsUse(String isUse) 
+    {
+        this.isUse = isUse;
+    }
+
+    public String getIsUse() 
+    {
+        return isUse;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("assessmentId", getAssessmentId())
+            .append("parentId", getParentId())
+            .append("ancestors", getAncestors())
+            .append("assessmentProject", getAssessmentProject())
+            .append("assessmentStandard", getAssessmentStandard())
+            .append("assessmentType", getAssessmentType())
+            .append("assessmentTotal", getAssessmentTotal())
+            .append("scoreType", getScoreType())
+            .append("assessmentScore", getAssessmentScore())
+            .append("assessmentCount", getAssessmentCount())
+            .append("assessmentExplain", getAssessmentExplain())
+            .append("isUse", getIsUse())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-system/src/main/java/com/ruoyi/system/domain/conference/ZxConference.java

@@ -41,6 +41,10 @@ public class ZxConference extends BaseEntity
     /** 会议地点 */
     @Excel(name = "会议地点")
     private String conferenceAddress;
+    /**
+     * 会议类型
+     */
+    private String conferenceType;
     /**
      * 已读人数
      */
@@ -62,6 +66,14 @@ public class ZxConference extends BaseEntity
      */
     private String conferenceQr;
 
+    public String getConferenceType() {
+        return conferenceType;
+    }
+
+    public void setConferenceType(String conferenceType) {
+        this.conferenceType = conferenceType;
+    }
+
     public String getConferenceQr() {
         return conferenceQr;
     }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ZxAssessmentMapper.java

@@ -0,0 +1,65 @@
+package com.ruoyi.system.mapper;
+
+
+import com.ruoyi.system.domain.assessment.ZxAssessment;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 政协评价考核Mapper接口
+ * 
+ * @author boman
+ * @date 2024-03-19
+ */
+public interface ZxAssessmentMapper 
+{
+    /**
+     * 查询政协评价考核
+     * 
+     * @param assessmentId 政协评价考核主键
+     * @return 政协评价考核
+     */
+    public ZxAssessment selectZxAssessmentByAssessmentId(Long assessmentId);
+
+    /**
+     * 查询政协评价考核列表
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 政协评价考核集合
+     */
+    public List<ZxAssessment> selectZxAssessmentList(ZxAssessment zxAssessment);
+
+    /**
+     * 新增政协评价考核
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 结果
+     */
+    public int insertZxAssessment(ZxAssessment zxAssessment);
+    public ZxAssessment checkAssessmentProjectUnique(@Param("assessmentProject") String assessmentProject, @Param("assessmentId") Long assessmentId);
+
+    /**
+     * 修改政协评价考核
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 结果
+     */
+    public int updateZxAssessment(ZxAssessment zxAssessment);
+
+    /**
+     * 删除政协评价考核
+     * 
+     * @param assessmentId 政协评价考核主键
+     * @return 结果
+     */
+    public int deleteZxAssessmentByAssessmentId(Long assessmentId);
+
+    /**
+     * 批量删除政协评价考核
+     * 
+     * @param assessmentIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZxAssessmentByAssessmentIds(Long[] assessmentIds);
+}

ruoyi-system/src/main/java/com/ruoyi/system/service/IZxAssessmentService.java

@@ -0,0 +1,70 @@
+package com.ruoyi.system.service;
+
+import com.ruoyi.system.domain.assessment.ZxAssessment;
+
+import java.util.List;
+
+
+/**
+ * 政协评价考核Service接口
+ * 
+ * @author boman
+ * @date 2024-03-19
+ */
+public interface IZxAssessmentService 
+{
+    /**
+     * 查询政协评价考核
+     * 
+     * @param assessmentId 政协评价考核主键
+     * @return 政协评价考核
+     */
+    public ZxAssessment selectZxAssessmentByAssessmentId(Long assessmentId);
+
+    /**
+     * 查询政协评价考核列表
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 政协评价考核集合
+     */
+    public List<ZxAssessment> selectZxAssessmentList(ZxAssessment zxAssessment);
+
+    /**
+     * 新增政协评价考核
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 结果
+     */
+    public int insertZxAssessment(ZxAssessment zxAssessment);
+    /**
+     * 校验考核项目是否唯一
+     *
+     * @param zxAssessment 考核信息
+     * @return 结果
+     */
+    public boolean checkAssessmentProjectUnique(ZxAssessment zxAssessment);
+
+    /**
+     * 修改政协评价考核
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 结果
+     */
+    public int updateZxAssessment(ZxAssessment zxAssessment);
+
+    /**
+     * 批量删除政协评价考核
+     * 
+     * @param assessmentIds 需要删除的政协评价考核主键集合
+     * @return 结果
+     */
+    public int deleteZxAssessmentByAssessmentIds(Long[] assessmentIds);
+
+    /**
+     * 删除政协评价考核信息
+     * 
+     * @param assessmentId 政协评价考核主键
+     * @return 结果
+     */
+    public int deleteZxAssessmentByAssessmentId(Long assessmentId);
+}

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

@@ -0,0 +1,124 @@
+package com.ruoyi.system.service.impl;
+
+import com.ruoyi.common.constant.UserConstants;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.system.domain.assessment.ZxAssessment;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.ZxAssessmentMapper;
+import com.ruoyi.system.service.IZxAssessmentService;
+
+import java.util.List;
+
+/**
+ * 政协评价考核Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-03-19
+ */
+@Service
+public class ZxAssessmentServiceImpl implements IZxAssessmentService 
+{
+    @Autowired
+    private ZxAssessmentMapper zxAssessmentMapper;
+
+    /**
+     * 查询政协评价考核
+     * 
+     * @param assessmentId 政协评价考核主键
+     * @return 政协评价考核
+     */
+    @Override
+    public ZxAssessment selectZxAssessmentByAssessmentId(Long assessmentId)
+    {
+        return zxAssessmentMapper.selectZxAssessmentByAssessmentId(assessmentId);
+    }
+
+    /**
+     * 查询政协评价考核列表
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 政协评价考核
+     */
+    @Override
+    public List<ZxAssessment> selectZxAssessmentList(ZxAssessment zxAssessment)
+    {
+        return zxAssessmentMapper.selectZxAssessmentList(zxAssessment);
+    }
+
+    /**
+     * 新增政协评价考核
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 结果
+     */
+    @Override
+    public int insertZxAssessment(ZxAssessment zxAssessment)
+    {
+        ZxAssessment info = zxAssessmentMapper.selectZxAssessmentByAssessmentId(zxAssessment.getAssessmentId());
+        // 如果父节点不为正常状态,则不允许新增子节点
+        if (!UserConstants.YES.equals(info.getIsUse()))
+        {
+            throw new ServiceException("停用，不允许新增");
+        }
+        zxAssessment.setCreateTime(DateUtils.getNowDate());
+        return zxAssessmentMapper.insertZxAssessment(zxAssessment);
+    }
+
+    /**
+     * 校验考核项目是否唯一
+     *
+     * @param zxAssessment 考核信息
+     * @return 结果
+     */
+    @Override
+    public boolean checkAssessmentProjectUnique(ZxAssessment zxAssessment) {
+        Long assessmentId = StringUtils.isNull(zxAssessment.getAssessmentId()) ? -1L : zxAssessment.getAssessmentId();
+        ZxAssessment info = zxAssessmentMapper.checkAssessmentProjectUnique(zxAssessment.getAssessmentProject(), zxAssessment.getParentId());
+        if (StringUtils.isNotNull(info) && info.getAssessmentId().longValue() != assessmentId.longValue())
+        {
+            return UserConstants.NOT_UNIQUE;
+        }
+        return UserConstants.UNIQUE;
+    }
+
+    /**
+     * 修改政协评价考核
+     * 
+     * @param zxAssessment 政协评价考核
+     * @return 结果
+     */
+    @Override
+    public int updateZxAssessment(ZxAssessment zxAssessment)
+    {
+        zxAssessment.setUpdateTime(DateUtils.getNowDate());
+        return zxAssessmentMapper.updateZxAssessment(zxAssessment);
+    }
+
+    /**
+     * 批量删除政协评价考核
+     * 
+     * @param assessmentIds 需要删除的政协评价考核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZxAssessmentByAssessmentIds(Long[] assessmentIds)
+    {
+        return zxAssessmentMapper.deleteZxAssessmentByAssessmentIds(assessmentIds);
+    }
+
+    /**
+     * 删除政协评价考核信息
+     * 
+     * @param assessmentId 政协评价考核主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZxAssessmentByAssessmentId(Long assessmentId)
+    {
+        return zxAssessmentMapper.deleteZxAssessmentByAssessmentId(assessmentId);
+    }
+}

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

@@ -0,0 +1,130 @@
+<?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.system.mapper.ZxAssessmentMapper">
+    
+    <resultMap type="ZxAssessment" id="ZxAssessmentResult">
+        <result property="assessmentId"    column="assessment_id"    />
+        <result property="parentId"    column="parent_id"    />
+        <result property="ancestors"    column="ancestors"    />
+        <result property="assessmentProject"    column="assessment_project"    />
+        <result property="assessmentStandard"    column="assessment_standard"    />
+        <result property="assessmentType"    column="assessment_type"    />
+        <result property="assessmentTotal"    column="assessment_total"    />
+        <result property="scoreType"    column="score_type"    />
+        <result property="assessmentScore"    column="assessment_score"    />
+        <result property="assessmentCount"    column="assessment_count"    />
+        <result property="assessmentExplain"    column="assessment_explain"    />
+        <result property="isUse"    column="is_use"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectZxAssessmentVo">
+        select assessment_id, parent_id, ancestors, assessment_project, assessment_standard, assessment_type, assessment_total, score_type, assessment_score, assessment_count, assessment_explain, is_use, create_by, create_time, update_by, update_time, remark from zx_assessment
+    </sql>
+
+    <select id="selectZxAssessmentList" parameterType="ZxAssessment" resultMap="ZxAssessmentResult">
+        <include refid="selectZxAssessmentVo"/>
+        <where>  
+            <if test="parentId != null "> and parent_id = #{parentId}</if>
+            <if test="ancestors != null  and ancestors != ''"> and ancestors = #{ancestors}</if>
+            <if test="assessmentProject != null  and assessmentProject != ''"> and assessment_project = #{assessmentProject}</if>
+            <if test="assessmentStandard != null  and assessmentStandard != ''"> and assessment_standard = #{assessmentStandard}</if>
+            <if test="assessmentType != null  and assessmentType != ''"> and assessment_type = #{assessmentType}</if>
+            <if test="assessmentTotal != null  and assessmentTotal != ''"> and assessment_total = #{assessmentTotal}</if>
+            <if test="scoreType != null  and scoreType != ''"> and score_type = #{scoreType}</if>
+            <if test="assessmentScore != null  and assessmentScore != ''"> and assessment_score = #{assessmentScore}</if>
+            <if test="assessmentCount != null  and assessmentCount != ''"> and assessment_count = #{assessmentCount}</if>
+            <if test="assessmentExplain != null  and assessmentExplain != ''"> and assessment_explain = #{assessmentExplain}</if>
+            <if test="isUse != null  and isUse != ''"> and is_use = #{isUse}</if>
+        </where>
+    </select>
+    
+    <select id="selectZxAssessmentByAssessmentId" parameterType="Long" resultMap="ZxAssessmentResult">
+        <include refid="selectZxAssessmentVo"/>
+        where assessment_id = #{assessmentId}
+    </select>
+    <select id="checkAssessmentProjectUnique" resultMap="ZxAssessmentResult">
+        <include refid="selectZxAssessmentVo"/>
+        where assessment_project = #{assessmentProject} and and parent_id = #{parentId} and is_use = 'Y' limit 1
+    </select>
+
+    <insert id="insertZxAssessment" parameterType="ZxAssessment" useGeneratedKeys="true" keyProperty="assessmentId">
+        insert into zx_assessment
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">parent_id,</if>
+            <if test="ancestors != null">ancestors,</if>
+            <if test="assessmentProject != null and assessmentProject != ''">assessment_project,</if>
+            <if test="assessmentStandard != null and assessmentStandard != ''">assessment_standard,</if>
+            <if test="assessmentType != null and assessmentType != ''">assessment_type,</if>
+            <if test="assessmentTotal != null and assessmentTotal != ''">assessment_total,</if>
+            <if test="scoreType != null and scoreType != ''">score_type,</if>
+            <if test="assessmentScore != null and assessmentScore != ''">assessment_score,</if>
+            <if test="assessmentCount != null and assessmentCount != ''">assessment_count,</if>
+            <if test="assessmentExplain != null and assessmentExplain != ''">assessment_explain,</if>
+            <if test="isUse != null">is_use,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="parentId != null">#{parentId},</if>
+            <if test="ancestors != null">#{ancestors},</if>
+            <if test="assessmentProject != null and assessmentProject != ''">#{assessmentProject},</if>
+            <if test="assessmentStandard != null and assessmentStandard != ''">#{assessmentStandard},</if>
+            <if test="assessmentType != null and assessmentType != ''">#{assessmentType},</if>
+            <if test="assessmentTotal != null and assessmentTotal != ''">#{assessmentTotal},</if>
+            <if test="scoreType != null and scoreType != ''">#{scoreType},</if>
+            <if test="assessmentScore != null and assessmentScore != ''">#{assessmentScore},</if>
+            <if test="assessmentCount != null and assessmentCount != ''">#{assessmentCount},</if>
+            <if test="assessmentExplain != null and assessmentExplain != ''">#{assessmentExplain},</if>
+            <if test="isUse != null">#{isUse},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateZxAssessment" parameterType="ZxAssessment">
+        update zx_assessment
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="parentId != null">parent_id = #{parentId},</if>
+            <if test="ancestors != null">ancestors = #{ancestors},</if>
+            <if test="assessmentProject != null and assessmentProject != ''">assessment_project = #{assessmentProject},</if>
+            <if test="assessmentStandard != null and assessmentStandard != ''">assessment_standard = #{assessmentStandard},</if>
+            <if test="assessmentType != null and assessmentType != ''">assessment_type = #{assessmentType},</if>
+            <if test="assessmentTotal != null and assessmentTotal != ''">assessment_total = #{assessmentTotal},</if>
+            <if test="scoreType != null and scoreType != ''">score_type = #{scoreType},</if>
+            <if test="assessmentScore != null and assessmentScore != ''">assessment_score = #{assessmentScore},</if>
+            <if test="assessmentCount != null and assessmentCount != ''">assessment_count = #{assessmentCount},</if>
+            <if test="assessmentExplain != null and assessmentExplain != ''">assessment_explain = #{assessmentExplain},</if>
+            <if test="isUse != null">is_use = #{isUse},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where assessment_id = #{assessmentId}
+    </update>
+
+    <delete id="deleteZxAssessmentByAssessmentId" parameterType="Long">
+        delete from zx_assessment where assessment_id = #{assessmentId}
+    </delete>
+
+    <delete id="deleteZxAssessmentByAssessmentIds" parameterType="String">
+        delete from zx_assessment where assessment_id in 
+        <foreach item="assessmentId" collection="array" open="(" separator="," close=")">
+            #{assessmentId}
+        </foreach>
+    </delete>
+</mapper>

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

@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="conferenceTime"    column="conference_time"    />
         <result property="conferenceAddress"    column="conference_address"    />
         <result property="publishTime"    column="publish_time"    />
+        <result property="conferenceType"    column="conference_type"    />
         <result property="conferenceQr"    column="conference_qr"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -43,11 +44,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZxConferenceVo">
-        select conference_id, conference_title, conference_date, conference_time, conference_address, publish_time,conference_qr, create_by, create_time, update_by, update_time, remark from zx_conference
+        select conference_id, conference_title, conference_date,conference_type, conference_time, conference_address, publish_time,conference_qr, create_by, create_time, update_by, update_time, remark from zx_conference
     </sql>
 
     <select id="selectZxConferenceList" parameterType="ZxConference" resultMap="ZxConferenceResult">
-        select a.conference_id, a.conference_title, a.conference_date, a.conference_time, a.conference_address, a.publish_time,a.conference_qr, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
+        select a.conference_id, a.conference_title, a.conference_date,a.conference_type, a.conference_time, a.conference_address, a.publish_time,a.conference_qr, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
         b.conference_id as sub_conference_id, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
@@ -63,7 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     
     <select id="selectZxConferenceByConferenceId" parameterType="Long" resultMap="ZxConferenceZxConferenceUserResult">
-        select a.conference_id, a.conference_title,a.conference_qr, a.conference_date, a.conference_time, a.conference_address, a.publish_time, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
+        select a.conference_id, a.conference_title,a.conference_qr,a.conference_type, a.conference_date, a.conference_time, a.conference_address, a.publish_time, a.create_by, a.create_time, a.update_by, a.update_time, a.remark,
  b.conference_id as sub_conference_id, b.user_id as sub_user_id, b.user_name as sub_user_name, b.post_name as sub_post_name, b.user_level as sub_user_level, b.reply_time as sub_reply_time, b.is_join as sub_is_join, b.leave_type as sub_leave_type, b.leave_reason as sub_leave_reason,b.sign_in as sub_sign_in, b.create_by as sub_create_by, b.create_time as sub_create_time, b.update_by as sub_update_by, b.update_time as sub_update_time, b.remark as sub_remark
         from zx_conference a
         left join zx_conference_user b on b.conference_id = a.conference_id
@@ -91,6 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceTime != null">conference_time,</if>
             <if test="conferenceAddress != null and conferenceAddress != ''">conference_address,</if>
             <if test="publishTime != null">publish_time,</if>
+            <if test="conferenceType != null">conference_type,</if>
             <if test="conferenceQr != null">conference_qr,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
@@ -104,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceTime != null">#{conferenceTime},</if>
             <if test="conferenceAddress != null and conferenceAddress != ''">#{conferenceAddress},</if>
             <if test="publishTime != null">#{publishTime},</if>
+            <if test="conferenceType != null">#{conferenceType},</if>
             <if test="conferenceQr != null">#{conferenceQr},</if>
             <if test="createBy != null">#{createBy},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -121,6 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceTime != null">conference_time = #{conferenceTime},</if>
             <if test="conferenceAddress != null and conferenceAddress != ''">conference_address = #{conferenceAddress},</if>
             <if test="publishTime != null">publish_time = #{publishTime},</if>
+            <if test="conferenceType != null">conference_type = #{conferenceType},</if>
             <if test="conferenceQr != null">conference_qr = #{conferenceQr},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>