[update]业务绩效模块:技术绩效信息列表页面，技术绩效列表对象

ruoyi-admin/src/main/java/com/ruoyi/system/controller/ErpTechniqueMeritsController.java

@@ -0,0 +1,157 @@
+package com.ruoyi.system.controller;
+
+import java.util.List;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.domain.ErpTechniqueMerits;
+import com.ruoyi.system.service.IErpTechniqueMeritsService;
+import com.ruoyi.common.core.controller.BaseController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.page.TableDataInfo;
+
+/**
+ * 技术绩效列表Controller
+ * 
+ * @author zhangsiqi
+ * @date 2024-04-24
+ */
+@Controller
+@RequestMapping("/system/technicalMerits")
+public class ErpTechniqueMeritsController extends BaseController
+{
+    private String prefix = "system/technicalMerits";
+
+    @Autowired
+    private IErpTechniqueMeritsService erpTechniqueMeritsService;
+
+    @RequiresPermissions("system:technicalMerits:view")
+    @GetMapping()
+    public String technicalMerits()
+    {
+        return prefix + "/technicalMerits";
+    }
+
+    /**
+     * 查询技术绩效列表列表
+     */
+    @RequiresPermissions("system:technicalMerits:list")
+    @PostMapping("/list")
+    @ResponseBody
+    public TableDataInfo list(ErpTechniqueMerits erpTechniqueMerits)
+    {
+        startPage();
+        List<ErpTechniqueMerits> list = erpTechniqueMeritsService.selectErpTechniqueMeritsList(erpTechniqueMerits);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出技术绩效列表列表
+     */
+    @RequiresPermissions("system:technicalMerits:export")
+    @Log(title = "技术绩效列表", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    @ResponseBody
+    public AjaxResult export(ErpTechniqueMerits erpTechniqueMerits)
+    {
+        List<ErpTechniqueMerits> list = erpTechniqueMeritsService.selectErpTechniqueMeritsList(erpTechniqueMerits);
+        ExcelUtil<ErpTechniqueMerits> util = new ExcelUtil<ErpTechniqueMerits>(ErpTechniqueMerits.class);
+        return util.exportExcel(list, "技术绩效列表数据");
+    }
+
+    /**
+     * 新增技术绩效列表
+     */
+    @GetMapping("/add")
+    public String add()
+    {
+        return prefix + "/add";
+    }
+
+    /**
+     * 新增保存技术绩效列表
+     */
+    @RequiresPermissions("system:technicalMerits:add")
+    @Log(title = "技术绩效列表", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    @ResponseBody
+    public AjaxResult addSave(ErpTechniqueMerits erpTechniqueMerits)
+    {
+        return toAjax(erpTechniqueMeritsService.insertErpTechniqueMerits(erpTechniqueMerits));
+    }
+
+    /**
+     * 修改技术绩效列表
+     */
+    @GetMapping("/edit/{id}")
+    public String edit(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        ErpTechniqueMerits erpTechniqueMerits = erpTechniqueMeritsService.selectErpTechniqueMeritsById(id);
+        mmap.put("erpTechniqueMerits", erpTechniqueMerits);
+        return prefix + "/edit";
+    }
+    @GetMapping("/detail/{id}")
+    public String detail(@PathVariable("id") Long id, ModelMap mmap)
+    {
+        ErpTechniqueMerits erpTechniqueMerits = erpTechniqueMeritsService.selectErpTechniqueMeritsById(id);
+        mmap.put("erpTechniqueMerits", erpTechniqueMerits);
+        return prefix + "/detail";
+    }
+    /**
+     * 修改保存技术绩效列表
+     */
+    @RequiresPermissions("system:technicalMerits:edit")
+    @Log(title = "技术绩效列表", businessType = BusinessType.UPDATE)
+    @PostMapping("/edit")
+    @ResponseBody
+    public AjaxResult editSave(ErpTechniqueMerits erpTechniqueMerits)
+    {
+        return toAjax(erpTechniqueMeritsService.updateErpTechniqueMerits(erpTechniqueMerits));
+    }
+
+    /**
+     * 删除技术绩效列表
+     */
+    @RequiresPermissions("system:technicalMerits:remove")
+    @Log(title = "技术绩效列表", businessType = BusinessType.DELETE)
+    @PostMapping( "/remove")
+    @ResponseBody
+    public AjaxResult remove(String ids)
+    {
+        return toAjax(erpTechniqueMeritsService.deleteErpTechniqueMeritsByIds(ids));
+    }
+
+    /**
+     * 作废技术绩效列表
+     */
+    @RequiresPermissions("system:technicalMerits:cancel")
+    @Log(title = "技术绩效列表", businessType = BusinessType.CANCEL)
+    @GetMapping( "/cancel/{id}")
+    @ResponseBody
+    public AjaxResult cancel(@PathVariable("id") Long id){
+        return toAjax(erpTechniqueMeritsService.cancelErpTechniqueMeritsById(id));
+    }
+
+    /**
+     * 恢复技术绩效列表
+     */
+    @RequiresPermissions("system:technicalMerits:restore")
+    @Log(title = "技术绩效列表", businessType = BusinessType.RESTORE)
+    @GetMapping( "/restore/{id}")
+    @ResponseBody
+    public AjaxResult restore(@PathVariable("id")Long id)
+    {
+        return toAjax(erpTechniqueMeritsService.restoreErpTechniqueMeritsById(id));
+    }
+
+
+}

ruoyi-admin/src/main/java/com/ruoyi/system/domain/ErpTechniqueMerits.java

@@ -0,0 +1,169 @@
+package com.ruoyi.system.domain;
+
+import java.util.List;
+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;
+
+/**
+ * 技术绩效列表对象 erp_technique_merits
+ * 
+ * @author zhangsiqi
+ * @date 2024-04-24
+ */
+public class ErpTechniqueMerits extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 技术绩效表id */
+    private Long id;
+
+    /** 技术绩效ID */
+    @Excel(name = "技术绩效ID")
+    private Long techniqueId;
+
+    /** 员工ID */
+    @Excel(name = "员工ID")
+    private Long staffNo;
+
+    /** 生产员 */
+    @Excel(name = "生产员")
+    private String makeName;
+
+    /** 部门 */
+    @Excel(name = "部门")
+    private String dept;
+
+    /** 币种 */
+    @Excel(name = "币种")
+    private String currency;
+
+    /** 待结算绩效 */
+    @Excel(name = "待结算绩效")
+    private Long nsettleNum;
+
+    /** 已结算绩效 */
+    @Excel(name = "已结算绩效")
+    private Long sttleNum;
+
+    /** 待发放绩效 */
+    @Excel(name = "待发放绩效")
+    private Long ngrantNum;
+
+    /** 已发放绩效 */
+    @Excel(name = "已发放绩效")
+    private Long grantNum;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTechniqueId(Long techniqueId) 
+    {
+        this.techniqueId = techniqueId;
+    }
+
+    public Long getTechniqueId() 
+    {
+        return techniqueId;
+    }
+    public void setStaffNo(Long staffNo) 
+    {
+        this.staffNo = staffNo;
+    }
+
+    public Long getStaffNo() 
+    {
+        return staffNo;
+    }
+    public void setMakeName(String makeName) 
+    {
+        this.makeName = makeName;
+    }
+
+    public String getMakeName() 
+    {
+        return makeName;
+    }
+    public void setDept(String dept) 
+    {
+        this.dept = dept;
+    }
+
+    public String getDept() 
+    {
+        return dept;
+    }
+    public void setCurrency(String currency) 
+    {
+        this.currency = currency;
+    }
+
+    public String getCurrency() 
+    {
+        return currency;
+    }
+    public void setNsettleNum(Long nsettleNum) 
+    {
+        this.nsettleNum = nsettleNum;
+    }
+
+    public Long getNsettleNum() 
+    {
+        return nsettleNum;
+    }
+    public void setSttleNum(Long sttleNum) 
+    {
+        this.sttleNum = sttleNum;
+    }
+
+    public Long getSttleNum() 
+    {
+        return sttleNum;
+    }
+    public void setNgrantNum(Long ngrantNum) 
+    {
+        this.ngrantNum = ngrantNum;
+    }
+
+    public Long getNgrantNum() 
+    {
+        return ngrantNum;
+    }
+    public void setGrantNum(Long grantNum) 
+    {
+        this.grantNum = grantNum;
+    }
+
+    public Long getGrantNum() 
+    {
+        return grantNum;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("techniqueId", getTechniqueId())
+            .append("staffNo", getStaffNo())
+            .append("makeName", getMakeName())
+            .append("dept", getDept())
+            .append("currency", getCurrency())
+            .append("nsettleNum", getNsettleNum())
+            .append("sttleNum", getSttleNum())
+            .append("ngrantNum", getNgrantNum())
+            .append("grantNum", getGrantNum())
+            .append("createBy", getCreateBy())
+            .append("createTime", getCreateTime())
+            .append("updateBy", getUpdateBy())
+            .append("updateTime", getUpdateTime())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

ruoyi-admin/src/main/java/com/ruoyi/system/mapper/ErpTechniqueMeritsMapper.java

@@ -0,0 +1,77 @@
+package com.ruoyi.system.mapper;
+
+import java.util.List;
+import com.ruoyi.system.domain.ErpTechniqueMerits;
+
+/**
+ * 技术绩效列表Mapper接口
+ * 
+ * @author zhangsiqi
+ * @date 2024-04-24
+ */
+public interface ErpTechniqueMeritsMapper 
+{
+    /**
+     * 查询技术绩效列表
+     * 
+     * @param id 技术绩效列表ID
+     * @return 技术绩效列表
+     */
+    public ErpTechniqueMerits selectErpTechniqueMeritsById(Long id);
+
+    /**
+     * 查询技术绩效列表列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 技术绩效列表集合
+     */
+    public List<ErpTechniqueMerits> selectErpTechniqueMeritsList(ErpTechniqueMerits erpTechniqueMerits);
+
+    /**
+     * 新增技术绩效列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 结果
+     */
+    public int insertErpTechniqueMerits(ErpTechniqueMerits erpTechniqueMerits);
+
+    /**
+     * 修改技术绩效列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 结果
+     */
+    public int updateErpTechniqueMerits(ErpTechniqueMerits erpTechniqueMerits);
+
+    /**
+     * 删除技术绩效列表
+     * 
+     * @param id 技术绩效列表ID
+     * @return 结果
+     */
+    public int deleteErpTechniqueMeritsById(Long id);
+
+    /**
+     * 批量删除技术绩效列表
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpTechniqueMeritsByIds(String[] ids);
+
+    /**
+     * 作废技术绩效列表
+     *
+     * @param id 技术绩效列表ID
+     * @return 结果
+     */
+    public int cancelErpTechniqueMeritsById(Long id);
+
+    /**
+     * 恢复技术绩效列表
+     *
+     * @param id 技术绩效列表ID
+     * @return 结果
+     */
+    public int restoreErpTechniqueMeritsById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/IErpTechniqueMeritsService.java

@@ -0,0 +1,75 @@
+package com.ruoyi.system.service;
+
+import java.util.List;
+import com.ruoyi.system.domain.ErpTechniqueMerits;
+
+/**
+ * 技术绩效列表Service接口
+ * 
+ * @author zhangsiqi
+ * @date 2024-04-24
+ */
+public interface IErpTechniqueMeritsService 
+{
+    /**
+     * 查询技术绩效列表
+     * 
+     * @param id 技术绩效列表ID
+     * @return 技术绩效列表
+     */
+    public ErpTechniqueMerits selectErpTechniqueMeritsById(Long id);
+
+    /**
+     * 查询技术绩效列表列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 技术绩效列表集合
+     */
+    public List<ErpTechniqueMerits> selectErpTechniqueMeritsList(ErpTechniqueMerits erpTechniqueMerits);
+
+    /**
+     * 新增技术绩效列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 结果
+     */
+    public int insertErpTechniqueMerits(ErpTechniqueMerits erpTechniqueMerits);
+
+    /**
+     * 修改技术绩效列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 结果
+     */
+    public int updateErpTechniqueMerits(ErpTechniqueMerits erpTechniqueMerits);
+
+    /**
+     * 批量删除技术绩效列表
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteErpTechniqueMeritsByIds(String ids);
+
+    /**
+     * 删除技术绩效列表信息
+     * 
+     * @param id 技术绩效列表ID
+     * @return 结果
+     */
+    public int deleteErpTechniqueMeritsById(Long id);
+
+    /**
+     * 作废技术绩效列表
+     * @param id 技术绩效列表ID
+     * @return
+     */
+    int cancelErpTechniqueMeritsById(Long id);
+
+    /**
+     * 恢复技术绩效列表
+     * @param id 技术绩效列表ID
+     * @return
+     */
+    int restoreErpTechniqueMeritsById(Long id);
+}

ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/ErpTechniqueMeritsServiceImpl.java

@@ -0,0 +1,126 @@
+package com.ruoyi.system.service.impl;
+
+import java.util.List;
+import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.ShiroUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ruoyi.system.mapper.ErpTechniqueMeritsMapper;
+import com.ruoyi.system.domain.ErpTechniqueMerits;
+import com.ruoyi.system.service.IErpTechniqueMeritsService;
+import com.ruoyi.common.core.text.Convert;
+
+/**
+ * 技术绩效列表Service业务层处理
+ * 
+ * @author zhangsiqi
+ * @date 2024-04-24
+ */
+@Service
+public class ErpTechniqueMeritsServiceImpl implements IErpTechniqueMeritsService 
+{
+    @Autowired
+    private ErpTechniqueMeritsMapper erpTechniqueMeritsMapper;
+
+    /**
+     * 查询技术绩效列表
+     * 
+     * @param id 技术绩效列表ID
+     * @return 技术绩效列表
+     */
+    @Override
+    public ErpTechniqueMerits selectErpTechniqueMeritsById(Long id)
+    {
+        return erpTechniqueMeritsMapper.selectErpTechniqueMeritsById(id);
+    }
+
+    /**
+     * 查询技术绩效列表列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 技术绩效列表
+     */
+    @Override
+    public List<ErpTechniqueMerits> selectErpTechniqueMeritsList(ErpTechniqueMerits erpTechniqueMerits)
+    {
+        return erpTechniqueMeritsMapper.selectErpTechniqueMeritsList(erpTechniqueMerits);
+    }
+
+    /**
+     * 新增技术绩效列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 结果
+     */
+    @Override
+    public int insertErpTechniqueMerits(ErpTechniqueMerits erpTechniqueMerits)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        erpTechniqueMerits.setCreateBy(loginName);
+        erpTechniqueMerits.setCreateTime(DateUtils.getNowDate());
+        return erpTechniqueMeritsMapper.insertErpTechniqueMerits(erpTechniqueMerits);
+    }
+
+    /**
+     * 修改技术绩效列表
+     * 
+     * @param erpTechniqueMerits 技术绩效列表
+     * @return 结果
+     */
+    @Override
+    public int updateErpTechniqueMerits(ErpTechniqueMerits erpTechniqueMerits)
+    {
+        String loginName = ShiroUtils.getLoginName();
+        erpTechniqueMerits.setUpdateBy(loginName);
+        erpTechniqueMerits.setUpdateTime(DateUtils.getNowDate());
+        return erpTechniqueMeritsMapper.updateErpTechniqueMerits(erpTechniqueMerits);
+    }
+
+    /**
+     * 删除技术绩效列表对象
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpTechniqueMeritsByIds(String ids)
+    {
+        return erpTechniqueMeritsMapper.deleteErpTechniqueMeritsByIds(Convert.toStrArray(ids));
+    }
+
+    /**
+     * 删除技术绩效列表信息
+     * 
+     * @param id 技术绩效列表ID
+     * @return 结果
+     */
+    @Override
+    public int deleteErpTechniqueMeritsById(Long id)
+    {
+        return erpTechniqueMeritsMapper.deleteErpTechniqueMeritsById(id);
+    }
+
+    /**
+     * 作废技术绩效列表
+     *
+     * @param id 技术绩效列表ID
+     * @return 结果
+     */
+    @Override
+    public int cancelErpTechniqueMeritsById(Long id)
+    {
+        return erpTechniqueMeritsMapper.cancelErpTechniqueMeritsById(id);
+    }
+
+    /**
+     * 恢复技术绩效列表信息
+     *
+     * @param id 技术绩效列表ID
+     * @return 结果
+     */
+    @Override
+    public int restoreErpTechniqueMeritsById(Long id)
+    {
+        return erpTechniqueMeritsMapper.restoreErpTechniqueMeritsById(id);
+    }
+}

ruoyi-admin/src/main/resources/mapper/system/ErpTechniqueMeritsMapper.xml

@@ -0,0 +1,120 @@
+<?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.ErpTechniqueMeritsMapper">
+    
+    <resultMap type="ErpTechniqueMerits" id="ErpTechniqueMeritsResult">
+        <result property="id"    column="id"    />
+        <result property="techniqueId"    column="technique_id"    />
+        <result property="staffNo"    column="staff_no"    />
+        <result property="makeName"    column="make_name"    />
+        <result property="dept"    column="dept"    />
+        <result property="currency"    column="currency"    />
+        <result property="nsettleNum"    column="nsettle_num"    />
+        <result property="sttleNum"    column="sttle_num"    />
+        <result property="ngrantNum"    column="ngrant_num"    />
+        <result property="grantNum"    column="grant_num"    />
+        <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="selectErpTechniqueMeritsVo">
+        select id, technique_id, staff_no, make_name, dept, currency, nsettle_num, sttle_num, ngrant_num, grant_num, create_by, create_time, update_by, update_time, remark from erp_technique_merits
+    </sql>
+
+    <select id="selectErpTechniqueMeritsList" parameterType="ErpTechniqueMerits" resultMap="ErpTechniqueMeritsResult">
+        <include refid="selectErpTechniqueMeritsVo"/>
+        <where>  
+            <if test="techniqueId != null "> and technique_id = #{techniqueId}</if>
+            <if test="staffNo != null "> and staff_no = #{staffNo}</if>
+            <if test="makeName != null  and makeName != ''"> and make_name like concat('%', #{makeName}, '%')</if>
+            <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''"> and create_time between #{params.beginCreateTime} and #{params.endCreateTime}</if>
+        </where>
+    </select>
+    
+    <select id="selectErpTechniqueMeritsById" parameterType="Long" resultMap="ErpTechniqueMeritsResult">
+        <include refid="selectErpTechniqueMeritsVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertErpTechniqueMerits" parameterType="ErpTechniqueMerits" useGeneratedKeys="true" keyProperty="id">
+        insert into erp_technique_merits
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="techniqueId != null">technique_id,</if>
+            <if test="staffNo != null">staff_no,</if>
+            <if test="makeName != null">make_name,</if>
+            <if test="dept != null">dept,</if>
+            <if test="currency != null">currency,</if>
+            <if test="nsettleNum != null">nsettle_num,</if>
+            <if test="sttleNum != null">sttle_num,</if>
+            <if test="ngrantNum != null">ngrant_num,</if>
+            <if test="grantNum != null">grant_num,</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="techniqueId != null">#{techniqueId},</if>
+            <if test="staffNo != null">#{staffNo},</if>
+            <if test="makeName != null">#{makeName},</if>
+            <if test="dept != null">#{dept},</if>
+            <if test="currency != null">#{currency},</if>
+            <if test="nsettleNum != null">#{nsettleNum},</if>
+            <if test="sttleNum != null">#{sttleNum},</if>
+            <if test="ngrantNum != null">#{ngrantNum},</if>
+            <if test="grantNum != null">#{grantNum},</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="updateErpTechniqueMerits" parameterType="ErpTechniqueMerits">
+        update erp_technique_merits
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="techniqueId != null">technique_id = #{techniqueId},</if>
+            <if test="staffNo != null">staff_no = #{staffNo},</if>
+            <if test="makeName != null">make_name = #{makeName},</if>
+            <if test="dept != null">dept = #{dept},</if>
+            <if test="currency != null">currency = #{currency},</if>
+            <if test="nsettleNum != null">nsettle_num = #{nsettleNum},</if>
+            <if test="sttleNum != null">sttle_num = #{sttleNum},</if>
+            <if test="ngrantNum != null">ngrant_num = #{ngrantNum},</if>
+            <if test="grantNum != null">grant_num = #{grantNum},</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 id = #{id}
+    </update>
+
+    <delete id="deleteErpTechniqueMeritsById" parameterType="Long">
+        delete from erp_technique_merits where id = #{id}
+    </delete>
+
+    <delete id="deleteErpTechniqueMeritsByIds" parameterType="String">
+        delete from erp_technique_merits where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+    <update id="cancelErpTechniqueMeritsById" parameterType="Long">
+        update erp_technique_merits set del_flag = '1' where id = #{id}
+    </update>
+
+    <update id="restoreErpTechniqueMeritsById" parameterType="Long">
+        update erp_technique_merits set del_flag = '0' where id = #{id}
+    </update>
+
+</mapper>

ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html

@@ -404,6 +404,17 @@
                 { title: '物料的不含税总价(美元)',field: 'materialNoUsdSum',align: 'center'},
                 { title: '物料的含税总价(RMB)',field: 'materialNoRmbSum', align: 'center'},
                 { title: '物料的不含税总价(RMB)',field: 'materialRmbSum',align: 'center'},
+                {   title: '计划交付时间',field: 'deliveryTime',align: 'center',
+                    editable: {type: 'date',title: '计划交付时间',format: 'yyyy-mm-dd', emptytext: "计划交付时间",
+                        formatter: function (value, row, index) {
+                            return value;
+                        }}
+                },
+                {title: '质保天数',align: 'center',field: 'expiryDay',formatter: function(value, row, index){
+                        return value + "天数";
+                    },
+                },
+                {title:'已完成数'},{title: '已出货数'},{title: '已出库数'},{title: '已收货数'},{title: '已验收数'},
                 { title: '录入人',field: 'createBy',align: 'center',visible: false},
                 { title: '录入时间',field: 'createTime',align: 'center',visible: false},
                 { title: '更新人',field: 'updateBy',align: 'center',visible: false},

ruoyi-admin/src/main/resources/templates/system/technicalMerits/add.html

@@ -0,0 +1,85 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增技术绩效列表')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-technicalMerits-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">技术绩效ID：</label>
+                <div class="col-sm-8">
+                    <input name="techniqueId" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">员工ID：</label>
+                <div class="col-sm-8">
+                    <input name="staffNo" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">生产员：</label>
+                <div class="col-sm-8">
+                    <input name="makeName" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">部门：</label>
+                <div class="col-sm-8">
+                    <input name="dept" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">币种：</label>
+                <div class="col-sm-8">
+                    <input name="currency" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">待结算绩效：</label>
+                <div class="col-sm-8">
+                    <input name="nsettleNum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">已结算绩效：</label>
+                <div class="col-sm-8">
+                    <input name="sttleNum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">待发放绩效：</label>
+                <div class="col-sm-8">
+                    <input name="ngrantNum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">已发放绩效：</label>
+                <div class="col-sm-8">
+                    <input name="grantNum" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/technicalMerits"
+        $("#form-technicalMerits-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-technicalMerits-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/technicalMerits/detail.html

@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改技术绩效列表')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-technicalMerits-edit" th:object="${erpTechniqueMerits}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">技术绩效ID：</label>
+                <div class="col-sm-8">
+                    <input name="techniqueId" th:field="*{techniqueId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">员工ID：</label>
+                <div class="col-sm-8">
+                    <input name="staffNo" th:field="*{staffNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">生产员：</label>
+                <div class="col-sm-8">
+                    <input name="makeName" th:field="*{makeName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">部门：</label>
+                <div class="col-sm-8">
+                    <input name="dept" th:field="*{dept}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">币种：</label>
+                <div class="col-sm-8">
+                    <input name="currency" th:field="*{currency}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">待结算绩效：</label>
+                <div class="col-sm-8">
+                    <input name="nsettleNum" th:field="*{nsettleNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">已结算绩效：</label>
+                <div class="col-sm-8">
+                    <input name="sttleNum" th:field="*{sttleNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">待发放绩效：</label>
+                <div class="col-sm-8">
+                    <input name="ngrantNum" th:field="*{ngrantNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">已发放绩效：</label>
+                <div class="col-sm-8">
+                    <input name="grantNum" th:field="*{grantNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/technicalMerits";
+        $("#form-technicalMerits-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-technicalMerits-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/technicalMerits/edit.html

@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改技术绩效列表')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-technicalMerits-edit" th:object="${erpTechniqueMerits}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">技术绩效ID：</label>
+                <div class="col-sm-8">
+                    <input name="techniqueId" th:field="*{techniqueId}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">员工ID：</label>
+                <div class="col-sm-8">
+                    <input name="staffNo" th:field="*{staffNo}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">生产员：</label>
+                <div class="col-sm-8">
+                    <input name="makeName" th:field="*{makeName}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">部门：</label>
+                <div class="col-sm-8">
+                    <input name="dept" th:field="*{dept}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">币种：</label>
+                <div class="col-sm-8">
+                    <input name="currency" th:field="*{currency}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">待结算绩效：</label>
+                <div class="col-sm-8">
+                    <input name="nsettleNum" th:field="*{nsettleNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">已结算绩效：</label>
+                <div class="col-sm-8">
+                    <input name="sttleNum" th:field="*{sttleNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">待发放绩效：</label>
+                <div class="col-sm-8">
+                    <input name="ngrantNum" th:field="*{ngrantNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">已发放绩效：</label>
+                <div class="col-sm-8">
+                    <input name="grantNum" th:field="*{grantNum}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "system/technicalMerits";
+        $("#form-technicalMerits-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-technicalMerits-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>

ruoyi-admin/src/main/resources/templates/system/technicalMerits/technicalMerits.html

@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('技术绩效列表列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>技术绩效ID：</label>
+                                <input type="text" name="techniqueId"/>
+                            </li>
+                            <li>
+                                <label>员工ID：</label>
+                                <input type="text" name="staffNo"/>
+                            </li>
+                            <li>
+                                <label>生产员：</label>
+                                <input type="text" name="makeName"/>
+                            </li>
+                            <li class="select-time">
+                                <label>录入时间：</label>
+                                <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCreateTime]"/>
+                                <span>-</span>
+                                <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[endCreateTime]"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-warning">
+                    <i class="fa fa-download"></i> 导入已发放绩效
+                </a>
+
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:technicalMerits:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('system:technicalMerits:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('system:technicalMerits:remove')}]];
+        var cancelFlag = [[${@permission.hasPermi('system:technicalMerits:cancel')}]];
+        var restoreFlag = [[${@permission.hasPermi('system:technicalMerits:restore')}]];
+        var currencyDatas = [[${@dict.getType('sys_common_currency')}]];
+        var prefix = ctx + "system/technicalMerits";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                cancelUrl: prefix + "/cancel/{id}",
+                restoreUrl: prefix + "/restore/{id}",
+                exportUrl: prefix + "/export",
+                detailUrl: prefix + "/detail/{id}",
+                modalName: "技术绩效列表",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    title: '技术绩效表id',
+                    field: 'id',
+                    visible: false
+                },
+                {
+                    title: '技术绩效ID',
+                    field: 'techniqueId',
+                },
+                {
+                    title: '员工ID',
+                    field: 'staffNo',
+                },
+                {
+                    title: '生产员',
+                    field: 'makeName',
+                },
+                {
+                    title: '部门',
+                    field: 'dept',
+                },
+                {
+                    title: '币种',
+                    field: 'currency',
+                    formatter: function(value, row, index) {
+                       return $.table.selectDictLabel(currencyDatas, value);
+                    }
+                },
+                {
+                    title: '待结算绩效',
+                    field: 'nsettleNum',
+                },
+                {
+                    title: '已结算绩效',
+                    field: 'sttleNum',
+                },
+                {
+                    title: '待发放绩效',
+                    field: 'ngrantNum',
+                },
+                {
+                    title: '已发放绩效',
+                    field: 'grantNum',
+                },
+                {
+                    title: '录入时间',
+                    field: 'createTime',
+                },
+                {
+                    title: '更新人',
+                    field: 'updateBy',
+                },
+                {
+                    title: '上次更新时间',
+                    field: 'updateTime',
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>发放绩效</a> ');
+                        actions.push('<a class="btn btn-warning btn-xs ' + '" href="javascript:void(0)" onclick="$.operate.detail(\'' + row.id + '\')"><i class="fa fa-remove"></i>详情</a> ');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>