添加申述查询，修改包件工单历史查询

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---------------

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")
 	;
 
 

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;
 	/**
 	 * 处理时间
 	 */

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;
+
 }

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<AftersalesAbnormalPackageVO> getAbnormalPackage(@ApiIgnore @RequestParam Map<String, Object> aftersalesAbnormalPackage, Query query) {
+	public R<List<AftersalesAbnormalPackageVO>> getAbnormalPackage(@ApiIgnore @RequestParam Map<String, Object> aftersalesAbnormalPackage, Query query) {
 		log.info("查询包件的数据》》》{}",aftersalesAbnormalPackage);
-		AftersalesAbnormalPackageVO pages = aftersalesAbnormalPackageService.getAbnormalPackage( aftersalesAbnormalPackage,Condition.getPage(query));
+		List<AftersalesAbnormalPackageVO> pages = aftersalesAbnormalPackageService.getAbnormalPackage( aftersalesAbnormalPackage,Condition.getPage(query));
 		return R.data(pages);
 	}
 

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<IPage<AftersalesAppealVO>> getListAppeal(@ApiIgnore @RequestParam Map<String, Object> aftersalesAppeal, Query query) {
+		IPage<AftersalesAppealVO> pages = aftersalesAppealService.getListAppeal(Condition.getPage(query), aftersalesAppeal);
+		return R.data(pages);
+	}
+
 	/**
 	 * 异常工单申述表 自定义分页
 	 */

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

@@ -56,5 +56,5 @@ public interface AftersalesAbnormalPackageMapper extends BaseMapper<AftersalesAb
 	 * @param aftersalesAbnormalPackageEntity
 	 * @return
 	 */
-    AftersalesAbnormalPackageVO getAbnormalPackage(@Param("param") AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity);
+    List<AftersalesAbnormalPackageVO> getAbnormalPackage(@Param("param") AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity);
 }

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

@@ -51,4 +51,11 @@ public interface AftersalesAppealMapper extends BaseMapper<AftersalesAppealEntit
 	 */
 	List<AftersalesAppealExcel> exportAftersalesAppeal(@Param("ew") Wrapper<AftersalesAppealEntity> queryWrapper);
 
+	/**
+	 * 查询申述数据
+	 * @param page
+	 * @param aftersalesAppealEntity
+	 * @return
+	 */
+	IPage<AftersalesAppealVO> getListAppeal(IPage<Object> page,@Param("param") AftersalesAppealEntity aftersalesAppealEntity);
 }

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

@@ -39,5 +39,21 @@
     <select id="exportAftersalesAppeal" resultType="com.logpm.aftersales.excel.AftersalesAppealExcel">
         SELECT * FROM logpm_aftersales_appeal ${ew.customSqlSegment}
     </select>
+    <select id="getListAppeal" resultType="com.logpm.aftersales.vo.AftersalesAppealVO">
+        select laa.appeal_people_name appealPeopleName,laa.claimant,lawo.work_order_number workOrderNumber,lawo.waybill_number waybillNumber,lawo.order_code orderCode,
+               lawo.work_order_type workOrderType,lawo.discovery_node discoveryNode,laa.types_of typesOf
+        from logpm_aftersales_appeal laa
+        LEFT JOIN logpm_aftersales_work_order lawo  on lawo.id = laa.work_order_id
+        <where>
+            <if test="param.appealPeopleName != null and param.appealPeopleName != ''">and laa.appeal_people_name  = #{param.appealPeopleName}</if>
+            <if test="param.claimant != null and param.claimant != ''">and laa.claimant = #{param.claimant}</if>
+            <if test="param.workOrderNumber != null and param.workOrderNumber != ''">and lawo.work_order_number  = #{param.workOrderNumber}</if>
+            <if test="param.waybillNumber != null and param.waybillNumber != ''">and lawo.waybill_number = #{param.waybillNumber}</if>
+            <if test="param.orderCode != null and param.orderCode != ''">and lawo.order_code = #{param.orderCode}</if>
+            <if test="param.workOrderType != null and param.workOrderType != ''">and lawo.work_order_type = #{param.workOrderType}</if>
+            <if test="param.discoveryNode != null and param.discoveryNode != ''">and lawo.discovery_node = #{param.discoveryNode}</if>
+            <if test="param.typesOf != null and param.typesOf != ''">and laa.types_of = #{param.typesOf}</if>
+        </where>
+    </select>
 
 </mapper>

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

@@ -56,5 +56,5 @@ public interface IAftersalesAbnormalPackageService extends BaseService<Aftersale
 	 * @param page
 	 * @return
 	 */
-    AftersalesAbnormalPackageVO getAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page);
+    List<AftersalesAbnormalPackageVO> getAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page);
 }

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<AftersalesAppealEn
 	 * @return
 	 */
 	boolean saveOrUpdateOwn(AftersalesAppealDTO aftersalesAppeal);
+
+	/**
+	 * 分页查询申述数据
+	 * @param page
+	 * @param aftersalesAppeal
+	 * @return
+	 */
+	IPage<AftersalesAppealVO> getListAppeal(IPage<Object> page, Map<String, Object> aftersalesAppeal);
 }

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<AftersalesWorkO
 	 * @return
 	 */
 	IPage<AftersalesSettlementEntity> getListSettlement(Map<String, Object> aftersalesWorkOrder, IPage<Object> page);
+
+	/**
+	 * 添加工单操作记录
+	 *
+	 * @return
+	 */
+	Boolean addSurveyRecord(Long workOrderId,String results,String difference);
+
+
+
+
+
+
+
+
+
 }

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

@@ -68,7 +68,7 @@ public class AftersalesAbnormalPackageServiceImpl extends BaseServiceImpl<Afters
 	 * @return
 	 */
 	@Override
-	public AftersalesAbnormalPackageVO getAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page) {
+	public List<AftersalesAbnormalPackageVO> getAbnormalPackage(Map<String, Object> aftersalesAbnormalPackage, IPage<Object> page) {
 		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
 
 		AftersalesAbnormalPackageEntity aftersalesAbnormalPackageEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesAbnormalPackage), AftersalesAbnormalPackageEntity.class);

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<AftersalesAppea
 	private final IAftersalesAppealPeopleService aftersalesAppealPeopleService;
 
 	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+	private final IAftersalesWorkOrderService  aftersalesWorkOrderService;
+
 
 	@Override
 	public IPage<AftersalesAppealVO> selectAftersalesAppealPage(IPage<AftersalesAppealVO> page, AftersalesAppealVO aftersalesAppeal) {
@@ -104,11 +116,18 @@ public class AftersalesAppealServiceImpl extends BaseServiceImpl<AftersalesAppea
 			//新增
 			AftersalesAppealEntity aftersalesAppealEntity = new AftersalesAppealEntity();
 			BeanUtil.copyProperties(aftersalesAppeal,aftersalesAppealEntity);
-			aftersalesAppeal.setClaimantUserId(user.getUserId());
-			aftersalesAppeal.setClaimant(user.getUserName());
-			aftersalesAppeal.setTypesOf("0");
-			aftersalesAppeal.setWarehouseId(myCurrentWarehouse.getId());
+			aftersalesAppealEntity.setClaimantUserId(user.getUserId());
+			aftersalesAppealEntity.setClaimant(user.getUserName());
+			aftersalesAppealEntity.setTypesOf("0");
+			aftersalesAppealEntity.setWarehouseId(myCurrentWarehouse.getId());
 			baseMapper.insert(aftersalesAppealEntity);
+			//修改工单状态
+			AftersalesWorkOrderEntity aftersalesWorkOrder = new AftersalesWorkOrderEntity();
+			aftersalesWorkOrder.setId(aftersalesAppeal.getWorkOrderId());
+			aftersalesWorkOrder.setWorkOrderStatus(WorkOrderStatusConstant.shenshuzhong.getValue());
+			aftersalesWorkOrderService.updateById(aftersalesWorkOrder);
+			//添加操作记录
+			aftersalesWorkOrderService.addSurveyRecord(aftersalesAppeal.getWorkOrderId(),"申述操作","3");
 
 		}
 		if(ObjectUtil.isNotNull( aftersalesAppeal.getPeopleEntityList())){
@@ -124,4 +143,23 @@ public class AftersalesAppealServiceImpl extends BaseServiceImpl<AftersalesAppea
 		return true;
 	}
 
+	/**
+	 * 查询申述数据
+	 * @param page
+	 * @param aftersalesAppeal
+	 * @return
+	 */
+	@Override
+	public IPage<AftersalesAppealVO> getListAppeal(IPage<Object> page, Map<String, Object> aftersalesAppeal) {
+		Condition.getQueryWrapper(aftersalesAppeal, AftersalesAppealEntity.class);
+		AftersalesAppealEntity aftersalesAppealEntity = JSONObject.parseObject(JSONObject.toJSONString(aftersalesAppeal), AftersalesAppealEntity.class);
+		IPage<AftersalesAppealVO> 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;
+	}
+
 }

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<AftersalesWo
 		return iPage;
 	}
 
+	@Override
+	public Boolean addSurveyRecord(Long workOrderId,String results,String difference) {
+		//添加跟踪记录
+		BladeUser user = AuthUtil.getUser();
+		AftersaleSurveyRecordDTO aftersaleSurveyRecordDTO = changName(null, user);
+		AftersaleSurveyRecordEntity surveyRecordEntity = new AftersaleSurveyRecordEntity();
+		BeanUtil.copyProperties(aftersaleSurveyRecordDTO,surveyRecordEntity);
+		surveyRecordEntity.setDifference(difference);
+		surveyRecordEntity.setTypesOf("1");
+		surveyRecordEntity.setWorkOrderId(workOrderId);
+		surveyRecordEntity.setProcessingResults(results);
+		aftersaleSurveyRecordService.save(surveyRecordEntity);
+		return null;
+	}
+
 	/**
 	 * 添加处理处理方信息
 	 * @param aftersalesWorkOrderDTO