Changes

jinlin

2023-11-15 ba5766f1e6de66275a01ef506f3701cfbe958724

Changes

 modules/mainPart/src/main/java/com/zt/life/modules/project/dao/SoftwareTestOrderDao.java

@@ -1,9 +1,8 @@
package com.zt.life.modules.project.dao;

import com.zt.common.dao.BaseDao;
import com.zt.life.modules.project.model.DictList;
import com.zt.core.sys.dto.DictIstance;
import com.zt.life.modules.project.model.SoftwareTestOrder;
import com.zt.life.modules.project.model.SoftwareTestOrderDeliverable;
import org.apache.ibatis.annotations.Mapper;


@@ -21,5 +20,5 @@
public interface SoftwareTestOrderDao extends BaseDao<SoftwareTestOrder> {

    List<SoftwareTestOrder> getList(Map<String, Object> params);
    List<DictList> dictList(String dictType);
    List<DictIstance> dictList(String dictType, String projectCode);
}

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/DictList.java

File was deleted

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderDeliverable.java

@@ -9,26 +9,27 @@
/**
 * software_test_order_deliverable
 *
 * @author zt generator 
 * @author zt generator
 * @since 1.0.0 2023-11-09
 */
@Data
@EqualsAndHashCode(callSuper=false)
@EqualsAndHashCode(callSuper = false)
@TableName("software_test_order_deliverable")
public class SoftwareTestOrderDeliverable extends DictList {
    private static final long serialVersionUID = 1L;
public class SoftwareTestOrderDeliverable extends BusiEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "序号")
    private Integer no;
    @ApiModelProperty(value = "序号")
    private Integer no;

    @ApiModelProperty(value = "委托单ID")
    private Long orderId;
    @ApiModelProperty(value = "委托单ID")
    private Long orderId;

    @ApiModelProperty(value = "标识/版本")
    private String identify;
    @ApiModelProperty(value = "标识/版本")
    private String identify;

    @ApiModelProperty(value = "交付物名称")
    private String name;
    @ApiModelProperty(value = "交付物名称")
    private String name;


    public SoftwareTestOrderDeliverable() {
    }
}

 modules/mainPart/src/main/java/com/zt/life/modules/project/model/SoftwareTestOrderMeasured.java

@@ -15,7 +15,7 @@
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("software_test_order_measured")
public class SoftwareTestOrderMeasured extends DictList  {
public class SoftwareTestOrderMeasured extends BusiEntity {
    private static final long serialVersionUID = 1L;

    @ApiModelProperty(value = "委托单ID")
@@ -33,6 +33,6 @@
    @ApiModelProperty(value = "是否被测件")
    private String isMeasured;



    public SoftwareTestOrderMeasured() {
    }
}

 modules/mainPart/src/main/resources/mapper/project/SoftwareTestOrderDao.xml

@@ -18,8 +18,10 @@
        </if>
    </select>

    <select id="dictList" resultType="com.zt.life.modules.project.model.DictList">
        SELECT dd.dict_label as name, '1.0.0' as identify
    <select id="dictList" resultType="com.zt.core.sys.dto.DictIstance">
        SELECT dd.dict_label as name,
        case when '${dictType}'='product_library_file' then concat(dd.REMARK,'-${projectCode}') else
        '1.0.0' end as identify
        FROM sys_dict_type dt
        JOIN sys_dict_data dd ON dt.ID = dd.DICT_TYPE_ID
        <where>

 zt/common/src/main/java/com/zt/core/sys/dto/DictIstance.java

New file
@@ -0,0 +1,14 @@
package com.zt.core.sys.dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;

@Data
@EqualsAndHashCode(callSuper=false)
public class DictIstance {

    private String name;

    private String identify;

}