From a485269f95b5e29aaab3a403353dcb2c3d225666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Sat, 23 Sep 2023 01:33:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/enums/PublicStateEnum.java | 2 + ruoyi-ui/src/api/project/projectAuditinfo.js | 20 ++ .../src/views/flowable/task/todo/index.vue | 21 +- .../checkDetection/checkDetectionDrawer.vue | 2 +- .../views/project/checkDetection/index.vue | 11 +- .../approveCheckDetectionDrawer.vue | 227 ++++++++++++ .../approveCheckingDrawer.vue | 200 +++++++++++ .../approveMaterialSealDrawer.vue | 223 ++++++++++++ .../projectAuditinfo/approveMeasureDrawer.vue | 224 ++++++++++++ .../views/project/projectAuditinfo/index.vue | 330 ++++++++++++++++++ .../views/project/projectMeasure/index.vue | 2 +- .../SurProjectAuditinfoController.java | 129 +++++++ .../mapper/SurProjectAuditinfoMapper.java | 9 + .../service/ISurProjectAuditinfoService.java | 24 ++ .../impl/SurProjectAuditinfoServiceImpl.java | 126 ++++++- .../SurProjectCheckDetectionServiceImpl.java | 4 + .../impl/SurProjectCheckingServiceImpl.java | 8 +- .../SurProjectMaterialSealServiceImpl.java | 8 +- .../impl/SurProjectMeasureServiceImpl.java | 9 +- .../yanzhu/jh/publics/PublicsController.java | 23 ++ .../project/SurProjectAuditinfoMapper.xml | 18 + .../SurProjectCheckDetectionMapper.xml | 1 + .../project/SurProjectCheckingMapper.xml | 5 +- .../project/SurProjectMeasureMapper.xml | 2 +- 24 files changed, 1599 insertions(+), 29 deletions(-) create mode 100644 ruoyi-ui/src/api/project/projectAuditinfo.js create mode 100644 ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue create mode 100644 ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue create mode 100644 ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue create mode 100644 ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue create mode 100644 ruoyi-ui/src/views/project/projectAuditinfo/index.vue create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/project/controller/SurProjectAuditinfoController.java diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/PublicStateEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/PublicStateEnum.java index 93c58636..4b526f26 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/PublicStateEnum.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/PublicStateEnum.java @@ -10,6 +10,8 @@ public enum PublicStateEnum { OK("0", "正常"), DISABLE("1", "停用"), DELETED("2", "删除"), + HG("1","合格"), + BHG("2","不合格"), USERTYPE_JFJL("21", "甲方经理"), /**********************************项目验收***************************************/ PROJECT_CHECK_TYPE_JPYS("1", "举牌验收"), diff --git a/ruoyi-ui/src/api/project/projectAuditinfo.js b/ruoyi-ui/src/api/project/projectAuditinfo.js new file mode 100644 index 00000000..f4f63d36 --- /dev/null +++ b/ruoyi-ui/src/api/project/projectAuditinfo.js @@ -0,0 +1,20 @@ +import request from '@/utils/request' + +// 查询项目审核信息列表 +export function listProjectAuditinfo(query) { + return request({ + url: '/project/projectAuditinfo/findList', + method: 'get', + params: query + }) +} + +// 统计项目审核信息 +export function findAuditCount(query) { + return request({ + url: '/project/projectAuditinfo/findAuditCount', + method: 'get', + params: query + }) +} + diff --git a/ruoyi-ui/src/views/flowable/task/todo/index.vue b/ruoyi-ui/src/views/flowable/task/todo/index.vue index c22f973b..77342277 100644 --- a/ruoyi-ui/src/views/flowable/task/todo/index.vue +++ b/ruoyi-ui/src/views/flowable/task/todo/index.vue @@ -156,12 +156,13 @@ export default { this.queryParams.params["beginDate"] = this.daterangeCheckTime[0]; this.queryParams.params["endDate"] = this.daterangeCheckTime[1]; } - // todoList(this.queryParams).then(response => { - // this.todoList = response.data.records; - // this.total = response.data.total; - // this.loading = false; - // }); + //重新刷新代办任务 this.$store.dispatch('settingAwaitNum'); + myAwaitFlowTaskList(this.queryParams).then(response => { + this.todoList = response.rows; + this.total = response.total; + this.loading = false; + }); }, // 跳转到处理页面 handleProcess(row){ @@ -179,16 +180,6 @@ export default { this.$refs.approveDrawer.show(row); } } - - // this.$router.push({ path: '/flowable/task/todo/detail/index', - // query: { - // procInsId: row.procInsId, - // executionId: row.executionId, - // deployId: row.deployId, - // taskId: row.taskId, - // taskName: row.taskName, - // startUser: row.startUserName + '-' + row.startDeptName, - // }}) }, // 取消按钮 cancel() { diff --git a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue index a9512b3f..6f3ecadb 100644 --- a/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue +++ b/ruoyi-ui/src/views/project/checkDetection/checkDetectionDrawer.vue @@ -158,7 +158,7 @@ size="mini" type="text" icon="el-icon-paperclip" - @click="handledownload(scope.row)" + @click="handleDownload(scope.row)" v-hasPermi="['project:surProjectSpecial:list']" >下载检测报告 diff --git a/ruoyi-ui/src/views/project/checkDetection/index.vue b/ruoyi-ui/src/views/project/checkDetection/index.vue index 9b0e49af..8a3b698f 100644 --- a/ruoyi-ui/src/views/project/checkDetection/index.vue +++ b/ruoyi-ui/src/views/project/checkDetection/index.vue @@ -172,15 +172,16 @@ :data="checkDetectionList" @selection-change="handleSelectionChange" stripe > - + > + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue new file mode 100644 index 00000000..f4922dbf --- /dev/null +++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckDetectionDrawer.vue @@ -0,0 +1,227 @@ + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue new file mode 100644 index 00000000..0eb15e51 --- /dev/null +++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveCheckingDrawer.vue @@ -0,0 +1,200 @@ + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue new file mode 100644 index 00000000..31143865 --- /dev/null +++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveMaterialSealDrawer.vue @@ -0,0 +1,223 @@ + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue new file mode 100644 index 00000000..9358f23f --- /dev/null +++ b/ruoyi-ui/src/views/project/projectAuditinfo/approveMeasureDrawer.vue @@ -0,0 +1,224 @@ + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectAuditinfo/index.vue b/ruoyi-ui/src/views/project/projectAuditinfo/index.vue new file mode 100644 index 00000000..5cae8240 --- /dev/null +++ b/ruoyi-ui/src/views/project/projectAuditinfo/index.vue @@ -0,0 +1,330 @@ + + + + \ No newline at end of file diff --git a/ruoyi-ui/src/views/project/projectMeasure/index.vue b/ruoyi-ui/src/views/project/projectMeasure/index.vue index a811f32d..2e951487 100644 --- a/ruoyi-ui/src/views/project/projectMeasure/index.vue +++ b/ruoyi-ui/src/views/project/projectMeasure/index.vue @@ -100,6 +100,7 @@ clearable @keyup.enter.native="handleQuery" /> + - 搜索 list = surProjectAuditinfoService.selectSurProjectAuditinfoList(surProjectAuditinfo); + return getDataTable(list); + } + + /** + * 查询项目审核信息列表 + */ + @PreAuthorize("@ss.hasPermi('project:projectAuditinfo:list')") + @GetMapping("/findList") + public TableDataInfo findList(FlowTaskEntity flowTaskEntity) + { + startPage(); + flowTaskEntity.setAssigneeName(getUsername()); + return getDataTable(surProjectAuditinfoService.selectMyAwaitFlowTask(flowTaskEntity)); + } + + /** + * 统计审核信息 + */ + @PreAuthorize("@ss.hasPermi('project:projectAuditinfo:list')") + @GetMapping("/findAuditCount") + public AjaxResult findAuditCount(FlowTaskEntity flowTaskEntity) + { + flowTaskEntity.setAssigneeName(getUsername()); + return success(surProjectAuditinfoService.queryCount(flowTaskEntity)); + } + + /** + * 导出项目审核信息列表 + */ + @PreAuthorize("@ss.hasPermi('project:projectAuditinfo:export')") + @Log(title = "项目审核信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SurProjectAuditinfo surProjectAuditinfo) + { + List list = surProjectAuditinfoService.selectSurProjectAuditinfoList(surProjectAuditinfo); + ExcelUtil util = new ExcelUtil(SurProjectAuditinfo.class); + util.exportExcel(response, list, "项目审核信息数据"); + } + + /** + * 获取项目审核信息详细信息 + */ + @PreAuthorize("@ss.hasPermi('project:projectAuditinfo:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(surProjectAuditinfoService.selectSurProjectAuditinfoById(id)); + } + + /** + * 新增项目审核信息 + */ + @PreAuthorize("@ss.hasPermi('project:projectAuditinfo:add')") + @Log(title = "项目审核信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SurProjectAuditinfo surProjectAuditinfo) + { + return toAjax(surProjectAuditinfoService.insertSurProjectAuditinfo(surProjectAuditinfo)); + } + + /** + * 修改项目审核信息 + */ + @PreAuthorize("@ss.hasPermi('project:projectAuditinfo:edit')") + @Log(title = "项目审核信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SurProjectAuditinfo surProjectAuditinfo) + { + return toAjax(surProjectAuditinfoService.updateSurProjectAuditinfo(surProjectAuditinfo)); + } + + /** + * 删除项目审核信息 + */ + @PreAuthorize("@ss.hasPermi('project:projectAuditinfo:remove')") + @Log(title = "项目审核信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(surProjectAuditinfoService.deleteSurProjectAuditinfoByIds(ids)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAuditinfoMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAuditinfoMapper.java index 6a00cfdb..f91c4b31 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAuditinfoMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectAuditinfoMapper.java @@ -3,6 +3,7 @@ package com.yanzhu.jh.project.mapper; import java.util.List; import java.util.Map; +import com.ruoyi.system.domain.FlowTaskEntity; import com.yanzhu.jh.project.domain.SurProjectAuditinfo; /** @@ -70,4 +71,12 @@ public interface SurProjectAuditinfoMapper public int deleteSurProjectAuditinfoByIds(Long[] ids); public int batch(List surProjectAuditinfoList); + + /** + * 查询我的代办 + * + * @param flowTaskEntity 查询条件 + * @return 结果 + */ + public List> selectMyAwaitFlowTask(FlowTaskEntity flowTaskEntity); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAuditinfoService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAuditinfoService.java index c7711df2..7e9bfa86 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAuditinfoService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectAuditinfoService.java @@ -3,6 +3,7 @@ package com.yanzhu.jh.project.service; import java.util.List; import java.util.Map; +import com.ruoyi.system.domain.FlowTaskEntity; import com.yanzhu.jh.project.domain.SurProjectAuditinfo; /** @@ -69,4 +70,27 @@ public interface ISurProjectAuditinfoService */ public int deleteSurProjectAuditinfoById(Long id); + /** + * 查询我的代办 + * + * @param flowTaskEntity 查询条件 + * @return 结果 + */ + public Map findMyTask(FlowTaskEntity flowTaskEntity); + + /** + * 查询我的审批 + * + * @param flowTaskEntity 查询条件 + * @return 结果 + */ + public List> selectMyAwaitFlowTask(FlowTaskEntity flowTaskEntity); + + /** + * 统计我的审批 + * + * @param flowTaskEntity 查询条件 + * @return 结果 + */ + public Map queryCount(FlowTaskEntity flowTaskEntity); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java index 2a7d21b8..958a7ab2 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectAuditinfoServiceImpl.java @@ -1,10 +1,14 @@ package com.yanzhu.jh.project.service.impl; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.system.domain.FlowTaskEntity; +import com.ruoyi.system.mapper.FlowBusinessKeyMapper; import com.yanzhu.jh.project.domain.*; import com.yanzhu.jh.project.mapper.*; import org.springframework.beans.factory.annotation.Autowired; @@ -24,11 +28,14 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi private SurProjectAuditinfoMapper surProjectAuditinfoMapper; @Autowired - private SurProjectCheckDetectionMapper surProjectCheckDetectionMapper; + private FlowBusinessKeyMapper flowBusinessKeyMapper; @Autowired private SurProjectCheckingMapper surProjectCheckingMapper; + @Autowired + private SurProjectCheckDetectionMapper surProjectCheckDetectionMapper; + @Autowired private SurProjectMaterialSealMapper surProjectMaterialSealMapper; @@ -121,4 +128,121 @@ public class SurProjectAuditinfoServiceImpl implements ISurProjectAuditinfoServi return surProjectAuditinfoMapper.deleteSurProjectAuditinfoById(id); } + /** + * 查询我的代办 + * + * @param flowTaskEntity 查询条件 + * @return 结果 + */ + public Map findMyTask(FlowTaskEntity flowTaskEntity) { + Map dataMap = new HashMap<>(); + List> todoList = flowBusinessKeyMapper.selectMyAwaitFlowTask(flowTaskEntity); + if(todoList!=null){ + dataMap.put("todo",todoList.size()); + }else{ + dataMap.put("todo",0); + } + List> approveList = surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity); + if(approveList!=null){ + dataMap.put("approve",approveList.size()); + }else{ + dataMap.put("approve",0); + } + return dataMap; + } + + /** + * 查询我的审批 + * + * @param flowTaskEntity 查询条件 + * @return 结果 + */ + public List> selectMyAwaitFlowTask(FlowTaskEntity flowTaskEntity) { + return surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity); + } + + /** + * 统计我的审批 + * + * @param flowTaskEntity 查询条件 + * @return 结果 + */ + public Map queryCount(FlowTaskEntity flowTaskEntity) { + Map dataMap = new HashMap<>(); + flowTaskEntity.setActiveName("await"); + List> awaitList = surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity); + if(awaitList!=null){ + dataMap.put("await",awaitList.size()); + }else{ + dataMap.put("await",0); + } + flowTaskEntity.setActiveName("finished"); + List> finishedList = surProjectAuditinfoMapper.selectMyAwaitFlowTask(flowTaskEntity); + if(finishedList!=null){ + dataMap.put("finished",finishedList.size()); + }else{ + dataMap.put("finished",0); + } + return dataMap; + } + + private void init(){ + List list = new ArrayList<>(); + List surProjectCheckDetectionList = surProjectCheckDetectionMapper.selectSurProjectCheckDetectionList(new SurProjectCheckDetection()); + List surProjectCheckingList = surProjectCheckingMapper.selectSurProjectCheckingList(new SurProjectChecking()); + List surProjectMaterialSealList = surProjectMaterialSealMapper.selectSurProjectMaterialSealList(new SurProjectMaterialSeal()); + List surProjectMeasureList = surProjectMeasureMapper.selectSurProjectMeasureList(new SurProjectMeasure()); + if(surProjectCheckDetectionList!=null && surProjectCheckDetectionList.size()>0){ + for(SurProjectCheckDetection surProjectCheckDetection:surProjectCheckDetectionList){ + SurProjectAuditinfo a = new SurProjectAuditinfo(); + a.setFromType(PublicStateEnum.AUDIT_TYPE_QYFS.getCode()); + a.setFromId(surProjectCheckDetection.getId()); + a.setApproveStatus("1"); + a.setComment("提交申请"); + a.setCreateBy(surProjectCheckDetection.getCreateBy()); + a.setCreateTime(surProjectCheckDetection.getCreateTime()); + list.add(a); + } + } + + if(surProjectCheckingList!=null && surProjectCheckingList.size()>0){ + for(SurProjectChecking surProjectChecking:surProjectCheckingList){ + SurProjectAuditinfo a = new SurProjectAuditinfo(); + a.setFromType(PublicStateEnum.AUDIT_TYPE_JPYS.getCode()); + a.setFromId(surProjectChecking.getId()); + a.setApproveStatus("1"); + a.setComment("提交申请"); + a.setCreateBy(surProjectChecking.getCreateBy()); + a.setCreateTime(surProjectChecking.getCreateTime()); + list.add(a); + } + } + + if(surProjectMaterialSealList!=null && surProjectMaterialSealList.size()>0){ + for(SurProjectMaterialSeal surProjectMaterialSeal:surProjectMaterialSealList){ + SurProjectAuditinfo a = new SurProjectAuditinfo(); + a.setFromType(PublicStateEnum.AUDIT_TYPE_CLFY.getCode()); + a.setFromId(surProjectMaterialSeal.getId()); + a.setApproveStatus("1"); + a.setComment("提交申请"); + a.setCreateBy(surProjectMaterialSeal.getCreateBy()); + a.setCreateTime(surProjectMaterialSeal.getCreateTime()); + list.add(a); + } + } + + if(surProjectMeasureList!=null && surProjectMeasureList.size()>0){ + for(SurProjectMeasure surProjectMeasure:surProjectMeasureList){ + SurProjectAuditinfo a = new SurProjectAuditinfo(); + a.setFromType(PublicStateEnum.AUDIT_TYPE_SCSL.getCode()); + a.setFromId(surProjectMeasure.getId()); + a.setApproveStatus("1"); + a.setComment("提交申请"); + a.setCreateBy(surProjectMeasure.getCreateBy()); + a.setCreateTime(surProjectMeasure.getCreateTime()); + list.add(a); + } + } + surProjectAuditinfoMapper.batch(list); + } } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java index aacfa9e8..6dc37355 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckDetectionServiceImpl.java @@ -16,6 +16,8 @@ import com.yanzhu.jh.project.mapper.SurProjectCheckDetectionMapper; import com.yanzhu.jh.project.domain.SurProjectCheckDetection; import com.yanzhu.jh.project.service.ISurProjectCheckDetectionService; import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.transaction.annotation.Transactional; + /** * 材料送检Service业务层处理 * @@ -62,6 +64,7 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete * @return 结果 */ @Override + @Transactional public int insertSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection) { surProjectCheckDetection.setCheckState(PublicStateEnum.CHECK_STATE_SJ.getCode()); @@ -80,6 +83,7 @@ public class SurProjectCheckDetectionServiceImpl implements ISurProjectCheckDete * @return 结果 */ @Override + @Transactional public int updateSurProjectCheckDetection(SurProjectCheckDetection surProjectCheckDetection) { if(surProjectCheckDetection.getUpdateBy()==null){ diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java index 8f1a4b0a..fbc959c8 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java @@ -17,6 +17,8 @@ import com.yanzhu.jh.project.mapper.SurProjectCheckingMapper; import com.yanzhu.jh.project.domain.SurProjectChecking; import com.yanzhu.jh.project.service.ISurProjectCheckingService; import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.transaction.annotation.Transactional; + /** * 项目验收Service业务层处理 * @@ -102,6 +104,7 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService * @return 结果 */ @Override + @Transactional public int insertSurProjectChecking(SurProjectChecking surProjectChecking) { @@ -136,9 +139,12 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService * @return 结果 */ @Override + @Transactional public int updateSurProjectChecking(SurProjectChecking surProjectChecking) { - surProjectChecking.setMainImage(surProjectChecking.getImageUrls().split(",")[0]); + if(surProjectChecking.getImageUrls()!=null){ + surProjectChecking.setMainImage(surProjectChecking.getImageUrls().split(",")[0]); + } if(surProjectChecking.getUpdateBy()==null){ surProjectChecking.setUpdateBy(SecurityUtils.getUsername()); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java index 4393a5af..58720fa6 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMaterialSealServiceImpl.java @@ -15,6 +15,8 @@ import com.yanzhu.jh.project.mapper.SurProjectMaterialSealMapper; import com.yanzhu.jh.project.domain.SurProjectMaterialSeal; import com.yanzhu.jh.project.service.ISurProjectMaterialSealService; import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.transaction.annotation.Transactional; + /** * 材料封样Service业务层处理 * @@ -62,6 +64,7 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea * @return 结果 */ @Override + @Transactional public int insertSurProjectMaterialSeal(SurProjectMaterialSeal surProjectMaterialSeal) { if(surProjectMaterialSeal.getCreateBy()==null){ @@ -95,12 +98,15 @@ public class SurProjectMaterialSealServiceImpl implements ISurProjectMaterialSea * @return 结果 */ @Override + @Transactional public int updateSurProjectMaterialSeal(SurProjectMaterialSeal surProjectMaterialSeal) { if(surProjectMaterialSeal.getUpdateBy()==null){ surProjectMaterialSeal.setUpdateBy(SecurityUtils.getUsername()); } - surProjectMaterialSeal.setMainImage(surProjectMaterialSeal.getImageUrls().split(",")[0]); + if(surProjectMaterialSeal.getImageUrls()!=null){ + surProjectMaterialSeal.setMainImage(surProjectMaterialSeal.getImageUrls().split(",")[0]); + } surProjectMaterialSeal.setUpdateTime(DateUtils.getNowDate()); //操作日志 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java index 55591a18..599aa5ab 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectMeasureServiceImpl.java @@ -15,6 +15,8 @@ import com.yanzhu.jh.project.mapper.SurProjectMeasureMapper; import com.yanzhu.jh.project.domain.SurProjectMeasure; import com.yanzhu.jh.project.service.ISurProjectMeasureService; import com.ruoyi.common.utils.SecurityUtils; +import org.springframework.transaction.annotation.Transactional; + /** * 实测实量Service业务层处理 * @@ -61,6 +63,7 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService * @return 结果 */ @Override + @Transactional public int insertSurProjectMeasure(SurProjectMeasure surProjectMeasure) { if(surProjectMeasure.getCreateBy()==null){ @@ -94,13 +97,15 @@ public class SurProjectMeasureServiceImpl implements ISurProjectMeasureService * @return 结果 */ @Override + @Transactional public int updateSurProjectMeasure(SurProjectMeasure surProjectMeasure) { if(surProjectMeasure.getCreateBy()==null){ surProjectMeasure.setUpdateBy(SecurityUtils.getUsername()); } - - surProjectMeasure.setMainImage(surProjectMeasure.getImageUrls().split(",")[0]); + if(surProjectMeasure.getImageUrls()!=null){ + surProjectMeasure.setMainImage(surProjectMeasure.getImageUrls().split(",")[0]); + } surProjectMeasure.setUpdateTime(DateUtils.getNowDate()); //操作日志 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 24b587ab..bb61be34 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 @@ -8,6 +8,8 @@ import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.PublicStateEnum; import com.ruoyi.common.enums.SysRoleEnum; +import com.ruoyi.common.utils.SecurityUtils; +import com.ruoyi.system.domain.FlowTaskEntity; import com.ruoyi.system.service.ISysDeptService; import com.ruoyi.system.service.ISysUserService; import com.yanzhu.jh.project.domain.SurProject; @@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.stream.Collectors; /** * 公共服务Controller @@ -166,4 +169,24 @@ PublicsController extends BaseController { { return success(surProjectAuditinfoService.selectProjectAuditinfoList(surProjectAuditinfo)); } + + /** + * 查询代办任务 + */ + @GetMapping("/findTask") + public AjaxResult findTask() + { + FlowTaskEntity flowTaskEntity = new FlowTaskEntity(); + flowTaskEntity.setNowRole(Convert.toStr(getUserFirstRole())); + if(SysRoleEnum.ZGS.getCode().equals(flowTaskEntity.getNowRole())){ + flowTaskEntity.setNowDept(Convert.toStr(deptService.getZGSDeptId(getDeptId()))); + }else{ + flowTaskEntity.setNowDept(Convert.toStr(getDeptId())); + } + flowTaskEntity.setNowUser(Convert.toStr(SecurityUtils.getUserId())); + flowTaskEntity.setRoleIds(SecurityUtils.getLoginUser().getUser().getRoles().stream().map(role -> role.getRoleId()).collect(Collectors.toList())); + flowTaskEntity.setAssigneeName(getUsername()); + flowTaskEntity.setActiveName("await"); + return success(surProjectAuditinfoService.findMyTask(flowTaskEntity)); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml index d1dc221e..e046191a 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectAuditinfoMapper.xml @@ -59,6 +59,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by pa.create_time desc + + @@ -50,6 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project_userinfo spu on spu.project_id = sp.id and spc.is_del=0 + and spc.id = #{id} and spc.project_id = #{projectId} and sp.projectName like concat('%', #{projectName}, '%') diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml index 30069ee0..030852b5 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectMeasureMapper.xml @@ -167,7 +167,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - approveStatus = #{approveStatus}, + approve_status = #{approveStatus}, where id = #{id}