|
@@ -126,12 +126,6 @@ public class TemplateServer {
|
|
.andEqualTo("gutId", proComAttDto.getUnitType())
|
|
.andEqualTo("gutId", proComAttDto.getUnitType())
|
|
.andEqualTo("factor", new BigDecimal(1));
|
|
.andEqualTo("factor", new BigDecimal(1));
|
|
List<EsUnit> esUnitList = esmapper.selectByExample(example);
|
|
List<EsUnit> esUnitList = esmapper.selectByExample(example);
|
|
- /*EsUnitSQLBuilder sqlbuilder_standardUnit = new EsUnitSQLBuilder();
|
|
|
|
- EsUnitSQLBuilder.Criteria criteria1 = sqlbuilder_standardUnit.createCriteria();
|
|
|
|
- criteria1.andGutIdEqualTo(proComAttDto.getUnitType());
|
|
|
|
- criteria1.andFactorEqualTo(new BigDecimal(1));
|
|
|
|
- //EsUnit esUnit_standardUnit = esmapper.selectOneByExample(sqlbuilder_standardUnit);
|
|
|
|
- List<EsUnit> esUnitList = esmapper.selectByExample(criteria1);*/
|
|
|
|
EsUnit esUnit_standardUnit = esUnitList.get(0);
|
|
EsUnit esUnit_standardUnit = esUnitList.get(0);
|
|
|
|
|
|
if(Objects.equals(esUnit.getFactor(), new BigDecimal(1))){//factor为1时不变
|
|
if(Objects.equals(esUnit.getFactor(), new BigDecimal(1))){//factor为1时不变
|