提交代码
parent
ae19c41891
commit
b1f8540003
|
@ -8,7 +8,7 @@
|
|||
style="padding-left: 20px"
|
||||
>
|
||||
<template slot="title">
|
||||
<div>{{ title + " 【实时测量管理】" }}</div>
|
||||
<div>{{ title + " 【实测实量管理】" }}</div>
|
||||
</template>
|
||||
<el-tabs
|
||||
v-model="activeName"
|
||||
|
|
|
@ -427,7 +427,7 @@
|
|||
command="handleProjectMeasure"
|
||||
icon="el-icon-s-operation"
|
||||
v-hasPermi="['project:projectMeasure:list']"
|
||||
>实时测量管理</el-dropdown-item
|
||||
>实测实量管理</el-dropdown-item
|
||||
>
|
||||
<el-dropdown-item
|
||||
command="handleProjectMaterialSeal"
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="形象图片" prop="image">
|
||||
<image-upload v-model="form.image" :limit="2" />
|
||||
<image-upload v-model="form.image" :limit="5" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
@ -50,39 +50,39 @@
|
|||
/> </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>
|
||||
<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-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">
|
||||
|
|
|
@ -253,7 +253,7 @@
|
|||
<el-form ref="form" :model="form" :rules="rules" label-width="120px">
|
||||
<el-col :span="24">
|
||||
<el-form-item label="形象图片" prop="image">
|
||||
<image-upload v-model="form.image" :limit="2" />
|
||||
<image-upload v-model="form.image" :limit="5" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="12">
|
||||
|
|
|
@ -43,7 +43,15 @@ public class ProjectController extends BaseController {
|
|||
*/
|
||||
@RequestMapping("/getProjectFoundation")
|
||||
public Map<String, Object> getProjectFoundation(@RequestParam String id) {
|
||||
return IProjectInfoService.getProjectBasicInfo(id);
|
||||
//设置缓存
|
||||
String key="wechat_project_getProjectFoundation-id"+id;
|
||||
Object obj=redisCache.getCacheObject(key);
|
||||
if(obj!=null){
|
||||
return (Map<String, Object>)obj;
|
||||
}
|
||||
Map<String,Object> dataMap = IProjectInfoService.getProjectBasicInfo(id);
|
||||
redisCache.setCacheObject(key, dataMap, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
|
||||
return dataMap;
|
||||
}
|
||||
|
||||
/***
|
||||
|
|
|
@ -36,8 +36,6 @@ public class ProjectProblemmodifyController extends BaseController {
|
|||
@Autowired
|
||||
ISmzSspProblemmodifyService smzSspProblemmodifyService;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* 查询当前用户问题整改列表
|
||||
* @param smzSspProblemmodify
|
||||
|
|
|
@ -0,0 +1,77 @@
|
|||
package com.ruoyi.web.project.controller;
|
||||
|
||||
import com.ruoyi.common.annotation.Log;
|
||||
import com.ruoyi.common.core.controller.BaseController;
|
||||
import com.ruoyi.common.core.domain.AjaxResult;
|
||||
import com.ruoyi.common.enums.BusinessType;
|
||||
import com.yanzhu.jh.project.domain.SurProjectSchedule;
|
||||
import com.yanzhu.jh.project.service.ISurProjectScheduleService;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
|
||||
/**
|
||||
* @version : V1.0
|
||||
* @ClassName: ProjectScheduleController
|
||||
* @Description: 项目形象进度
|
||||
* @Auther: JiangYuQi
|
||||
* @Date: 2020/7/7 18:03
|
||||
*/
|
||||
@RestController
|
||||
@RequestMapping("/wechat/projectSchedule")
|
||||
public class ProjectScheduleController extends BaseController {
|
||||
|
||||
@Autowired
|
||||
private ISurProjectScheduleService isurProjectScheduleService;
|
||||
|
||||
/**
|
||||
* 查询项目形象进度列表
|
||||
* @param surProjectSchedule
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/list")
|
||||
public AjaxResult list(SurProjectSchedule surProjectSchedule){
|
||||
return success(isurProjectScheduleService.selectSurProjectScheduleList(surProjectSchedule));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询项目最后一个形象进度
|
||||
* @param projectId
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/lastInfo")
|
||||
public AjaxResult lastInfo(Long projectId){
|
||||
return success(isurProjectScheduleService.getProjectConstructionProgress(projectId));
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询形象进度详情
|
||||
* @param id
|
||||
* @return
|
||||
*/
|
||||
@GetMapping("/info")
|
||||
public AjaxResult info(Long id){
|
||||
return success(isurProjectScheduleService.selectSurProjectScheduleById(id));
|
||||
}
|
||||
|
||||
/**
|
||||
* 新增问题整改
|
||||
* @param surProjectSchedule
|
||||
* @return
|
||||
*/
|
||||
@PostMapping("/add")
|
||||
@Log(title = "形象进度", businessType = BusinessType.INSERT)
|
||||
public AjaxResult add(@RequestBody SurProjectSchedule surProjectSchedule){
|
||||
return success(isurProjectScheduleService.insertSurProjectSchedule(surProjectSchedule));
|
||||
}
|
||||
|
||||
/**
|
||||
* 删除形象进度
|
||||
*/
|
||||
@Log(title = "形象进度", businessType = BusinessType.DELETE)
|
||||
@GetMapping("/remove")
|
||||
public AjaxResult remove(@RequestParam Long id)
|
||||
{
|
||||
return toAjax(isurProjectScheduleService.deleteSurProjectScheduleById(id));
|
||||
}
|
||||
|
||||
}
|
|
@ -108,8 +108,8 @@
|
|||
IFNULL( spi.actualOperatingTime, '' ) AS actualStartTime,
|
||||
IFNULL( spi.plannedCompletionTime, '' ) AS planCompletedTime,
|
||||
'' AS totalManHours,
|
||||
IFNULL( sup2.nick_name, '' ) AS projectPerson,
|
||||
IFNULL( sup2.phonenumber, '' ) AS projectPhone
|
||||
IFNULL( spi.projectPerson, '' ) AS projectPerson,
|
||||
IFNULL( spi.projectPhone, '' ) AS projectPhone
|
||||
FROM
|
||||
sur_project spi
|
||||
LEFT JOIN china_area ca ON spi.projectRegional = ca.id
|
||||
|
@ -117,21 +117,6 @@
|
|||
left join sys_dict_data sdd2 on sdd2.dict_type = 'project_level' and sdd2.dict_value = spi.projiectLevel
|
||||
left join sys_dict_data sdd3 on sdd3.dict_type = 'project_build_type' and sdd3.dict_value = spi.projectNature
|
||||
left join sys_dict_data sdd4 on sdd4.dict_type = 'sur_project_xmjd' and sdd4.dict_value = spi.projectSchedule
|
||||
LEFT JOIN (
|
||||
SELECT
|
||||
su.user_id,
|
||||
su.nick_name,
|
||||
su.phonenumber
|
||||
FROM
|
||||
sur_project_userinfo sup1
|
||||
LEFT JOIN sys_user su ON sup1.user_id = su.user_id
|
||||
WHERE
|
||||
sup1.project_id =#{id}
|
||||
AND sup1.job_type = '21'
|
||||
ORDER BY
|
||||
sup1.create_time DESC
|
||||
LIMIT 1
|
||||
) sup2 ON 1 = 1
|
||||
WHERE
|
||||
spi.id =#{id}
|
||||
AND spi.isDel = 0
|
||||
|
|
|
@ -80,8 +80,15 @@ public class SurProjectSchedule extends BaseEntity
|
|||
@Excel(name = "数据状态")
|
||||
private Long isDel;
|
||||
|
||||
private String mainImage;
|
||||
|
||||
private SurProject surProject;
|
||||
|
||||
private String projectType;
|
||||
|
||||
//数据模板
|
||||
private String dataTemplate;
|
||||
|
||||
public SurProject getSurProject() {
|
||||
return surProject;
|
||||
}
|
||||
|
@ -208,6 +215,30 @@ public class SurProjectSchedule extends BaseEntity
|
|||
return isDel;
|
||||
}
|
||||
|
||||
public String getMainImage() {
|
||||
return mainImage;
|
||||
}
|
||||
|
||||
public void setMainImage(String mainImage) {
|
||||
this.mainImage = mainImage;
|
||||
}
|
||||
|
||||
public String getDataTemplate() {
|
||||
return dataTemplate;
|
||||
}
|
||||
|
||||
public void setDataTemplate(String dataTemplate) {
|
||||
this.dataTemplate = dataTemplate;
|
||||
}
|
||||
|
||||
public String getProjectType() {
|
||||
return projectType;
|
||||
}
|
||||
|
||||
public void setProjectType(String projectType) {
|
||||
this.projectType = projectType;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
|
||||
|
|
|
@ -2,6 +2,9 @@ package com.yanzhu.jh.project.service.impl;
|
|||
|
||||
import java.util.List;
|
||||
import com.ruoyi.common.utils.DateUtils;
|
||||
import com.ruoyi.common.utils.StringUtils;
|
||||
import com.yanzhu.jh.project.domain.SurProject;
|
||||
import com.yanzhu.jh.project.mapper.SurProjectMapper;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.yanzhu.jh.project.mapper.SurProjectScheduleMapper;
|
||||
|
@ -17,6 +20,10 @@ import com.yanzhu.jh.project.service.ISurProjectScheduleService;
|
|||
@Service
|
||||
public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService
|
||||
{
|
||||
|
||||
@Autowired
|
||||
private SurProjectMapper surProjectMapper;
|
||||
|
||||
@Autowired
|
||||
private SurProjectScheduleMapper surProjectScheduleMapper;
|
||||
|
||||
|
@ -58,6 +65,11 @@ public class SurProjectScheduleServiceImpl implements ISurProjectScheduleService
|
|||
@Override
|
||||
public int insertSurProjectSchedule(SurProjectSchedule surProjectSchedule)
|
||||
{
|
||||
if(surProjectSchedule.getDataTemplate()==null || surProjectSchedule.getDataTemplate()==""){
|
||||
//查询项目类型进度
|
||||
SurProject surProject = surProjectMapper.selectSurProjectById(surProjectSchedule.getProjectId());
|
||||
surProjectSchedule.setDataTemplate(surProject.getProjectType());
|
||||
}
|
||||
surProjectSchedule.setCreateTime(DateUtils.getNowDate());
|
||||
surProjectSchedule.setIsDel(0l);
|
||||
return surProjectScheduleMapper.insertSurProjectSchedule(surProjectSchedule);
|
||||
|
|
|
@ -24,6 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<result property="updateBy" column="update_by" />
|
||||
<result property="updateTime" column="update_time" />
|
||||
<result property="remark" column="remark" />
|
||||
<result property="mainImage" column="mainImage" />
|
||||
<result property="dataTemplate" column="data_template" />
|
||||
<result property="projectType" column="projectType" />
|
||||
<association property="surProject" javaType="SurProject">
|
||||
<result property="id" column="project_id" />
|
||||
<result property="projectName" column="projectName"/>
|
||||
|
@ -33,16 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
</resultMap>
|
||||
<sql id="selectSurProjectScheduleVo">
|
||||
SELECT * from (
|
||||
SELECT s.*,p.projectName
|
||||
SELECT s.*,p.projectType,p.projectName
|
||||
FROM sur_project_schedule AS s LEFT JOIN sur_project AS p ON s.project_id=p.id ) as a
|
||||
</sql>
|
||||
|
||||
|
||||
|
||||
|
||||
<select id="selectSurProjectScheduleList" parameterType="SurProjectSchedule" resultMap="SurProjectScheduleResult">
|
||||
SELECT * from (
|
||||
SELECT s.*,p.projectName
|
||||
SELECT s.*,substring_index(s.image,',',1) as mainImage,p.projectName
|
||||
FROM sur_project_schedule AS s LEFT JOIN sur_project AS p ON s.project_id=p.id
|
||||
<!--监理单位/总包公司/分包单位-->
|
||||
<if test='nowRole == "5" or nowRole == "6" or nowRole == "7"'> left join sur_project_unit_info spui on spui.projectId = p.id</if>
|
||||
|
@ -107,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="planForNextWeek != null">plan_for_next_week,</if>
|
||||
<if test="existingProblem != null">existing_problem,</if>
|
||||
<if test="problemProgress != null">problem_progress,</if>
|
||||
<if test="dataTemplate != null">data_template,</if>
|
||||
<if test="isDel != null">is_del,</if>
|
||||
<if test="createBy != null">create_by,</if>
|
||||
<if test="createTime != null">create_time,</if>
|
||||
|
@ -127,6 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="planForNextWeek != null">#{planForNextWeek},</if>
|
||||
<if test="existingProblem != null">#{existingProblem},</if>
|
||||
<if test="problemProgress != null">#{problemProgress},</if>
|
||||
<if test="dataTemplate != null">#{dataTemplate},</if>
|
||||
<if test="isDel != null">#{isDel},</if>
|
||||
<if test="createBy != null">#{createBy},</if>
|
||||
<if test="createTime != null">#{createTime},</if>
|
||||
|
@ -150,6 +152,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="planForNextWeek != null">plan_for_next_week = #{planForNextWeek},</if>
|
||||
<if test="existingProblem != null">existing_problem = #{existingProblem},</if>
|
||||
<if test="problemProgress != null">problem_progress = #{problemProgress},</if>
|
||||
<if test="dataTemplate != null">data_template = #{dataTemplate},</if>
|
||||
<if test="isDel != null">is_del = #{isDel},</if>
|
||||
<if test="createBy != null">create_by = #{createBy},</if>
|
||||
<if test="createTime != null">create_time = #{createTime},</if>
|
||||
|
|
Loading…
Reference in New Issue