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

yifu-archives/yifu-archives-api/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/entity/TProveRecord.java

@@ -206,6 +206,7 @@ public class TProveRecord extends Model<TProveRecord> {
 	 * 合同结束时间
 	 */
 	@Schema(description = "合同结束时间")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	private Date contractEndDate;
 	/**
 	 * 入职时间

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/SalaryProveController.java

@@ -183,7 +183,7 @@ public class SalaryProveController {
 					WageProofDto pd = new WageProofDto();
 					pd.setStartMouth(startDate);
 					pd.setEndMouth(endDate);
-					pd.setEmIdCard(em.getEmpIdcard());
+					pd.setEmIdCard(record.getEmployeeIdCard());
 					pd.setSumType(sumType);
 					R<WageProofDto> wpR = HttpDaprUtil.invokeMethodPost(daprSalaryProperties.getAppUrl(), daprSalaryProperties.getAppId()
 							, "/tsalaryaccount/inner/findAverageSalaryForProve", pd, WageProofDto.class, SecurityConstants.FROM_IN);
@@ -283,7 +283,7 @@ public class SalaryProveController {
 		record.setCreatUserName(user.getNickname());
 		record.setIsInvalid(CommonConstants.ZERO_STRING);
 		tProveRecordService.saveNo(record);//保存并自动生成编号
-		return new R(record.getNo());
+		return R.ok(record.getNo());
 	}
 
 	/**
@@ -330,7 +330,6 @@ public class SalaryProveController {
 		} else {
 			return R.failed("id不能为空！");
 		}
-
 	}
 
 	/**

yifu-salary/yifu-salary-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/salary/controller/TSalaryAccountController.java

@@ -329,7 +329,7 @@ public class TSalaryAccountController {
 	 **/
 	@Inner
 	@PostMapping("/inner/findAverageSalaryForProve")
-	public WageProofDto findAverageSalaryForProve(WageProofDto pd) {
+	public WageProofDto findAverageSalaryForProve(@RequestBody WageProofDto pd) {
 		return getWageProofDtoR(pd.getStartMouth(), pd.getEndMouth(), pd.getEmIdCard(), pd.getSumType(), null);
 	}