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

Merge branch 'dev' of http://62.234.3.186:3000/sxyanzhu/jhprjv2 into dev

dev_xds
姜玉琦 2023-08-21 18:56:47 +08:00
parent a2e1638296 de74e00c22
commit 6fc92e0414
5 changed files with 52 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ruoyi-ui/src/layout/components/Navbar.vue
View File

@ -86,6 +86,7 @@ export default {
},
methods: {
goBigScreen(){
//window.open("//szgc.jhncidg.com:808/jhbs/")
window.open("/jhbs/")
},
toggleSideBar() {

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

@ -49,8 +49,41 @@
placeholder="请输入内容"
/> </el-form-item
></el-col>
<el-col :span="24">
<el-form-item label="施工进展" prop="constructionProgress">
<el-input
v-model="form.constructionProgress"
type="textarea"
placeholder="请输入内容"
/> </el-form-item
></el-col>
<el-col :span="12"
><el-form-item label="验收进展" prop="acceptanceProgress">
<el-input
v-model="form.acceptanceProgress"
type="textarea"
placeholder="请输入内容"
/> </el-form-item
></el-col>
</template>
<template v-if="isFinish">
<el-col :span="24">
<el-form-item label="施工进展" prop="constructionProgress">
<el-input
v-model="form.constructionProgress"
type="textarea"
placeholder="请输入内容"
/> </el-form-item
></el-col>
<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="purchaseProgress">
<el-input
@ -69,23 +102,6 @@
></el-col>
</template>
<el-col :span="24">
<el-form-item label="施工进展" prop="constructionProgress">
<el-input
v-model="form.constructionProgress"
type="textarea"
placeholder="请输入内容"
/> </el-form-item
></el-col>
<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

12
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectController.java
View File

@ -4,9 +4,11 @@ import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import com.yanzhu.jh.project.domain.SurProject;
import com.yanzhu.jh.project.domain.SurProjectUserinfo;
import com.yanzhu.jh.project.service.ISurProjectService;
import com.yanzhu.jh.project.domain.SurProjectBuildNodeData;
import com.yanzhu.jh.project.service.ISurProjectBuildNodeDataService;
import com.yanzhu.jh.project.service.ISurProjectUserinfoService;
import org.aspectj.weaver.loadtime.Aj;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -24,6 +26,9 @@ public class ProjectController {
@Autowired
private ISurProjectBuildNodeDataService surProjectBuildNodeDataService;
@Autowired
private ISurProjectUserinfoService surProjectUserinfoService;
@Autowired
private RedisCache redisCache;
@ -102,4 +107,11 @@ public class ProjectController {
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list);
}
@GetMapping("/getProjectUser")
public AjaxResult getProjectUser(Long projectId){
SurProjectUserinfo where=new SurProjectUserinfo();
where.setProjectId(projectId);
return AjaxResult.success( surProjectUserinfoService.selectSurProjectUserinfoList(where));
}
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectBuildNodeDataServiceImpl.java
View File

@ -139,7 +139,7 @@ public class SurProjectBuildNodeDataServiceImpl implements ISurProjectBuildNodeD
int cnt=0;
try {
for (SurProjectBuildNodeDataExport it : list) {
List<SurProjectBuildNodeData> finds = items.stream().filter(d -> d.getId() == it.getId()).collect(Collectors.toList());
List<SurProjectBuildNodeData> finds = items.stream().filter(d -> d.getId().equals(it.getId())).collect(Collectors.toList());
if (finds.size() == 1) {
SurProjectBuildNodeData find = finds.get(0);
find.setPlanEndDate(it.getPlanEndDate());

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

@ -58,6 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and ssp.isDel=0
<if test="projectId != null "> and ssp.projectId = #{projectId}</if>
<if test="infoType != null "> and ssp.infoType = #{infoType}</if>
<if test="roleType != null and roleType >0 "> and ssp.roleType = #{roleType}</if>
<if test="problemArea != null and problemArea != ''"> and ssp.problemArea like concat('%', #{problemArea}, '%')</if>
<if test="workParts != null and workParts != ''"> and ssp.workParts like concat('%', #{workParts}, '%')</if>
<if test="changeInfo != null and changeInfo != ''"> and ssp.changeInfo like concat('%', #{changeInfo}, '%')</if>
@ -327,8 +328,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="groupByInfotypeCheckState" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
SELECT infotype,checkState,COUNT(1) id FROM smz_ssp_problemmodify WHERE isDel=0
SELECT infotype,checkState,COUNT(1) id FROM vw_smz_ssp_problemmodify_audit WHERE isDel=0
<if test="infoType !=null">and infoType=#{infoType}</if>
<if test="roleType !=null and roleType>0">and roleType=#{roleType}</if>
<if test="projectId > 0"> and projectId=#{projectId}</if>
<if test="projectId &lt;= 0">
AND projectId IN (
@ -342,7 +344,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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="roleType !=null and roleType>0">and roleType=#{roleType}</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 (