Merge remote-tracking branch 'origin/dev' into pre-production

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesWorkOrderController.java

@@ -41,6 +41,7 @@ import com.logpm.aftersales.service.IAftersalesCompletionRecipientService;
 import com.logpm.aftersales.service.IAftersalesCompletionRecordService;
 import com.logpm.aftersales.service.IAftersalesPersonResponsibleService;
 import com.logpm.aftersales.service.IAftersalesWorkOrderService;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
 import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
 import com.logpm.aftersales.wrapper.AftersalesWorkOrderWrapper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -160,21 +161,7 @@ public class AftersalesWorkOrderController extends BladeController {
 	}
 
 
-	/**
-	 * 客服异常工单 查询异常工单完整数据集合
-	 */
-	@PostMapping("/pageAllList")
-	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "查询异常工单完整数据集合", notes = "传入aftersalesWorkOrder")
-	public R ageAllList(@ApiIgnore @RequestBody AftersalesWorkOrderQueryDTO workOrderQueryDTO, Query query) {
-		try {
-			R r = aftersalesWorkOrderService.ageAllList(workOrderQueryDTO, Condition.getPage(query));
-			return r;
-		} catch (Exception e) {
-			log.error("工单查询系统异常》》》{}", e.getMessage());
-			return R.fail("系统异常！");
-		}
-	}
+
 
 
 
@@ -297,7 +284,7 @@ public class AftersalesWorkOrderController extends BladeController {
 			if (ObjectUtils.isNull(aftersalesWorkOrderDTO.getSurveyRecordDTO().getContent())) {
 				throw new ServiceException("内容不能为空！！");
 			}
-			return R.status(aftersalesWorkOrderService.savaSurveyRecord(aftersalesWorkOrderDTO));
+			return aftersalesWorkOrderService.savaSurveyRecord(aftersalesWorkOrderDTO);
 		} catch (ServiceException s) {
 			return R.fail(s.getMessage());
 		} catch (Exception e) {
@@ -676,7 +663,6 @@ public class AftersalesWorkOrderController extends BladeController {
 			log.error("填写钉钉流程号异常》》{}", e.getMessage());
 			return R.fail("系统异常！！！");
 		}
-
 	}
 
 	/**
@@ -695,14 +681,13 @@ public class AftersalesWorkOrderController extends BladeController {
 		}
 		try {
 			aftersalesWorkOrder.setInitiationIdentification("PC");
-			return R.status(aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrder));
+			return aftersalesWorkOrderService.saveOrUpdateOwn(aftersalesWorkOrder);
 		} catch (ServiceException s) {
 			return R.fail(s.getMessage());
 		} catch (Exception e) {
 			log.error("工单提交异常》》》{}", e.getMessage());
 			return R.fail(e.getMessage());
 		}
-
 	}
 
 
@@ -1413,6 +1398,26 @@ public class AftersalesWorkOrderController extends BladeController {
 		return R.success("操作成功");
 	}
 
+	/**
+	 * 修改内部责任信息
+	 */
+	@PostMapping("/updatePersonResponsible")
+	@ApiOperationSupport(order = 13)
+	@ApiOperation(value = "写入财务入账时间", notes = "传入aftersalesWorkOrder")
+	public R updatePersonResponsible(@Valid @RequestBody AftersalesWorkOrderVO aftersalesWorkOrderVO) {
+
+		if (Objects.isNull(aftersalesWorkOrderVO.getPersonResponsibleVOS())){
+			return R.fail("参数缺失,请联系管理员");
+		}
+		if (Objects.isNull(aftersalesWorkOrderVO.getId())){
+			return R.fail("参数缺失,请联系管理员");
+		}
+		List<AftersalesPersonResponsibleVO> personResponsibleVOS = aftersalesWorkOrderVO.getPersonResponsibleVOS();
+		Long id = aftersalesWorkOrderVO.getId();
+		return aftersalesWorkOrderService.updatePersonResponsible(id, personResponsibleVOS);
+	}
+
+
 	/**
 	 * 写入财务入账时间
 	 */
@@ -1431,4 +1436,38 @@ public class AftersalesWorkOrderController extends BladeController {
 
 	}
 
+
+
+
+	/**
+	 * 客服异常工单 查询异常工单完整数据集合
+	 */
+	@PostMapping("/newPage")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查询", notes = "传入aftersalesWorkOrder")
+	public R newPage(@ApiIgnore @RequestBody AftersalesWorkOrderQueryDTO workOrderQueryDTO, Query query,@RequestParam Integer pageType) {
+		try {
+			R r = aftersalesWorkOrderService.newPage(workOrderQueryDTO,query,pageType);
+			return r;
+		} catch (Exception e) {
+			log.error("工单查询系统异常》》》{}", e.getMessage());
+			return R.fail("系统异常！");
+		}
+	}
+
+
+
+	/**
+	 * 客服异常工单 查询异常工单完整数据集合
+	 */
+	@PostMapping("/newExport")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "查询", notes = "传入aftersalesWorkOrder")
+	public void newExport(@ApiIgnore @RequestBody AftersalesWorkOrderQueryDTO workOrderQueryDTO, Query query,@RequestParam Integer pageType,HttpServletResponse response) {
+		try {
+		 	aftersalesWorkOrderService.newExport(workOrderQueryDTO,query,pageType,response);
+		} catch (Exception e) {
+			log.error("工单查询系统异常》》》{}", e.getMessage());
+		}
+	}
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesWorkOrderMapper.java

@@ -21,17 +21,14 @@ import com.logpm.aftersales.dto.AftersalesWorkOrderQueryDTO;
 import com.logpm.aftersales.entity.AftersalesProcessorEntity;
 import com.logpm.aftersales.entity.AftersalesSettlementEntity;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
-import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
-import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
-import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
+import com.logpm.aftersales.excel.*;
+import com.logpm.aftersales.vo.*;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 /**
  * 客服异常工单 Mapper 接口
@@ -135,12 +132,134 @@ public interface AftersalesWorkOrderMapper extends BaseMapper<AftersalesWorkOrde
 	 */
 	List<AftersalesProcessorEntity> overTimeAfterSalesList();
 
+
 	/**
-	 * 工单查询列表
+	 * 查询工单全部列表
 	 * @param page
 	 * @param workOrderQueryDTO
+	 * @return
+	 */
+	IPage<AftersalesWorkOrderAllPageVO> selectAllWorkOrderPage(IPage<AftersalesWorkOrderAllPageVO> page, @Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	IPage<AftersalesWorkOrderReplyPageVO> selectReplyWorkOrderPage(IPage<AftersalesWorkOrderReplyPageVO> page2,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 查询处理中工单
+	 * @param page3
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	IPage<AftersalesWorkOrderProcessPageVO> selectProcessWorkOrderPage(IPage<AftersalesWorkOrderProcessPageVO> page3,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds,@Param("isWait") Integer isWait);
+
+	/**
+	 * 查询理赔金未出
+	 * @param page5
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	IPage<AftersalesWorkOrderCompensationPageVO> selectCompensationWorkOrderPage(IPage<AftersalesWorkOrderCompensationPageVO> page5,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	IPage<AftersalesWorkOrderCompletePageVO> selectCompleteWorkOrderPage(IPage<AftersalesWorkOrderCompletePageVO> page6,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 查询客服介入列表
+	 * @param page7
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	IPage<AftersalesWorkOrderInterventionPageVO> selectInterventioWorkOrderPage(IPage<AftersalesWorkOrderInterventionPageVO> page7,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds")List<Long> warehouseIds);
+
+	IPage<AftersalesWorkOrderExaminePageVO> selectExamineWorkOrderPage(IPage<AftersalesWorkOrderExaminePageVO> page7,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	IPage<AftersalesWorkOrderEndPageVO> selectEndWorkOrderPage(IPage<AftersalesWorkOrderEndPageVO> page8,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+
+	IPage<AftersalesWorkOrderAppealPageVO> selectAppealWorkOrderPage(IPage<AftersalesWorkOrderAppealPageVO> page9, @Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	IPage<AftersalesWorkOrderTimeOutPageVO> selectTimeOutWorkOrderPage(IPage<AftersalesWorkOrderTimeOutPageVO> page10,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 查询所有列表导出数据
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	List<AftersalesWorkOrderAllExcel> selectAllWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 待回复导出
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	List<AftersalesWorkOrderReplyExcel> selectReplyWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 查询待处理和处理中的导出数据
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @param i
+	 * @return
+	 */
+	List<AftersalesWorkOrderProcessExcel> selectProcessWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds,@Param("isWait") int isWait);
+
+	/**
+	 * 查询理赔金未出导出数据
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	List<AftersalesWorkOrderCompensationPageExcel> selectCompensationWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 处理完毕导出数据
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	List<AftersalesWorkOrderCompleteExcel> selectCompleteWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 查询待审核导出数据
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	List<AftersalesWorkOrderExamineExcel> selectExamineWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO, @Param("warehouseIds")List<Long> warehouseIds);
+
+	/**
+	 * 查询完结导出数据
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	List<AftersalesWorkOrderEndExcel> selectEndWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 查询申述列表导出数据
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	List<AftersalesWorkOrderAppealExcel> selectAppealWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+	/**
+	 * 查询超时导出数据
+	 * @param workOrderQueryDTO
+	 * @param warehouseIds
+	 * @return
+	 */
+	List<AftersalesWorkOrderTimeOutExcel> selectTimeOutWorkOrderExcelData(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
+
+
+	/**
+	 * 客服介入导出
+	 * @param workOrderQueryDTO
 	 * @param warehouseIds
 	 * @return
 	 */
-	IPage<AftersalesWorkOrderVO> pageAllList(IPage<AftersalesWorkOrderVO> page,@Param("param") AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseId") List<Long> warehouseIds);
+	List<AftersalesWorkOrderInterventionExcel> selectInterventioWorkOrderExcelDta(@Param("param")AftersalesWorkOrderQueryDTO workOrderQueryDTO,@Param("warehouseIds") List<Long> warehouseIds);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java

@@ -24,15 +24,18 @@ import com.logpm.aftersales.entity.AftersalesAppealEntity;
 import com.logpm.aftersales.entity.AftersalesSettlementEntity;
 import com.logpm.aftersales.entity.AftersalesWorkOrderEntity;
 import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
+import com.logpm.aftersales.vo.AftersalesPersonResponsibleVO;
 import com.logpm.aftersales.vo.AftersalesWorkOrderVO;
 import com.logpm.aftersales.excel.AftersalesWorkOrderExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.tool.api.R;
 import org.springblade.system.entity.User;
 
+import javax.servlet.http.HttpServletResponse;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -66,9 +69,9 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @param aftersalesWorkOrder
 	 * @return
 	 */
-	boolean saveOrUpdateOwn(AftersalesWorkOrderDTO aftersalesWorkOrder);
+	R saveOrUpdateOwn(AftersalesWorkOrderDTO aftersalesWorkOrder);
 
-	boolean extractedSaveAndUpdate(AftersalesWorkOrderDTO aftersalesWorkOrder, BladeUser user, BasicdataWarehouseEntity myCurrentWarehouse);
+	R extractedSaveAndUpdate(AftersalesWorkOrderDTO aftersalesWorkOrder, BladeUser user, BasicdataWarehouseEntity myCurrentWarehouse);
 
 	/**
 	 * 查询待处理的异常工单数据
@@ -127,13 +130,7 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 */
 	R getUpdateWorkList(AftersalesWorkOrderDTO aftersalesWorkOrder);
 
-	/**
-	 * API 添加工单记录
-	 *
-	 * @param aftersalesWorkOrderDTO
-	 * @return
-	 */
-	Boolean addWorkOrder(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
+
 
 	/**
 	 *导入 批量修改 钉钉流程号、审核人、审核日期，财务理赔入账日期、操作人
@@ -155,12 +152,6 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @return
 	 */
 
-	/**
-	 * PDA保存异常工单
-	 * @param aftersalesWorkOrderDTO
-	 * @return
-	 */
-	R saveAfterSalesOrder(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
 
 	/**
 	 * 查询客服信息
@@ -193,7 +184,7 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @param aftersalesWorkOrderDTO
 	 * @return
 	 */
-	boolean savaSurveyRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
+	R savaSurveyRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
 
 	/**
 	 * 营业部提交异常工单处理结果
@@ -329,8 +320,22 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	/**
 	 * 查询全部工单信息
 	 * @param workOrderQueryDTO
-	 * @param page
+	 * @param query
 	 * @return
 	 */
-	R ageAllList(AftersalesWorkOrderQueryDTO workOrderQueryDTO, IPage<AftersalesWorkOrderVO> page);
+	R newPage(AftersalesWorkOrderQueryDTO workOrderQueryDTO, Query query,Integer pageType);
+
+
+	/**
+	 * 导出
+	 * @param workOrderQueryDTO
+	 * @param query
+	 * @param pageType
+	 * @param response
+	 */
+	void newExport(AftersalesWorkOrderQueryDTO workOrderQueryDTO, Query query, Integer pageType, HttpServletResponse response);
+
+
+	R updatePersonResponsible(Long id, List<AftersalesPersonResponsibleVO> personResponsibleVOS);
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml

@@ -1412,7 +1412,7 @@
         AND ldrs.stock_article_status != 2
         ) AS orderNum,
         SUM(ldr.reservation_num + ldr.reservation_stock_list_num) AS planNum,
-        (SELECT IFNULL(SUM(ldss.stock_quantity),0) FROM logpm_distribution_stock AS ldss WHERE ldss.is_deleted = 0  AND ldss.stockup_id = lds.id) AS scanNum,
+        (SELECT IFNULL(SUM(ldss.stock_quantity),0) FROM logpm_distribution_stock AS ldss WHERE ldss.is_deleted = 0  AND ldss.stockup_id = lds.id AND ldss.cancel_status != 1) AS scanNum,
         IFNULL(SUM(ldr.reservation_stock_list_num),0) AS  inventoryNum
         FROM
         logpm_distribution_stockup AS lds
@@ -1655,6 +1655,7 @@
         logpm_distribution_stock AS ldss
         WHERE
         ldss.is_deleted = 0
+        ldss.cancel_status != 1
         AND ldss.reservation_id = ldbl.id
         ) AS scanNum,
         (

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java

@@ -5985,6 +5985,16 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			}
 			if (!updateData.isEmpty()) {
 				distributionStockService.updateBatchById(updateData);
+				boolean anyMatch = false;
+				updateData.stream().anyMatch(a -> "1".equals(a.getType()));
+				if (anyMatch) {
+					List<Long> packageIds = updateData.stream().filter(a -> "1".equals(a.getType())).map(DistributionStockEntity::getParcelListId).collect(Collectors.toList());
+					distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>update().lambda()
+						.in(DistributionParcelListEntity::getId,packageIds)
+						.set(DistributionParcelListEntity::getOrderPackageStockupStatus,OrderPackageStockupStatusConstant.daibeihuo.getValue())
+					);
+				}
+
 			}
 		}