|
@@ -23,7 +23,9 @@ import com.ydtech.modules.protocol.entity.vo.TaxSourceVo;
|
|
|
import com.ydtech.modules.protocol.service.ITaxSourceExcludeService;
|
|
import com.ydtech.modules.protocol.service.ITaxSourceExcludeService;
|
|
|
import com.ydtech.modules.protocol.service.ITaxSourceService;
|
|
import com.ydtech.modules.protocol.service.ITaxSourceService;
|
|
|
import com.ydtech.modules.protocol.service.PtlAgreementService;
|
|
import com.ydtech.modules.protocol.service.PtlAgreementService;
|
|
|
|
|
+import com.ydtech.modules.protocol.utils.AssertionUtils;
|
|
|
import com.ydtech.utils.idgen.IdGenerate;
|
|
import com.ydtech.utils.idgen.IdGenerate;
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
import org.apache.poi.ss.formula.functions.T;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -375,6 +377,8 @@ public class TaxSourceServiceImpl extends ServiceImpl<TaxSourceMapper, TaxSource
|
|
|
taxSourceDtos = collect.get(0);
|
|
taxSourceDtos = collect.get(0);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ AssertionUtils.isFail(StringUtils.isEmpty(volume), "请填写排量");
|
|
|
|
|
+
|
|
|
if (!isExclude && (Float.parseFloat(volume) >= 1) && (taxSourceDtos != null)) {
|
|
if (!isExclude && (Float.parseFloat(volume) >= 1) && (taxSourceDtos != null)) {
|
|
|
resultId = taxSourceDtos.getAgreementId();
|
|
resultId = taxSourceDtos.getAgreementId();
|
|
|
}
|
|
}
|