no message

skyouc

4 天以前 1badfb47887a8b95e422341fb7b44f1610cae11b

 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrder.java

@@ -5,6 +5,7 @@

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.DictDataService;
@@ -199,15 +200,20 @@
        if (Cools.isEmpty(this.exceStatus)){
            return "";
        }
        String exceType = DictTypeCode.DICT_ASN_EXCE_STATUS;
        if (this.type.equals(OrderType.ORDER_CHECK.type)) {
            exceType = DictTypeCode.SYS_CHECK_EXCE_STATUS;
        }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>()
                .eq(DictData::getDictTypeCode, DictTypeCode.DICT_ASN_EXCE_STATUS)
                .eq(DictData::getDictTypeCode, exceType)
                .eq(DictData::getValue, this.exceStatus));
        if (Objects.isNull(dictData)) {
            return null;
        }
        return dictData.getLabel();
    }


    public String getType$(){
        if (Cools.isEmpty(this.type)){
@@ -235,6 +241,18 @@
        return dictData.getLabel();
    }

    public String getCheckType$(){
        if (Cools.isEmpty(this.wkType)){
            return "";
        }
        DictDataService dictDataService = SpringUtils.getBean(DictDataService.class);
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.SYS_CHECK_ORDER_TYPE).eq(DictData::getValue, this.wkType));
        if (Objects.isNull(dictData)) {
            return null;
        }
        return dictData.getLabel();
    }


    public String getArrTime$(){
        if (Cools.isEmpty(this.arrTime)){