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

update code

dev_xds
haha 2023-08-22 00:58:57 +08:00
parent 6fc92e0414
commit 7600c2344a
12 changed files with 98 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/permission.js
View File

@ -45,7 +45,7 @@ router.beforeEach((to, from, next) => {
// 在免登录白名单，直接进入
next()
} else {
next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
next(`/login?redirect=#/index`) // 否则全部重定向到登录页
NProgress.done()
}
}

4
ruoyi-ui/src/views/login.vue
View File

@ -113,7 +113,6 @@ export default {
created() {
this.getCode();
this.getCookie();
location.hash = "#/login?redirect=%2Findex";
},
methods: {
getCode() {
@ -137,6 +136,7 @@ export default {
};
},
handleLogin() {
this.redirect=this.$route.query.redirect;
this.$refs.loginForm.validate((valid) => {
if (valid) {
this.loading = true;
@ -152,7 +152,7 @@ export default {
this.$store
.dispatch("Login", this.loginForm)
.then(() => {
this.$router.push({ path: this.redirect || "#/index" }).catch(() => {});
window.open( this.redirect || "#/index",'_self');
})
.catch(() => {
this.loading = false;

24
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectBuildNodeController.java
View File

@ -1,12 +1,15 @@
package com.yanzhu.jh.bigscreen.web.controller;
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.SurProjectBuildNodeData;
import com.yanzhu.jh.project.service.ISurProjectBuildNodeDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.concurrent.TimeUnit;
@RestController
@RequestMapping("/bgscreen/projectBuildNode")
@ -15,7 +18,8 @@ public class ProjectBuildNodeController {
@Autowired
ISurProjectBuildNodeDataService surProjectBuildNodeDataService;
@Autowired
private RedisCache redisCache;
/**
* 节点计划预警
* @param where
@ -62,4 +66,22 @@ public class ProjectBuildNodeController {
list=surProjectBuildNodeDataService.selectSurProjectBuildNodeDataList(surProjectBuildNodeData);
return AjaxResult.success(list);
}
/**
* 按项目类型查询计划节点数据
* @param type
* @return
*/
@GetMapping("queryByProjectType")
public AjaxResult queryByProjectType(long type){
String key="bgscreen_projectBuildNode_queryByProjectType_"+type;
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return AjaxResult.success(obj);
}
List list=surProjectBuildNodeDataService.queryByProjectType(type);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list);
}
}

29
yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java
View File

@ -3,15 +3,14 @@ package com.yanzhu.jh.bigscreen.web.controller;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.yanzhu.jh.project.domain.SmzProjectQuarterlyAssess;
import com.yanzhu.jh.project.service.ISmzProjectQuarterlyAssessService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.Calendar;
import java.util.List;
@ -30,12 +29,11 @@ public class ProjectQuarterlyAssessController extends BaseController {
@Log(title = "按部门获取当前季度考核目标", businessType = BusinessType.INSERT)
@GetMapping("/currentListByDept")
public TableDataInfo currentListByDept(Long deptId){
String key="bgscreen_currentListByDept"+deptId;
String key="bgscreen_asscess_currentListByDept"+deptId;
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return getDataTable((List<?>) obj);
}
SmzProjectQuarterlyAssess smzProjectQuarterlyAssess=new SmzProjectQuarterlyAssess();
smzProjectQuarterlyAssess.setDeptId(deptId);
Calendar calendar=Calendar.getInstance();
@ -46,4 +44,25 @@ public class ProjectQuarterlyAssessController extends BaseController {
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return getDataTable(list);
}
/**
* 根据项目类型查询项目的季度计划
* @param
* @return
*/
@PostMapping("/queryByProjectType")
public AjaxResult queryByProjectType(@RequestBody SmzProjectQuarterlyAssess where){
String key="bgscreen_asscess_queryByProjectType_"+where.getId()+"_"+where.getYear()+"_"+where.getQuarterly();
Object obj=redisCache.getCacheObject(key);
if(obj!=null){
return AjaxResult.success(obj);
}
List list=smzProjectQuarterlyAssessService.queryByProjectType(where);
redisCache.setCacheObject(key, list, Constants.BIGSCREEN_QUERY_CACHE, TimeUnit.MINUTES);
return AjaxResult.success(list);
}
}

7
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SmzProjectQuarterlyAssessMapper.java
View File

@ -65,4 +65,11 @@ public interface SmzProjectQuarterlyAssessMapper
* @return
*/
public List<SmzProjectQuarterlyAssess> currentListByDept(SmzProjectQuarterlyAssess smzProjectQuarterlyAssess);
/**
* 根据项目类型查询项目的季度计划
* @param where
* @return
*/
public List<SmzProjectQuarterlyAssess> queryByProjectType(SmzProjectQuarterlyAssess where);
}

2
yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectBuildNodeDataMapper.java
View File

@ -74,4 +74,6 @@ public interface SurProjectBuildNodeDataMapper
public List<SurProjectBuildNodeData> selectCurrent(SurProjectBuildNodeData where);
public List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where);
public List<SurProjectBuildNodeData> queryByProjectType(long type);
}

7
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISmzProjectQuarterlyAssessService.java
View File

@ -62,4 +62,11 @@ public interface ISmzProjectQuarterlyAssessService
public void addYear(SmzProjectQuarterlyAssess smzProjectQuarterlyAssess);
public List<SmzProjectQuarterlyAssess> currentListByDept( SmzProjectQuarterlyAssess smzProjectQuarterlyAssess);
/**
* 根据项目类型查询项目的季度计划
* @param where
* @return
*/
public List queryByProjectType(SmzProjectQuarterlyAssess where);
}

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

@ -79,4 +79,6 @@ public interface ISurProjectBuildNodeDataService
public List<SurProjectBuildNodeData> selectCurrent(SurProjectBuildNodeData where);
public List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where);
public List<SurProjectBuildNodeData> queryByProjectType(long type);
}

10
yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SmzProjectQuarterlyAssessServiceImpl.java
View File

@ -128,4 +128,14 @@ public class SmzProjectQuarterlyAssessServiceImpl implements ISmzProjectQuarterl
public List<SmzProjectQuarterlyAssess> currentListByDept( SmzProjectQuarterlyAssess smzProjectQuarterlyAssess) {
return smzProjectQuarterlyAssessMapper.currentListByDept(smzProjectQuarterlyAssess);
}
/**
* 根据项目类型查询项目的季度计划
* @param where
* @return
*/
@Override
public List queryByProjectType(SmzProjectQuarterlyAssess where) {
return smzProjectQuarterlyAssessMapper.queryByProjectType(where);
}
}

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

@ -180,4 +180,9 @@ public class SurProjectBuildNodeDataServiceImpl implements ISurProjectBuildNodeD
public List<SurProjectBuildNodeData> countCompletionRate(SurProjectBuildNodeData where) {
return surProjectBuildNodeDataMapper.countCompletionRate(where);
}
@Override
public List<SurProjectBuildNodeData> queryByProjectType(long type) {
return surProjectBuildNodeDataMapper.queryByProjectType(type);
}
}

9
yanzhu-jh/src/main/resources/mapper/project/SmzProjectQuarterlyAssessMapper.xml
View File

@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="id" column="project_id" />
<result property="projectName" column="projectName" />
<result property="paretProjectName" column="paretProjectName" />
<result property="projectSchedule" column="projectSchedule"/>
</association>
</resultMap>
@ -57,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<select id="currentListByDept" parameterType="SmzProjectQuarterlyAssess" resultMap="SmzProjectQuarterlyAssessResultToProject">
SELECT a.*,p.projectName,d.dept_name paretProjectName
SELECT a.*,p.projectName,d.dept_name,d. paretProjectName,d.projectSchedule
FROM smz_project_quarterly_assess a,sur_project p,sys_dept d
WHERE a.project_id IN
(SELECT id FROM sur_project
@ -72,6 +73,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<select id="queryByProjectType" parameterType="SmzProjectQuarterlyAssess" resultMap="SmzProjectQuarterlyAssessResultToProject">
SELECT p.id, p.projectName,p.projectSchedule,a.plan_target
FROM sur_project p LEFT JOIN smz_project_quarterly_assess a ON a.project_id=p.id
WHERE p.projecttype=#{id} AND a.year=#{year} AND a.quarterly=#{quarterly} AND p.isdel=0
order by p.projectSort
</select>
<select id="selectSmzProjectQuarterlyAssessList" parameterType="SmzProjectQuarterlyAssess" resultMap="SmzProjectQuarterlyAssessResult">
<include refid="selectSmzProjectQuarterlyAssessVo"/>
<where>

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

@ -192,4 +192,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
GROUP BY a.project_id
) c ON a.project_id=c.project_id
</select>
<select id="queryByProjectType" parameterType="Long" resultMap="SurProjectBuildNodeDataResultNode">
<include refid="selectSurProjectBuildNodeDataVoByNode"/>
WHERE is_del=0 AND project_id IN (
SELECT id FROM sur_project WHERE isdel=0 AND projecttype=#{type})
</select>
</mapper>