优化

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/BgtProjectTaskProgress.java

@@ -61,6 +61,9 @@ public class BgtProjectTaskProgress implements Serializable {
 	@ApiModelProperty("用工数量")
 	private Integer taskStaffNum;
 
+	@ApiModelProperty("任务地址")
+	private String  taskAddress;
+
     /** 进度名称 */
     @Excel(name = "进度名称")
     @ApiModelProperty("进度名称")

ruoyi-system/src/main/java/com/ruoyi/bgt/domain/dto/BgtProjectTaskProgressDTO.java

@@ -47,6 +47,8 @@ public class BgtProjectTaskProgressDTO {
     @ApiModelProperty("进度名称")
     private String progressName;
 
+	@ApiModelProperty("任务地址")
+	private String  taskAddress;
 
     @ApiModelProperty("负责人")
     private String director;

ruoyi-system/src/main/java/com/ruoyi/bgt/service/impl/BgtProjectRecruitApplyServiceImpl.java

@@ -198,8 +198,7 @@ public class BgtProjectRecruitApplyServiceImpl extends ServicePlusImpl<BgtProjec
 			.setSubheading(map.get(SUBHEADING))
 			.setTableId(recruitApply.getId())
 			.setTableName(SqlHelper.table(BgtProjectRecruitApply.class).getTableName())
-			.setMessageLargeType(LARGE_APPLY)
+			.setMessageLargeType(LARGE_APPLY);
-			.setMessageSmallType(SMALL_SYSTEM);
 		iWgzMessageService.sendAMessage(wgzMessage);
 		return updateById(recruitApply);
 	}

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

@@ -94,6 +94,9 @@ public class AppTaskDetailVO {
 	@ApiModelProperty("任务进度")
 	private Integer progress;
 
+	@ApiModelProperty("任务进度")
+	private Double progressDouble;
+
 	//结算情况
 	@ApiModelProperty("任务收款金额")
 	private Integer taskReceiveAmount;

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

@@ -60,5 +60,5 @@ public class AppTaskVO {
 	private Integer applyNum;
 
 	@ApiModelProperty("任务收款金额")
-	private Integer taskReceiveAmount;
+	private Integer taskReceiveAmount = 0;
 }

ruoyi-system/src/main/java/com/ruoyi/fbs/service/IFbsProjectTaskService.java

@@ -62,6 +62,9 @@ public interface IFbsProjectTaskService extends IServicePlus<FbsProjectTask> {
 	 */
 	TableDataInfo<AppTaskVO> appQueryPageList(AppTaskDTO dto);
 
+	/**
+	 * App包工头任务列表（不分页）
+	 */
 	List<AppTaskVO> appQueryList();
 
 	/**

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

@@ -156,7 +156,7 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
 		Page<AppTaskVO> appTaskVOPage = baseMapper.appQueryPageList(appTaskDTOPage, dto);
 		if(dto.getMyTask() && ProjectTaskStatus.APPLY.getCode().equals(dto.getStatus())
 			&&CollectionUtil.isEmpty(taskIds)){
-			appTaskVOPage.setRecords(new ArrayList<AppTaskVO>());
+			appTaskVOPage.setRecords(new ArrayList<>());
 			appTaskVOPage.setTotal(0);
 		}
 		return PageUtils.buildDataInfo(appTaskVOPage);
@@ -183,8 +183,10 @@ public class FbsProjectTaskServiceImpl extends ServicePlusImpl<FbsProjectTaskMap
 		if(ProjectTaskStatus.PROGRESS.getCode().equals(byId.getStatus())
 			|| ProjectTaskStatus.COMPLETE.getCode().equals(byId.getStatus())){
 			//任务进度
-			appTaskDetailVO.setProgress(progressService.getLastProgress(id));
+			Integer lastProgress = progressService.getLastProgress(id);
-
+			appTaskDetailVO.setProgress(lastProgress);
+			BigDecimal bd = new BigDecimal(lastProgress).divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
+			appTaskDetailVO.setProgressDouble(bd.doubleValue());
 			//结算情况
 			//收款申请列表
 			BgtWageApplicationQueryDTO wageDTO = new BgtWageApplicationQueryDTO();

ruoyi-system/src/main/java/com/ruoyi/wgz/service/impl/WgzPayCalculationServiceImpl.java

@@ -298,8 +298,7 @@ public class WgzPayCalculationServiceImpl extends ServicePlusImpl<WgzPayCalculat
 			.setSubheading(map.get(SUBHEADING))
 			.setTableId(payCalculation.getId())
 			.setTableName(SqlHelper.table(WgzPayCalculation.class).getTableName())
-			.setMessageLargeType(LARGE_SALARY)
+			.setMessageLargeType(LARGE_SALARY);
-			.setMessageSmallType(SMALL_SYSTEM);
 		wgzMessageService.sendAMessage(wgzMessage);
 		return updateById(payCalculation);
 	}

ruoyi-system/src/main/resources/mapper/bgt/BgtProjectTaskProgressMapper.xml

@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bptp.uploader,
                bptp.progress,
                bptp.audit_status,
-               bptp.create_time,
+               bptp.upload_time,
                bptp.task_staff_num,
                bptp.task_name,
                bptp.project_name

ruoyi-system/src/main/resources/mapper/fbs/FbsProjectTaskMapper.xml

@@ -79,6 +79,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and fpt.status = #{dto.status}
         </if>
         </where>
+        order by fpt.create_time desc
     </select>
 
 </mapper>