Merge remote-tracking branch 'origin/master'

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmProductCodeServiceImpl.java

@@ -151,13 +151,14 @@
                                OsCodeFillTypeEnum.LEFT.getValue().equalsIgnoreCase(secVO.getCodeFillType()))));
                        }
                        Map<String, Double> thisUnitMaxMap = maxSerialMap.getOrDefault(serialUnitString, new HashMap<>());
                        Double maxValue=serialDb;
                        if(thisUnitMaxMap.containsKey(secOid)){
                            Double maxValue=  thisUnitMaxMap.getOrDefault(secOid,new Double(-1));
                            if(maxValue>serialDb){
                                serialDb=maxValue;
                            maxValue=  thisUnitMaxMap.getOrDefault(secOid,new Double(-1));
                            if(maxValue<serialDb){
                                maxValue=serialDb;
                            }
                        }
                        thisUnitMaxMap.put(secOid,serialDb);
                        thisUnitMaxMap.put(secOid,maxValue);
                        maxSerialMap.put(serialUnitString,thisUnitMaxMap);
                        serialUnFileStringList.add(String.valueOf(serialDb));
                    });
@@ -171,7 +172,8 @@
                allCodeDO.setCreateCodeBtm(cbo.getBtmname());
                allCodeDO.setCreateCodeOid(cbo.getOid());
                allCodeDO.setSerialUnit(serialUnitString);
                allCodeDO.setUnFillSerial(serialUnFileStringList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE)));
                String unFillSerial =serialUnFileStringList.size()==1?serialUnFileStringList.get(0)+ SERIAL_VALUE_SPACE:serialUnFileStringList.stream().collect(Collectors.joining(SERIAL_VALUE_SPACE));
                allCodeDO.setUnFillSerial(unFillSerial);
                allCodeDO.setLcStatus(cbo.getLcStatus());
                allCodeDOList.add(allCodeDO);
            });

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/StatusController.java

@@ -102,4 +102,16 @@
        statusService.batchDelete(StatusVOList);
        return R.status(true);
    }

    /**
     * 查看使用范围
     * @param id 版本规则id
     * @return 执行结果
     */
    @GetMapping("/get-apply-range")
    @ApiOperationSupport(order = 6)
    @ApiOperation(value = "版本规则id",notes = "传入id")
    public R getApplyRange(String id){
        return R.data(statusService.getApplyRange(id));
    }
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IStatusService.java

@@ -2,7 +2,9 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.entity.Status;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.StatusVO;
import com.vci.ubcs.starter.exception.VciBaseException;
import org.springblade.core.mp.support.Query;
@@ -160,5 +162,10 @@
     * @throws VciBaseException 参数为空或者查询出错时会抛出错误
     */
    boolean checkStatusUsed(String pkStatus) throws VciBaseException;

    /**
     * 查看应用范围
     * @param id id
     * @return 执行结果
     */
    List<BtmTypeVO> getApplyRange(String id);
}

 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/impl/StatusServiceImpl.java

@@ -6,11 +6,17 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.omd.constant.BtmTypeConstant;
import com.vci.ubcs.omd.entity.BtmType;
import com.vci.ubcs.omd.entity.LifeCycleRule;
import com.vci.ubcs.omd.entity.Status;
import com.vci.ubcs.omd.mapper.BtmTypeMapper;
import com.vci.ubcs.omd.mapper.LifeCycleMapper;
import com.vci.ubcs.omd.mapper.StatusMapper;
import com.vci.ubcs.omd.service.IStatusService;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.omd.vo.StatusVO;
import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
import com.vci.ubcs.omd.wrapper.LifeCycleRuleWrapper;
import com.vci.ubcs.omd.wrapper.StatusWrapper;
import com.vci.ubcs.starter.exception.VciBaseException;
import com.vci.ubcs.starter.web.util.BeanUtil;
@@ -23,6 +29,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import javax.annotation.Resource;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
@@ -37,7 +44,10 @@
public class StatusServiceImpl extends ServiceImpl<StatusMapper, Status> implements IStatusService {

    private final String REGEXP = "^[A-Za-z]+$";

    @Resource
    private BtmTypeMapper btmTypeMapper;
    @Resource
    private LifeCycleMapper lifeCycleMapper;
    /**
     * 获取状态列表
     *
@@ -454,4 +464,17 @@
    public boolean checkStatusUsed(String pkStatus) throws VciBaseException {
        return false;
    }

    /**
     * 查看应用范围
     *
     * @param id id
     * @return 执行结果
     */
    @Override
    public List<BtmTypeVO> getApplyRange(String id) {
        VciBaseUtil.alertNotNull(id,"状态英文名称");
        //lifeCycleMapper.selectList(Wrappers.<LifeCycleRule>query().lambda().eq(LifeCycleRule::getStartStatus,id));
        return BtmTypeWrapper.build().listEntityVO(btmTypeMapper.selectList(Wrappers.<BtmType>query().lambda().eq(BtmType::getRevisionRuleId,id)));
    }
}