派单优化修改

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/entity/TDispatchInfo.java

@@ -63,6 +63,15 @@ public class TDispatchInfo extends BaseEntity {
 	@ExcelProperty("派单申请编码" )
 	private String dispatchCode;
 
+	/**
+	 * 重新派单号
+	 */
+	@ExcelAttribute(name = "重新派单号", maxLength = 30)
+	@Schema(description = "重新派单号" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("重新派单号" )
+	private String againDispatchCode;
+
 	/**
 	 * 员工ID
 	 */

yifu-social/yifu-social-api/src/main/java/com/yifu/cloud/plus/v1/yifu/social/vo/TDispatchReduceVo.java

@@ -110,4 +110,13 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
 	@ExcelProperty("委托备注" )
 	private String trustRemark;
 
+	/**
+	 * 是否是失败项重新派单 0 是
+	 */
+	@ExcelAttribute(name = "是否是失败项重新派单")
+	@Schema(description = "是否是失败项重新派单" )
+	@HeadFontStyle(fontHeightInPoints = 11)
+	@ExcelProperty("是否是失败项重新派单" )
+	private String isAgainFlag;
+
 }

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/service/impl/TDispatchInfoServiceImpl.java

@@ -2724,6 +2724,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			try {
 				dispatch.setOrderId(orderId);
 				dispatch.setApplyNo(getApplyCode());
+				if (CommonConstants.ZERO_STRING.equals(excel.getIsAgainFlag())) {
+					dispatch.setAgainDispatchCode(dispatch.getApplyNo());
+				}
 				dispatch.setStatus(CommonConstants.ONE_STRING);
 				baseMapper.insert(dispatch);
 				socialFundMapper.updateById(socialFund);

yifu-social/yifu-social-biz/src/main/resources/mapper/TDispatchInfoMapper.xml

@@ -85,6 +85,7 @@
 	<result property="settleDomainCode" column="SETTLE_DOMAIN_CODE"/>
     <result property="belongUnitName" column="BELONG_UNIT_NAME"/>
 	<result property="dispatchCode" column="DISPATCH_CODE"/>
+	<result property="againDispatchCode" column="AGAIN_DISPATCH_CODE"/>
 	<result property="contractSubName" column="CONTRACT_SUB_NAME"/>
 	<result property="contractId" column="CONTRACT_ID"/>
 	<result property="educationName" column="EDUCATION_NAME"/>
@@ -280,6 +281,7 @@
 		a.SETTLE_DOMAIN_NAME,
 		a.BELONG_UNIT_NAME,
 		a.DISPATCH_CODE,
+		a.AGAIN_DISPATCH_CODE,
 		a.SETTLE_DOMAIN_CODE,
 		a.CONTRACT_SUB_NAME,
 		a.CONTRACT_ID,