Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev

wenwj

2025-04-12 32bcf3f12aef0de69f7cb83d3521b2452a01e50d

 aps-modules/aps-core/src/main/java/com/aps/core/service/impl/ApsPlatePlanServiceImpl.java

@@ -1,7 +1,9 @@
package com.aps.core.service.impl;

import java.util.List;
import java.util.Optional;

import com.aps.common.core.utils.DateUtils;
import com.aps.common.core.utils.uuid.IdUtils;
import com.aps.common.security.utils.DictUtils;
import com.aps.core.domain.ApsPlatePlanTemp;
@@ -67,6 +69,7 @@
    public int insertApsPlatePlan(ApsPlatePlan apsPlatePlan)
    {
        apsPlatePlan.setId(IdUtils.fastUUID());
        apsPlatePlan.setCreateTime(DateUtils.getNowDate());
        return apsPlatePlanMapper.insertApsPlatePlan(apsPlatePlan);
    }

@@ -134,15 +137,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);
                //插入临时表