diff --git a/ruoyi-ui/src/api/project/checkDetection.js b/ruoyi-ui/src/api/project/checkDetection.js index 14bdd303..c4296555 100644 --- a/ruoyi-ui/src/api/project/checkDetection.js +++ b/ruoyi-ui/src/api/project/checkDetection.js @@ -1,6 +1,6 @@ import request from '@/utils/request' -// 查询材料送检列表 +// 查询材料取样复试列表 export function listCheckDetection(query) { return request({ url: '/project/checkDetection/list', @@ -9,7 +9,7 @@ export function listCheckDetection(query) { }) } -// 查询材料送检详细 +// 查询材料取样复试详细 export function getCheckDetection(id) { return request({ url: '/project/checkDetection/' + id, @@ -17,7 +17,7 @@ export function getCheckDetection(id) { }) } -// 新增材料送检 +// 新增材料取样复试 export function addCheckDetection(data) { return request({ url: '/project/checkDetection', @@ -26,7 +26,7 @@ export function addCheckDetection(data) { }) } -// 修改材料送检 +// 修改材料取样复试 export function updateCheckDetection(data) { return request({ url: '/project/checkDetection', @@ -34,11 +34,28 @@ export function updateCheckDetection(data) { data: data }) } +// 取样复试登记结果 +export function updateCheckDetectionResult(data) { + return request({ + url: '/project/checkDetection/editResult', + method: 'post', + data: data + }) +} -// 删除材料送检 +// 删除材料取样复试 export function delCheckDetection(id) { return request({ url: '/project/checkDetection/' + id, method: 'delete' }) } + +//材料取样复试统计 +export function findCheckDetectionCount(query) { + return request({ + url: '/project/checkDetection/findCheckDetectionCount', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/ruoyi-ui/src/api/publics.js b/ruoyi-ui/src/api/publics.js index 93b80eab..950a4afa 100644 --- a/ruoyi-ui/src/api/publics.js +++ b/ruoyi-ui/src/api/publics.js @@ -45,6 +45,14 @@ const queryUnitList = (query) => { }) } +const selectProjectAllUnitUser = (query) => { + return request({ + url: '/publics/selectProjectAllUnitUser', + method: 'get', + params: query + }) +} + const selectProjectUnitUser = (query) => { return request({ url: '/publics/selectProjectUnitUser', @@ -60,6 +68,7 @@ export default{ getMyProjectList, getUserList, queryUnitList, + selectProjectAllUnitUser, selectProjectUnitUser, } diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue new file mode 100644 index 00000000..27ace537 --- /dev/null +++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue @@ -0,0 +1,724 @@ + + + + diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue index 1adb3b78..4270e539 100644 --- a/ruoyi-ui/src/views/project/checkDetection/index.vue +++ b/ruoyi-ui/src/views/project/checkDetection/index.vue @@ -1,18 +1,25 @@ diff --git a/ruoyi-ui/src/views/project/projectChecking/index.vue b/ruoyi-ui/src/views/project/projectChecking/index.vue index 44506ccf..1366d156 100644 --- a/ruoyi-ui/src/views/project/projectChecking/index.vue +++ b/ruoyi-ui/src/views/project/projectChecking/index.vue @@ -559,7 +559,7 @@ export default { this.title = "修改项目验收"; }); this.$api.publics - .selectProjectUnitUser({ + .selectProjectAllUnitUser({ projectId: row.projectId, }) .then((d) => { diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue index ef2b4443..e0e18d7c 100644 --- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue +++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue @@ -416,7 +416,7 @@ export default { } }); this.$api.publics - .selectProjectUnitUser({ + .selectProjectAllUnitUser({ projectId: project.id, }) .then((d) => { diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue index 07ad4463..94583e22 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/index.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue @@ -649,7 +649,7 @@ export default { this.title = "修改实测实量"; }); this.$api.publics - .selectProjectUnitUser({ + .selectProjectAllUnitUser({ projectId: row.projectId, }) .then((d) => { diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue index 3c9057e6..1b7540ae 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue @@ -467,7 +467,7 @@ export default { } }); this.$api.publics - .selectProjectUnitUser({ + .selectProjectAllUnitUser({ projectId: project.id, }) .then((d) => { diff --git a/ruoyi-ui/src/views/project/surProject/index.vue b/ruoyi-ui/src/views/project/surProject/index.vue index e8b8afb1..483b6242 100644 --- a/ruoyi-ui/src/views/project/surProject/index.vue +++ b/ruoyi-ui/src/views/project/surProject/index.vue @@ -374,6 +374,8 @@ 'project:projectDeptWroks:list', 'project:surProjectAttendance:add', 'video:videoConfig:list', + 'project:checkDetection:list', + 'project:costOutput:edit', 'project:surProject:remove', ]" > @@ -453,6 +455,12 @@ v-hasPermi="['video:videoConfig:list']" >视频配置 + 材料取样复试 + @@ -819,6 +828,7 @@ import materialSealDrawer from "@/views/project/materialSeal/projectMaterialSeal import projectMeasureDrawer from "../projectMeasure/projectMeasureDrawer.vue"; import videoConfigDrawer from "@/views/video/videoConfig/videoConfigDrawer"; import costOutputDrawer from "@/views/project/costOutput/costOutputDrawer.vue"; +import checkDetectionDrawer from "../checkDetection/checkDetectionDrawer.vue"; import { checkPermi, checkRole } from "@/utils/permission"; // 权限判断函数 export default { @@ -840,6 +850,7 @@ export default { projectMeasureDrawer, videoConfigDrawer, costOutputDrawer, + checkDetectionDrawer, }, dicts: [ "sys_check_state", @@ -1090,6 +1101,9 @@ export default { case "handleCostOutput": this.$refs.costOutput.show(row); break; + case "handleCheckDetection": + this.$refs.checkDetection.show(row); + break; default: break; } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java index 01e1a625..53a22b03 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectUserinfoController.java @@ -2,6 +2,7 @@ package com.ruoyi.web.project.controller; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.yanzhu.jh.project.domain.SurProjectUnitInfo; import com.yanzhu.jh.project.domain.SurProjectUserinfo; import com.yanzhu.jh.project.service.ISurProjectUserinfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -34,6 +35,16 @@ public class ProjectUserinfoController extends BaseController { return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUserinfo)); } + /** + * 根据项目单位人员 + * @param surProjectUnitInfo + * @return + */ + @GetMapping("/selectProjectUnitUser") + public AjaxResult selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInfo){ + return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUnitInfo)); + } + /** * 查询项目整改人，复检人，抄送人 * @param projectId diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java index bfb5b181..1c7fc6d5 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectCheckDetectionController.java @@ -2,6 +2,10 @@ package com.yanzhu.jh.project.controller; import java.util.List; import javax.servlet.http.HttpServletResponse; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.system.service.ISysDeptService; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -22,7 +26,7 @@ import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.common.core.page.TableDataInfo; /** - * 材料送检Controller + * 取样复试Controller * * @author JiangYuQi * @date 2023-08-31 @@ -31,36 +35,62 @@ import com.ruoyi.common.core.page.TableDataInfo; @RequestMapping("/project/checkDetection") public class SurProjectCheckDetectionController extends BaseController { + @Autowired + private ISysDeptService sysDeptService; + @Autowired private ISurProjectCheckDetectionService surProjectCheckDetectionService; /** - * 查询材料送检列表 + * 查询取样复试列表 */ @PreAuthorize("@ss.hasPermi('project:checkDetection:list')") @GetMapping("/list") public TableDataInfo list(SurProjectCheckDetection surProjectCheckDetection) { startPage(); + surProjectCheckDetection.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(surProjectCheckDetection.getNowRole())){ + surProjectCheckDetection.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + surProjectCheckDetection.setNowDept(Convert.toStr(getDeptId())); + } + surProjectCheckDetection.setNowUser(Convert.toStr(getUserId())); List list = surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection); return getDataTable(list); } + /** + * 查询取样复试列表 + */ + @PreAuthorize("@ss.hasPermi('project:checkDetection:list')") + @GetMapping("/findCheckDetectionCount") + public AjaxResult findCheckDetectionCount(SurProjectCheckDetection surProjectCheckDetection) + { + surProjectCheckDetection.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(surProjectCheckDetection.getNowRole())){ + surProjectCheckDetection.setNowDept(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId()))); + }else{ + surProjectCheckDetection.setNowDept(Convert.toStr(getDeptId())); + } + surProjectCheckDetection.setNowUser(Convert.toStr(getUserId())); + return success(surProjectCheckDetectionService.queryGroupCount(surProjectCheckDetection)); + } /** - * 导出材料送检列表 + * 导出取样复试列表 */ @PreAuthorize("@ss.hasPermi('project:checkDetection:export')") - @Log(title = "材料送检", businessType = BusinessType.EXPORT) + @Log(title = "取样复试", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, SurProjectCheckDetection surProjectCheckDetection) { List list = surProjectCheckDetectionService.selectSurProjectCheckDetectionList(surProjectCheckDetection); ExcelUtil util = new ExcelUtil(SurProjectCheckDetection.class); - util.exportExcel(response, list, "材料送检数据"); + util.exportExcel(response, list, "取样复试数据"); } /** - * 获取材料送检详细信息 + * 获取取样复试详细信息 */ @PreAuthorize("@ss.hasPermi('project:checkDetection:query')") @GetMapping(value = "/{id}") @@ -70,10 +100,10 @@ public class SurProjectCheckDetectionController extends BaseController } /** - * 新增材料送检 + * 新增取样复试 */ @PreAuthorize("@ss.hasPermi('project:checkDetection:add')") - @Log(title = "材料送检", businessType = BusinessType.INSERT) + @Log(title = "取样复试", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SurProjectCheckDetection surProjectCheckDetection) { @@ -81,10 +111,10 @@ public class SurProjectCheckDetectionController extends BaseController } /** - * 修改材料送检 + * 修改取样复试 */ @PreAuthorize("@ss.hasPermi('project:checkDetection:edit')") - @Log(title = "材料送检", businessType = BusinessType.UPDATE) + @Log(title = "取样复试", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody SurProjectCheckDetection surProjectCheckDetection) { @@ -92,10 +122,21 @@ public class SurProjectCheckDetectionController extends BaseController } /** - * 删除材料送检 + * 登记取样复试结果 + */ + @PreAuthorize("@ss.hasPermi('project:checkDetection:editResult')") + @Log(title = "取样复试", businessType = BusinessType.UPDATE) + @PostMapping("/editResult") + public AjaxResult editResult(@RequestBody SurProjectCheckDetection surProjectCheckDetection) + { + return toAjax(surProjectCheckDetectionService.updateSurProjectCheckDetection(surProjectCheckDetection)); + } + + /** + * 删除取样复试 */ @PreAuthorize("@ss.hasPermi('project:checkDetection:remove')") - @Log(title = "材料送检", businessType = BusinessType.DELETE) + @Log(title = "取样复试", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) { diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java index 4dbcddb7..6762bba7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java @@ -40,6 +40,14 @@ public interface ISurProjectUserinfoService */ public List selectProjectUnitUser(SurProjectUserinfo surProjectUserinfo); + /** + * 查询项目部门人员 + * + * @param surProjectUnitInf 项目部门 + * @return 项目用户集合 + */ + public List selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInf); + /** * 查询项目相关人员 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java index 9cf5447f..c35465ab 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java @@ -82,6 +82,7 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService * @param surProjectUserinfo 项目用户 * @return 项目用户集合 */ + @Override public List selectProjectUnitUser(SurProjectUserinfo surProjectUserinfo) { SurProjectUnitInfo surProjectUnitInfo = new SurProjectUnitInfo(); surProjectUnitInfo.setProjectId(surProjectUserinfo.getProjectId()); @@ -102,6 +103,32 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService return projectUnitUserInfoList; } + /** + * 查询项目部门人员 + * + * @param surProjectUnitInfo 项目用户 + * @return 项目用户集合 + */ + @Override + public List selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInfo) { + List projectUnitUserInfoList = surProjectUnitInfoMapper.selectSurProjectUnitInfoList(surProjectUnitInfo); + SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo(); + surProjectUserinfo.setProjectId(surProjectUnitInfo.getProjectId()); + List projectUserinfoList = surProjectUserinfoMapper.selectSurProjectUserinfoList(surProjectUserinfo); + for(SurProjectUnitInfo projectUnitInfo:projectUnitUserInfoList){ + List unitUserList = new ArrayList<>(); + for(SurProjectUserinfo projectUserinfo:projectUserinfoList){ + //同一部门组装数据 + if(projectUnitInfo.getUnitId().equals(projectUserinfo.getDeptId())){ + unitUserList.add(projectUserinfo); + }else if(DeptTypeEnum.ZGS.getCode().equals(projectUnitInfo.getUnitType().toString()) && PublicStateEnum.USERTYPE_JFJL.getCode().equals(projectUserinfo.getJobType())) { + unitUserList.add(projectUserinfo); + } + } + projectUnitInfo.setUserinfoList(unitUserList); + } + return projectUnitUserInfoList; + } /** * 根据不同角色查询项目人员信息 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java index 93f977e8..45fa1836 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/publics/PublicsController.java @@ -117,11 +117,20 @@ PublicsController extends BaseController { } /** - * 选择项目部门人员 + * 选择项目所有部门人员 */ - @GetMapping("/selectProjectUnitUser") - public AjaxResult selectProjectUnitUser(SurProjectUserinfo surProjectUserinfo) + @GetMapping("/selectProjectAllUnitUser") + public AjaxResult selectProjectAllUnitUser(SurProjectUserinfo surProjectUserinfo) { return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUserinfo)); } + + /** + * 选择项目部门人员 + */ + @GetMapping("/selectProjectUnitUser") + public AjaxResult selectProjectUnitUser(SurProjectUnitInfo surProjectUnitInfo) + { + return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUnitInfo)); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml index 103a7525..b49ff342 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckDetectionMapper.xml @@ -56,8 +56,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spcd.use_position like concat('%', #{usePosition}, '%') and spcd.sample_num = #{sampleNum} and spcd.is_del = #{isDel} - and spcd.sample_user_name like concat('%', #{sampleUserName}, '%') - and spcd.witness_user_name like concat('%', #{witnessUserName}, '%') + and (spcd.sample_user like concat('%', #{sampleUserName}, '%') or spcd.sample_user_name like concat('%', #{sampleUserName}, '%')) + and (spcd.witness_user like concat('%', #{witnessUserName}, '%') or spcd.witness_user_name like concat('%', #{witnessUserName}, '%')) and spcd.laboratory_name like concat('%', #{laboratoryName}, '%') and spcd.check_time between #{params.beginCheckTime} and #{params.endCheckTime} and spcd.check_state = #{checkState}