优化

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/FbsProjectTask.java

@@ -61,13 +61,11 @@ public class FbsProjectTask implements Serializable {
     /** 任务金额 */
     @Excel(name = "任务金额")
     @ApiModelProperty("任务金额")
-	@Pattern(regexp = "^[0-9]+(\\.[0-9]{1,2})?$",message = "只能两位小数的数字")
     private BigDecimal taskAmount;
 
     /** 用工数量 */
     @Excel(name = "用工数量")
     @ApiModelProperty("用工数量")
-	@Pattern(regexp = "^[0-9]+$",message = "只能是整数")
     private Integer taskStaffNum;
 
     /** 任务开始时间 */

ruoyi-system/src/main/java/com/ruoyi/fbs/domain/vo/AppTaskDetailWageVO.java

@@ -28,4 +28,7 @@ public class AppTaskDetailWageVO {
 	@ApiModelProperty("任务金额")
 	private BigDecimal taskAmount;
 
+	@ApiModelProperty("付款总金额")
+	private BigDecimal payAmount;
+
 }

ruoyi-system/src/main/java/com/ruoyi/fbs/service/impl/FbsProjectTaskServiceImpl.java

@@ -253,6 +253,9 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
 		//付款金额
 		BigDecimal payByTaskAndBgt = payCalculationService.getPayByTaskAndBgt(id, SecurityUtils.getAppUserId());
 		appTaskDetailVO.setTaskPaymentAmount(payByTaskAndBgt);
+
+		BigDecimal taskPay = attendanceService.getTaskPay(id, SecurityUtils.getAppUserId());
+		appTaskDetailVO.setPayAmount(taskPay);
 		return appTaskDetailVO;
 	}