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

yifu-common/yifu-common-core/src/main/java/com/yifu/cloud/plus/v1/yifu/common/core/util/DateUtil.java

@@ -1600,26 +1600,30 @@ public class DateUtil {
           }
      }
 
-	public static boolean isDate(String dateText,String format) {
+	public static boolean isDate(String dateText) {
 		if (dateText == null) {
-			return false;
+			return true;
 		}
 		DateFormat df = null;
 		try {
-
-			if (format != null) {
-				df = new SimpleDateFormat(format);
-			} else {
+			if (dateText.indexOf("-") >= 0) {
+				df = new SimpleDateFormat(ISO_EXPANDED_DATE_FORMAT);
+				df.setLenient(false);
+				df.parse(dateText);
+			}else if (dateText.indexOf("/") >= 0) {
+				df = new SimpleDateFormat(DateUtil.DATETIME_PATTERN_XIEGANG);
+				df.setLenient(false);
+				df.parse(dateText);
+			}else{
 				df = new SimpleDateFormat(ISO_DATE_FORMAT);
-			}
-
 				df.setLenient(false);
 				df.parse( dateText.replace("/","").replace("-","")
 						.replace(CommonConstants.YEAR,"").replace(CommonConstants.MONTH,"")
 						.replace(CommonConstants.DAY,""));
-		} catch (ParseException e) {
-			return false;
 			}
+		} catch (ParseException e) {
 			return true;
 		}
+		return false;
+	}
 }

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

@@ -39,6 +39,12 @@ public class OrderDetailVO implements Serializable {
 	@Schema(description = "项目编码")
 	private String deptNo;
 
+	/**
+	 * 项目ID
+	 */
+	@Schema(description = "项目ID")
+	private String deptId;
+
 	/**
 	 * 项目名称
 	 */

yifu-social/yifu-social-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/social/controller/TDispatchInfoController.java

@@ -616,7 +616,7 @@ public class TDispatchInfoController {
 	@PostMapping("/doexportFundRecordChange")
 	@Operation(description = "导出公积金变更清册 hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
 	@SysLog("导出公积金变更清册")
-	@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
+	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
 	public void doexportFundRecordChange(HttpServletResponse response, HttpServletRequest request,
 										 @RequestBody SocialHandleSearchVo searchVo) {
 		YifuUser user = SecurityUtils.getUser();
@@ -637,7 +637,7 @@ public class TDispatchInfoController {
 	@GetMapping("/doExportFundSupplementaryRecord")
 	@Operation(description = "导出公积金补缴清册 hasPermission('wxhr:tdispatchinfo_doExportFundSupplementaryRecord')")
 	@SysLog("导出公积金补缴清册")
-	@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doExportFundSupplementaryRecord')")
+	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doExportFundSupplementaryRecord')")
 	public R<List<FundSupplementaryExportVo>> doExportFundSupplementaryRecord(HttpServletResponse response, HttpServletRequest request,
 																			  @RequestParam(name = "idStr", required = false) String idStr,
 																			  @RequestBody SocialHandleSearchVo searchVo) {
@@ -765,7 +765,7 @@ public class TDispatchInfoController {
 	@PostMapping("/doexportMedicalInfo")
 	@Operation(description = "导出医保花名册")
 	@SysLog("导出医保花名册")
-	@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
+	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
 	public void doexportMedicalInfo(HttpServletResponse response, HttpServletRequest request,
 										 @RequestBody SocialHandleSearchVo searchVo) {
 		YifuUser user = SecurityUtils.getUser();
@@ -787,7 +787,7 @@ public class TDispatchInfoController {
 	@PostMapping("/doexportPensionInfo")
 	@Operation(description = "导出三险花名册")
 	@SysLog("导出三险花名册")
-	@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
+	//@PreAuthorize("@pms.hasPermission('wxhr:tdispatchinfo_doexportFundRecordChange')")
 	public void doexportPensionInfo(HttpServletResponse response, HttpServletRequest request,
 									@RequestBody SocialHandleSearchVo searchVo) {
 		YifuUser user = SecurityUtils.getUser();

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

@@ -759,8 +759,7 @@ public class TPreDispatchInfoServiceImpl extends ServiceImpl<TPreDispatchInfoMap
 			if (checkAddRepeat(errorList, existsMap, i, info)) {
 				continue;
 			}
-			if (Common.isNotNull(info.getLeaveDate())
-					&& DateUtil.isDate(info.getLeaveDate(),DateUtil.ISO_EXPANDED_DATE_FORMAT)){
+			if (Common.isNotNull(info.getLeaveDate()) && DateUtil.isDate(info.getLeaveDate())){
 				errorList.add(new ErrorMessage(i, PreDispatchConstants.LEAVE_DATE_FORMAT_ERROR));
 				continue;
 			}

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

@@ -1254,17 +1254,6 @@
 		</where>) a
 	</select>
 
-	<!--tDispatchInfo 社保花名册派单数据count-->
-	<select id="getSocialDisRecordCount" resultType="java.lang.Integer">
-		SELECT count(1) from (
-		SELECT 1
-		FROM t_dispatch_info a
-		<where>
-			<include refid="where_getSocialDisRecord"/>
-		</where>
-		group by a.EMP_IDCARD) h
-	</select>
-
 	<select id="getFCount" resultType="java.lang.Integer">
 		SELECT count(1) from (
 		SELECT 1

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

@@ -492,7 +492,6 @@
 			<if test="tPaymentInfo.providentPayAddr != null and tPaymentInfo.providentPayAddr.trim() != ''">
 				AND a.PROVIDENT_PAY_ADDR = #{tPaymentInfo.providentPayAddr}
 			</if>
-
 			<!-- 区域 默认精准查询 0    包含下级查询 1 开始 2023-03-02 fxj -->
 			<if test='tPaymentInfo.areaFlag == null || tPaymentInfo.areaFlag == "1"'>
 				<if test="tPaymentInfo.socialTown == null">
@@ -678,6 +677,9 @@
 				</foreach>
 			</if>
 			<if test="tPaymentInfo.idList == null">
+				<if test="tPaymentInfo.pushStatus != null and tPaymentInfo.pushStatus.trim() != ''">
+					AND a.PUSH_STATUS = #{tPaymentInfo.pushStatus}
+				</if>
 				<if test="tPaymentInfo.id != null and tPaymentInfo.id.trim() != ''">
 					AND a.ID = #{tPaymentInfo.id}
 				</if>