From ebf56887c553aef6f8be73f6376fe54c20b676b5 Mon Sep 17 00:00:00 2001 From: zhouhaibin Date: Wed, 3 Jul 2024 10:43:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=81=94=E5=90=88=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E5=AE=A1=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HuzhouUploadfileinfoController.java | 4 +- .../huzhou/controller/WorkflowController.java | 6 +- .../service/IHuzhouUploadfileinfoService.java | 2 +- .../impl/HuzhouPlaninfoServiceImpl.java | 6 +- .../impl/HuzhouProjectinfoServiceImpl.java | 12 ++ .../impl/HuzhouUploadfileinfoServiceImpl.java | 104 +++++++++++------- 6 files changed, 87 insertions(+), 47 deletions(-) diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java index 48eea55..f9e1aad 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/HuzhouUploadfileinfoController.java @@ -130,8 +130,8 @@ public class HuzhouUploadfileinfoController { } @PostMapping("/uploadURTFile") public Result uploadURTFile(@RequestParam(value = "file") - MultipartFile[] files,@RequestParam(value = "projectid") String projectid) throws IOException { - uploadfileinfoService.submitURTFile(files, projectid,"6"); + MultipartFile[] files,@RequestParam(value = "planinfoid") String planinfoid) throws IOException { + uploadfileinfoService.submitURTFile(files, planinfoid,"6"); return Result.OK("上传成功!!"); } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java index 8a2b80e..d6bd4f5 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/controller/WorkflowController.java @@ -387,9 +387,9 @@ public class WorkflowController { } } for(HashMap lastUser:approvalEntityList){ -// if ("0".equals(lastUser.get("approvalStatue"))) { -// continue; -// } + if ("0".equals(lastUser.get("approvalStatue"))) { + continue; + } for (int i =0;i lastUser = approvalEntityList.get(approvalEntityList.size() - 1);//获取最后一个 diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java index eb3df67..827ad0c 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/IHuzhouUploadfileinfoService.java @@ -29,7 +29,7 @@ public interface IHuzhouUploadfileinfoService extends IService getuploacFilePageListOk(HuzhouUploadfileinfo uploadfileinfo, Integer pageNo, Integer pageSize); - void submitURTFile(MultipartFile[] files, String projectid, String s) throws IOException; + void submitURTFile(MultipartFile[] files, String planinfoid, String s) throws IOException; void approveURTFile(MultipartFile[] files, String taskId, String flag, String projectid, String comment, MultipartFile[] adviceFiles) throws IOException; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index 3f3f8bd..b317136 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -561,11 +561,11 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl taskList = taskService.createTaskQuery() .processInstanceId(processInstanceId) .active() - .singleResult(); - String name = task.getName(); + .list(); + String name = taskList.get(0).getName(); if("发起人".equals(name)){ hashMap.put("isEdit","1"); diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index 1e5f7bb..d156a82 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -1216,6 +1216,18 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl unitedTechnicalReviewList = projectinfoMapper.getUnitedTechnicalReviewList(projectInfoAndChildPageList, projectInfoAuthSelect); + List records = unitedTechnicalReviewList.getRecords(); + records.forEach(item -> { + item.setMissingSubprojects(false);//设置默认是false + double subTotalMoney = 0;//子项目的总金额 + List subProjectinfoList = item.getChildren(); + if (subProjectinfoList.size() > 0) { + + } else { + //没有子项目 + item.setChildren(null); + } + }); return unitedTechnicalReviewList; } diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java index bbaed90..0b8d6ae 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouUploadfileinfoServiceImpl.java @@ -9,12 +9,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.easy.admin.auth.model.SysUser; import com.easy.admin.auth.service.SysUserService; import com.easy.admin.common.util.CommonUtils; +import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfoMapper; +import com.easy.admin.modules.huzhou.dao.HuzhouPlaninfofileMapper; import com.easy.admin.modules.huzhou.dao.HuzhouProcessinfoMapper; import com.easy.admin.modules.huzhou.dao.HuzhouUploadfileinfoMapper; -import com.easy.admin.modules.huzhou.entity.BaseEntity; -import com.easy.admin.modules.huzhou.entity.HuzhouProcessinfo; -import com.easy.admin.modules.huzhou.entity.HuzhouUploadfileinfo; -import com.easy.admin.modules.huzhou.entity.WorkFlow; +import com.easy.admin.modules.huzhou.entity.*; +import com.easy.admin.modules.huzhou.service.IHuzhouPlaninfoService; import com.easy.admin.modules.huzhou.service.IHuzhouProcessinfoService; import com.easy.admin.modules.huzhou.service.IHuzhouUploadfileinfoService; import com.easy.admin.modules.huzhou.service.IWorkflowService; @@ -65,7 +65,10 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl processinfos = processinfoService.list(queryWrapper); String processName = processinfos.get(0).getProcessName(); if(files!=null&&"1".equals(flag)){ - modifyUploadFile(files,projectid,"6"); + this.modifyUploadFileByURT(files,projectid,"2","1"); + } //意见文件 if(adviceFiles!=null){ - modifyUploadFileByURT(adviceFiles,projectid,"7"); + this.modifyUploadFileByURT(adviceFiles,projectid,"2","2"); } WorkFlow workFlow = workflowService.approveProjectInfo(taskId, flag, comment); ProcessInstance processInstance = runtimeService.createProcessInstanceQuery().processInstanceId(workFlow.getProcessInstanceId()).singleResult(); if(processInstance==null&&"1".equals(flag)){ processinfoService.modifyStatusByProjectId(projectid,"2",processName); + HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo(); + huzhouPlaninfo.setId(projectid); + huzhouPlaninfo.setIsfinish("2"); + huzhouPlaninfo.setActualEndTime(new Date()); + planinfoMapper.updateById(huzhouPlaninfo); }else{ //如果流程未完成，检查流程是否被拒绝退回，退回后，之前同意的系统默认同意 List tasks = taskService.createTaskQuery() @@ -267,44 +283,56 @@ public class HuzhouUploadfileinfoServiceImpl extends ServiceImpl queryWrapper = new LambdaUpdateWrapper<>(); - queryWrapper.eq(HuzhouUploadfileinfo::getProjectid,projectid); - queryWrapper.eq(HuzhouUploadfileinfo::getStage,stage); - queryWrapper.eq(BaseEntity::getCreateUser,ShiroUtil.getCurrentUser().getId()); - queryWrapper.set(HuzhouUploadfileinfo::getStatus,"0"); - this.update(queryWrapper); + public void modifyUploadFileByURT(MultipartFile[] files, String planinfoid, String type,String stage) throws IOException { SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); String currentDay = dateFormat.format(new Date()); SysUser currentUser = ShiroUtil.getCurrentUser(); String nickname = currentUser.getNickname(); - File filePath = new File(uploadpath + File.separator +nickname+ File.separator+currentDay+File.separator); + + File filePath = new File(uploadpath +File.separator+"planinfoFile"+ File.separator + nickname+ File.separator+currentDay+File.separator); //文件夹不存在则创建 if (!filePath.exists()) { // 创建文件根目录 filePath.mkdirs(); + }else { +// return modifyUploadFile(files,projectid,status); } - for (MultipartFile item:files) { - String fileName =null; - String originalFilename = item.getOriginalFilename(); - originalFilename = CommonUtils.getFileName(originalFilename); - if(originalFilename.indexOf(".")!=-1){ - fileName = originalFilename.substring(0, originalFilename.lastIndexOf(".")) + "_" + System.currentTimeMillis() + originalFilename.substring(originalFilename.lastIndexOf(".")); - }else{ - fileName = originalFilename+ "_" + System.currentTimeMillis(); + if(null!=files){ + for (MultipartFile item:files) { + String fileName =null; + String originalFilename = item.getOriginalFilename(); + originalFilename = CommonUtils.getFileName(originalFilename); + if(originalFilename.indexOf(".")!=-1){ + fileName = originalFilename.substring(0, originalFilename.lastIndexOf(".")) + "_" + System.currentTimeMillis() + originalFilename.substring(originalFilename.lastIndexOf(".")); + }else{ + fileName = originalFilename+ "_" + System.currentTimeMillis(); + } + String savePath = filePath.getPath() + File.separator + fileName; + File savefile = new File(savePath); + FileCopyUtils.copy(item.getBytes(), savefile);//保存文件 + if("2".equals(type)){ + //修改以前记录为作废 + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(HuzhouPlaninfofile::getPlaninfoid,planinfoid); + updateWrapper.eq(HuzhouPlaninfofile::getCreateUser,currentUser.getId()); + updateWrapper.set(HuzhouPlaninfofile::getStatus,"0"); + planinfofileMapper.update(null,updateWrapper); + } + HuzhouPlaninfofile huzhouUploadfileinfo = new HuzhouPlaninfofile(); + huzhouUploadfileinfo.setDocumentName(originalFilename);//未加工过的文件名称 + huzhouUploadfileinfo.setDocumentType(item.getContentType()); + huzhouUploadfileinfo.setDocumentPath(savePath); + huzhouUploadfileinfo.setSize(item.getSize()); + huzhouUploadfileinfo.setPlaninfoid(planinfoid); + huzhouUploadfileinfo.setStatus("1"); + huzhouUploadfileinfo.setStage(stage); + planinfofileMapper.insert(huzhouUploadfileinfo); } - String savePath = filePath.getPath() + File.separator + fileName; - File savefile = new File(savePath); - FileCopyUtils.copy(item.getBytes(), savefile);//保存文件 - HuzhouUploadfileinfo huzhouUploadfileinfo = new HuzhouUploadfileinfo(); - huzhouUploadfileinfo.setDocumentName(originalFilename);//未加工过的文件名称 - huzhouUploadfileinfo.setDocumentType(item.getContentType()); - huzhouUploadfileinfo.setDocumentPath(savePath); - huzhouUploadfileinfo.setStage(stage); - huzhouUploadfileinfo.setStatus("1"); - huzhouUploadfileinfo.setSize(item.getSize()); - huzhouUploadfileinfo.setProjectid(projectid); - boolean save = this.save(huzhouUploadfileinfo); } + HuzhouPlaninfo huzhouPlaninfo = new HuzhouPlaninfo(); + huzhouPlaninfo.setId(planinfoid); + huzhouPlaninfo.setIsfinish("1"); + huzhouPlaninfo.setActualEndTime(new Date()); + planinfoMapper.updateById(huzhouPlaninfo); } }