|
|
@@ -25,6 +25,7 @@ import com.jzg.commons.entity.dto.InsOrdersParamVO;
|
|
|
import com.jzg.commons.entity.dto.InsTaskImagesAdd;
|
|
|
import com.jzg.commons.entity.enums.MessageCodeEnum;
|
|
|
import com.jzg.commons.entity.finance.vo.BatchModifyVo;
|
|
|
+import com.jzg.commons.entity.finance.vo.UpdateCompanyBatchVo;
|
|
|
import com.jzg.commons.entity.orders.po.*;
|
|
|
import com.jzg.commons.entity.orders.vo.HistoryQuoteQueryVo;
|
|
|
import com.jzg.commons.entity.orders.vo.HistoryQuoteResultVo;
|
|
|
@@ -2396,42 +2397,47 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
|
|
|
* 3. 根据orderNos批量修改ins_order_adjust表的companyId和companyName
|
|
|
* </p>
|
|
|
*
|
|
|
- * @param batchModifyVo 批量修改参数,包含orderNos和companyIds
|
|
|
+ * @param updateCompanyBatchVo 批量修改参数,包含orderNos和companyIds
|
|
|
* @author lipf
|
|
|
* @date 2026/8/5
|
|
|
*/
|
|
|
@Override
|
|
|
- public HttpResult<String> updateCompanyBatch(BatchModifyVo batchModifyVo) {
|
|
|
+ public HttpResult<String> updateCompanyBatch(UpdateCompanyBatchVo updateCompanyBatchVo) {
|
|
|
+ BatchModifyVo batchModifyVo = updateCompanyBatchVo.getBatchModifyVo();
|
|
|
+ AgreementVo agreementVo = updateCompanyBatchVo.getAgreementVo();
|
|
|
+
|
|
|
log.info("批量修改订单和批改表的保司信息: batchModifyVo=[{}]", JSONUtil.toJsonStr(batchModifyVo));
|
|
|
List<String> orderNos = batchModifyVo.getOrderNos();
|
|
|
if (CollUtil.isEmpty(orderNos)) {
|
|
|
return HttpResult.error("批量修改保司信息时,请指定订单编号");
|
|
|
}
|
|
|
- List<String> companyIds = batchModifyVo.getCompanyIds();
|
|
|
- if (CollUtil.isEmpty(companyIds)) {
|
|
|
+
|
|
|
+ // 获取新的保司ID
|
|
|
+ String newPartnerCompanyId = agreementVo.getPartnerCompanyId();
|
|
|
+ if (StrUtil.isBlank(newPartnerCompanyId)) {
|
|
|
return HttpResult.error("批量修改保司信息时,请指定保司ID");
|
|
|
}
|
|
|
|
|
|
- // 获取新的保司ID
|
|
|
- String companyId = CollUtil.getFirst(companyIds);
|
|
|
// 通过保司ID查询保司名称
|
|
|
String companyName = "";
|
|
|
- HttpResult<EsmInsCompany> companyResult = esmInsCompanyClient.findById(companyId);
|
|
|
+ HttpResult<EsmInsCompany> companyResult = esmInsCompanyClient.findById(newPartnerCompanyId);
|
|
|
if (companyResult != null && companyResult.isSuccess() && companyResult.getData() != null) {
|
|
|
companyName = companyResult.getData().getName();
|
|
|
}
|
|
|
|
|
|
// 修改ins_orders表的保司信息
|
|
|
int orderCount = baseMapper.update(null, new LambdaUpdateWrapper<InsOrders>()
|
|
|
- .set(InsOrders::getCompanyId, companyId)
|
|
|
+ .set(InsOrders::getCompanyId, newPartnerCompanyId)
|
|
|
.set(InsOrders::getCompanyName, companyName)
|
|
|
.set(InsOrders::getAgreementId, batchModifyVo.getUpdateAgreementId())
|
|
|
+ .set(InsOrders::getDockingPerson, agreementVo.getDockingPerson())
|
|
|
+ .set(InsOrders::getDockingPersonPhone, agreementVo.getDockingPhone())
|
|
|
.in(InsOrders::getId, orderNos));
|
|
|
log.info("修改ins_orders保司信息完成,影响行数: {}", orderCount);
|
|
|
|
|
|
// 修改ins_order_adjust表的保司信息
|
|
|
int adjustCount = insOrderAdjustMapper.update(null, new LambdaUpdateWrapper<InsOrderAdjust>()
|
|
|
- .set(InsOrderAdjust::getCompanyId, companyId)
|
|
|
+ .set(InsOrderAdjust::getCompanyId, newPartnerCompanyId)
|
|
|
.set(InsOrderAdjust::getCompanyName, companyName)
|
|
|
.in(InsOrderAdjust::getOrderNo, orderNos));
|
|
|
log.info("修改ins_order_adjust保司信息完成,影响行数: {}", adjustCount);
|