sxyanzhu
/
jhprjv2
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update code

dev_xds
haha 2023-08-16 23:41:57 +08:00
parent 8e05388032
commit a536bf2856
14 changed files with 97 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pom.xml
View File

@ -31,6 +31,7 @@
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<flowable.version>6.7.2</flowable.version>
<hutool.version>5.8.20</hutool.version>
</properties>
<!-- 依赖声明 -->

2
ruoyi-admin/src/main/java/com/ruoyi/RuoYiApplication.java
View File

@ -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");
}
}

4
ruoyi-common/pom.xml
View File

@ -137,13 +137,13 @@
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-http</artifactId>
<version>5.8.16</version>
<version>${hutool.version}</version>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-core</artifactId>
<version>5.8.16</version>
<version>${hutool.version}</version>
</dependency>
<dependency>

7
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
View File

@ -143,6 +143,13 @@ public class FileUploadUtils
}
}
public static void minPath(String path){
List<File> list= FileUtil.loopFiles(path);
for(File f :list){
System.out.println(f.getAbsolutePath());
makeMiniImage(f.getAbsolutePath());
}
}
public static void main(String[] args) {
List<File> list= FileUtil.loopFiles("D:/hahaprj/tmp");

17
ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue
View File

@ -16,13 +16,25 @@
<el-col :span="12"> <el-form-item label="实际节点" prop="actualNode">
<el-input v-model="form.actualNode" type="textarea" placeholder="请输入内容" />
</el-form-item>
</el-col><el-col :span="12">
</el-col>
<template v-if="!isFinish">
<el-col :span="12">
<el-form-item label="融资、招采进展" prop="purchaseProgress">
<el-input v-model="form.purchaseProgress" type="textarea" placeholder="请输入内容" />
</el-form-item></el-col>
<el-col :span="12"> <el-form-item label="报建、设计进展" prop="designProgress">
<el-input v-model="form.designProgress" type="textarea" placeholder="请输入内容" />
</el-form-item></el-col>
</template>
<template v-if="isFinish">
<el-col :span="12">
<el-form-item label="结算进展" prop="purchaseProgress">
<el-input v-model="form.purchaseProgress" type="textarea" placeholder="请输入内容" />
</el-form-item></el-col>
<el-col :span="12"> <el-form-item label="运维进展" prop="designProgress">
<el-input v-model="form.designProgress" type="textarea" placeholder="请输入内容" />
</el-form-item></el-col>
</template>
<el-col :span="24"> <el-form-item label="施工进展" prop="constructionProgress">
<el-input v-model="form.constructionProgress" type="textarea" placeholder="请输入内容" />
@ -30,6 +42,7 @@
<el-col :span="12"><el-form-item label="验收进展" prop="acceptanceProgress">
<el-input v-model="form.acceptanceProgress" type="textarea" placeholder="请输入内容" />
</el-form-item></el-col>
<el-col :span="12"><el-form-item label="下周计划" prop="planForNextWeek">
<el-input v-model="form.planForNextWeek" type="textarea" placeholder="请输入内容" />
</el-form-item></el-col>
@ -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();

5
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProblemmodifyController.java
View File

@ -125,6 +125,11 @@ public class ProblemmodifyController extends BaseController {
@PostMapping("/groupByInfotypeCheckState")
public AjaxResult groupByInfotypeCheckState(@RequestBody SmzSspProblemmodifyWhere where){
List<SmzSspProblemmodify> 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);
}

5
yanzhu-jh/pom.xml
View File

@ -17,6 +17,11 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
<groupId>cn.hutool</groupId>
<artifactId>hutool-poi</artifactId>
<version>${hutool.version}</version>
</dependency>
</dependencies>
</project>

12
yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectBuildNodeData.java
View File

@ -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;
}

11
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java
View File

@ -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;

2
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java
View File

@ -90,4 +90,6 @@ public interface SmzSspProblemmodifyMapper
public List<SmzSspProblemmodify> countByDateRange(SmzSspProblemmodifyWhere where);
public List<SmzSspProblemmodify> groupByInfotypeCheckState(SmzSspProblemmodifyWhere where);
public int countTimeout(SmzSspProblemmodifyWhere where);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java
View File

@ -83,4 +83,6 @@ public interface ISmzSspProblemmodifyService
public List<SmzSspProblemmodify> countByDateRange(SmzSspProblemmodifyWhere where);
public List<SmzSspProblemmodify> groupByInfotypeCheckState(SmzSspProblemmodifyWhere where);
public Long countTimeout(SmzSspProblemmodifyWhere where);
}

5
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java
View File

@ -127,4 +127,9 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
public List<SmzSspProblemmodify> groupByInfotypeCheckState(SmzSspProblemmodifyWhere where) {
return smzSspProblemmodifyMapper.groupByInfotypeCheckState(where);
}
@Override
public Long countTimeout(SmzSspProblemmodifyWhere where) {
return (long) smzSspProblemmodifyMapper.countTimeout(where);
}
}

12
yanzhu-jh/src/main/resources/mapper/project/SurProjectBuildNodeDataMapper.xml
View File

@ -42,16 +42,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="nodeText" column="node_text" />
<result property="nodeLvl" column="node_lvl" />
</association>
<association property="project" javaType="SurProject">
<result property="id" column="project_id" />
<result property="projectName" column="projectName"/>
</association>
</resultMap>
<sql id="selectSurProjectBuildNodeDataVo">
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
</sql>
<sql id="selectSurProjectBuildNodeDataVoByNode">
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
</sql>
<select id="selectSurProjectBuildNodeDataList" parameterType="SurProjectBuildNodeData" resultMap="SurProjectBuildNodeDataResultNode">
<include refid="selectSurProjectBuildNodeDataVoByNode"/>

24
yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml
View File

@ -37,6 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="recheckSendUser" column="recheckSendUser" />
<result property="roleType" column="roleType" />
<result property="vDel" column="v_del" />
<result property="createBy" column="createBy"/>
</resultMap>
<sql id="selectSmzSspProblemmodifyVo">
@ -44,12 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="selectSmzSspProblemmodifyList" parameterType="SmzSspProblemmodify" resultMap="SmzSspProblemmodifyResult">
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 &lt; 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
<where>
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) &lt; date(now()) ) or date(audittime)>date(nickedTime)
((updateTime is null and date(nickedTime) &lt; date(now()) ) or date(updateTime )>date(nickedTime))
and infoType=#{infoType}
<if test="id >0 ">AND deptid = #{id}</if>
<if test="roleType > 0">AND roletype=#{roleType}</if>
@ -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) &lt; DATE(nickedTime)
SELECT projectid,COUNT(1) timoutComp FROM vw_smz_ssp_problemmodify_audit WHERE (updateTime is null and date(nickedTime) &lt; date(now()) )
and infoType=#{infoType}
<if test="id >0 ">AND deptid = #{id}</if>
<if test="roleType > 0">AND roletype=#{roleType}</if>
@ -273,6 +274,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="groupByInfotypeCheckState" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
SELECT infotype,checkState,COUNT(1) id FROM smz_ssp_problemmodify WHERE isDel=0
<if test="infoType !=null">and infoType=#{infoType}</if>
<if test="projectId > 0"> and projectId=#{projectId}</if>
<if test="projectId &lt;= 0">
AND projectId IN (
@ -282,4 +284,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</if>
GROUP BY infotype,checkState
</select>
<select id="countTimeout" parameterType="SmzSspProblemmodifyWhere" resultType="Integer">
select count(1) cnt
FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0
<if test="infoType !=null">and infoType=#{infoType}</if>
and ((updateTime is null and date(nickedTime) &lt; date(now()) ) or date(updateTime )>date(nickedTime))
<if test="projectId > 0"> and projectId=#{projectId}</if>
<if test="projectId &lt;= 0">
AND projectId IN (
SELECT id FROM sur_project WHERE isdel=0
<if test="deptId >0 ">AND deptid = #{deptId}</if>
)
</if>
</select>
</mapper>