fix 催办

ruoyi-admin/src/main/java/com/ruoyi/web/controller/conference/ZxConferenceController.java

@@ -46,6 +46,16 @@ public class ZxConferenceController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询政协会议活动列表
+     */
+    @PreAuthorize("@ss.hasPermi('zxConference:conference:listNoPage')")
+    @GetMapping("/listNoPage")
+    public TableDataInfo listNoPage(ZxConference zxConference) {
+        List<ZxConference> list = zxConferenceService.selectZxConferenceList(zxConference);
+        return getDataTable(list);
+    }
+
     /**
      * 导出政协会议活动列表
      */

ruoyi-admin/src/main/java/com/ruoyi/web/controller/urge/ZxUrgeController.java

@@ -0,0 +1,104 @@
+package com.ruoyi.web.controller.urge;
+
+import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.system.domain.urge.ZxUrge;
+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.IZxUrgeService;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+import java.util.List;
+
+/**
+ * 政协催办Controller
+ *
+ * @author boman
+ * @date 2024-03-12
+ */
+@RestController
+@RequestMapping("/zxUrge/urge")
+public class ZxUrgeController extends BaseController
+{
+    @Autowired
+    private IZxUrgeService zxUrgeService;
+
+/**
+ * 查询政协催办列表
+ */
+@PreAuthorize("@ss.hasPermi('zxUrge:urge:list')")
+@GetMapping("/list")
+    public TableDataInfo list(ZxUrge zxUrge)
+    {
+        startPage();
+        List<ZxUrge> list = zxUrgeService.selectZxUrgeList(zxUrge);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出政协催办列表
+     */
+    @PreAuthorize("@ss.hasPermi('zxUrge:urge:export')")
+    @Log(title = "政协催办", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, ZxUrge zxUrge)
+    {
+        List<ZxUrge> list = zxUrgeService.selectZxUrgeList(zxUrge);
+        ExcelUtil<ZxUrge> util = new ExcelUtil<ZxUrge>(ZxUrge.class);
+        util.exportExcel(response, list, "政协催办数据");
+    }
+
+    /**
+     * 获取政协催办详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('zxUrge:urge:query')")
+    @GetMapping(value = "/{zxUrgeId}")
+    public AjaxResult getInfo(@PathVariable("zxUrgeId") Long zxUrgeId)
+    {
+        return success(zxUrgeService.selectZxUrgeByZxUrgeId(zxUrgeId));
+    }
+
+    /**
+     * 新增政协催办
+     */
+    @PreAuthorize("@ss.hasPermi('zxUrge:urge:add')")
+    @Log(title = "政协催办", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody ZxUrge zxUrge)
+    {
+        return toAjax(zxUrgeService.insertZxUrge(zxUrge));
+    }
+
+    /**
+     * 修改政协催办
+     */
+    @PreAuthorize("@ss.hasPermi('zxUrge:urge:edit')")
+    @Log(title = "政协催办", businessType = BusinessType.UPDATE)
+    @PostMapping("/put")
+    public AjaxResult edit(@RequestBody ZxUrge zxUrge)
+    {
+        return toAjax(zxUrgeService.updateZxUrge(zxUrge));
+    }
+
+    /**
+     * 删除政协催办
+     */
+    @PreAuthorize("@ss.hasPermi('zxUrge:urge:remove')")
+    @Log(title = "政协催办", businessType = BusinessType.DELETE)
+    @GetMapping("/delete/{zxUrgeIds}")
+    public AjaxResult remove(@PathVariable Long[] zxUrgeIds)
+    {
+        return toAjax(zxUrgeService.deleteZxUrgeByZxUrgeIds(zxUrgeIds));
+    }
+}

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

@@ -20,6 +20,10 @@ public class ZxConference extends BaseEntity
 
     /** 会议活动ID */
     private Long conferenceId;
+    /**
+     * 会议通知时查询列表使用，不在数据库中
+     */
+    private Long userId;
 
     /** 会议名称 */
     @Excel(name = "会议名称")
@@ -54,6 +58,14 @@ public class ZxConference extends BaseEntity
     /** 政协会议活动-用户关联信息 */
     private List<ZxConferenceUser> zxConferenceUserList;
 
+    public Long getUserId() {
+        return userId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
     public String getNoRead() {
         return noRead;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/speak/ZxSpeak.java

@@ -35,10 +35,18 @@ public class ZxSpeak extends BaseEntity
     /** 会议活动id */
     @Excel(name = "会议活动id")
     private Long conferenceId;
+    /**
+     * 会议活动名称
+     */
+    private String conferenceTitle;
 
     /** 发言单位 */
     @Excel(name = "发言单位")
     private String speakUnit;
+    /**
+     * 发言单位id
+     */
+    private Long deptId;
 
     /** 发言类型(字典值) */
     @Excel(name = "发言类型(字典值)")
@@ -58,7 +66,23 @@ public class ZxSpeak extends BaseEntity
     @Excel(name = "状态 1:待审核 2:已审核")
     private String speakStatus;
 
-    public void setSpeakId(Long speakId) 
+    public String getConferenceTitle() {
+        return conferenceTitle;
+    }
+
+    public void setConferenceTitle(String conferenceTitle) {
+        this.conferenceTitle = conferenceTitle;
+    }
+
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+
+    public void setSpeakId(Long speakId)
     {
         this.speakId = speakId;
     }

ruoyi-system/src/main/java/com/ruoyi/system/domain/urge/ZxUrge.java

@@ -0,0 +1,240 @@
+package com.ruoyi.system.domain.urge;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+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_urge
+ * 
+ * @author boman
+ * @date 2024-03-12
+ */
+public class ZxUrge extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 催办ID */
+    private Long zxUrgeId;
+
+    /** 提案/社情民意id */
+    @Excel(name = "提案/社情民意id")
+    private Long scoreId;
+
+    /** 催办标题 */
+    @Excel(name = "催办标题")
+    private String urgeTitle;
+
+    /** 催办类型（字典值）1：提案催办 2:社情名义催办 */
+    @Excel(name = "催办类型", readConverterExp = "字=典值")
+    private String urgeType;
+
+    /** 催办内容 */
+    @Excel(name = "催办内容")
+    private String urgeContent;
+
+    /** 催办状态 */
+    private String status;
+
+    /** 发布人 */
+    @Excel(name = "发布人")
+    private String issuer;
+
+    /** 发布人id */
+    @Excel(name = "发布人id")
+    private Long issuerId;
+
+    /** 发布单位 */
+    @Excel(name = "发布单位")
+    private String issuerDept;
+
+    /** 发布单位id */
+    @Excel(name = "发布单位id")
+    private Long issuerDeptId;
+
+    /** 接收人 */
+    @Excel(name = "接收人")
+    private String acceptUser;
+
+    /** 接收人id */
+    @Excel(name = "接收人id")
+    private Long acceptUserId;
+
+    /** 接收单位 */
+    @Excel(name = "接收单位")
+    private String acceptDept;
+
+    /** 接收单位id */
+    @Excel(name = "接收单位id")
+    private Long acceptDeptId;
+
+    /** 催办时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "催办时间", width = 30, dateFormat = "HH:mm:ss")
+    private Date urgeTime;
+
+    public void setZxUrgeId(Long zxUrgeId) 
+    {
+        this.zxUrgeId = zxUrgeId;
+    }
+
+    public Long getZxUrgeId() 
+    {
+        return zxUrgeId;
+    }
+    public void setScoreId(Long scoreId) 
+    {
+        this.scoreId = scoreId;
+    }
+
+    public Long getScoreId() 
+    {
+        return scoreId;
+    }
+    public void setUrgeTitle(String urgeTitle) 
+    {
+        this.urgeTitle = urgeTitle;
+    }
+
+    public String getUrgeTitle() 
+    {
+        return urgeTitle;
+    }
+    public void setUrgeType(String urgeType) 
+    {
+        this.urgeType = urgeType;
+    }
+
+    public String getUrgeType() 
+    {
+        return urgeType;
+    }
+    public void setUrgeContent(String urgeContent) 
+    {
+        this.urgeContent = urgeContent;
+    }
+
+    public String getUrgeContent() 
+    {
+        return urgeContent;
+    }
+    public void setStatus(String status) 
+    {
+        this.status = status;
+    }
+
+    public String getStatus() 
+    {
+        return status;
+    }
+    public void setIssuer(String issuer) 
+    {
+        this.issuer = issuer;
+    }
+
+    public String getIssuer() 
+    {
+        return issuer;
+    }
+    public void setIssuerId(Long issuerId) 
+    {
+        this.issuerId = issuerId;
+    }
+
+    public Long getIssuerId() 
+    {
+        return issuerId;
+    }
+    public void setIssuerDept(String issuerDept) 
+    {
+        this.issuerDept = issuerDept;
+    }
+
+    public String getIssuerDept() 
+    {
+        return issuerDept;
+    }
+    public void setIssuerDeptId(Long issuerDeptId) 
+    {
+        this.issuerDeptId = issuerDeptId;
+    }
+
+    public Long getIssuerDeptId() 
+    {
+        return issuerDeptId;
+    }
+    public void setAcceptUser(String acceptUser) 
+    {
+        this.acceptUser = acceptUser;
+    }
+
+    public String getAcceptUser() 
+    {
+        return acceptUser;
+    }
+    public void setAcceptUserId(Long acceptUserId) 
+    {
+        this.acceptUserId = acceptUserId;
+    }
+
+    public Long getAcceptUserId() 
+    {
+        return acceptUserId;
+    }
+    public void setAcceptDept(String acceptDept) 
+    {
+        this.acceptDept = acceptDept;
+    }
+
+    public String getAcceptDept() 
+    {
+        return acceptDept;
+    }
+    public void setAcceptDeptId(Long acceptDeptId) 
+    {
+        this.acceptDeptId = acceptDeptId;
+    }
+
+    public Long getAcceptDeptId() 
+    {
+        return acceptDeptId;
+    }
+    public void setUrgeTime(Date urgeTime) 
+    {
+        this.urgeTime = urgeTime;
+    }
+
+    public Date getUrgeTime() 
+    {
+        return urgeTime;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("zxUrgeId", getZxUrgeId())
+            .append("scoreId", getScoreId())
+            .append("urgeTitle", getUrgeTitle())
+            .append("urgeType", getUrgeType())
+            .append("urgeContent", getUrgeContent())
+            .append("status", getStatus())
+            .append("issuer", getIssuer())
+            .append("issuerId", getIssuerId())
+            .append("issuerDept", getIssuerDept())
+            .append("issuerDeptId", getIssuerDeptId())
+            .append("acceptUser", getAcceptUser())
+            .append("acceptUserId", getAcceptUserId())
+            .append("acceptDept", getAcceptDept())
+            .append("acceptDeptId", getAcceptDeptId())
+            .append("urgeTime", getUrgeTime())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.mapper;
+
+
+import com.ruoyi.system.domain.urge.ZxUrge;
+
+import java.util.List;
+
+/**
+ * 政协催办Mapper接口
+ * 
+ * @author boman
+ * @date 2024-03-12
+ */
+public interface ZxUrgeMapper 
+{
+    /**
+     * 查询政协催办
+     * 
+     * @param zxUrgeId 政协催办主键
+     * @return 政协催办
+     */
+    public ZxUrge selectZxUrgeByZxUrgeId(Long zxUrgeId);
+
+    /**
+     * 查询政协催办列表
+     * 
+     * @param zxUrge 政协催办
+     * @return 政协催办集合
+     */
+    public List<ZxUrge> selectZxUrgeList(ZxUrge zxUrge);
+
+    /**
+     * 新增政协催办
+     * 
+     * @param zxUrge 政协催办
+     * @return 结果
+     */
+    public int insertZxUrge(ZxUrge zxUrge);
+
+    /**
+     * 修改政协催办
+     * 
+     * @param zxUrge 政协催办
+     * @return 结果
+     */
+    public int updateZxUrge(ZxUrge zxUrge);
+
+    /**
+     * 删除政协催办
+     * 
+     * @param zxUrgeId 政协催办主键
+     * @return 结果
+     */
+    public int deleteZxUrgeByZxUrgeId(Long zxUrgeId);
+
+    /**
+     * 批量删除政协催办
+     * 
+     * @param zxUrgeIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteZxUrgeByZxUrgeIds(Long[] zxUrgeIds);
+}

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

@@ -0,0 +1,63 @@
+package com.ruoyi.system.service;
+
+
+import com.ruoyi.system.domain.urge.ZxUrge;
+
+import java.util.List;
+
+/**
+ * 政协催办Service接口
+ * 
+ * @author boman
+ * @date 2024-03-12
+ */
+public interface IZxUrgeService 
+{
+    /**
+     * 查询政协催办
+     * 
+     * @param zxUrgeId 政协催办主键
+     * @return 政协催办
+     */
+    public ZxUrge selectZxUrgeByZxUrgeId(Long zxUrgeId);
+
+    /**
+     * 查询政协催办列表
+     * 
+     * @param zxUrge 政协催办
+     * @return 政协催办集合
+     */
+    public List<ZxUrge> selectZxUrgeList(ZxUrge zxUrge);
+
+    /**
+     * 新增政协催办
+     * 
+     * @param zxUrge 政协催办
+     * @return 结果
+     */
+    public int insertZxUrge(ZxUrge zxUrge);
+
+    /**
+     * 修改政协催办
+     * 
+     * @param zxUrge 政协催办
+     * @return 结果
+     */
+    public int updateZxUrge(ZxUrge zxUrge);
+
+    /**
+     * 批量删除政协催办
+     * 
+     * @param zxUrgeIds 需要删除的政协催办主键集合
+     * @return 结果
+     */
+    public int deleteZxUrgeByZxUrgeIds(Long[] zxUrgeIds);
+
+    /**
+     * 删除政协催办信息
+     * 
+     * @param zxUrgeId 政协催办主键
+     * @return 结果
+     */
+    public int deleteZxUrgeByZxUrgeId(Long zxUrgeId);
+}

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

@@ -0,0 +1,96 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.system.domain.urge.ZxUrge;
+import com.ruoyi.system.mapper.ZxUrgeMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.service.IZxUrgeService;
+
+/**
+ * 政协催办Service业务层处理
+ * 
+ * @author boman
+ * @date 2024-03-12
+ */
+@Service
+public class ZxUrgeServiceImpl implements IZxUrgeService 
+{
+    @Autowired
+    private ZxUrgeMapper zxUrgeMapper;
+
+    /**
+     * 查询政协催办
+     * 
+     * @param zxUrgeId 政协催办主键
+     * @return 政协催办
+     */
+    @Override
+    public ZxUrge selectZxUrgeByZxUrgeId(Long zxUrgeId)
+    {
+        return zxUrgeMapper.selectZxUrgeByZxUrgeId(zxUrgeId);
+    }
+
+    /**
+     * 查询政协催办列表
+     * 
+     * @param zxUrge 政协催办
+     * @return 政协催办
+     */
+    @Override
+    public List<ZxUrge> selectZxUrgeList(ZxUrge zxUrge)
+    {
+        return zxUrgeMapper.selectZxUrgeList(zxUrge);
+    }
+
+    /**
+     * 新增政协催办
+     * 
+     * @param zxUrge 政协催办
+     * @return 结果
+     */
+    @Override
+    public int insertZxUrge(ZxUrge zxUrge)
+    {
+        zxUrge.setCreateTime(DateUtils.getNowDate());
+        return zxUrgeMapper.insertZxUrge(zxUrge);
+    }
+
+    /**
+     * 修改政协催办
+     * 
+     * @param zxUrge 政协催办
+     * @return 结果
+     */
+    @Override
+    public int updateZxUrge(ZxUrge zxUrge)
+    {
+        zxUrge.setUpdateTime(DateUtils.getNowDate());
+        return zxUrgeMapper.updateZxUrge(zxUrge);
+    }
+
+    /**
+     * 批量删除政协催办
+     * 
+     * @param zxUrgeIds 需要删除的政协催办主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZxUrgeByZxUrgeIds(Long[] zxUrgeIds)
+    {
+        return zxUrgeMapper.deleteZxUrgeByZxUrgeIds(zxUrgeIds);
+    }
+
+    /**
+     * 删除政协催办信息
+     * 
+     * @param zxUrgeId 政协催办主键
+     * @return 结果
+     */
+    @Override
+    public int deleteZxUrgeByZxUrgeId(Long zxUrgeId)
+    {
+        return zxUrgeMapper.deleteZxUrgeByZxUrgeId(zxUrgeId);
+    }
+}

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

@@ -6,6 +6,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <resultMap type="ZxConference" id="ZxConferenceResult">
         <result property="conferenceId"    column="conference_id"    />
+        <result property="userId"    column="user_id"    />
         <result property="conferenceTitle"    column="conference_title"    />
         <result property="conferenceDate"    column="conference_date"    />
         <result property="conferenceTime"    column="conference_time"    />
@@ -54,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="conferenceTime != null  and conferenceTime != ''"> and a.conference_time = #{conferenceTime}</if>
             <if test="conferenceAddress != null  and conferenceAddress != ''"> and a.conference_address = #{conferenceAddress}</if>
             <if test="publishTime != null "> and a.publish_time = #{publishTime}</if>
+            <if test="userId != null "> and b.user_id = #{userId}</if>
         </where>
         order  by a.publish_time DESC
     </select>
@@ -122,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="leaveType != null and leaveType != ''">leave_type = #{leaveType},</if>
             <if test="leaveReason != null and leaveReason != ''">leave_reason = #{leaveReason},</if>
         </trim>
-        where conference_id = #{conferenceId}
+        where conference_id = #{conferenceId} and user_id = #{userId}
     </update>
 
     <delete id="deleteZxConferenceByConferenceId" parameterType="Long">

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

@@ -10,7 +10,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="speakName"    column="speak_name"    />
         <result property="inputName"    column="input_name"    />
         <result property="conferenceId"    column="conference_id"    />
+        <result property="conferenceTitle"    column="conference_title"    />
         <result property="speakUnit"    column="speak_unit"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="speakType"    column="speak_type"    />
         <result property="speakTime"    column="speak_time"    />
         <result property="publishTime"    column="publish_time"    />
@@ -23,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectZxSpeakVo">
-        select speak_id, speak_title, speak_name, input_name, conference_id, speak_unit, speak_type, speak_time, publish_time, speak_status, create_by, create_time, update_by, update_time, remark from zx_speak
+        select speak_id, speak_title, speak_name, input_name, conference_id,conference_title, speak_unit,dept_id, speak_type, speak_time, publish_time, speak_status, create_by, create_time, update_by, update_time, remark from zx_speak
     </sql>
 
     <select id="selectZxSpeakList" parameterType="ZxSpeak" resultMap="ZxSpeakResult">
@@ -33,7 +35,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speakName != null  and speakName != ''"> and speak_name like concat('%', #{speakName}, '%')</if>
             <if test="inputName != null  and inputName != ''"> and input_name like concat('%', #{inputName}, '%')</if>
             <if test="conferenceId != null "> and conference_id = #{conferenceId}</if>
+            <if test="conferenceTitle != null and conferenceTitle != ''"> and conference_title = #{conferenceTitle}</if>
             <if test="speakUnit != null  and speakUnit != ''"> and speak_unit = #{speakUnit}</if>
+            <if test="deptId != null  "> and dept_id = #{deptId}</if>
             <if test="speakType != null  and speakType != ''"> and speak_type = #{speakType}</if>
             <if test="speakTime != null "> and speak_time = #{speakTime}</if>
             <if test="publishTime != null "> and publish_time = #{publishTime}</if>
@@ -53,7 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speakName != null and speakName != ''">speak_name,</if>
             <if test="inputName != null and inputName != ''">input_name,</if>
             <if test="conferenceId != null">conference_id,</if>
+            <if test="conferenceTitle != null and conferenceTitle != ''">conference_title,</if>
             <if test="speakUnit != null and speakUnit != ''">speak_unit,</if>
+            <if test="deptId != null ">dept_id,</if>
             <if test="speakType != null and speakType != ''">speak_type,</if>
             <if test="speakTime != null">speak_time,</if>
             <if test="publishTime != null">publish_time,</if>
@@ -69,7 +75,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speakName != null and speakName != ''">#{speakName},</if>
             <if test="inputName != null and inputName != ''">#{inputName},</if>
             <if test="conferenceId != null">#{conferenceId},</if>
+            <if test="conferenceTitle != null and conferenceTitle != ''">#{conferenceTitle},</if>
             <if test="speakUnit != null and speakUnit != ''">#{speakUnit},</if>
+            <if test="deptId != null ">#{deptId},</if>
             <if test="speakType != null and speakType != ''">#{speakType},</if>
             <if test="speakTime != null">#{speakTime},</if>
             <if test="publishTime != null">#{publishTime},</if>
@@ -89,7 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="speakName != null and speakName != ''">speak_name = #{speakName},</if>
             <if test="inputName != null and inputName != ''">input_name = #{inputName},</if>
             <if test="conferenceId != null">conference_id = #{conferenceId},</if>
+            <if test="conferenceTitle != null and conferenceTitle != ''">conference_title = #{conferenceTitle},</if>
             <if test="speakUnit != null and speakUnit != ''">speak_unit = #{speakUnit},</if>
+            <if test="deptId != null ">dept_id = #{deptId},</if>
             <if test="speakType != null and speakType != ''">speak_type = #{speakType},</if>
             <if test="speakTime != null">speak_time = #{speakTime},</if>
             <if test="publishTime != null">publish_time = #{publishTime},</if>

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

@@ -0,0 +1,140 @@
+<?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.ZxUrgeMapper">
+    
+    <resultMap type="ZxUrge" id="ZxUrgeResult">
+        <result property="zxUrgeId"    column="zx_urge_id"    />
+        <result property="scoreId"    column="score_id"    />
+        <result property="urgeTitle"    column="urge_title"    />
+        <result property="urgeType"    column="urge_type"    />
+        <result property="urgeContent"    column="urge_content"    />
+        <result property="status"    column="status"    />
+        <result property="issuer"    column="issuer"    />
+        <result property="issuerId"    column="issuer_id"    />
+        <result property="issuerDept"    column="issuer_dept"    />
+        <result property="issuerDeptId"    column="issuer_dept_id"    />
+        <result property="acceptUser"    column="accept_user"    />
+        <result property="acceptUserId"    column="accept_user_id"    />
+        <result property="acceptDept"    column="accept_dept"    />
+        <result property="acceptDeptId"    column="accept_dept_id"    />
+        <result property="urgeTime"    column="urge_time"    />
+        <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="selectZxUrgeVo">
+        select zx_urge_id, score_id, urge_title, urge_type, urge_content, status, issuer, issuer_id, issuer_dept, issuer_dept_id, accept_user, accept_user_id, accept_dept, accept_dept_id, urge_time, create_by, create_time, update_by, update_time, remark from zx_urge
+    </sql>
+
+    <select id="selectZxUrgeList" parameterType="ZxUrge" resultMap="ZxUrgeResult">
+        <include refid="selectZxUrgeVo"/>
+        <where>  
+            <if test="scoreId != null "> and score_id = #{scoreId}</if>
+            <if test="urgeTitle != null  and urgeTitle != ''"> and urge_title = #{urgeTitle}</if>
+            <if test="urgeType != null  and urgeType != ''"> and urge_type = #{urgeType}</if>
+            <if test="urgeContent != null  and urgeContent != ''"> and urge_content = #{urgeContent}</if>
+            <if test="issuer != null  and issuer != ''"> and issuer = #{issuer}</if>
+            <if test="issuerId != null "> and issuer_id = #{issuerId}</if>
+            <if test="issuerDept != null  and issuerDept != ''"> and issuer_dept = #{issuerDept}</if>
+            <if test="issuerDeptId != null "> and issuer_dept_id = #{issuerDeptId}</if>
+            <if test="acceptUser != null  and acceptUser != ''"> and accept_user = #{acceptUser}</if>
+            <if test="acceptUserId != null "> and accept_user_id = #{acceptUserId}</if>
+            <if test="acceptDept != null  and acceptDept != ''"> and accept_dept = #{acceptDept}</if>
+            <if test="acceptDeptId != null "> and accept_dept_id = #{acceptDeptId}</if>
+            <if test="urgeTime != null "> and urge_time = #{urgeTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectZxUrgeByZxUrgeId" parameterType="Long" resultMap="ZxUrgeResult">
+        <include refid="selectZxUrgeVo"/>
+        where zx_urge_id = #{zxUrgeId}
+    </select>
+        
+    <insert id="insertZxUrge" parameterType="ZxUrge" useGeneratedKeys="true" keyProperty="zxUrgeId">
+        insert into zx_urge
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="scoreId != null">score_id,</if>
+            <if test="urgeTitle != null and urgeTitle != ''">urge_title,</if>
+            <if test="urgeType != null and urgeType != ''">urge_type,</if>
+            <if test="urgeContent != null">urge_content,</if>
+            <if test="status != null">status,</if>
+            <if test="issuer != null">issuer,</if>
+            <if test="issuerId != null">issuer_id,</if>
+            <if test="issuerDept != null">issuer_dept,</if>
+            <if test="issuerDeptId != null">issuer_dept_id,</if>
+            <if test="acceptUser != null">accept_user,</if>
+            <if test="acceptUserId != null">accept_user_id,</if>
+            <if test="acceptDept != null">accept_dept,</if>
+            <if test="acceptDeptId != null">accept_dept_id,</if>
+            <if test="urgeTime != null">urge_time,</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="scoreId != null">#{scoreId},</if>
+            <if test="urgeTitle != null and urgeTitle != ''">#{urgeTitle},</if>
+            <if test="urgeType != null and urgeType != ''">#{urgeType},</if>
+            <if test="urgeContent != null">#{urgeContent},</if>
+            <if test="status != null">#{status},</if>
+            <if test="issuer != null">#{issuer},</if>
+            <if test="issuerId != null">#{issuerId},</if>
+            <if test="issuerDept != null">#{issuerDept},</if>
+            <if test="issuerDeptId != null">#{issuerDeptId},</if>
+            <if test="acceptUser != null">#{acceptUser},</if>
+            <if test="acceptUserId != null">#{acceptUserId},</if>
+            <if test="acceptDept != null">#{acceptDept},</if>
+            <if test="acceptDeptId != null">#{acceptDeptId},</if>
+            <if test="urgeTime != null">#{urgeTime},</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="updateZxUrge" parameterType="ZxUrge">
+        update zx_urge
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="scoreId != null">score_id = #{scoreId},</if>
+            <if test="urgeTitle != null and urgeTitle != ''">urge_title = #{urgeTitle},</if>
+            <if test="urgeType != null and urgeType != ''">urge_type = #{urgeType},</if>
+            <if test="urgeContent != null">urge_content = #{urgeContent},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="issuer != null">issuer = #{issuer},</if>
+            <if test="issuerId != null">issuer_id = #{issuerId},</if>
+            <if test="issuerDept != null">issuer_dept = #{issuerDept},</if>
+            <if test="issuerDeptId != null">issuer_dept_id = #{issuerDeptId},</if>
+            <if test="acceptUser != null">accept_user = #{acceptUser},</if>
+            <if test="acceptUserId != null">accept_user_id = #{acceptUserId},</if>
+            <if test="acceptDept != null">accept_dept = #{acceptDept},</if>
+            <if test="acceptDeptId != null">accept_dept_id = #{acceptDeptId},</if>
+            <if test="urgeTime != null">urge_time = #{urgeTime},</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 zx_urge_id = #{zxUrgeId}
+    </update>
+
+    <delete id="deleteZxUrgeByZxUrgeId" parameterType="Long">
+        delete from zx_urge where zx_urge_id = #{zxUrgeId}
+    </delete>
+
+    <delete id="deleteZxUrgeByZxUrgeIds" parameterType="String">
+        delete from zx_urge where zx_urge_id in 
+        <foreach item="zxUrgeId" collection="array" open="(" separator="," close=")">
+            #{zxUrgeId}
+        </foreach>
+    </delete>
+</mapper>