Merge remote-tracking branch 'origin/develop' into develop

yifu-insurances/yifu-insurances-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/insurances/service/insurance/impl/TInsuranceDetailServiceImpl.java

@@ -3704,6 +3704,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 			param.setMId(mId);
 		}
 		param.setCreateBy(user.getId());
+		//设置updateBy字段是给导出使用的
+		param.setUpdateBy(user.getId());
 		menuUtil.setAuthSql(user, param);
 		if (Common.isNotNull(param.getAuthSql()) && param.getAuthSql().contains("1=2 CONCAT")) {
 			param.setAuthSql(param.getAuthSql().replace("1=2 CONCAT", "CONCAT"));
@@ -3711,7 +3713,7 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
 		List<RefundExportListVo> refundExportList;
 		//如果是待减员状态，sql中UPDATE_BY过滤条件不需要，这里强制变为null
 		if(param.getReduceHandleStatus() == CommonConstants.ONE_INT){
-			param.setCreateBy(null);
+			param.setUpdateBy(null);
 		}
 		//如勾选项不为空，则导出勾选记录；否则导出当前筛选条件下 && 「待减员」的结果集
 		if (CollectionUtils.isNotEmpty(param.getIdList())){

yifu-insurances/yifu-insurances-biz/src/main/resources/mapper/insurances/TInsuranceDetailMapper.xml

@@ -1025,8 +1025,8 @@
 		<if test="param.insuranceCompanyName != null and param.insuranceCompanyName.trim() != ''">
 			and a.INSURANCE_COMPANY_NAME = #{param.insuranceCompanyName}
 		</if>
-		<if test="param.createBy != null and param.createBy.trim() != ''">
-			and  refund.UPDATE_BY = #{param.createBy}
+		<if test="param.updateBy != null and param.updateBy.trim() != ''">
+			and  refund.UPDATE_BY = #{param.updateBy}
 		</if>
 		<if test="param.authSql != null and param.authSql.trim() != ''">
 			${param.authSql}

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/service/impl/TSalaryStandardServiceImpl.java

@@ -856,6 +856,7 @@ public class TSalaryStandardServiceImpl extends ServiceImpl<TSalaryStandardMappe
 			List<TSalaryAccount> salaryAccountList = salaryAccountService.getListByIncome(id);
 			if (salaryAccountList != null && !salaryAccountList.isEmpty()) {
 				// 将重置生成推送时间
+				tSalaryStandard.setStatus(CommonConstants.dingleDigitIntArray[11]);
 				tSalaryStandard.setIncomeStartTime(new Date());
 				tSalaryStandard.setIncomeEndTime(null);
 				this.updateById(tSalaryStandard);