Merge branch 'MVP1.5.5' into MVP1.5.6

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/vo/TSettleDomainEkpVo.java

@@ -441,4 +441,10 @@ public class TSettleDomainEkpVo  implements Serializable {
 	 */
 	@Schema(description = "BU归属")
 	private String buBelong;
+
+	@Schema(description = "一级指标归属",name = "firstIndicatorBelong")
+	private String firstIndicatorBelong ;
+
+	@Schema(description = "二级指标归属",name = "secondIndicatorBelong")
+	private String secondIndicatorBelong ;
 }

yifu-job/yifu-job-api/src/main/java/com/yifu/cloud/plus/v1/job/compont/MsgTask.java

@@ -37,5 +37,20 @@ public class MsgTask {
 				"/msg/inner/updateOverTimeMsg", "", Object.class,
 				SecurityConstants.FROM_IN);
 		log.info("-------------每29分钟刷新 超时待办提醒定时任务结束------------");
+
+	}
+	/**
+	 * @Author wzb
+	 * @Description 每29分钟刷新 薪资状态变更待支出提醒
+	 * @Date 17:23 2023/7/3
+	 * @Param
+	 * @return
+	 **/
+	public void createChangeStatusMsg() {
+		log.info("-------------每29分钟刷新 薪资状态变更待支出提醒-定时任务开始------------");
+		HttpDaprUtil.invokeMethodPost(daprMsgProperties.getAppUrl(), daprMsgProperties.getAppId(),
+				"/msg/inner/statusChangeTimeMsg", "", Object.class,
+				SecurityConstants.FROM_IN);
+		log.info("-------------每29分钟刷新 薪资状态变更待支出提醒定时任务结束------------");
 	}
 }
\ No newline at end of file

yifu-msg/yifu-msg-api/src/main/java/com/yifu/cloud/plus/v1/msg/entity/MsgInfo.java

@@ -74,7 +74,7 @@ public class MsgInfo {
 	@ExcelAttribute(name = "0 接单 1 超时 2变更", maxLength = 1)
 	@Length(max = 1, message = "0 接单 1 超时 2变更不能超过1个字符")
 	@ExcelProperty("0 接单 1 超时 2变更")
-	@Schema(description = "0 接单 1 超时 2变更")
+	@Schema(description = "0 接单 1 超时 2变更 3薪资状态待支出")
 	private String alertType;
 
 	/**

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/controller/MsgInfoController.java

@@ -89,4 +89,19 @@ public class MsgInfoController {
 	public void updateOverTimeMsg() {
 		msgInfoService.updateOverTimeMsg();
 	}
+
+
+	/**
+	 * @Author wzb
+	 * @Description 每29分钟刷新 薪资状态变更待支出提醒
+	 * @Date 14:29 2023/7/3
+	 * @Param
+	 * @return
+	 **/
+	@Operation(summary = "每29分钟刷新 -薪资状态变更待支出提醒", description = "每29分钟刷新 薪资状态变更待支出提醒")
+	@Inner
+	@PostMapping("/inner/statusChangeTimeMsg")
+	public void statusChangeTimeMsg() {
+		msgInfoService.statusChangeTimeMsg();
+	}
 }

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/mapper/MsgInfoMapper.java

@@ -45,5 +45,8 @@ public interface MsgInfoMapper extends BaseMapper<MsgInfo> {
 
 	List<MsgInfo> getMsgByTask();
 
+
+	List<MsgInfo> getMsgByTaskOne();
+
 	List<MsgInfo> getMsgInfo(@Param("msgInfo") MsgInfo msgInfo);
 }

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/MsgInfoService.java

@@ -44,4 +44,6 @@ public interface MsgInfoService extends IService<MsgInfo> {
 	R<Boolean> createMsg(EkpAlertVo vo);
 
 	void updateOverTimeMsg();
+
+	void statusChangeTimeMsg();
 }

yifu-msg/yifu-msg-biz/src/main/java/com/yifu/cloud/plus/v1/msg/service/impl/MsgInfoServiceImpl.java

@@ -169,4 +169,50 @@ public class MsgInfoServiceImpl extends ServiceImpl<MsgInfoMapper, MsgInfo> impl
 			}
 		}
 	}
+
+	/**
+	 * @Author wzb
+	 * @Description 薪资状态变更待支出提醒
+	 * @Date 14:58 2023/7/3
+	 * @Param
+	 * @return
+	 **/
+	@Transactional
+	@Override
+	public void statusChangeTimeMsg(){
+		// 1. 删除未读的待支出状态变更，如果有继续生成
+		baseMapper.delete(Wrappers.<MsgInfo>query().lambda()
+				.eq(MsgInfo::getReadStatus,CommonConstants.ZERO_STRING)
+				.eq(MsgInfo::getAlertType,CommonConstants.THREE_STRING));
+		List<MsgInfo>  temps = baseMapper.selectList(Wrappers.<MsgInfo>query().lambda()
+				.eq(MsgInfo::getAlertType,CommonConstants.THREE_STRING)
+				.eq(MsgInfo::getReadStatus,CommonConstants.ONE_STRING));
+		Map<String,MsgInfo> tempMap = new HashMap<>();
+		if (Common.isNotNull(temps)){
+			for (MsgInfo msg:temps){
+				tempMap.put(msg.getOrderNo(),msg);
+			}
+		}
+		List<MsgInfo>  msgInfos = baseMapper.getMsgByTaskOne();
+		List<MsgInfo>  saves = new ArrayList<>();
+		if (Common.isNotNull(msgInfos)){
+			//2. 重新生成
+			MsgInfo temp;
+			for (MsgInfo ms:msgInfos){
+				temp = tempMap.get(ms.getOrderNo());
+				if (Common.isNotNull(temp)){
+					tempMap.remove(ms.getOrderNo());
+					continue;
+				}
+				ms.setCreateTime(LocalDateTime.now());
+				ms.setUrl(MesConstants.orderUrl+ms.getOrderId());
+				saves.add(ms);
+			}
+			if (Common.isNotNull(tempMap)){
+				this.removeByIds(tempMap.values());
+			}
+			this.saveBatch(saves);
+		}
+	}
+
 }

yifu-msg/yifu-msg-biz/src/main/resources/mapper/MsgInfoMapper.xml

@@ -129,4 +129,22 @@
 		) x
 		where x.date1 > date2
 	</select>
+
+	<select id="getMsgByTaskOne"  resultMap="msgInfoMap">
+		SELECT
+			b1.fd_3ac901ba3b9d3e domain_name,
+			o.fd_no ALERT_USER,
+			b1.fd_3ac901c5184274 ORDER_NO,
+			b1.fd_id ORDER_ID,
+			'3' AS ALERT_TYPE
+		FROM
+			lbpm_workitem a
+				LEFT JOIN lbpm_node  e ON e.fd_id = a.fd_node_id
+				LEFT JOIN lbpm_process p ON p.fd_id = e.fd_process_id
+				LEFT JOIN ekp_ea33075576149bb8a4f5 b1 ON p.fd_model_id = b1.fd_id
+				LEFT JOIN sys_org_element o ON o.fd_id = fd_expected_id
+		WHERE
+			b1.fd_3bddc3d6c8a734 = '待支出'
+		  AND b1.fd_id IS NOT NULL
+	</select>
 </mapper>

yifu-order/yifu-order-biz/src/main/resources/application.yml

@@ -71,7 +71,7 @@ spring:
       #所有上传文件最大大小
       max-request-size: 100MB
       #单个文件最大大小
-      max-file-size: 50MB
+      max-file-size: 100MB
 #swagger 文档 https://springdoc.org/
 ### OpenAPI3 注解
 #  OpenAPI 3	                            注解位置

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

@@ -2277,21 +2277,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 				return true;
 			}
 			// 如果没有人员档案和项目档案的时候校验身份证和手机号码
-//			R<Boolean> checkRes = checkDaprUtil.checkIdCardAndMobile(excel.getEmpName(),excel.getEmpIdcard(),excel.getEmpMobile());
-//			if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
-//				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
-//				return true;
-//			}
-//			// 校验手机号码重复
-//			checkRes = archivesDaprUtil.checkMobile(excel.getEmpMobile());
-//			if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
-//				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
-//				return true;
-//			}
-//			if (checkRes.getData().booleanValue()){
-//				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_MOBILE_REPEAT)));
-//				return true;
-//			}
+			R<Boolean> checkRes = checkDaprUtil.checkIdCardAndMobile(excel.getEmpName(),excel.getEmpIdcard(),excel.getEmpMobile());
+			if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
+				return true;
+			}
+			// 校验手机号码重复
+			checkRes = archivesDaprUtil.checkMobile(excel.getEmpMobile());
+			if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
+				return true;
+			}
+			if (checkRes.getData().booleanValue()){
+				errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_MOBILE_REPEAT)));
+				return true;
+			}
 		}
 		Date contractDateTemp = excel.getContractStart();
 		/*项目档案有可用状态的合同：
@@ -2340,12 +2340,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
 			if (Common.isNotNull(empVo.getEmpPhone()) && Common.isEmpty(excel.getEmpMobile())){
 				excel.setEmpMobile(empVo.getEmpPhone());
 			}
-//			// 如果存在档案但是手机号码不为空校验号码
-//			if (Common.isNotNull(excel.getEmpMobile())
-//					&& !excel.getEmpMobile().equals(empVo.getEmpPhone())
-//					&& checkMobileAndIdcard(errorMessageList, excel)){
-//				return true;
-//			}
+			// 如果存在档案但是手机号码不为空校验号码
+			if (Common.isNotNull(excel.getEmpMobile())
+					&& !excel.getEmpMobile().equals(empVo.getEmpPhone())
+					&& checkMobileAndIdcard(errorMessageList, excel)){
+				return true;
+			}
 			// 档案地  手机号码， 派单有数据 更新档案，派单没有 有档案取值档案数据
 			if (Common.isEmpty(excel.getFileProvince())){
 				excel.setFileProvince(Common.isNotNullToStr(empVo.getFileProvince()));