diff --git a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
index fd08f22a..3c9057e6 100644
--- a/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
+++ b/ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
@@ -8,7 +8,7 @@
style="padding-left: 20px"
>
- {{ title + " 【实时测量管理】" }}
+ {{ title + " 【实测实量管理】" }}
实时测量管理实测实量管理
-
+
@@ -50,39 +50,39 @@
/>
-
-
-
-
+
+
+
+
-
-
-
-
+
+
+
+
diff --git a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue
index 8015151a..dbecb0fa 100644
--- a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue
+++ b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue
@@ -253,7 +253,7 @@
-
+
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
index 663b5ac0..04cead30 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectController.java
@@ -43,7 +43,15 @@ public class ProjectController extends BaseController {
*/
@RequestMapping("/getProjectFoundation")
public Map 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)obj;
+ }
+ Map dataMap = IProjectInfoService.getProjectBasicInfo(id);
+ redisCache.setCacheObject(key, dataMap, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+ return dataMap;
}
/***
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java
index e8698686..4052039f 100644
--- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectProblemmodifyController.java
@@ -36,8 +36,6 @@ public class ProjectProblemmodifyController extends BaseController {
@Autowired
ISmzSspProblemmodifyService smzSspProblemmodifyService;
-
-
/**
* 查询当前用户问题整改列表
* @param smzSspProblemmodify
diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectScheduleController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectScheduleController.java
new file mode 100644
index 00000000..dfda5100
--- /dev/null
+++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/controller/ProjectScheduleController.java
@@ -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));
+ }
+
+}
diff --git a/ruoyi-wechat/src/main/resources/mapper/ProjectInfoMapper.xml b/ruoyi-wechat/src/main/resources/mapper/ProjectInfoMapper.xml
index cee3bcc8..c69a7889 100644
--- a/ruoyi-wechat/src/main/resources/mapper/ProjectInfoMapper.xml
+++ b/ruoyi-wechat/src/main/resources/mapper/ProjectInfoMapper.xml
@@ -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
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java
index 5e2f4cd8..d9327109 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectSchedule.java
@@ -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)
diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java
index c3677921..3ef90a0f 100644
--- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java
+++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectScheduleServiceImpl.java
@@ -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);
diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml
index 5a63637b..075878bc 100644
--- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml
+++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectScheduleMapper.xml
@@ -24,6 +24,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
@@ -33,16 +36,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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
-
-
-