lxw
2023-02-23 4b8f4a3dd79fbc02dc7faaa694b1be391dd1f995
ECR修改
2个文件已修改
114 ■■■■■ 已修改文件
src/main/java/com/whyc/pojo/ECR.java 98 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/ProductMapper.xml 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/pojo/ECR.java
@@ -1,5 +1,6 @@
package com.whyc.pojo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.AllArgsConstructor;
@@ -12,7 +13,6 @@
 * 设 计 工  程  变  更  申  请  调  查  表(ECR)
 */
@TableName("tb_ecr")
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ECR {
@@ -20,6 +20,8 @@
    private String number;
    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
    private Date proposeDate;
    @TableField(exist = false)
    private String proposeWebsocket;
    private String proposer;
    private String changeDescription;
    private String subCode;
@@ -29,5 +31,99 @@
    private Date createTime;
    private String excelFile;
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public String getNumber() {
        return number;
    }
    public void setNumber(String number) {
        this.number = number;
    }
    public Date getProposeDate() {
        return proposeDate;
    }
    public void setProposeDate(Date proposeDate) {
        this.proposeDate = proposeDate;
    }
    public String getProposeWebsocket() {
        return proposeWebsocket;
    }
    public void setProposeWebsocket(String proposeWebsocket) {
        this.proposeWebsocket = proposeWebsocket;
    }
    public String getProposer() {
        return proposer;
    }
    public void setProposer(String proposer) {
        this.proposer = proposer;
    }
    public String getChangeDescription() {
        return changeDescription;
    }
    public void setChangeDescription(String changeDescription) {
        this.changeDescription = changeDescription;
    }
    public String getSubCode() {
        return subCode;
    }
    public void setSubCode(String subCode) {
        this.subCode = subCode;
    }
    public String getSubModel() {
        return subModel;
    }
    public void setSubModel(String subModel) {
        this.subModel = subModel;
    }
    public String getParentModel() {
        return parentModel;
    }
    public void setParentModel(String parentModel) {
        this.parentModel = parentModel;
    }
    public String getSolution() {
        return solution;
    }
    public void setSolution(String solution) {
        this.solution = solution;
    }
    public Date getCreateTime() {
        return createTime;
    }
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getExcelFile() {
        return excelFile;
    }
    public void setExcelFile(String excelFile) {
        this.excelFile = excelFile;
    }
}
src/main/resources/mapper/ProductMapper.xml
@@ -49,7 +49,21 @@
        </where>
        order by tb_product.version_time desc
    </select>
    <select id="selectEcrProduct" resultType="ECR">
    <resultMap id="ECRWebSockt" type="ECR">
        <id property="id" column="id"></id>
        <result property="number" column="number"></result>
        <result property="proposeDate" column="propose_date"></result>
        <result property="proposeWebsocket" column="propose_date"></result>
        <result property="proposer" column="proposer"></result>
        <result property="changeDescription" column="change_description"></result>
        <result property="subCode" column="sub_code"></result>
        <result property="subModel" column="sub_model"></result>
        <result property="parentModel" column="parent_model"></result>
        <result property="solution" column="solution"></result>
        <result property="createTime" column="create_time"></result>
        <result property="excelFile" column="excel_file"></result>
    </resultMap>
    <select id="selectEcrProduct" resultMap="ECRWebSockt">
        select tb_ecr.* from tb_ecr
        where sub_code=#{subCode} and sub_model=#{subModel}
        order by create_time desc