diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanMapper.java index 1e2f53a0..9f63b940 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProPlanMapper.java @@ -136,6 +136,11 @@ public interface ProPlanMapper */ public List findAllPlanDatasByProId(Long proId); + /** + * 查询计划任务数据 + */ + public List findCheckAllPlanDatasByProId(Long proId); + /** * 查询计划进度 */ diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml index ecfcd361..1e8b24c5 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml @@ -324,6 +324,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE pp.project_id = #{proId} + + + + \ No newline at end of file diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java index 7ef6df75..c98ebaaa 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProPlanController.java @@ -1,12 +1,10 @@ package com.yanzhu.manage.controller; -import com.alibaba.fastjson2.JSON; import com.aspose.tasks.Project; import com.aspose.tasks.Task; import com.aspose.tasks.TaskCollection; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; -import com.yanzhu.common.core.web.page.TableDataInfo; import com.yanzhu.common.log.annotation.Log; import com.yanzhu.common.log.enums.BusinessType; import com.yanzhu.common.security.annotation.RequiresPermissions; @@ -21,7 +19,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; - /** * 计划管理Controller * @@ -98,10 +95,8 @@ public class ProPlanController extends BaseController if(proPlan.getPlanFinishDate()!=null){ subTask.setFinish(proPlan.getPlanFinishDate()); } - } - @RequiresPermissions("manage:plan:import") @Log(title = "计划管理", businessType = BusinessType.IMPORT) @PostMapping("/importData") @@ -253,6 +248,15 @@ public class ProPlanController extends BaseController return success(plans); } + /** + * 查询任务状态统计 + */ + @GetMapping(value = "/findCheckAllPlanDatas/{proId}") + public AjaxResult findCheckAllPlanDatas(@PathVariable("proId") Long proId){ + List plans = proPlanService.findCheckAllPlanDatasByProId(proId); + return success(plans); + } + /** * 查询计划进度 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java index a03847ef..6cf55836 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectCheckedController.java @@ -72,8 +72,8 @@ public class ProProjectCheckedController extends BaseController /** * 新增项目举牌验收 + * @RequiresPermissions("manage:projectChecked:add") */ - @RequiresPermissions("manage:projectChecked:add") @Log(title = "项目举牌验收", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody ProProjectChecked proProjectChecked) diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java index c83d4264..091e9ad4 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java @@ -356,6 +356,19 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController return success(proProjectInfoSubdeptsUsersService.fileGroupLeaderUsers(subDeptId,craftPost)); } + /** + * 查询班组长列表 + */ + @GetMapping("/fileAllUsers/{proId}") + public AjaxResult fileAllUsers(@PathVariable("proId") Long proId) + { + ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = new ProProjectInfoSubdeptsUsers(); + proProjectInfoSubdeptsUsers.setProjectId(proId); + proProjectInfoSubdeptsUsers.setActiveTags("finished"); + List list = proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersList(proProjectInfoSubdeptsUsers); + return success(list); + } + /** * 查询分包单位工人列表 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanService.java index 364ce0af..31ee4842 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProPlanService.java @@ -98,6 +98,11 @@ public interface IProPlanService */ public List findAllPlanDatasByProId(Long proId); + /** + * 查询计划任务数据 + */ + public List findCheckAllPlanDatasByProId(Long proId); + /** * 查询计划进度 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanServiceImpl.java index bd0667c2..39246b72 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProPlanServiceImpl.java @@ -219,6 +219,14 @@ public class ProPlanServiceImpl implements IProPlanService return proPlanMapper.findAllPlanDatasByProId(proId); } + /** + * 查询计划任务数据 + */ + @Override + public List findCheckAllPlanDatasByProId(Long proId){ + return proPlanMapper.findCheckAllPlanDatasByProId(proId); + } + /** * 查询计划进度 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java index 38653ffa..251db92c 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectCheckedServiceImpl.java @@ -2,10 +2,13 @@ package com.yanzhu.manage.service.impl; import com.yanzhu.common.core.context.SecurityContextHolder; import com.yanzhu.common.core.enums.ApprovalTypes; +import com.yanzhu.common.core.text.Convert; import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.StringUtils; +import com.yanzhu.manage.domain.ProPlan; import com.yanzhu.manage.domain.ProProjectApproval; import com.yanzhu.manage.domain.ProProjectChecked; +import com.yanzhu.manage.mapper.ProPlanMapper; import com.yanzhu.manage.mapper.ProProjectApprovalMapper; import com.yanzhu.manage.mapper.ProProjectCheckedMapper; import com.yanzhu.manage.service.IProProjectCheckedService; @@ -23,6 +26,9 @@ import java.util.List; @Service public class ProProjectCheckedServiceImpl implements IProProjectCheckedService { + @Autowired + private ProPlanMapper proPlanMapper; + @Autowired private ProProjectCheckedMapper proProjectCheckedMapper; @@ -66,6 +72,12 @@ public class ProProjectCheckedServiceImpl implements IProProjectCheckedService proProjectChecked.setMainImage(proProjectChecked.getImageUrls().split(",")[0]); proProjectChecked.setCreateBy(SecurityContextHolder.getUserName()); proProjectChecked.setCreateTime(DateUtils.getNowDate()); + if(StringUtils.isNotEmpty(proProjectChecked.getWorkingPosition())){ + ProPlan plan = proPlanMapper.selectProPlanById(Convert.toLong(proProjectChecked.getWorkingPosition())); + if(plan!=null){ + proProjectChecked.setWorkingPosition(plan.getTaskName()); + } + } int rows = proProjectCheckedMapper.insertProProjectChecked(proProjectChecked); //操作日志 diff --git a/yanzhu-ui-vue3/src/api/manage/projectChecked.js b/yanzhu-ui-vue3/src/api/manage/projectChecked.js new file mode 100644 index 00000000..fbd04ed8 --- /dev/null +++ b/yanzhu-ui-vue3/src/api/manage/projectChecked.js @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// 查询项目举牌验收列表 +export function listProjectChecked(query) { + return request({ + url: '/manage/projectChecked/list', + method: 'get', + params: query + }) +} + +// 查询项目举牌验收详细 +export function getProjectChecked(id) { + return request({ + url: '/manage/projectChecked/' + id, + method: 'get' + }) +} + +// 新增项目举牌验收 +export function addProjectChecked(data) { + return request({ + url: '/manage/projectChecked', + method: 'post', + data: data + }) +} + +// 修改项目举牌验收 +export function updateProjectChecked(data) { + return request({ + url: '/manage/projectChecked', + method: 'put', + data: data + }) +} + +// 删除项目举牌验收 +export function delProjectChecked(id) { + return request({ + url: '/manage/projectChecked/' + id, + method: 'delete' + }) +} + +// 查询项目举牌验收详细 +export function findCheckAllPlanDatas(id) { + return request({ + url: '/manage/plan/findCheckAllPlanDatas/' + id, + method: 'get' + }) +} \ No newline at end of file diff --git a/yanzhu-ui-vue3/src/views/manage/projectChecked/index.vue b/yanzhu-ui-vue3/src/views/manage/projectChecked/index.vue new file mode 100644 index 00000000..773d788c --- /dev/null +++ b/yanzhu-ui-vue3/src/views/manage/projectChecked/index.vue @@ -0,0 +1,546 @@ + + +