1.考核-指标管理按钮权限修复

blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/entity/IndicatorsEntity.java

@@ -45,5 +45,7 @@ public class IndicatorsEntity  extends TenantEntity {
 	@ApiModelProperty(value = "异议备注")
 	private String objectionRemark;
 
+	@ApiModelProperty(value = "申述原因")
+	private String appealReason;
 
 }

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

@@ -29,6 +29,7 @@ import com.logpm.distribution.vo.DistributionStockArticleVO;
 import com.logpm.distribution.vo.DistributionStockListVO;
 import com.logpm.distribution.vo.app.DistributionAppReservationVO;
 import com.logpm.distribution.vo.app.DistributionAppStockArticleVO;
+import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -40,6 +41,7 @@ import java.util.Map;
  * @author TJJ
  * @since 2023-06-16
  */
+@Mapper
 public interface DistributionDeliveryInfoMapper extends BaseMapper<DistributionDeliveryInfoEntity> {
 
 	/**

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

@@ -25,7 +25,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.logpm.aftersales.vo.AftersalesAbnormalPackageVO;
 import com.logpm.basic.entity.BasicPrintTemplateEntity;
 import com.logpm.basic.feign.IBasicPrintTemplateClient;
@@ -73,7 +72,6 @@ import org.springblade.common.constant.order.OrderStatusConstant;
 import org.springblade.common.constant.orderpackage.*;
 import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant;
 import org.springblade.common.constant.reservation.*;
-import org.springblade.common.constant.signing.SignforDriverSigningStatusConstant;
 import org.springblade.common.constant.signing.SignforStatusConstant;
 import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
@@ -6157,6 +6155,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			Long deliveryListEntityId = deliveryListEntity.getId();
 			String taskTime = deliveryListEntity.getTaskTime();//配送时间
 			String kind = deliveryListEntity.getKind();
+			String trainNumber = deliveryListEntity.getTrainNumber();
 			Map<String, String> driverCar = getDriverCar(kind, deliveryListEntityId);
 			String dirverName = driverCar.get("dirverName");
 			String dirverPhone = driverCar.get("dirverPhone");
@@ -6168,9 +6167,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			for (DistributionReservationEntity reservationEntity : distributionReservationEntityList) {
 				Map<String, Object> map = new HashMap<>();
 				map.put("配送单号", reservationEntity.getReservationCode());
+				map.put("车次号", trainNumber);
 				String fileTypeName = QRCodeUtil.createCodeToFile(reservationEntity.getReservationCode());
 				map.put("配送单二维码", QRCodeUtil.getEmpAutograph(fileTypeName));
-				map.put("收货单单位", reservationEntity.getReceivingUnit());//收货单单位
+				map.put("收货单位", reservationEntity.getReceivingUnit());//收货单单位
 				map.put("商城名称", reservationEntity.getStoreName());//商场名称
 				map.put("收货人", reservationEntity.getConsignee());//收货人
 				map.put("联系电话", reservationEntity.getDeliveryPhone());//收货人电话

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/mapper/IndicatorsMapper.xml

@@ -15,6 +15,7 @@
                si.assess_user_name assessUserName,
                si.point point,
                si.remark remark,
+               si.appeal_reason appealReason,
                si.indicators_status indicatorsStatus,
                si.is_objection isObjection,
                si.objection_remark objectionRemark,

blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/IndicatorsServiceImpl.java

@@ -110,6 +110,7 @@ public class IndicatorsServiceImpl extends BaseServiceImpl<IndicatorsMapper, Ind
 		indicatorsEntity.setPoint(indicatorsDTO.getPoint());
 		indicatorsEntity.setRemark(indicatorsDTO.getRemark());
 		indicatorsEntity.setObjectionRemark(indicatorsDTO.getObjectionRemark());
+		indicatorsEntity.setAppealReason(indicatorsDTO.getAppealReason());
 
 		updateById(indicatorsEntity);
 		return R.success("更新成功");