王子文 班组管理 - 班组建设

master/src/main/java/com/ruoyi/project/shiftmgr/controller/TShiftAccidentController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.shiftmgr.controller;
 
+import java.util.Date;
 import java.util.List;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +77,8 @@ public class TShiftAccidentController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TShiftAccident tShiftAccident)
     {
+        tShiftAccident.setCreaterCode(getUserId());
+        tShiftAccident.setCreatedate(new Date());
         return toAjax(tShiftAccidentService.insertTShiftAccident(tShiftAccident));
     }
 
@@ -87,6 +90,8 @@ public class TShiftAccidentController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TShiftAccident tShiftAccident)
     {
+        tShiftAccident.setUpdaterCode(getUserId());
+        tShiftAccident.setUpdatedate(new Date());
         return toAjax(tShiftAccidentService.updateTShiftAccident(tShiftAccident));
     }
 

master/src/main/java/com/ruoyi/project/shiftmgr/controller/TShiftDevelopmentController.java

@@ -0,0 +1,111 @@
+package com.ruoyi.project.shiftmgr.controller;
+
+import java.util.Date;
+import java.util.List;
+
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysUserService;
+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.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.framework.aspectj.lang.annotation.Log;
+import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
+import com.ruoyi.project.shiftmgr.domain.TShiftDevelopment;
+import com.ruoyi.project.shiftmgr.service.ITShiftDevelopmentService;
+import com.ruoyi.framework.web.controller.BaseController;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.web.page.TableDataInfo;
+
+/**
+ * 班组建设Controller
+ *
+ * @author ruoyi
+ * @date 2022-07-29
+ */
+@RestController
+@RequestMapping("/shiftmgr/development")
+public class TShiftDevelopmentController extends BaseController
+{
+    @Autowired
+    private ITShiftDevelopmentService tShiftDevelopmentService;
+
+    /**
+     * 查询班组建设列表
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:development:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TShiftDevelopment tShiftDevelopment)
+    {
+        startPage();
+        List<TShiftDevelopment> list = tShiftDevelopmentService.selectTShiftDevelopmentList(tShiftDevelopment);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出班组建设列表
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:development:export')")
+    @Log(title = "班组建设", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TShiftDevelopment tShiftDevelopment)
+    {
+        List<TShiftDevelopment> list = tShiftDevelopmentService.selectTShiftDevelopmentList(tShiftDevelopment);
+        ExcelUtil<TShiftDevelopment> util = new ExcelUtil<TShiftDevelopment>(TShiftDevelopment.class);
+        return util.exportExcel(list, "development");
+    }
+
+    /**
+     * 获取班组建设详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:development:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(tShiftDevelopmentService.selectTShiftDevelopmentById(id));
+    }
+
+    /**
+     * 新增班组建设
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:development:add')")
+    @Log(title = "班组建设", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TShiftDevelopment tShiftDevelopment)
+    {
+        tShiftDevelopment.setCreaterCode(getUserId());
+        tShiftDevelopment.setCreatedate(new Date());
+        return toAjax(tShiftDevelopmentService.insertTShiftDevelopment(tShiftDevelopment));
+    }
+
+    /**
+     * 修改班组建设
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:development:edit')")
+    @Log(title = "班组建设", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TShiftDevelopment tShiftDevelopment)
+    {
+        tShiftDevelopment.setUpdaterCode(getUserId());
+        tShiftDevelopment.setUpdatedate(new Date());
+        return toAjax(tShiftDevelopmentService.updateTShiftDevelopment(tShiftDevelopment));
+    }
+
+    /**
+     * 删除班组建设
+     */
+    @PreAuthorize("@ss.hasPermi('shiftmgr:development:remove')")
+    @Log(title = "班组建设", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tShiftDevelopmentService.deleteTShiftDevelopmentByIds(ids));
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/controller/TShiftImprovementController.java

@@ -1,5 +1,6 @@
 package com.ruoyi.project.shiftmgr.controller;
 
+import java.util.Date;
 import java.util.List;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,6 +77,8 @@ public class TShiftImprovementController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody TShiftImprovement tShiftImprovement)
     {
+        tShiftImprovement.setCreaterCode(getUserId());
+        tShiftImprovement.setCreatedate(new Date());
         return toAjax(tShiftImprovementService.insertTShiftImprovement(tShiftImprovement));
     }
 
@@ -87,6 +90,8 @@ public class TShiftImprovementController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody TShiftImprovement tShiftImprovement)
     {
+        tShiftImprovement.setUpdaterCode(getUserId());
+        tShiftImprovement.setUpdatedate(new Date());
         return toAjax(tShiftImprovementService.updateTShiftImprovement(tShiftImprovement));
     }
 

master/src/main/java/com/ruoyi/project/shiftmgr/domain/TShiftDevelopment.java

@@ -0,0 +1,209 @@
+package com.ruoyi.project.shiftmgr.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.framework.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 班组建设对象 t_shift_development
+ *
+ * @author ruoyi
+ * @date 2022-07-29
+ */
+public class TShiftDevelopment extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 班组 */
+    @Excel(name = "班组")
+    private String team;
+
+    /** 主题 */
+    @Excel(name = "主题")
+    private String title;
+
+    /** 地点 */
+    @Excel(name = "地点")
+    private String location;
+
+    /** 日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date organizeDate;
+
+    /** 组织人（列表），关联T_STAFFMGR表主键ID */
+    @Excel(name = "组织人", readConverterExp = "列=表")
+    private String organizer;
+
+    /** 参与人（列表），关联T_STAFFMGR表主键ID */
+    @Excel(name = "参与人", readConverterExp = "列=表")
+    private String participants;
+
+    /** 状态，0：正常；2：删除 */
+    private Long delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private Long createrCode;
+
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 修改人 */
+    @Excel(name = "修改人")
+    private Long updaterCode;
+
+    /** 修改时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
+    @Excel(name = "修改时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date updatedate;
+
+    /** 部门编号 */
+    @Excel(name = "部门编号")
+    private Long deptId;
+
+    public void setId(Long id)
+    {
+        this.id = id;
+    }
+
+    public Long getId()
+    {
+        return id;
+    }
+    public void setTeam(String team)
+    {
+        this.team = team;
+    }
+
+    public String getTeam()
+    {
+        return team;
+    }
+    public void setTitle(String title)
+    {
+        this.title = title;
+    }
+
+    public String getTitle()
+    {
+        return title;
+    }
+    public void setLocation(String location)
+    {
+        this.location = location;
+    }
+
+    public String getLocation()
+    {
+        return location;
+    }
+    public void setOrganizeDate(Date organizeDate)
+    {
+        this.organizeDate = organizeDate;
+    }
+
+    public Date getOrganizeDate()
+    {
+        return organizeDate;
+    }
+    public void setOrganizer(String organizer)
+    {
+        this.organizer = organizer;
+    }
+
+    public String getOrganizer()
+    {
+        return organizer;
+    }
+    public void setParticipants(String participants)
+    {
+        this.participants = participants;
+    }
+
+    public String getParticipants()
+    {
+        return participants;
+    }
+    public void setDelFlag(Long delFlag)
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Long getDelFlag()
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(Long createrCode)
+    {
+        this.createrCode = createrCode;
+    }
+
+    public Long getCreaterCode()
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate)
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate()
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(Long updaterCode)
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public Long getUpdaterCode()
+    {
+        return updaterCode;
+    }
+    public void setUpdatedate(Date updatedate)
+    {
+        this.updatedate = updatedate;
+    }
+
+    public Date getUpdatedate()
+    {
+        return updatedate;
+    }
+    public void setDeptId(Long deptId)
+    {
+        this.deptId = deptId;
+    }
+
+    public Long getDeptId()
+    {
+        return deptId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("team", getTeam())
+            .append("title", getTitle())
+            .append("location", getLocation())
+            .append("organizeDate", getOrganizeDate())
+            .append("organizer", getOrganizer())
+            .append("participants", getParticipants())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

master/src/main/java/com/ruoyi/project/shiftmgr/mapper/TShiftDevelopmentMapper.java

@@ -0,0 +1,63 @@
+package com.ruoyi.project.shiftmgr.mapper;
+
+import java.util.List;
+import com.ruoyi.framework.aspectj.lang.annotation.DataScope;
+import com.ruoyi.project.shiftmgr.domain.TShiftDevelopment;
+
+/**
+ * 班组建设Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2022-07-29
+ */
+public interface TShiftDevelopmentMapper 
+{
+    /**
+     * 查询班组建设
+     * 
+     * @param id 班组建设ID
+     * @return 班组建设
+     */
+    public TShiftDevelopment selectTShiftDevelopmentById(Long id);
+
+    /**
+     * 查询班组建设列表
+     * 
+     * @param tShiftDevelopment 班组建设
+     * @return 班组建设集合
+     */
+    @DataScope(deptAlias = "d")
+    public List<TShiftDevelopment> selectTShiftDevelopmentList(TShiftDevelopment tShiftDevelopment);
+
+    /**
+     * 新增班组建设
+     * 
+     * @param tShiftDevelopment 班组建设
+     * @return 结果
+     */
+    public int insertTShiftDevelopment(TShiftDevelopment tShiftDevelopment);
+
+    /**
+     * 修改班组建设
+     * 
+     * @param tShiftDevelopment 班组建设
+     * @return 结果
+     */
+    public int updateTShiftDevelopment(TShiftDevelopment tShiftDevelopment);
+
+    /**
+     * 删除班组建设
+     * 
+     * @param id 班组建设ID
+     * @return 结果
+     */
+    public int deleteTShiftDevelopmentById(Long id);
+
+    /**
+     * 批量删除班组建设
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTShiftDevelopmentByIds(Long[] ids);
+}

master/src/main/java/com/ruoyi/project/shiftmgr/service/ITShiftDevelopmentService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.shiftmgr.service;
+
+import java.util.List;
+import com.ruoyi.project.shiftmgr.domain.TShiftDevelopment;
+
+/**
+ * 班组建设Service接口
+ * 
+ * @author ruoyi
+ * @date 2022-07-29
+ */
+public interface ITShiftDevelopmentService 
+{
+    /**
+     * 查询班组建设
+     * 
+     * @param id 班组建设ID
+     * @return 班组建设
+     */
+    public TShiftDevelopment selectTShiftDevelopmentById(Long id);
+
+    /**
+     * 查询班组建设列表
+     * 
+     * @param tShiftDevelopment 班组建设
+     * @return 班组建设集合
+     */
+    public List<TShiftDevelopment> selectTShiftDevelopmentList(TShiftDevelopment tShiftDevelopment);
+
+    /**
+     * 新增班组建设
+     * 
+     * @param tShiftDevelopment 班组建设
+     * @return 结果
+     */
+    public int insertTShiftDevelopment(TShiftDevelopment tShiftDevelopment);
+
+    /**
+     * 修改班组建设
+     * 
+     * @param tShiftDevelopment 班组建设
+     * @return 结果
+     */
+    public int updateTShiftDevelopment(TShiftDevelopment tShiftDevelopment);
+
+    /**
+     * 批量删除班组建设
+     * 
+     * @param ids 需要删除的班组建设ID
+     * @return 结果
+     */
+    public int deleteTShiftDevelopmentByIds(Long[] ids);
+
+    /**
+     * 删除班组建设信息
+     * 
+     * @param id 班组建设ID
+     * @return 结果
+     */
+    public int deleteTShiftDevelopmentById(Long id);
+}

master/src/main/java/com/ruoyi/project/shiftmgr/service/impl/TShiftDevelopmentServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.shiftmgr.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.shiftmgr.mapper.TShiftDevelopmentMapper;
+import com.ruoyi.project.shiftmgr.domain.TShiftDevelopment;
+import com.ruoyi.project.shiftmgr.service.ITShiftDevelopmentService;
+
+/**
+ * 班组建设Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2022-07-29
+ */
+@Service
+public class TShiftDevelopmentServiceImpl implements ITShiftDevelopmentService
+{
+    @Autowired
+    private TShiftDevelopmentMapper tShiftDevelopmentMapper;
+
+    /**
+     * 查询班组建设
+     *
+     * @param id 班组建设ID
+     * @return 班组建设
+     */
+    @Override
+    public TShiftDevelopment selectTShiftDevelopmentById(Long id)
+    {
+        return tShiftDevelopmentMapper.selectTShiftDevelopmentById(id);
+    }
+
+    /**
+     * 查询班组建设列表
+     *
+     * @param tShiftDevelopment 班组建设
+     * @return 班组建设
+     */
+    @Override
+    public List<TShiftDevelopment> selectTShiftDevelopmentList(TShiftDevelopment tShiftDevelopment)
+    {
+        return tShiftDevelopmentMapper.selectTShiftDevelopmentList(tShiftDevelopment);
+    }
+
+    /**
+     * 新增班组建设
+     *
+     * @param tShiftDevelopment 班组建设
+     * @return 结果
+     */
+    @Override
+    public int insertTShiftDevelopment(TShiftDevelopment tShiftDevelopment)
+    {
+        return tShiftDevelopmentMapper.insertTShiftDevelopment(tShiftDevelopment);
+    }
+
+    /**
+     * 修改班组建设
+     *
+     * @param tShiftDevelopment 班组建设
+     * @return 结果
+     */
+    @Override
+    public int updateTShiftDevelopment(TShiftDevelopment tShiftDevelopment)
+    {
+        return tShiftDevelopmentMapper.updateTShiftDevelopment(tShiftDevelopment);
+    }
+
+    /**
+     * 批量删除班组建设
+     *
+     * @param ids 需要删除的班组建设ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShiftDevelopmentByIds(Long[] ids)
+    {
+        return tShiftDevelopmentMapper.deleteTShiftDevelopmentByIds(ids);
+    }
+
+    /**
+     * 删除班组建设信息
+     *
+     * @param id 班组建设ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTShiftDevelopmentById(Long id)
+    {
+        return tShiftDevelopmentMapper.deleteTShiftDevelopmentById(id);
+    }
+}

master/src/main/resources/mybatis/shiftmgr/TShiftDevelopmentMapper.xml

@@ -0,0 +1,121 @@
+<?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.shiftmgr.mapper.TShiftDevelopmentMapper">
+    
+    <resultMap type="TShiftDevelopment" id="TShiftDevelopmentResult">
+        <result property="id"    column="id"    />
+        <result property="team"    column="team"    />
+        <result property="title"    column="title"    />
+        <result property="location"    column="location"    />
+        <result property="organizeDate"    column="organize_date"    />
+        <result property="organizer"    column="organizer"    />
+        <result property="participants"    column="participants"    />
+        <result property="delFlag"    column="del_flag"    />
+        <result property="createrCode"    column="creater_code"    />
+        <result property="createdate"    column="createdate"    />
+        <result property="updaterCode"    column="updater_code"    />
+        <result property="updatedate"    column="updatedate"    />
+        <result property="deptId"    column="dept_id"    />
+        <result property="deptName" column="dept_name" />
+    </resultMap>
+
+    <sql id="selectTShiftDevelopmentVo">
+        select d.id, d.team, d.title, d.location, d.organize_date, d.organizer, d.participants, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id ,s.dept_name from t_shift_development d
+      left join sys_dept s on s.dept_id = d.dept_id
+    </sql>
+
+    <select id="selectTShiftDevelopmentList" parameterType="TShiftDevelopment" resultMap="TShiftDevelopmentResult">
+        <include refid="selectTShiftDevelopmentVo"/>
+        <where>  
+            <if test="team != null  and team != ''"> and team = #{team}</if>
+            <if test="title != null  and title != ''"> and title = #{title}</if>
+            <if test="location != null  and location != ''"> and location = #{location}</if>
+            <if test="organizeDate != null "> and organize_date = #{organizeDate}</if>
+            <if test="organizer != null  and organizer != ''"> and organizer = #{organizer}</if>
+            <if test="participants != null  and participants != ''"> and participants = #{participants}</if>
+            <if test="createrCode != null "> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null "> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+            and d.del_flag = 0
+        </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
+    </select>
+    
+    <select id="selectTShiftDevelopmentById" parameterType="Long" resultMap="TShiftDevelopmentResult">
+        <include refid="selectTShiftDevelopmentVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTShiftDevelopment" parameterType="TShiftDevelopment">
+        <selectKey keyProperty="id" resultType="long" order="BEFORE">
+            SELECT SEQ_T_SHIFT_DEVELOPMENT.NEXTVAL as id FROM DUAL
+        </selectKey>
+        insert into t_shift_development
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="team != null">team,</if>
+            <if test="title != null">title,</if>
+            <if test="location != null">location,</if>
+            <if test="organizeDate != null">organize_date,</if>
+            <if test="organizer != null">organizer,</if>
+            <if test="participants != null">participants,</if>
+            <if test="delFlag != null">del_flag,</if>
+            <if test="createrCode != null">creater_code,</if>
+            <if test="createdate != null">createdate,</if>
+            <if test="updaterCode != null">updater_code,</if>
+            <if test="updatedate != null">updatedate,</if>
+            <if test="deptId != null">dept_id,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="id != null">#{id},</if>
+            <if test="team != null">#{team},</if>
+            <if test="title != null">#{title},</if>
+            <if test="location != null">#{location},</if>
+            <if test="organizeDate != null">#{organizeDate},</if>
+            <if test="organizer != null">#{organizer},</if>
+            <if test="participants != null">#{participants},</if>
+            <if test="delFlag != null">#{delFlag},</if>
+            <if test="createrCode != null">#{createrCode},</if>
+            <if test="createdate != null">#{createdate},</if>
+            <if test="updaterCode != null">#{updaterCode},</if>
+            <if test="updatedate != null">#{updatedate},</if>
+            <if test="deptId != null">#{deptId},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTShiftDevelopment" parameterType="TShiftDevelopment">
+        update t_shift_development
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="team != null">team = #{team},</if>
+            <if test="title != null">title = #{title},</if>
+            <if test="location != null">location = #{location},</if>
+            <if test="organizeDate != null">organize_date = #{organizeDate},</if>
+            <if test="organizer != null">organizer = #{organizer},</if>
+            <if test="participants != null">participants = #{participants},</if>
+            <if test="delFlag != null">del_flag = #{delFlag},</if>
+            <if test="createrCode != null">creater_code = #{createrCode},</if>
+            <if test="createdate != null">createdate = #{createdate},</if>
+            <if test="updaterCode != null">updater_code = #{updaterCode},</if>
+            <if test="updatedate != null">updatedate = #{updatedate},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <update id="deleteTShiftDevelopmentById" parameterType="Long">
+        update t_shift_development set del_flag = 2 where id = #{id}
+    </update>
+
+    <update id="deleteTShiftDevelopmentByIds" parameterType="String">
+        update t_shift_development set del_flag = 2 where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </update>
+    
+</mapper>

ui/src/api/shiftmgr/development.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询班组建设列表
+export function listDevelopment(query) {
+  return request({
+    url: '/shiftmgr/development/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询班组建设详细
+export function getDevelopment(id) {
+  return request({
+    url: '/shiftmgr/development/' + id,
+    method: 'get'
+  })
+}
+
+// 新增班组建设
+export function addDevelopment(data) {
+  return request({
+    url: '/shiftmgr/development',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改班组建设
+export function updateDevelopment(data) {
+  return request({
+    url: '/shiftmgr/development',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除班组建设
+export function delDevelopment(id) {
+  return request({
+    url: '/shiftmgr/development/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出班组建设
+export function exportDevelopment(query) {
+  return request({
+    url: '/shiftmgr/development/export',
+    method: 'get',
+    params: query
+  })
+}

ui/src/views/shiftmgr/eventmgr/accident/index.vue

@@ -150,7 +150,7 @@
       <el-table-column label="事故记录编号" align="center" prop="accidentId" :show-overflow-tooltip="true"/>
       <el-table-column label="责任人" align="center" prop="personLiable" :show-overflow-tooltip="true"/>
       <el-table-column label="提出人" align="center" prop="reporter" :show-overflow-tooltip="true"/>
-      <el-table-column label="提出日期" align="center" prop="reportDate">
+      <el-table-column label="提出日期" align="center" prop="reportDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -158,13 +158,13 @@
       <el-table-column label="标题" align="center" prop="title" :show-overflow-tooltip="true"/>
       <el-table-column label="内容" align="center" prop="content" :show-overflow-tooltip="true"/>
       <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createdate">
+      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updatedate">
+      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
         </template>

ui/src/views/shiftmgr/eventmgr/improvement/index.vue

@@ -148,7 +148,7 @@
     <el-table v-loading="loading" :data="improvementList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="提出人" align="center" prop="reporter" :show-overflow-tooltip="true"/>
-      <el-table-column label="提出日期" align="center" prop="reportDate">
+      <el-table-column label="提出日期" align="center" prop="reportDate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.reportDate, '{y}-{m}-{d}') }}</span>
         </template>
@@ -158,13 +158,13 @@
       <el-table-column label="等级" align="center" prop="importanceLevel" :show-overflow-tooltip="true"/>
       <el-table-column label="是否采纳" align="center" prop="isAccepted" :show-overflow-tooltip="true"/>
       <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建时间" align="center" prop="createdate">
+      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
       <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改时间" align="center" prop="updatedate">
+      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
         </template>

ui/src/views/shiftmgr/shiftdevelopment/index.vue

@@ -0,0 +1,542 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="班组" prop="team">
+        <el-input
+          v-model="queryParams.team"
+          placeholder="请输入班组"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="主题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入主题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="地点" prop="location">
+        <el-input
+          v-model="queryParams.location"
+          placeholder="请输入地点"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="日期" prop="organizeDate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.organizeDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="组织人" prop="organizer">
+        <el-input
+          v-model="queryParams.organizer"
+          placeholder="请输入组织人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="参与人" prop="participants">
+        <el-input
+          v-model="queryParams.participants"
+          placeholder="请输入参与人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人" prop="createrCode">
+        <el-input
+          v-model="queryParams.createrCode"
+          placeholder="请输入创建人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createdate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.createdate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择创建时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="修改人" prop="updaterCode">
+        <el-input
+          v-model="queryParams.updaterCode"
+          placeholder="请输入修改人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改时间" prop="updatedate">
+        <el-date-picker clearable size="small" style="width: 200px"
+          v-model="queryParams.updatedate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择修改时间">
+        </el-date-picker>
+      </el-form-item>
+      <!--<el-form-item label="部门编号" prop="deptId">-->
+        <!--<el-input-->
+          <!--v-model="queryParams.deptId"-->
+          <!--placeholder="请输入部门编号"-->
+          <!--clearable-->
+          <!--size="small"-->
+          <!--@keyup.enter.native="handleQuery"-->
+        <!--/>-->
+      <!--</el-form-item>-->
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['shiftmgr:development:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['shiftmgr:development:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['shiftmgr:development:remove']"
+        >删除</el-button>
+      </el-col>
+        <el-col :span="1.5">
+            <el-button
+                    type="info"
+                    icon="el-icon-upload2"
+                    size="mini"
+                    @click="handleImport"
+                    v-hasPermi="['shiftmgr:development:edit']"
+            >导入</el-button>
+        </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['shiftmgr:development:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="developmentList" @selection-change="handleSelectionChange" :height="clientHeight" border>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="班组" align="center" prop="team" :show-overflow-tooltip="true"/>
+      <el-table-column label="主题" align="center" prop="title" :show-overflow-tooltip="true"/>
+      <el-table-column label="地点" align="center" prop="location" :show-overflow-tooltip="true"/>
+      <el-table-column label="日期" align="center" prop="organizeDate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.organizeDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="组织人" align="center" prop="organizer" :show-overflow-tooltip="true"/>
+      <el-table-column label="参与人" align="center" prop="participants" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createrCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createdate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createdate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="修改人" align="center" prop="updaterCode" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updatedate" width="100">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updatedate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <!--<el-table-column label="部门编号" align="center" prop="deptId" :show-overflow-tooltip="true"/>-->
+      <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['shiftmgr:development:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['shiftmgr:development:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改班组建设对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <!--<el-form-item label="部门编号" prop="id">-->
+          <!--<el-input v-model="form.id" placeholder="请输入部门编号" />-->
+        <!--</el-form-item>-->
+        <el-form-item label="班组" prop="team">
+          <el-input v-model="form.team" placeholder="请输入班组" />
+        </el-form-item>
+        <el-form-item label="主题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入主题" />
+        </el-form-item>
+        <el-form-item label="地点" prop="location">
+          <el-input v-model="form.location" placeholder="请输入地点" />
+        </el-form-item>
+        <el-form-item label="日期" prop="organizeDate">
+          <el-date-picker clearable size="small" style="width: 200px"
+            v-model="form.organizeDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="组织人" prop="organizer">
+          <el-input v-model="form.organizer" placeholder="请输入组织人" />
+        </el-form-item>
+        <el-form-item label="参与人" prop="participants">
+          <el-input v-model="form.participants" placeholder="请输入参与人" />
+        </el-form-item>
+        <el-form-item label="状态" prop="delFlag">
+          <el-input v-model="form.delFlag" placeholder="请输入状态" />
+        </el-form-item>
+        <!--<el-form-item label="创建人" prop="createrCode">-->
+          <!--<el-input v-model="form.createrCode" placeholder="请输入创建人" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="创建时间" prop="createdate">-->
+          <!--<el-date-picker clearable size="small" style="width: 200px"-->
+            <!--v-model="form.createdate"-->
+            <!--type="date"-->
+            <!--value-format="yyyy-MM-dd"-->
+            <!--placeholder="选择创建时间">-->
+          <!--</el-date-picker>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="修改人" prop="updaterCode">-->
+          <!--<el-input v-model="form.updaterCode" placeholder="请输入修改人" />-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="修改时间" prop="updatedate">-->
+          <!--<el-date-picker clearable size="small" style="width: 200px"-->
+            <!--v-model="form.updatedate"-->
+            <!--type="date"-->
+            <!--value-format="yyyy-MM-dd"-->
+            <!--placeholder="选择修改时间">-->
+          <!--</el-date-picker>-->
+        <!--</el-form-item>-->
+        <!--<el-form-item label="部门编号" prop="deptId">-->
+          <!--<el-input v-model="form.deptId" placeholder="请输入部门编号" />-->
+        <!--</el-form-item>-->
+          <!--<el-form-item label="归属部门" prop="deptId">-->
+              <!--<treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />-->
+          <!--</el-form-item>-->
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+      <!-- 用户导入对话框 -->
+      <el-dialog :title="upload.title" :visible.sync="upload.open" width="400px" append-to-body>
+          <el-upload
+                  ref="upload"
+                  :limit="1"
+                  accept=".xlsx, .xls"
+                  :headers="upload.headers"
+                  :action="upload.url + '?updateSupport=' + upload.updateSupport"
+                  :disabled="upload.isUploading"
+                  :on-progress="handleFileUploadProgress"
+                  :on-success="handleFileSuccess"
+                  :auto-upload="false"
+                  drag
+          >
+              <i class="el-icon-upload"></i>
+              <div class="el-upload__text">
+                  将文件拖到此处，或
+                  <em>点击上传</em>
+              </div>
+              <div class="el-upload__tip" slot="tip">
+                  <el-checkbox v-model="upload.updateSupport" />是否更新已经存在的用户数据
+                  <el-link type="info" style="font-size:12px" @click="importTemplate">下载模板</el-link>
+              </div>
+              <div class="el-upload__tip" style="color:red" slot="tip">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+          </el-upload>
+          <div slot="footer" class="dialog-footer">
+              <el-button type="primary" @click="submitFileForm">确 定</el-button>
+              <el-button @click="upload.open = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listDevelopment, getDevelopment, delDevelopment, addDevelopment, updateDevelopment, exportDevelopment, importTemplate} from "@/api/shiftmgr/development";
+import { treeselect } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "Development",
+  components: { Treeselect },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 班组建设表格数据
+      developmentList: [],
+      // 弹出层标题
+      title: "",
+      // 部门树选项
+      deptOptions: undefined,
+      clientHeight:300,
+      // 是否显示弹出层
+      open: false,
+        // 用户导入参数
+        upload: {
+            // 是否显示弹出层（用户导入）
+            open: false,
+            // 弹出层标题（用户导入）
+            title: "",
+            // 是否禁用上传
+            isUploading: false,
+            // 是否更新已经存在的用户数据
+            updateSupport: 0,
+            // 设置上传的请求头部
+            headers: { Authorization: "Bearer " + getToken() },
+            // 上传的地址
+            url: process.env.VUE_APP_BASE_API + "/shiftmgr/development/importData"
+        },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        team: null,
+        title: null,
+        location: null,
+        organizeDate: null,
+        organizer: null,
+        participants: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  watch: {
+        // 根据名称筛选部门树
+        deptName(val) {
+            this.$refs.tree.filter(val);
+        }
+   },
+  created() {
+      //设置表格高度对应屏幕高度
+      this.$nextTick(() => {
+          this.clientHeight = document.body.clientHeight -250
+      })
+    this.getList();
+    this.getTreeselect();
+  },
+  methods: {
+    /** 查询班组建设列表 */
+    getList() {
+      this.loading = true;
+      listDevelopment(this.queryParams).then(response => {
+        this.developmentList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+     /** 查询部门下拉树结构 */
+     getTreeselect() {
+          treeselect().then(response => {
+              this.deptOptions = response.data;
+          });
+     },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        team: null,
+        title: null,
+        location: null,
+        organizeDate: null,
+        organizer: null,
+        participants: null,
+        delFlag: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加班组建设";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDevelopment(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改班组建设";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateDevelopment(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDevelopment(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDevelopment(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有班组建设数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportDevelopment(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    },
+      /** 导入按钮操作 */
+      handleImport() {
+          this.upload.title = "用户导入";
+          this.upload.open = true;
+      },
+      /** 下载模板操作 */
+      importTemplate() {
+          importTemplate().then(response => {
+              this.download(response.msg);
+          });
+      },
+      // 文件上传中处理
+      handleFileUploadProgress(event, file, fileList) {
+          this.upload.isUploading = true;
+      },
+      // 文件上传成功处理
+      handleFileSuccess(response, file, fileList) {
+          this.upload.open = false;
+          this.upload.isUploading = false;
+          this.$refs.upload.clearFiles();
+          this.$alert(response.msg, "导入结果", { dangerouslyUseHTMLString: true });
+          this.getList();
+      },
+      // 提交上传文件
+      submitFileForm() {
+          this.$refs.upload.submit();
+      }
+  }
+};
+</script>