diff --git a/src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java b/src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java index 05792ee..6d02880 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/dao/ProProgressDao.java @@ -113,4 +113,13 @@ public interface ProProgressDao { * @date 2025/4/22 15:03 */ void updateProProgress(ProProgressVo.UpdateRecordVo vo); + + /** + * 更新杆塔进度 + * @param vo + * @return void + * @author cwchen + * @date 2025/4/23 14:46 + */ + void updateTower(ProProgressVo.UpdateRecordVo vo); } diff --git a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java index c2f6cf2..c208854 100644 --- a/src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java +++ b/src/main/java/com/bonus/digitalSignage/backstage/service/impl/ProProgressServiceImpl.java @@ -121,13 +121,18 @@ public class ProProgressServiceImpl implements ProProgressService { @Override public ServerResponse getGxData(QueryParamDto dto) { + Map map = new HashMap<>(2); List list = null; + ProProgressVo.ProDetailVo vo = null; try { list = Optional.ofNullable(dao.getGxData(dto)).orElseGet(ArrayList::new); + vo = Optional.ofNullable(dao.getTowerProgress(dto)).orElseGet(ProProgressVo.ProDetailVo::new); } catch (Exception e) { log.error(e.toString(), e); } - return ServerResponse.createSuccess(list); + map.put("list", list); + map.put("vo", vo); + return ServerResponse.createSuccess(map); } @Override @@ -151,11 +156,12 @@ public class ProProgressServiceImpl implements ProProgressService { // 计算更新后的进度 double progress = handleProgress(finishTowerNum, towerNum, vo.getTowerIds().size()); vo.setFinishProgress(progress); - // 更新杆塔进度、杆塔进度关系表、更新工程整体进度 + // 添加杆塔进度、杆塔进度关系表、更新工程整体进度、更新杆塔进度 dao.addProgress(vo); dao.addTowerProgress(vo); dao.updateProProgress(vo); - return ServerResponse.createSuccess("操作成功"); + dao.updateTower(vo); + return ServerResponse.createBySuccessMsg("操作成功"); } catch (Exception e) { log.error(e.toString(), e); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); diff --git a/src/main/resources/mappers/backstage/ProProgressMapper.xml b/src/main/resources/mappers/backstage/ProProgressMapper.xml index fdb3f43..4d5f38c 100644 --- a/src/main/resources/mappers/backstage/ProProgressMapper.xml +++ b/src/main/resources/mappers/backstage/ProProgressMapper.xml @@ -33,6 +33,15 @@ UPDATE tb_project SET pro_progress = #{finishProgress},update_user_id = #{updateUserId} WHERE id = #{id} + + + + UPDATE tb_tower + SET + tower_progress = #{progressType} + WHERE id = #{item} + + + + + + + +
+ + +
+ + + + + + + + + + + \ No newline at end of file