修改添加工单处理信息不完整

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesCompletionRecordEntity.java

@@ -78,7 +78,7 @@ public class AftersalesCompletionRecordEntity extends TenantEntity {
 	@ApiModelProperty(value = "说明")
 	private String explain;
 	/**
-	 * 财务是否处理
+	 * 财务是否处理 1是 2 否
 	 */
 	@ApiModelProperty(value = "财务是否处理")
 	private String accounting;

blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesPersonResponsibleEntity.java

@@ -96,6 +96,11 @@ public class AftersalesPersonResponsibleEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "责任方名称")
 	private String businessName;
+	/**
+	 * 说明
+	 */
+	@ApiModelProperty(value = "说明")
+	private String description;
 	/**
 	 * 责任方ID
 	 */

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

@@ -23,6 +23,7 @@ import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import lombok.AllArgsConstructor;
 import javax.validation.Valid;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
@@ -53,6 +54,7 @@ import javax.servlet.http.HttpServletResponse;
  */
 @RestController
 @AllArgsConstructor
+@Slf4j
 @RequestMapping("/aftersalesCompletionRecord")
 @Api(value = "异常工单完结处理结果赔款方", tags = "异常工单完结处理结果赔款方接口")
 public class AftersalesCompletionRecordController extends BladeController {
@@ -108,6 +110,7 @@ public class AftersalesCompletionRecordController extends BladeController {
 	@ApiOperationSupport(order = 5)
 	@ApiOperation(value = "修改", notes = "传入aftersalesCompletionRecord")
 	public R update(@Valid @RequestBody AftersalesCompletionRecordEntity aftersalesCompletionRecord) {
+		log.info("赔货方信息修改》》》》{}",aftersalesCompletionRecord);
 		return R.status(aftersalesCompletionRecordService.updateById(aftersalesCompletionRecord));
 	}
 

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

@@ -186,6 +186,23 @@ public class AftersalesWorkOrderController extends BladeController {
 	}
 
 
+	/**
+	 * 工单调查记录表 查询全部跟踪记录
+	 */
+	@GetMapping("/getTrackRecord")
+	@ApiOperationSupport(order = 4)
+	@ApiOperation(value = "查询全部跟踪记录", notes = "传入aftersaleSurveyRecord")
+	public R getTrackRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
+		log.info("查询全部跟踪记录》》》{}", aftersalesWorkOrderDTO);
+
+		if(ObjectUtils.isNull(aftersalesWorkOrderDTO.getId())){
+			throw new ServiceException("异常工单ID不能为空");
+		}
+		AftersalesWorkOrderVO list = aftersalesWorkOrderService.getTrackRecord(aftersalesWorkOrderDTO);
+		return R.data(list);
+	}
+
+
 	/**
 	 * 客服异常工单  查询营业部责任人人员信息
 	 */

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

@@ -200,4 +200,11 @@ public interface IAftersalesWorkOrderService extends BaseService<AftersalesWorkO
 	 * @return
 	 */
 	AftersalesWorkOrderVO getSurveyRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
+
+	/**
+	 * 查询全部跟踪记录
+	 * @param aftersalesWorkOrderDTO
+	 * @return
+	 */
+	AftersalesWorkOrderVO getTrackRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO);
 }

blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java

@@ -994,8 +994,6 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		//查询调查数据
 		List<AftersaleSurveyRecordEntity> list = aftersaleSurveyRecordService.list(Wrappers.<AftersaleSurveyRecordEntity>query().lambda()
 			.eq(AftersaleSurveyRecordEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
-			.eq(AftersaleSurveyRecordEntity::getFollowWarehouseId, myCurrentWarehouse.getId())
-			.eq(AftersaleSurveyRecordEntity::getFollowWarehouseName, myCurrentWarehouse.getName())
 			.eq(AftersaleSurveyRecordEntity::getDifference, "1")
 		);
 		AftersalesWorkOrderVO aftersalesWorkOrderVO = new AftersalesWorkOrderVO();
@@ -1010,6 +1008,21 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		return aftersalesWorkOrderVO;
 	}
 
+	/**
+	 * 查询全部跟踪记录
+	 * @param aftersalesWorkOrderDTO
+	 * @return
+	 */
+	@Override
+	public AftersalesWorkOrderVO getTrackRecord(AftersalesWorkOrderDTO aftersalesWorkOrderDTO) {
+		List<AftersaleSurveyRecordEntity> list = aftersaleSurveyRecordService.list(Wrappers.<AftersaleSurveyRecordEntity>query().lambda()
+			.eq(AftersaleSurveyRecordEntity::getWorkOrderId, aftersalesWorkOrderDTO.getId())
+		);
+		AftersalesWorkOrderVO workOrderVO = new AftersalesWorkOrderVO();
+		workOrderVO.setSurveyRecordEntities(list);
+		return workOrderVO;
+	}
+
 	/**
 	 * 添加处理处理方信息
 	 * @param aftersalesWorkOrderDTO
@@ -1039,6 +1052,11 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		surveyRecordDTO.setContent(aftersalesWorkOrderDTO.getSurveyRecordDTO().getContent());//内容
 		surveyRecordDTO.setTypesOf("1");
 		surveyRecordDTO.setDifference("2");
+		surveyRecordDTO.setCreateUser(user.getUserId());
+		surveyRecordDTO.setCreateDept(Long.valueOf(user.getDeptId()));
+		surveyRecordDTO.setCreateTime(new Date());
+		surveyRecordDTO.setStatus(1);
+		surveyRecordDTO.setIsDeleted(0);
 		if(ObjectUtil.isNotNull(i)){
 			surveyRecordDTO.setFollowWarehouseName(i.getBusinessName());
 			surveyRecordDTO.setFollowWarehouseId(i.getBusinessId());