diff --git a/pom.xml b/pom.xml index 0c0dbc3f..4e06b239 100644 --- a/pom.xml +++ b/pom.xml @@ -31,6 +31,7 @@ 2.3 0.9.1 6.7.2 + 5.8.20 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java index 1dd43a27..00465637 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java @@ -1,5 +1,6 @@ package com.ruoyi; +import com.ruoyi.common.utils.file.FileUploadUtils; import org.mybatis.spring.annotation.MapperScan;; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -31,5 +32,6 @@ public class RuoYiApplication " | | \\ `' /| `-' / \n" + " | | \\ / \\ / \n" + " ''-' `'-' `-..-' "); + //FileUploadUtils.minPath("/data/uploadPath/upload/2023/08/16"); } } diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index c39e1ca8..3cf0f998 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -137,13 +137,13 @@ cn.hutool hutool-http - 5.8.16 + ${hutool.version} cn.hutool hutool-core - 5.8.16 + ${hutool.version} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java index b0d335d3..992c9837 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java @@ -143,6 +143,13 @@ public class FileUploadUtils } } + public static void minPath(String path){ + List list= FileUtil.loopFiles(path); + for(File f :list){ + System.out.println(f.getAbsolutePath()); + makeMiniImage(f.getAbsolutePath()); + } + } public static void main(String[] args) { List list= FileUtil.loopFiles("D:/hahaprj/tmp"); diff --git a/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue b/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue index 99b795b2..76c77a4d 100644 --- a/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue +++ b/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue @@ -16,13 +16,25 @@ - + + + @@ -30,6 +42,7 @@ + @@ -57,6 +70,7 @@ export default { dicts: ['sys_common_isdel'], data() { return { + isFinish:false, elKey: 0, open: false, prj: null, @@ -124,6 +138,7 @@ export default { this.resetForm("form"); }, showDialog(prj) { + this.isFinish=prj.projectType==4; this.prj = prj; this.open = true; this.loadLastData(); diff --git a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java index 27a65a12..17677847 100644 --- a/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java +++ b/yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java @@ -125,6 +125,11 @@ public class ProblemmodifyController extends BaseController { @PostMapping("/groupByInfotypeCheckState") public AjaxResult groupByInfotypeCheckState(@RequestBody SmzSspProblemmodifyWhere where){ List list=smzSspProblemmodifyService.groupByInfotypeCheckState(where); + SmzSspProblemmodify obj=new SmzSspProblemmodify(); + obj.setId(smzSspProblemmodifyService.countTimeout(where)); + obj.setCheckState(5l); + obj.setInfoType(where.getInfoType()); + list.add(obj); return AjaxResult.success(list); } diff --git a/yanzhu-jh/pom.xml b/yanzhu-jh/pom.xml index 40928829..97f68532 100644 --- a/yanzhu-jh/pom.xml +++ b/yanzhu-jh/pom.xml @@ -17,6 +17,11 @@ com.ruoyi ruoyi-system + + cn.hutool + hutool-poi + ${hutool.version} + \ No newline at end of file diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectBuildNodeData.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectBuildNodeData.java index 0d13420b..5f10bb9f 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectBuildNodeData.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectBuildNodeData.java @@ -71,7 +71,17 @@ public class SurProjectBuildNodeData extends BaseEntity private BaseBuildNode baseBuildNode; - public void setId(Long id) + private SurProject project; + + public SurProject getProject() { + return project; + } + + public void setProject(SurProject project) { + this.project = project; + } + + public void setId(Long id) { this.id = id; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java index 67c161cc..a487a206 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java @@ -85,6 +85,17 @@ public class SmzSspProblemmodify extends BaseEntity @Excel(name = "留痕说明") private String nickedInfo; + @Override + public String getCreateBy() { + return createBy; + } + + @Override + public void setCreateBy(String createBy) { + this.createBy = createBy; + } + + private String createBy; /** 审核人 */ @Excel(name = "审核人") private String checkUser; diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java index afa9a455..4fbc26e8 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java @@ -90,4 +90,6 @@ public interface SmzSspProblemmodifyMapper public List countByDateRange(SmzSspProblemmodifyWhere where); public List groupByInfotypeCheckState(SmzSspProblemmodifyWhere where); + + public int countTimeout(SmzSspProblemmodifyWhere where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java index e490f80e..5bc0bd2d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java @@ -83,4 +83,6 @@ public interface ISmzSspProblemmodifyService public List countByDateRange(SmzSspProblemmodifyWhere where); public List groupByInfotypeCheckState(SmzSspProblemmodifyWhere where); + + public Long countTimeout(SmzSspProblemmodifyWhere where); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java index 094e0a39..eb618d55 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java @@ -127,4 +127,9 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi public List groupByInfotypeCheckState(SmzSspProblemmodifyWhere where) { return smzSspProblemmodifyMapper.groupByInfotypeCheckState(where); } + + @Override + public Long countTimeout(SmzSspProblemmodifyWhere where) { + return (long) smzSspProblemmodifyMapper.countTimeout(where); + } } diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml index 94405973..00a0ba4a 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml @@ -42,16 +42,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + select id, node_id, project_id, start_date, plan_start_date, end_date, plan_end_date, status, remark, files, is_del, create_by, create_time, update_by, update_time from sur_project_build_node_data - select * from ( - SELECT a.id, node_id, project_id, start_date, end_date,plan_start_date,plan_end_date, STATUS, a.remark, files, a.is_del, a.create_by, a.create_time, a.update_by, a.update_time ,node_text,node_lvl - FROM sur_project_build_node_data a,base_build_node b WHERE a.node_id=b.id - ) sur_project_build_node_data + SELECT * FROM ( + SELECT a.id, node_id, project_id,p.projectName,start_date, end_date,plan_start_date,plan_end_date, STATUS, a.remark, files, a.is_del, a.create_by, a.create_time, a.update_by, a.update_time ,node_text,node_lvl + FROM sur_project_build_node_data a,base_build_node b,sur_project p WHERE a.node_id=b.id AND a.project_id=p.id + ) sur_project_build_node_data - select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type, ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, + select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type, ssp.recheckSend, ssp.recheckSendUser, ssp.roleType,ssp.createBy, CASE WHEN(ssp.createUser = #{nowUser} or #{nowRole} in ('1','2','3','4') ) and ssp.checkState < 4 THEN 0 ELSE 1 END AS v_del - from smz_ssp_problemmodify ssp + from vw_smz_ssp_problemmodify_audit ssp left join sur_project sp on ssp.projectId = sp.id and ssp.isDel=0 @@ -224,7 +225,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" a left join( select projectid,count(1) timoutNoComp from vw_smz_ssp_problemmodify_audit where - (audittime is null and date(nickedTime) < date(now()) ) or date(audittime)>date(nickedTime) + ((updateTime is null and date(nickedTime) < date(now()) ) or date(updateTime )>date(nickedTime)) and infoType=#{infoType} AND deptid = #{id} AND roletype=#{roleType} @@ -232,7 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ) b on a.projectId=b.projectId left join ( - SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE DATE(audittime) < DATE(nickedTime) + SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE (updateTime is null and date(nickedTime) < date(now()) ) and infoType=#{infoType} AND deptid = #{id} AND roletype=#{roleType} @@ -273,6 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + \ No newline at end of file