Merge remote-tracking branch 'origin/MVP1.5.4' into MVP1.5.4

yifu-archives/yifu-archives-biz/src/main/resources/mapper/TEmployeeRetirementMapper.xml

@@ -247,6 +247,7 @@
 			or (datediff(#{pp}, b.EMP_BIRTHDAY) = 0 and b.EMP_SEX = '2'))
 		  and b.FILE_STATUS = 0 and a.EMP_NATRUE in ('0','1','3')
 		   and a.PROJECT_STATUS = 0
+		   and a.DELETE_FLAG=0
 		GROUP BY a.EMP_IDCARD,
 				 a.DEPT_NO
 	</select>

yifu-common/yifu-common-ekp/src/main/java/com/yifu/cloud/plus/v1/yifu/ekp/util/EkpOrderUtil.java

@@ -24,7 +24,7 @@ import java.util.List;
 
 /**
  * @author licancan
- * @description 对接ekp订单
+ * @description 对接ekp订
  * @date 2022-08-31 15:35:20
  */
 @Log4j2

yifu-order/yifu-order-api/src/main/java/com/yifu/cloud/plus/v1/yifu/order/vo/OrderAddVO.java

@@ -356,70 +356,6 @@ public class OrderAddVO implements Serializable {
 
 
 
-	/**
-	 * 工资附件
-	 */
-	@Schema(description = "附件")
-	private MultipartFile[] wageFile;
-
-
-	/**
-	 * 薪资附件
-	 */
-	@Schema(description = "附件")
-	private MultipartFile[] salaryFile;
-
-	/**
-	 * 社保附件
-	 */
-	@Schema(description = "附件")
-	private MultipartFile[] socialFile;
-
-	/**
-	 * 公积金附件
-	 */
-	@Schema(description = "附件")
-	private MultipartFile[] fundFile;
-
-	/**
-	 * 商险附件
-	 */
-	@Schema(description = "附件")
-	private MultipartFile[] insuranceFile;
-
-	/**
-	 * 代扣附件
-	 */
-	@Schema(description = "代扣附件")
-	private MultipartFile[] withHoldingFile;
-
-	/**
-	 * 代扣附件
-	 */
-	@Schema(description = "代收附件")
-	private MultipartFile[] collectionFile;
-
-	/**
-	 * 代扣附件
-	 */
-	@Schema(description = "非扣税附件")
-	private MultipartFile[] noTaxFile;
-
-	/**
-	 * 其他
-	 */
-	@Schema(description = "其他")
-	private MultipartFile[] otherFile;
-
-
-	/**
-	 * 薪资交接手册
-	 */
-	@Schema(description = "非扣税附件")
-	private MultipartFile[]  salaryHandoverFile;
-
-
-
 
 
 }