bluejay
2025-04-09 0cfb74382e44ef538c0bab5f3014363769ecdb2f
调整导入和导出接口,进行数据字典的转义
已修改10个文件
372 ■■■■■ 文件已修改
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java 76 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java 75 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java 72 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java 28 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java 26 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java 19 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsGasPipingPlanController.java
@@ -2,6 +2,7 @@
import java.util.List;
import java.io.IOException;
import java.util.Optional;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
@@ -64,18 +65,36 @@
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsGasPipingPlan apsGasPipingPlan)
    {
        List<ApsGasPipingPlan> apsGasPipingPlans = apsGasPipingPlanService.selectApsGasPipingPlanList(apsGasPipingPlan);
        List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended");
        for (int i = 0; i < apsGasPipingPlans.size(); i++) {
            for (int j = 0; j < list.size(); j++) {
                if (apsGasPipingPlans.get(i).getIsSuspended().equals(Integer.parseInt(list.get(j).getDictValue()))) {
                    apsGasPipingPlans.get(i).setIsSuspendedTxt(list.get(j).getDictLabel());
                    break;
        List<ApsGasPipingPlan> planList = apsGasPipingPlanService.selectApsGasPipingPlanList(apsGasPipingPlan);
        List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
        List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
        List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
        List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
        for (int i = 0; i < planList.size(); i++) {
            ApsGasPipingPlan  plan=planList.get(i);
            String isSuspendedTxt = plan.getIsSuspended().trim();
            String businessType = plan.getBusinessType().trim();
            String documentStatusText = plan.getDocumentStatus().trim();
            String account = plan.getAccount().trim();
            Optional<SysDictData> documentStatusFirst = documentStatusDic.stream().filter(x -> x.getDictValue().equals(documentStatusText)).findFirst();
            documentStatusFirst.ifPresent(sysDictData -> plan.setDocumentStatus(sysDictData.getDictLabel()));
            Optional<SysDictData> accountFirst = accountDic.stream().filter(x -> x.getDictValue().equals(account)).findFirst();
            accountFirst.ifPresent(sysDictData -> plan.setAccount(sysDictData.getDictLabel()));
            Optional<SysDictData> businessTypeFirst = businessTypeDic.stream().filter(x -> x.getDictValue().equals(businessType)).findFirst();
            businessTypeFirst.ifPresent(sysDictData -> plan.setBusinessType(sysDictData.getDictLabel()));
            Optional<SysDictData> isSuspendedFirst = suspendedDic.stream().filter(x -> x.getDictValue().equals(isSuspendedTxt)).findFirst();
            isSuspendedFirst.ifPresent(sysDictData -> plan.setIsSuspended(sysDictData.getDictLabel()));
                }
            }
        }
        ExcelUtil<ApsGasPipingPlan> util = new ExcelUtil<ApsGasPipingPlan>(ApsGasPipingPlan.class);
        util.exportExcel(response, apsGasPipingPlans, "气体管路计划管理数据");
        util.exportExcel(response, planList, "气体管路计划管理数据");
    }
    /**
@@ -130,18 +149,37 @@
        //判断导入数据是否为空
        if (apsGasPipingPlanTemps.size() > 0) {
            String batchNum= IdUtils.fastUUID();
            List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended");
            List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
            List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
            List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
            List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
            for (int i = 0; i < apsGasPipingPlanTemps.size(); i++) {
                for (int j = 0; j < list.size(); j++) {
                    if (apsGasPipingPlanTemps.get(i).getIsSuspendedTxt().equals(list.get(j).getDictLabel())) {
                        apsGasPipingPlanTemps.get(i).setIsSuspended(Integer.parseInt(list.get(j).getDictValue()));
                        break;
                    }
                }
                ApsGasPipingPlanTemp planTemp = apsGasPipingPlanTemps.get(i);
                String isSuspendedTxt = planTemp.getIsSuspended().trim();
                String businessType = planTemp.getBusinessType().trim();
                String documentStatusText = planTemp.getDocumentStatus().trim();
                String account = planTemp.getAccount().trim();
                Optional<SysDictData> documentStatusFirst = documentStatusDic.stream().filter(x -> x.getDictLabel().equals(documentStatusText)).findFirst();
                documentStatusFirst.ifPresent(sysDictData -> planTemp.setDocumentStatus(sysDictData.getDictValue()));
                Optional<SysDictData> accountFirst = accountDic.stream().filter(x -> x.getDictLabel().equals(account)).findFirst();
                accountFirst.ifPresent(sysDictData -> planTemp.setAccount(sysDictData.getDictValue()));
                Optional<SysDictData> businessTypeFirst = businessTypeDic.stream().filter(x -> x.getDictLabel().equals(businessType)).findFirst();
                businessTypeFirst.ifPresent(sysDictData -> planTemp.setBusinessType(sysDictData.getDictValue()));
                Optional<SysDictData> isSuspendedFirst = suspendedDic.stream().filter(x -> x.getDictLabel().equals(isSuspendedTxt)).findFirst();
                isSuspendedFirst.ifPresent(sysDictData -> planTemp.setIsSuspended(sysDictData.getDictValue()));
                planTemp.setId(IdUtils.fastUUID());
                //插入版本号
                apsGasPipingPlanTemps.get(i).setBatchNumber(batchNum);
                planTemp.setBatchNumber(batchNum);
                //插入临时表
                apsGasPipingPlanTempService.insertApsGasPipingPlanTemp(apsGasPipingPlanTemps.get(i));
                apsGasPipingPlanTempService.insertApsGasPipingPlanTemp(planTemp);
            }
            return AjaxResult.success("导入成功",batchNum);
        } else {
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPartPlanController.java
@@ -9,6 +9,8 @@
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsGasPipingPlan;
import com.aps.core.domain.ApsGasPipingPlanTemp;
import com.aps.core.domain.ApsPartPlan;
import com.aps.core.domain.ApsPartPlanTemp;
import com.aps.core.service.IApsPartPlanService;
@@ -20,6 +22,7 @@
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Optional;
/**
 * 零件计划管理Controller
@@ -52,18 +55,36 @@
    @Log(title = "零件计划管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsPartPlan apsPartPlan) {
        List<ApsPartPlan> apsPartPlans = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
        List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended");
        for (int i = 0; i < apsPartPlans.size(); i++) {
            for (int j = 0; j < list.size(); j++) {
                if (apsPartPlans.get(i).getIsSuspended().equals(Integer.parseInt(list.get(j).getDictValue()))) {
                    apsPartPlans.get(i).setIsSuspendedTxt(list.get(j).getDictLabel());
                    break;
                }
            }
        List<ApsPartPlan> planList = apsPartPlanService.selectApsPartPlanList(apsPartPlan);
        List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
        List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
        List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
        List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
        for (int i = 0; i < planList.size(); i++) {
            ApsPartPlan plan=planList.get(i);
            String isSuspendedTxt = plan.getIsSuspended().trim();
            String businessType = plan.getBusinessType().trim();
            String documentStatusText = plan.getDocumentStatus().trim();
            String account = plan.getAccount().trim();
            Optional<SysDictData> documentStatusFirst = documentStatusDic.stream().filter(x -> x.getDictValue().equals(documentStatusText)).findFirst();
            documentStatusFirst.ifPresent(sysDictData -> plan.setDocumentStatus(sysDictData.getDictLabel()));
            Optional<SysDictData> accountFirst = accountDic.stream().filter(x -> x.getDictValue().equals(account)).findFirst();
            accountFirst.ifPresent(sysDictData -> plan.setAccount(sysDictData.getDictLabel()));
            Optional<SysDictData> businessTypeFirst = businessTypeDic.stream().filter(x -> x.getDictValue().equals(businessType)).findFirst();
            businessTypeFirst.ifPresent(sysDictData -> plan.setBusinessType(sysDictData.getDictLabel()));
            Optional<SysDictData> isSuspendedFirst = suspendedDic.stream().filter(x -> x.getDictValue().equals(isSuspendedTxt)).findFirst();
            isSuspendedFirst.ifPresent(sysDictData -> plan.setIsSuspended(sysDictData.getDictLabel()));
            }
        ExcelUtil<ApsPartPlan> util = new ExcelUtil<ApsPartPlan>(ApsPartPlan.class);
        util.exportExcel(response, apsPartPlans, "零件计划管理数据");
        util.exportExcel(response, planList, "零件计划管理数据");
    }
    /**
@@ -115,14 +136,34 @@
        //判断导入数据是否为空
        if (apsPartPlans.size() > 0) {
            String batchNum= IdUtils.fastUUID();
            List<SysDictData> list = DictUtils.getDictCache("aps_is_suspended");
            List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
            List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
            List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
            List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
            for (int i = 0; i < apsPartPlans.size(); i++) {
                for (int j = 0; j < list.size(); j++) {
                    if (apsPartPlans.get(i).getIsSuspendedTxt().equals(list.get(j).getDictLabel())) {
                        apsPartPlans.get(i).setIsSuspended(Integer.parseInt(list.get(j).getDictValue()));
                        break;
                    }
                }
                ApsPartPlanTemp planTemp = apsPartPlans.get(i);
                String isSuspendedTxt = planTemp.getIsSuspended().trim();
                String businessType = planTemp.getBusinessType().trim();
                String documentStatusText = planTemp.getDocumentStatus().trim();
                String account = planTemp.getAccount().trim();
                Optional<SysDictData> documentStatusFirst = documentStatusDic.stream().filter(x -> x.getDictLabel().equals(documentStatusText)).findFirst();
                documentStatusFirst.ifPresent(sysDictData -> planTemp.setDocumentStatus(sysDictData.getDictValue()));
                Optional<SysDictData> accountFirst = accountDic.stream().filter(x -> x.getDictLabel().equals(account)).findFirst();
                accountFirst.ifPresent(sysDictData -> planTemp.setAccount(sysDictData.getDictValue()));
                Optional<SysDictData> businessTypeFirst = businessTypeDic.stream().filter(x -> x.getDictLabel().equals(businessType)).findFirst();
                businessTypeFirst.ifPresent(sysDictData -> planTemp.setBusinessType(sysDictData.getDictValue()));
                Optional<SysDictData> isSuspendedFirst = suspendedDic.stream().filter(x -> x.getDictLabel().equals(isSuspendedTxt)).findFirst();
                isSuspendedFirst.ifPresent(sysDictData -> planTemp.setIsSuspended(sysDictData.getDictValue()));
                planTemp.setId(IdUtils.fastUUID());
                //插入版本号
                apsPartPlans.get(i).setBatchNumber(batchNum);
                //插入临时表
aps-modules/aps-core/src/main/java/com/aps/core/controller/ApsPlatePlanController.java
@@ -1,36 +1,25 @@
package com.aps.core.controller;
import java.util.List;
import java.io.IOException;
import com.aps.common.core.domain.R;
import com.aps.common.core.utils.file.FileUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsPartPlanTemp;
import com.aps.core.domain.ApsPlatePlanTemp;
import com.aps.system.api.domain.SysDictData;
import com.aps.system.api.domain.SysFile;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.common.log.annotation.Log;
import com.aps.common.log.enums.BusinessType;
import com.aps.common.security.annotation.RequiresPermissions;
import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsGasPipingPlan;
import  com.aps.core.domain.ApsPlatePlan;
import com.aps.core.domain.ApsPlatePlanTemp;
import  com.aps.core.service.IApsPlatePlanService;
import com.aps.common.core.web.controller.BaseController;
import com.aps.common.core.web.domain.AjaxResult;
import com.aps.common.core.utils.poi.ExcelUtil;
import com.aps.common.core.web.page.TableDataInfo;
import com.aps.system.api.domain.SysDictData;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import java.util.List;
import java.util.Optional;
/**
 * 钣金计划管理Controller
@@ -62,9 +51,38 @@
    @Log(title = "钣金计划管理", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, ApsPlatePlan apsPlatePlan) {
        List<ApsPlatePlan> list = apsPlatePlanService.selectApsPlatePlanList(apsPlatePlan);
        List<ApsPlatePlan> planList = apsPlatePlanService.selectApsPlatePlanList(apsPlatePlan);
        List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
        List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
        List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
        List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
        for (int i = 0; i < planList.size(); i++) {
            ApsPlatePlan plan=planList.get(i);
            String isSuspendedTxt = plan.getIsSuspended().trim();
            String businessType = plan.getBusinessType().trim();
            String documentStatusText = plan.getDocumentStatus().trim();
            String account = plan.getAccount().trim();
            Optional<SysDictData> documentStatusFirst = documentStatusDic.stream().filter(x -> x.getDictValue().equals(documentStatusText)).findFirst();
            documentStatusFirst.ifPresent(sysDictData -> plan.setDocumentStatus(sysDictData.getDictLabel()));
            Optional<SysDictData> accountFirst = accountDic.stream().filter(x -> x.getDictValue().equals(account)).findFirst();
            accountFirst.ifPresent(sysDictData -> plan.setAccount(sysDictData.getDictLabel()));
            Optional<SysDictData> businessTypeFirst = businessTypeDic.stream().filter(x -> x.getDictValue().equals(businessType)).findFirst();
            businessTypeFirst.ifPresent(sysDictData -> plan.setBusinessType(sysDictData.getDictLabel()));
            Optional<SysDictData> isSuspendedFirst = suspendedDic.stream().filter(x -> x.getDictValue().equals(isSuspendedTxt)).findFirst();
            isSuspendedFirst.ifPresent(sysDictData -> plan.setIsSuspended(sysDictData.getDictLabel()));
        }
        ExcelUtil<ApsPlatePlan> util = new ExcelUtil<ApsPlatePlan>(ApsPlatePlan.class);
        util.exportExcel(response, list, "钣金计划管理数据");
        util.exportExcel(response, planList, "钣金计划管理数据");
    }
    /**
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
@@ -119,11 +119,9 @@
    private String nextProcessDeparment;
    /** 是否挂起 */
//    @Excel(name = "是否挂起")
    private Integer isSuspended;
    /** 是否挂起 */
    @Excel(name = "是否挂起")
    private String isSuspendedTxt;
    private String isSuspended;
    /** 外协标识 */
    @Excel(name = "外协标识")
    private String isOutsourcing;
@@ -160,7 +158,7 @@
    /** 风险标识 */
    @Excel(name = "风险标识")
    private Integer hasRisk;
    private String plant;
    public void setId(String id)
    {
        this.id = id;
@@ -411,12 +409,12 @@
        return nextProcessDeparment;
    }
    public void setIsSuspended(Integer isSuspended)
    public void setIsSuspended(String isSuspended)
    {
        this.isSuspended = isSuspended;
    }
    public Integer getIsSuspended()
    public String getIsSuspended()
    {
        return isSuspended;
    }
@@ -550,21 +548,5 @@
                .append("hasTurnback", getHasTurnback())
                .append("hasRisk", getHasRisk())
                .toString();
    }
    public String getIsSuspendedTxt() {
        return isSuspendedTxt;
    }
    public void setIsSuspendedTxt(String isSuspendedTxt) {
        this.isSuspendedTxt = isSuspendedTxt;
    }
    public String getPlant() {
        return plant;
    }
    public void setPlant(String plant) {
        this.plant = plant;
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlanTemp.java
@@ -120,11 +120,9 @@
    private String nextProcessDeparment;
    /** 是否挂起 */
//    @Excel(name = "是否挂起")
    private Integer isSuspended;
    /** 是否挂起 */
    @Excel(name = "是否挂起")
    private String isSuspendedTxt;
    private String isSuspended;
    /** 外协标识 */
    @Excel(name = "外协标识")
    private String isOutsourcing;
@@ -165,7 +163,6 @@
    /** 批次号 */
    @Excel(name = "批次号")
    private String batchNumber;
    private String plant;
    public void setId(String id)
    {
@@ -417,12 +414,12 @@
        return nextProcessDeparment;
    }
    public void setIsSuspended(Integer isSuspended)
    public void setIsSuspended(String isSuspended)
    {
        this.isSuspended = isSuspended;
    }
    public Integer getIsSuspended()
    public String getIsSuspended()
    {
        return isSuspended;
    }
@@ -569,19 +566,4 @@
                .toString();
    }
    public String getIsSuspendedTxt() {
        return isSuspendedTxt;
    }
    public void setIsSuspendedTxt(String isSuspendedTxt) {
        this.isSuspendedTxt = isSuspendedTxt;
    }
    public String getPlant() {
        return plant;
    }
    public void setPlant(String plant) {
        this.plant = plant;
    }
}
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -125,11 +125,9 @@
    private String nextProcessDeparment;
    /** 是否挂起 */
//    @Excel(name = "是否挂起")
    private Integer isSuspended;
    /** 是否挂起 */
    @Excel(name = "是否挂起")
    private String isSuspendedTxt;
    private String isSuspended;
    /** 外协标识 */
    @Excel(name = "外协标识")
    private String isOutsourcing;
@@ -421,12 +419,12 @@
        return nextProcessDeparment;
    }
    public void setIsSuspended(Integer isSuspended)
    public void setIsSuspended(String isSuspended)
    {
        this.isSuspended = isSuspended;
    }
    public Integer getIsSuspended()
    public String getIsSuspended()
    {
        return isSuspended;
    }
@@ -562,15 +560,6 @@
                .append("plant", getPlant())
            .toString();
    }
    public String getIsSuspendedTxt() {
        return isSuspendedTxt;
    }
    public void setIsSuspendedTxt(String isSuspendedTxt) {
        this.isSuspendedTxt = isSuspendedTxt;
    }
    public String getPlant() {
        return plant;
    }
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlanTemp.java
@@ -120,11 +120,9 @@
    private String nextProcessDeparment;
    /** 是否挂起 */
//    @Excel(name = "是否挂起")
    private Integer isSuspended;
    /** 是否挂起 */
    @Excel(name = "是否挂起")
    private String isSuspendedTxt;
    private String isSuspended;
    /** 外协标识 */
    @Excel(name = "外协标识")
    private String isOutsourcing;
@@ -421,12 +419,12 @@
        return nextProcessDeparment;
    }
    public void setIsSuspended(Integer isSuspended)
    public void setIsSuspended(String isSuspended)
    {
        this.isSuspended = isSuspended;
    }
    public Integer getIsSuspended()
    public String getIsSuspended()
    {
        return isSuspended;
    }
@@ -574,13 +572,6 @@
            .toString();
    }
    public String getIsSuspendedTxt() {
        return isSuspendedTxt;
    }
    public void setIsSuspendedTxt(String isSuspendedTxt) {
        this.isSuspendedTxt = isSuspendedTxt;
    }
    public String getPlant() {
        return plant;
    }
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -121,7 +121,7 @@
    /** 是否挂起 */
    @Excel(name = "是否挂起")
    private Integer isSuspended;
    private String isSuspended;
    /** 外协标识 */
    @Excel(name = "外协标识")
@@ -414,12 +414,12 @@
        return nextProcessDeparment;
    }
    public void setIsSuspended(Integer isSuspended)
    public void setIsSuspended(String isSuspended)
    {
        this.isSuspended = isSuspended;
    }
    public Integer getIsSuspended()
    public String getIsSuspended()
    {
        return isSuspended;
    }
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlanTemp.java
@@ -120,11 +120,9 @@
    private String nextProcessDeparment;
    /** 是否挂起 */
    private Integer isSuspended;
    /** 是否挂起 */
    @Excel(name = "是否挂起")
    private String isSuspendedTxt;
    private String isSuspended;
    /** 外协标识 */
    @Excel(name = "外协标识")
    private String isOutsourcing;
@@ -420,12 +418,12 @@
        return nextProcessDeparment;
    }
    public void setIsSuspended(Integer isSuspended)
    public void setIsSuspended(String isSuspended)
    {
        this.isSuspended = isSuspended;
    }
    public Integer getIsSuspended()
    public String getIsSuspended()
    {
        return isSuspended;
    }
@@ -529,13 +527,7 @@
    {
        return batchNumber;
    }
    public String getIsSuspendedTxt() {
        return isSuspendedTxt;
    }
    public void setIsSuspendedTxt(String isSuspendedTxt) {
        this.isSuspendedTxt = isSuspendedTxt;
    }
    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java
@@ -1,6 +1,7 @@
package com.aps.core.service.impl;
import java.util.List;
import java.util.Optional;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
@@ -134,15 +135,37 @@
        String batchNum= IdUtils.fastUUID();
        //判断导入数据是否为空
        if (tempList.size() > 0) {
            List<SysDictData> dictDataList = DictUtils.getDictCache("aps_is_suspended");
            /*
            * aps_business_type aps_document_status aps_is_suspended aps_account
            * */
            List<SysDictData> suspendedDic = DictUtils.getDictCache("aps_is_suspended");
            List<SysDictData> businessTypeDic = DictUtils.getDictCache("aps_business_type");
            List<SysDictData> documentStatusDic = DictUtils.getDictCache("aps_document_status");
            List<SysDictData> accountDic = DictUtils.getDictCache("aps_account");
            for (int i = 0; i < tempList.size(); i++) {
                ApsPlatePlanTemp planTemp = tempList.get(i);
                for (int j = 0; j < dictDataList.size(); j++) {
                    if (planTemp.getIsSuspendedTxt().equals(dictDataList.get(j).getDictLabel())) {
                        planTemp.setIsSuspended(Integer.parseInt(dictDataList.get(j).getDictValue()));
                        break;
                    }
                }
                String isSuspendedTxt = planTemp.getIsSuspended().trim();
                String businessType = planTemp.getBusinessType().trim();
                String documentStatusText = planTemp.getDocumentStatus().trim();
                String account = planTemp.getAccount().trim();
                Optional<SysDictData> documentStatusFirst = documentStatusDic.stream().filter(x -> x.getDictLabel().equals(documentStatusText)).findFirst();
                documentStatusFirst.ifPresent(sysDictData -> planTemp.setDocumentStatus(sysDictData.getDictValue()));
                Optional<SysDictData> accountFirst = accountDic.stream().filter(x -> x.getDictLabel().equals(account)).findFirst();
                accountFirst.ifPresent(sysDictData -> planTemp.setAccount(sysDictData.getDictValue()));
                Optional<SysDictData> businessTypeFirst = businessTypeDic.stream().filter(x -> x.getDictLabel().equals(businessType)).findFirst();
                businessTypeFirst.ifPresent(sysDictData -> planTemp.setBusinessType(sysDictData.getDictValue()));
                Optional<SysDictData> isSuspendedFirst = suspendedDic.stream().filter(x -> x.getDictLabel().equals(isSuspendedTxt)).findFirst();
                isSuspendedFirst.ifPresent(sysDictData -> planTemp.setIsSuspended(sysDictData.getDictValue()));
                planTemp.setId(IdUtils.fastUUID());
                //插入版本号
                planTemp.setBatchNumber(batchNum);
                //插入临时表