cpms优化

moc清单
漏点清单

ruoyi-admin/src/main/java/com/ruoyi/project/process/controller/TMocController.java

@@ -0,0 +1,190 @@
+package com.ruoyi.project.process.controller;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alibaba.fastjson2.JSON;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.file.ExcelUtils;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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.project.process.domain.TMoc;
+import com.ruoyi.project.process.service.ITMocService;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * MOC清单Controller
+ * 
+ * @author ruoyi
+ * @date 2024-04-08
+ */
+@RestController
+@RequestMapping("/moc/moc")
+public class TMocController extends BaseController
+{
+    @Autowired
+    private ITMocService tMocService;
+
+    /**
+     * 查询MOC清单列表
+     */
+    @PreAuthorize("@ss.hasPermi('moc:moc:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(TMoc tMoc)
+    {
+        startPage();
+        List<TMoc> list = tMocService.selectTMocList(tMoc);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出MOC清单列表
+     */
+    @PreAuthorize("@ss.hasPermi('moc:moc:export')")
+    @Log(title = "MOC清单", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, TMoc tMoc)
+    {
+        List<TMoc> list = tMocService.selectTMocList(tMoc);
+        ExcelUtil<TMoc> util = new ExcelUtil<TMoc>(TMoc.class);
+        util.exportExcel(response, list, "MOC清单数据");
+    }
+
+    /**
+     * 获取MOC清单详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('moc:moc:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return success(tMocService.selectTMocById(id));
+    }
+
+    /**
+     * 新增MOC清单
+     */
+    @PreAuthorize("@ss.hasPermi('moc:moc:add')")
+    @Log(title = "MOC清单", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TMoc tMoc) throws Exception {
+        TMoc moc = new TMoc();
+        moc.setMocNo(tMoc.getMocNo());
+        List<TMoc> tMocs = tMocService.selectTMocList(moc);
+        if(CollectionUtils.isNotEmpty(tMocs)){
+            throw new Exception("已存在相同的MOC No.！");
+        }
+        return toAjax(tMocService.insertTMoc(tMoc));
+    }
+
+    /**
+     * 修改MOC清单
+     */
+    @PreAuthorize("@ss.hasPermi('moc:moc:edit')")
+    @Log(title = "MOC清单", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TMoc tMoc)
+    {
+        return toAjax(tMocService.updateTMoc(tMoc));
+    }
+
+    /**
+     * 删除MOC清单
+     */
+    @PreAuthorize("@ss.hasPermi('moc:moc:remove')")
+    @Log(title = "MOC清单", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(tMocService.deleteTMocByIds(ids));
+    }
+
+
+    @Log(title = "MOC清单批量导入", businessType = BusinessType.INSERT)
+    @PostMapping("/importData")
+    public AjaxResult importData(@RequestParam("file") MultipartFile file) throws IOException {
+        //获取操作人员ID
+        Long userId = getUserId();
+        //报错行数统计
+        List<Integer> failRow = new ArrayList<>();
+        Workbook workbook = ExcelUtils.getWorkBook(file);
+        Sheet sheet = workbook.getSheetAt(0);
+        List<TMoc> list = new ArrayList<>();
+        int rowNum = sheet.getPhysicalNumberOfRows();
+        int failNumber = 0;
+        for (int i = 2; i < rowNum; i++) {
+            try {
+                logger.info("读取行数：" + i);
+                Row row = sheet.getRow(i);
+                int cellNum = row.getLastCellNum();
+                TMoc entity = new TMoc();
+                for (int j = 0; j < cellNum; j++) {
+                    Cell cell = row.getCell(j);
+                    if (cell == null) {
+                        continue;
+                    }
+                    String cellValue = ExcelUtils.getCellValue(cell);
+                    logger.info("cellValue:" + cellValue);
+                    // TODO 添加属性值
+                    if (j==0){
+                        entity.setMocNo(cellValue);
+                    } else if (j==1) {
+                        entity.setMocOwner(cellValue);
+                    } else if (j==2) {
+                        entity.setChangeName(cellValue);
+                    } else if (j==3) {
+                        entity.settOrP(cellValue);
+                    } else if (j==4) {
+                        entity.setIssueDate(DateUtils.parseDate(cellValue));
+                    } else if (j==5) {
+                        entity.setEmocStatus(cellValue);
+                    } else if (j==6) {
+                        entity.setPriority(cellValue);
+                    } else if (j==7) {
+                        entity.setRemarks(cellValue);
+                    }
+                }
+                entity.setCreaterCode(String.valueOf(userId));
+                logger.info("entity:" + entity);
+                list.add(entity);
+            } catch (Exception e) {
+                failNumber++;
+                logger.info("e:" + JSON.toJSONString(e));
+                failRow.add(i + 1);
+            }
+        }
+        int successNumber = 0;
+        int failNum = 0;
+        for (TMoc t : list
+        ) {
+            failNum++;
+            try {
+                //根据使用证、注册编号、位号，进行数据更新
+                add(t);
+                successNumber++;
+            } catch (Exception e) {
+                failNumber++;
+                logger.info("e:" + e);
+                failRow.add(failNum + 1);
+            }
+        }
+        logger.info("list:" + JSON.toJSONString(list));
+        logger.info("successNumber:" + successNumber);
+        logger.info("failNumber:" + failNumber);
+        logger.info("failRow:" + failRow);
+        return AjaxResult.success(String.valueOf(successNumber), failRow);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/project/process/domain/TMoc.java

@@ -0,0 +1,237 @@
+package com.ruoyi.project.process.domain;
+
+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;
+
+/**
+ * MOC清单对象 t_moc
+ * 
+ * @author ruoyi
+ * @date 2024-04-08
+ */
+public class TMoc extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long id;
+
+    /** MOC NO. */
+    @Excel(name = "MOC NO.")
+    private String mocNo;
+
+    /** MOC Owner */
+    @Excel(name = "MOC Owner")
+    private String mocOwner;
+
+    /** Change Name */
+    @Excel(name = "Change Name")
+    private String changeName;
+
+    /** T or P */
+    @Excel(name = "T or P")
+    private String tOrP;
+
+    /** Issue date */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @Excel(name = "Issue date", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date issueDate;
+
+    /** e-MOC status */
+    @Excel(name = "e-MOC status")
+    private String emocStatus;
+
+    /** Priority */
+    @Excel(name = "Priority")
+    private String priority;
+
+    /** 备注 */
+    @Excel(name = "备注")
+    private String remarks;
+
+    /** 删除标识 */
+    private Integer delFlag;
+
+    /** 创建人 */
+    @Excel(name = "创建人")
+    private String createrCode;
+
+    /** 创建日期 */
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @Excel(name = "创建日期", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date createdate;
+
+    /** 更新人 */
+    @Excel(name = "更新人")
+    private String 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 setMocNo(String mocNo) 
+    {
+        this.mocNo = mocNo;
+    }
+
+    public String getMocNo() 
+    {
+        return mocNo;
+    }
+    public void setMocOwner(String mocOwner) 
+    {
+        this.mocOwner = mocOwner;
+    }
+
+    public String getMocOwner() 
+    {
+        return mocOwner;
+    }
+    public void setChangeName(String changeName) 
+    {
+        this.changeName = changeName;
+    }
+
+    public String getChangeName() 
+    {
+        return changeName;
+    }
+    public void settOrP(String tOrP) 
+    {
+        this.tOrP = tOrP;
+    }
+
+    public String gettOrP() 
+    {
+        return tOrP;
+    }
+    public void setIssueDate(Date issueDate) 
+    {
+        this.issueDate = issueDate;
+    }
+
+    public Date getIssueDate() 
+    {
+        return issueDate;
+    }
+    public void setEmocStatus(String emocStatus) 
+    {
+        this.emocStatus = emocStatus;
+    }
+
+    public String getEmocStatus() 
+    {
+        return emocStatus;
+    }
+    public void setPriority(String priority) 
+    {
+        this.priority = priority;
+    }
+
+    public String getPriority() 
+    {
+        return priority;
+    }
+    public void setRemarks(String remarks) 
+    {
+        this.remarks = remarks;
+    }
+
+    public String getRemarks() 
+    {
+        return remarks;
+    }
+    public void setDelFlag(Integer delFlag) 
+    {
+        this.delFlag = delFlag;
+    }
+
+    public Integer getDelFlag() 
+    {
+        return delFlag;
+    }
+    public void setCreaterCode(String createrCode) 
+    {
+        this.createrCode = createrCode;
+    }
+
+    public String getCreaterCode() 
+    {
+        return createrCode;
+    }
+    public void setCreatedate(Date createdate) 
+    {
+        this.createdate = createdate;
+    }
+
+    public Date getCreatedate() 
+    {
+        return createdate;
+    }
+    public void setUpdaterCode(String updaterCode) 
+    {
+        this.updaterCode = updaterCode;
+    }
+
+    public String 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("mocNo", getMocNo())
+            .append("mocOwner", getMocOwner())
+            .append("changeName", getChangeName())
+            .append("tOrP", gettOrP())
+            .append("issueDate", getIssueDate())
+            .append("emocStatus", getEmocStatus())
+            .append("priority", getPriority())
+            .append("remarks", getRemarks())
+            .append("delFlag", getDelFlag())
+            .append("createrCode", getCreaterCode())
+            .append("createdate", getCreatedate())
+            .append("updaterCode", getUpdaterCode())
+            .append("updatedate", getUpdatedate())
+            .append("deptId", getDeptId())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/project/process/mapper/TMocMapper.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.process.mapper;
+
+import java.util.List;
+import com.ruoyi.project.process.domain.TMoc;
+
+/**
+ * MOC清单Mapper接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-08
+ */
+public interface TMocMapper 
+{
+    /**
+     * 查询MOC清单
+     * 
+     * @param id MOC清单主键
+     * @return MOC清单
+     */
+    public TMoc selectTMocById(Long id);
+
+    /**
+     * 查询MOC清单列表
+     * 
+     * @param tMoc MOC清单
+     * @return MOC清单集合
+     */
+    public List<TMoc> selectTMocList(TMoc tMoc);
+
+    /**
+     * 新增MOC清单
+     * 
+     * @param tMoc MOC清单
+     * @return 结果
+     */
+    public int insertTMoc(TMoc tMoc);
+
+    /**
+     * 修改MOC清单
+     * 
+     * @param tMoc MOC清单
+     * @return 结果
+     */
+    public int updateTMoc(TMoc tMoc);
+
+    /**
+     * 删除MOC清单
+     * 
+     * @param id MOC清单主键
+     * @return 结果
+     */
+    public int deleteTMocById(Long id);
+
+    /**
+     * 批量删除MOC清单
+     * 
+     * @param ids 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteTMocByIds(Long[] ids);
+}

ruoyi-admin/src/main/java/com/ruoyi/project/process/service/ITMocService.java

@@ -0,0 +1,61 @@
+package com.ruoyi.project.process.service;
+
+import java.util.List;
+import com.ruoyi.project.process.domain.TMoc;
+
+/**
+ * MOC清单Service接口
+ * 
+ * @author ruoyi
+ * @date 2024-04-08
+ */
+public interface ITMocService 
+{
+    /**
+     * 查询MOC清单
+     * 
+     * @param id MOC清单主键
+     * @return MOC清单
+     */
+    public TMoc selectTMocById(Long id);
+
+    /**
+     * 查询MOC清单列表
+     * 
+     * @param tMoc MOC清单
+     * @return MOC清单集合
+     */
+    public List<TMoc> selectTMocList(TMoc tMoc);
+
+    /**
+     * 新增MOC清单
+     * 
+     * @param tMoc MOC清单
+     * @return 结果
+     */
+    public int insertTMoc(TMoc tMoc);
+
+    /**
+     * 修改MOC清单
+     * 
+     * @param tMoc MOC清单
+     * @return 结果
+     */
+    public int updateTMoc(TMoc tMoc);
+
+    /**
+     * 批量删除MOC清单
+     * 
+     * @param ids 需要删除的MOC清单主键集合
+     * @return 结果
+     */
+    public int deleteTMocByIds(Long[] ids);
+
+    /**
+     * 删除MOC清单信息
+     * 
+     * @param id MOC清单主键
+     * @return 结果
+     */
+    public int deleteTMocById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/project/process/service/impl/TMocServiceImpl.java

@@ -0,0 +1,93 @@
+package com.ruoyi.project.process.service.impl;
+
+import java.util.List;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.project.process.mapper.TMocMapper;
+import com.ruoyi.project.process.domain.TMoc;
+import com.ruoyi.project.process.service.ITMocService;
+
+/**
+ * MOC清单Service业务层处理
+ * 
+ * @author ruoyi
+ * @date 2024-04-08
+ */
+@Service
+public class TMocServiceImpl implements ITMocService 
+{
+    @Autowired
+    private TMocMapper tMocMapper;
+
+    /**
+     * 查询MOC清单
+     * 
+     * @param id MOC清单主键
+     * @return MOC清单
+     */
+    @Override
+    public TMoc selectTMocById(Long id)
+    {
+        return tMocMapper.selectTMocById(id);
+    }
+
+    /**
+     * 查询MOC清单列表
+     * 
+     * @param tMoc MOC清单
+     * @return MOC清单
+     */
+    @Override
+    public List<TMoc> selectTMocList(TMoc tMoc)
+    {
+        return tMocMapper.selectTMocList(tMoc);
+    }
+
+    /**
+     * 新增MOC清单
+     * 
+     * @param tMoc MOC清单
+     * @return 结果
+     */
+    @Override
+    public int insertTMoc(TMoc tMoc)
+    {
+        return tMocMapper.insertTMoc(tMoc);
+    }
+
+    /**
+     * 修改MOC清单
+     * 
+     * @param tMoc MOC清单
+     * @return 结果
+     */
+    @Override
+    public int updateTMoc(TMoc tMoc)
+    {
+        return tMocMapper.updateTMoc(tMoc);
+    }
+
+    /**
+     * 批量删除MOC清单
+     * 
+     * @param ids 需要删除的MOC清单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTMocByIds(Long[] ids)
+    {
+        return tMocMapper.deleteTMocByIds(ids);
+    }
+
+    /**
+     * 删除MOC清单信息
+     * 
+     * @param id MOC清单主键
+     * @return 结果
+     */
+    @Override
+    public int deleteTMocById(Long id)
+    {
+        return tMocMapper.deleteTMocById(id);
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -97,6 +97,10 @@ public class CommonController
                 downloadname = "漏点清单导入模板.xlsx";
                 url = "static/template/asset/assetPoints.xlsx";
                 break;
+            case "mocmoc":
+                downloadname = "Moc清单导入模板.xlsx";
+                url = "static/template/process/mocmoc.xlsx";
+                break;
         }
         InputStream is = Thread.currentThread().getContextClassLoader().getResourceAsStream(url);
 

ruoyi-admin/src/main/resources/mapper/moc/TMocMapper.xml

@@ -0,0 +1,122 @@
+<?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.process.mapper.TMocMapper">
+    
+    <resultMap type="TMoc" id="TMocResult">
+        <result property="id"    column="id"    />
+        <result property="mocNo"    column="moc_no"    />
+        <result property="mocOwner"    column="moc_owner"    />
+        <result property="changeName"    column="change_name"    />
+        <result property="tOrP"    column="t_or_p"    />
+        <result property="issueDate"    column="issue_date"    />
+        <result property="emocStatus"    column="emoc_status"    />
+        <result property="priority"    column="priority"    />
+        <result property="remarks"    column="remarks"    />
+        <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"    />
+    </resultMap>
+
+    <sql id="selectTMocVo">
+        select id, moc_no, moc_owner, change_name, t_or_p, issue_date, emoc_status, priority, remarks, del_flag, creater_code, createdate, updater_code, updatedate, dept_id from t_moc
+    </sql>
+
+    <select id="selectTMocList" parameterType="TMoc" resultMap="TMocResult">
+        <include refid="selectTMocVo"/>
+        <where>  
+            <if test="mocNo != null  and mocNo != ''"> and moc_no = #{mocNo}</if>
+            <if test="mocOwner != null  and mocOwner != ''"> and moc_owner = #{mocOwner}</if>
+            <if test="changeName != null  and changeName != ''"> and change_name like concat('%', #{changeName}, '%')</if>
+            <if test="tOrP != null  and tOrP != ''"> and t_or_p = #{tOrP}</if>
+            <if test="issueDate != null "> and issue_date = #{issueDate}</if>
+            <if test="emocStatus != null  and emocStatus != ''"> and emoc_status = #{emocStatus}</if>
+            <if test="priority != null  and priority != ''"> and priority = #{priority}</if>
+            <if test="remarks != null  and remarks != ''"> and remarks = #{remarks}</if>
+            <if test="createrCode != null  and createrCode != ''"> and creater_code = #{createrCode}</if>
+            <if test="createdate != null "> and createdate = #{createdate}</if>
+            <if test="updaterCode != null  and updaterCode != ''"> and updater_code = #{updaterCode}</if>
+            <if test="updatedate != null "> and updatedate = #{updatedate}</if>
+            <if test="deptId != null "> and dept_id = #{deptId}</if>
+        </where>
+    </select>
+    
+    <select id="selectTMocById" parameterType="Long" resultMap="TMocResult">
+        <include refid="selectTMocVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertTMoc" parameterType="TMoc">
+        insert into t_moc
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="id != null">id,</if>
+            <if test="mocNo != null and mocNo != ''">moc_no,</if>
+            <if test="mocOwner != null">moc_owner,</if>
+            <if test="changeName != null">change_name,</if>
+            <if test="tOrP != null">t_or_p,</if>
+            <if test="issueDate != null">issue_date,</if>
+            <if test="emocStatus != null">emoc_status,</if>
+            <if test="priority != null">priority,</if>
+            <if test="remarks != null">remarks,</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="mocNo != null and mocNo != ''">#{mocNo},</if>
+            <if test="mocOwner != null">#{mocOwner},</if>
+            <if test="changeName != null">#{changeName},</if>
+            <if test="tOrP != null">#{tOrP},</if>
+            <if test="issueDate != null">#{issueDate},</if>
+            <if test="emocStatus != null">#{emocStatus},</if>
+            <if test="priority != null">#{priority},</if>
+            <if test="remarks != null">#{remarks},</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="updateTMoc" parameterType="TMoc">
+        update t_moc
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="mocNo != null and mocNo != ''">moc_no = #{mocNo},</if>
+            <if test="mocOwner != null">moc_owner = #{mocOwner},</if>
+            <if test="changeName != null">change_name = #{changeName},</if>
+            <if test="tOrP != null">t_or_p = #{tOrP},</if>
+            <if test="issueDate != null">issue_date = #{issueDate},</if>
+            <if test="emocStatus != null">emoc_status = #{emocStatus},</if>
+            <if test="priority != null">priority = #{priority},</if>
+            <if test="remarks != null">remarks = #{remarks},</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>
+
+    <delete id="deleteTMocById" parameterType="Long">
+        delete from t_moc where id = #{id}
+    </delete>
+
+    <delete id="deleteTMocByIds" parameterType="String">
+        delete from t_moc where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+</mapper>

ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -1,7 +1,15 @@
 package ${packageName}.controller;
 
+import java.io.IOException;
 import java.util.List;
+import java.util.ArrayList;
+import com.ruoyi.common.utils.file.ExcelUtils;
 import javax.servlet.http.HttpServletResponse;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;

ruoyi-generator/src/main/resources/vm/vue/index.vue.vm

@@ -702,6 +702,7 @@ export default {
       } else {
         this.$alert('导入成功条数:' + response.msg, '导入结果', {dangerouslyUseHTMLString: true});
       }
+      this.getList();
     },
     /** 下载模板操作 */
     importTemplate() {

ruoyi-ui/src/api/moc/moc.js

@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询MOC清单列表
+export function listMoc(query) {
+  return request({
+    url: '/moc/moc/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询MOC清单详细
+export function getMoc(id) {
+  return request({
+    url: '/moc/moc/' + id,
+    method: 'get'
+  })
+}
+
+// 新增MOC清单
+export function addMoc(data) {
+  return request({
+    url: '/moc/moc',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改MOC清单
+export function updateMoc(data) {
+  return request({
+    url: '/moc/moc',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除MOC清单
+export function delMoc(id) {
+  return request({
+    url: '/moc/moc/' + id,
+    method: 'delete'
+  })
+}

ruoyi-ui/src/views/asset/points/index.vue

@@ -571,6 +571,7 @@ export default {
       } else {
         this.$alert('导入成功条数:' + response.msg, '导入结果', {dangerouslyUseHTMLString: true});
       }
+      this.getList();
     },
     /** 下载模板操作 */
     importTemplate() {

ruoyi-ui/src/views/moc/moc/index.vue

@@ -0,0 +1,484 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="MOC NO." prop="mocNo">
+        <el-input
+          v-model="queryParams.mocNo"
+          placeholder="请输入MOC NO."
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="T or P" prop="tOrP">
+        <el-input
+          v-model="queryParams.tOrP"
+          placeholder="请输入T or P"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" 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"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['moc:moc:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['moc:moc:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['moc:moc:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-upload2"
+          size="mini"
+          @click="handleImport"
+          v-hasPermi="['moc:moc:add']"
+        >导入
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['moc:moc:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="mocList" @selection-change="handleSelectionChange" :height="clientHeight"
+              border>
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="MOC NO." align="center" prop="mocNo"/>
+      <el-table-column label="MOC Owner" align="center" prop="mocOwner"/>
+      <el-table-column label="Change Name" align="center" prop="changeName"/>
+      <el-table-column label="T or P" align="center" prop="tOrP"/>
+      <el-table-column label="Issue date" align="center" prop="issueDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="e-MOC status" align="center" prop="emocStatus"/>
+      <el-table-column label="Priority" align="center" prop="priority"/>
+      <el-table-column label="备注" align="center" prop="remarks"/>
+      <el-table-column label="操作" align="center" 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="['moc:moc:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['moc:moc: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"
+    />
+
+    <!-- 添加或修改MOC清单对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body :close-on-click-modal="false">
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="MOC NO." prop="mocNo">
+          <el-input v-model="form.mocNo" placeholder="请输入MOC NO."/>
+        </el-form-item>
+        <el-form-item label="MOC Owner" prop="mocOwner">
+          <el-input v-model="form.mocOwner" placeholder="请输入MOC Owner"/>
+        </el-form-item>
+        <el-form-item label="Change Name" prop="changeName">
+          <el-input v-model="form.changeName" type="textarea" placeholder="请输入内容"/>
+        </el-form-item>
+        <el-form-item label="T or P" prop="tOrP">
+          <el-radio border v-model="form.tOrP" label="T" @input="tOrPChange">T</el-radio>
+          <el-radio border v-model="form.tOrP" label="P" @input="tOrPChange">P</el-radio>
+        </el-form-item>
+        <el-form-item label="Issue date" prop="issueDate">
+          <el-date-picker clearable
+                          v-model="form.issueDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择Issue date">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="e-MOC status" prop="emocStatus">
+          <el-select v-model="form.emocStatus" clearable placeholder="请选择e-MOC status">
+            <el-option-group v-if="form.tOrP==='P'">
+              <el-option value="Draft" label="Draft"/>
+              <el-option value="Approved" label="Approved"/>
+              <el-option value="MC" label="MC"/>
+              <el-option value="Closed" label="Closed"/>
+              <el-option value="Reject" label="Reject"/>
+            </el-option-group>
+            <el-option-group v-if="form.tOrP==='T'">
+              <el-option value="Draft" label="Draft"/>
+              <el-option value="Approved" label="Approved"/>
+              <el-option value="MC of applying" label="MC of applying"/>
+              <el-option value="MC of emoval" label="MC of emoval"/>
+              <el-option value="Closed" label="Closed"/>
+              <el-option value="Reject" label="Reject"/>
+            </el-option-group>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="Priority" prop="priority">
+          <el-select v-model="form.priority" clearable placeholder="请选择Priority">
+            <el-option-group v-if="form.tOrP==='P'">
+              <el-option value="1" label="1"/>
+              <el-option value="2" label="2"/>
+              <el-option value="3" label="3"/>
+              <el-option value="check" label="check"/>
+            </el-option-group>
+            <el-option-group v-if="form.tOrP==='T'">
+              <el-option value="-" label="-"/>
+            </el-option-group>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" 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 :close-on-click-modal="false" :title="upload.title" :visible.sync="upload.open" append-to-body
+               width="400px">
+      <el-upload
+        ref="upload"
+        :action="upload.url + '?updateSupport=' + upload.updateSupport"
+        :auto-upload="false"
+        :disabled="upload.isUploading"
+        :headers="upload.headers"
+        :limit="1"
+        :on-progress="handleFileUploadProgress"
+        :on-success="handleFileSuccess"
+        accept=".xlsx, .xls"
+        drag
+      >
+        <i class="el-icon-upload"></i>
+        <div class="el-upload__text">
+          将文件拖到此处，或
+          <em>点击上传</em>
+        </div>
+        <div slot="tip" class="el-upload__tip">
+          <!--          <el-checkbox v-model="upload.updateSupport"/>-->
+          <!--          是否更新已经存在的用户数据-->
+          <el-link style="font-size:12px" type="info" @click="importTemplate">下载模板</el-link>
+        </div>
+        <div slot="tip" class="el-upload__tip" style="color:red">提示：仅允许导入“xls”或“xlsx”格式文件！</div>
+      </el-upload>
+      <div slot="footer" class="dialog-footer">
+        <el-button v-loading.fullscreen.lock="fullscreenLoading" type="primary" @click="submitFileForm">确 定
+        </el-button>
+        <el-button @click="upload.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
+    <form ref="downloadFileForm" :action="upload.downloadAction" target="FORMSUBMIT">
+      <input :value="upload.type" hidden name="type"/>
+    </form>
+  </div>
+</template>
+
+<script>
+import {addMoc, delMoc, getMoc, listMoc, updateMoc} from "@/api/moc/moc";
+import {getToken} from "@/utils/auth";
+
+export default {
+  name: "Moc",
+  data() {
+    return {
+      // 批量导入全屏遮罩
+      fullscreenLoading: false,
+      // 用户导入参数
+      upload: {
+        downloadAction: process.env.VUE_APP_BASE_API + '/common/template',
+        type: "mocmoc",
+        // 是否显示弹出层（用户导入）
+        open: false,
+        // 弹出层标题（用户导入）
+        title: "",
+        // 是否禁用上传
+        isUploading: false,
+        // 是否更新已经存在的用户数据
+        updateSupport: 0,
+        // 设置上传的请求头部
+        headers: {Authorization: "Bearer " + getToken()},
+        // 上传的地址
+        url: process.env.VUE_APP_BASE_API + "/moc/moc/importData"
+      },
+      // 页面高度
+      clientHeight: 300,
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: false,
+      // 总条数
+      total: 0,
+      // MOC清单表格数据
+      mocList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        mocNo: null,
+        mocOwner: null,
+        changeName: null,
+        tOrP: null,
+        issueDate: null,
+        emocStatus: null,
+        priority: null,
+        remarks: null,
+        createrCode: null,
+        createdate: null,
+        updaterCode: null,
+        updatedate: null,
+        deptId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        mocNo: [
+          {required: true, message: "MOC NO.不能为空", trigger: "blur"}
+        ],
+        mocOwner: [
+          {required: true, message: "mocOwner不能为空", trigger: "blur"}
+        ],
+        changeName: [
+          {required: true, message: "changeName不能为空", trigger: "blur"}
+        ],
+        tOrP: [
+          {required: true, message: "tOrP不能为空", trigger: "blur"}
+        ],
+        issueDate: [
+          {required: true, message: "issueDate不能为空", trigger: "blur"}
+        ],
+        emocStatus: [
+          {required: true, message: "emocStatus不能为空", trigger: "blur"}
+        ],
+        priority: [
+          {required: true, message: "priority不能为空", trigger: "blur"}
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    //设置表格高度对应屏幕高度
+    this.$nextTick(() => {
+      this.clientHeight = (document.body.clientHeight - 80) * 0.8
+    });
+  },
+  methods: {
+    tOrPChange(val) {
+      this.form.emocStatus = null;
+      this.form.priority = null;
+    },
+    /** 查询MOC清单列表 */
+    getList() {
+      this.loading = true;
+      listMoc(this.queryParams).then(response => {
+        this.mocList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        mocNo: null,
+        mocOwner: null,
+        changeName: null,
+        tOrP: null,
+        issueDate: null,
+        emocStatus: null,
+        priority: null,
+        remarks: 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 = "添加MOC清单";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getMoc(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改MOC清单";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateMoc(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addMoc(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除MOC清单编号为"' + ids + '"的数据项？').then(function () {
+        return delMoc(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {
+      });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('moc/moc/export', {
+        ...this.queryParams
+      }, `moc_${new Date().getTime()}.xlsx`)
+    },
+    /** 导入按钮操作 */
+    handleImport() {
+      this.upload.title = "用户导入";
+      this.upload.open = true;
+    },
+    // 提交上传文件
+    submitFileForm() {
+      this.$refs.upload.submit();
+      this.fullscreenLoading = true;
+    },
+    // 文件上传中处理
+    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.fullscreenLoading = false;
+      if (response.data.length > 0) {
+        let failrow = ''
+        for (let i = 0; i < response.data.length; i++) {
+          failrow += response.data[i] + ','
+        }
+        this.$alert('导入成功条数:' + response.msg + '<br>' + '失败行数:' + failrow, '导入结果', {dangerouslyUseHTMLString: true});
+      } else {
+        this.$alert('导入成功条数:' + response.msg, '导入结果', {dangerouslyUseHTMLString: true});
+      }
+      this.getList();
+    },
+    /** 下载模板操作 */
+    importTemplate() {
+      this.$refs['downloadFileForm'].submit()
+    }
+  }
+};
+</script>

ruoyi-ui/src/views/process/valve/index.vue

@@ -388,6 +388,7 @@ export default {
       } else {
         this.$alert('导入成功条数:' + response.msg, '导入结果', {dangerouslyUseHTMLString: true});
       }
+      this.getList();
     },
     /** 下载模板操作 */
     importTemplate() {