diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java index 54330a971..32d7a5031 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/DictBizConstant.java @@ -127,6 +127,7 @@ public class DictBizConstant { public static final String RESULT_HANDLING = "result_handling"; //异常处理结果 public static final String PAYMENT_METHOD = "payment_method"; //赔付支付方式 public static final String WORK_ORDER_STATUS = "work_order_status";//异常工单状态 + public static final String STATEMENT_STATUS = "statement_status";//申述状态 //---------------------2023-12-04--------------- diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java b/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java index 44dc0fbf5..2f171f98a 100644 --- a/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java +++ b/blade-biz-common/src/main/java/org/springblade/common/constant/aftersales/WorkOrderStatusConstant.java @@ -10,7 +10,8 @@ public enum WorkOrderStatusConstant { chaoshiweichuli("超时未处理","60"), zhongchaizhong("仲裁中","70"), yiwanjei("完结","80"), - lipeijineweichu("理赔金额未出","90") + lipeijineweichu("理赔金额未出","90"), + shenshuzhong("申述中","100") ; diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java index 738c2e2e0..47a82704d 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/entity/AftersalesAppealEntity.java @@ -101,6 +101,11 @@ public class AftersalesAppealEntity extends TenantEntity { */ @ApiModelProperty(value = "处理人") private String processedByName; + /** + * 实际责任人 + */ + @ApiModelProperty(value = "实际责任人") + private String appealPeopleName; /** * 处理时间 */ diff --git a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAppealVO.java b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAppealVO.java index da7216900..a6d14e43f 100644 --- a/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAppealVO.java +++ b/blade-service-api/logpm-aftersales-api/src/main/java/com/logpm/aftersales/vo/AftersalesAppealVO.java @@ -32,4 +32,13 @@ import lombok.EqualsAndHashCode; public class AftersalesAppealVO extends AftersalesAppealEntity { private static final long serialVersionUID = 1L; + private String workOrderNumber; + private String waybillNumber; + private String orderCode; + private String workOrderType; + private String workOrderTypeName; + private String discoveryNode; + private String discoveryNodeName; + private String typesOfName; + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java index ac85fe94f..5076f1275 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAbnormalPackageController.java @@ -88,9 +88,9 @@ public class AftersalesAbnormalPackageController extends BladeController { @GetMapping("/getAbnormalPackage") @ApiOperationSupport(order = 2) @ApiOperation(value = "查询包件是否处理过的信息", notes = "传入aftersalesAbnormalPackage") - public R getAbnormalPackage(@ApiIgnore @RequestParam Map aftersalesAbnormalPackage, Query query) { + public R> getAbnormalPackage(@ApiIgnore @RequestParam Map aftersalesAbnormalPackage, Query query) { log.info("查询包件的数据》》》{}",aftersalesAbnormalPackage); - AftersalesAbnormalPackageVO pages = aftersalesAbnormalPackageService.getAbnormalPackage( aftersalesAbnormalPackage,Condition.getPage(query)); + List pages = aftersalesAbnormalPackageService.getAbnormalPackage( aftersalesAbnormalPackage,Condition.getPage(query)); return R.data(pages); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAppealController.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAppealController.java index 02f3d21bc..1779b97f9 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAppealController.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/controller/AftersalesAppealController.java @@ -87,6 +87,17 @@ public class AftersalesAppealController extends BladeController { return R.data(AftersalesAppealWrapper.build().pageVO(pages)); } + /** + * 异常工单申述表 分页查询申述数据 + */ + @GetMapping("/listAppeal") + @ApiOperationSupport(order = 2) + @ApiOperation(value = "分页查询申述数据", notes = "传入aftersalesAppeal") + public R> getListAppeal(@ApiIgnore @RequestParam Map aftersalesAppeal, Query query) { + IPage pages = aftersalesAppealService.getListAppeal(Condition.getPage(query), aftersalesAppeal); + return R.data(pages); + } + /** * 异常工单申述表 自定义分页 */ diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.java index 82efeb1b2..96b3d6e7b 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAbnormalPackageMapper.java @@ -56,5 +56,5 @@ public interface AftersalesAbnormalPackageMapper extends BaseMapper getAbnormalPackage(@Param("param") AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.java index 339dbfa08..8ed195fd4 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.java @@ -51,4 +51,11 @@ public interface AftersalesAppealMapper extends BaseMapper exportAftersalesAppeal(@Param("ew") Wrapper queryWrapper); + /** + * 查询申述数据 + * @param page + * @param aftersalesAppealEntity + * @return + */ + IPage getListAppeal(IPage page,@Param("param") AftersalesAppealEntity aftersalesAppealEntity); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml index e2d9c8957..e7f1f69bd 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/mapper/AftersalesAppealMapper.xml @@ -39,5 +39,21 @@ + diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalPackageService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalPackageService.java index 133f0217f..6aa89a4f8 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalPackageService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAbnormalPackageService.java @@ -56,5 +56,5 @@ public interface IAftersalesAbnormalPackageService extends BaseService aftersalesAbnormalPackage, IPage page); + List getAbnormalPackage(Map aftersalesAbnormalPackage, IPage page); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAppealService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAppealService.java index 4ae4003ab..6a71eabf3 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAppealService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesAppealService.java @@ -24,6 +24,7 @@ import com.logpm.aftersales.excel.AftersalesAppealExcel; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseService; import java.util.List; +import java.util.Map; /** * 异常工单申述表 服务类 @@ -56,4 +57,12 @@ public interface IAftersalesAppealService extends BaseService getListAppeal(IPage page, Map aftersalesAppeal); } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java index 78e94e857..8f15df326 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/IAftersalesWorkOrderService.java @@ -18,7 +18,6 @@ package com.logpm.aftersales.service; import com.logpm.aftersales.dto.AftersalesPackageScanDTO; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; -import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity; import com.logpm.aftersales.entity.AftersalesSettlementEntity; import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO; @@ -216,4 +215,20 @@ public interface IAftersalesWorkOrderService extends BaseService getListSettlement(Map aftersalesWorkOrder, IPage page); + + /** + * 添加工单操作记录 + * + * @return + */ + Boolean addSurveyRecord(Long workOrderId,String results,String difference); + + + + + + + + + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java index f9e19c171..f09da09a2 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAbnormalPackageServiceImpl.java @@ -68,7 +68,7 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl aftersalesAbnormalPackage, IPage page) { + public List getAbnormalPackage(Map aftersalesAbnormalPackage, IPage page) { BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse(); AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesAbnormalPackage), AftersalesAbnormalPackageEntity.class); diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java index b5b00a46b..7232b559f 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesAppealServiceImpl.java @@ -17,12 +17,17 @@ package com.logpm.aftersales.service.impl; import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO; import com.logpm.aftersales.dto.AftersalesAppealDTO; +import com.logpm.aftersales.entity.AftersaleSurveyRecordEntity; import com.logpm.aftersales.entity.AftersalesAppealEntity; import com.logpm.aftersales.entity.AftersalesAppealPeopleEntity; +import com.logpm.aftersales.entity.AftersalesWorkOrderEntity; import com.logpm.aftersales.service.IAftersalesAppealPeopleService; +import com.logpm.aftersales.service.IAftersalesWorkOrderService; import com.logpm.aftersales.vo.AftersalesAppealPeopleVO; import com.logpm.aftersales.vo.AftersalesAppealVO; import com.logpm.aftersales.excel.AftersalesAppealExcel; @@ -32,16 +37,21 @@ import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springblade.common.constant.DictBizConstant; +import org.springblade.common.constant.aftersales.WorkOrderStatusConstant; import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseEntity; +import org.springblade.core.mp.support.Condition; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.utils.BeanUtil; +import org.springblade.system.cache.DictBizCache; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import org.springblade.core.mp.base.BaseServiceImpl; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -58,6 +68,8 @@ public class AftersalesAppealServiceImpl extends BaseServiceImpl selectAftersalesAppealPage(IPage page, AftersalesAppealVO aftersalesAppeal) { @@ -104,11 +116,18 @@ public class AftersalesAppealServiceImpl extends BaseServiceImpl getListAppeal(IPage page, Map aftersalesAppeal) { + Condition.getQueryWrapper(aftersalesAppeal, AftersalesAppealEntity.class); + AftersalesAppealEntity aftersalesAppealEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesAppeal), AftersalesAppealEntity.class); + IPage iPage = baseMapper.getListAppeal(page,aftersalesAppealEntity); + iPage.getRecords().forEach( i ->{ + i.setWorkOrderTypeName(DictBizCache.getValue(DictBizConstant.PC_WORK_ORDER,i.getWorkOrderType())); + i.setDiscoveryNodeName(DictBizCache.getValue(DictBizConstant.PC_DISCOVERY_NODE,i.getDiscoveryNode())); + i.setTypesOfName(DictBizCache.getValue(DictBizConstant.STATEMENT_STATUS,i.getTypesOf())); + }); + return iPage; + } + } diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java index e6c39cf04..bae0e7aea 100644 --- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java +++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java @@ -27,7 +27,6 @@ import com.logpm.aftersales.dto.AftersalesPackageScanDTO; import com.logpm.aftersales.dto.AftersalesProcessingResultsDTO; import com.logpm.aftersales.dto.AftersaleSurveyRecordDTO; import com.logpm.aftersales.dto.AftersalesPersonResponsibleDTO; -import com.logpm.aftersales.dto.AftersalesProcessingResultsDTO; import com.logpm.aftersales.dto.AftersalesWorkOrderDTO; import com.logpm.aftersales.entity.*; import com.logpm.aftersales.service.*; @@ -1106,6 +1105,21 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl