|
|
@@ -10,7 +10,9 @@ import com.ydtech.modules.base.controller.BaseController;
|
|
|
import com.ydtech.modules.inv.dao.InvSettlementSourceMapper;
|
|
|
import com.ydtech.modules.inv.model.excel.InvSettlementSourceExcel;
|
|
|
import com.ydtech.modules.inv.model.po.InvSettlementSource;
|
|
|
+import com.ydtech.modules.inv.model.po.InvSource;
|
|
|
import com.ydtech.modules.inv.service.InvChannelAccountService;
|
|
|
+import com.ydtech.modules.inv.service.InvReceivableService;
|
|
|
import com.ydtech.modules.inv.service.InvSettlementSourceService;
|
|
|
import com.ydtech.modules.inv.utils.EasyExcelUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import java.util.List;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* @author Administrator
|
|
|
@@ -27,10 +30,13 @@ import java.util.List;
|
|
|
*/
|
|
|
@Service
|
|
|
public class InvSettlementSourceServiceImpl extends ServiceImpl<InvSettlementSourceMapper, InvSettlementSource>
|
|
|
- implements InvSettlementSourceService {
|
|
|
+ implements InvSettlementSourceService {
|
|
|
@Autowired
|
|
|
private InvSettlementSourceService invSettlementSourceService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private InvReceivableService invReceivableService;
|
|
|
+
|
|
|
@Autowired
|
|
|
private InvChannelAccountService invChannelAccountService;
|
|
|
|
|
|
@@ -40,8 +46,29 @@ public class InvSettlementSourceServiceImpl extends ServiceImpl<InvSettlementSou
|
|
|
@Override
|
|
|
public HttpResult readInvSettlementSourceExcel(String file) {
|
|
|
List<InvSettlementSourceExcel> invSettlementSourceExcels = EasyExcelUtils.readInvSettlementSourceExcelExcel(uploadFilePath + file, InvSettlementSourceExcel.class);
|
|
|
- List<InvSettlementSource> invSettlementSources = JSONArray.parseArray(JSONArray.toJSONString(invSettlementSourceExcels),InvSettlementSource.class);
|
|
|
+ List<InvSettlementSource> invSettlementSources = JSONArray.parseArray(JSONArray.toJSONString(invSettlementSourceExcels), InvSettlementSource.class);
|
|
|
+
|
|
|
+ List<String> namesList = invSettlementSources.stream()
|
|
|
+ .map(InvSettlementSource::getLicenseno)
|
|
|
+ .collect(Collectors.toList());
|
|
|
+
|
|
|
+ StringBuilder licensenos = new StringBuilder();
|
|
|
+ if (namesList.size() > 0) {
|
|
|
+ List<String> receivableLicensenos = invReceivableService.getReceivableListByLicenseno(namesList);
|
|
|
+ for (InvSettlementSource invSettlementSource : invSettlementSources) {
|
|
|
+ if (!receivableLicensenos.contains(invSettlementSource.getLicenseno())) {
|
|
|
+ licensenos.append(invSettlementSource.getLicenseno());
|
|
|
+ licensenos.append(",");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
boolean result = invSettlementSourceService.saveOrUpdateBatchWithConditions(invSettlementSources);
|
|
|
+
|
|
|
+ if (licensenos.length() > 0) {
|
|
|
+ licensenos.append("未在应收表中查询到对应车牌号");
|
|
|
+ return result ? HttpResult.ok("导入成功", licensenos.toString()) : HttpResult.error("导入失败");
|
|
|
+ }
|
|
|
return result ? HttpResult.ok("导入成功") : HttpResult.error("导入失败");
|
|
|
}
|
|
|
|