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

提交diamagnetic

dev_xds
姜玉琦 2024-05-05 22:31:36 +08:00
parent 5ae9dd8387
commit ec7a9dbb08
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/project/projectMeasure/index.vue
View File

@ -601,7 +601,7 @@ export default {
if(this.form.measureType=='6'){ if(this.form.measureType=='6'){
return dict.raw.remark == 'gjgc' || dict.raw.remark == 'all'; return dict.raw.remark == 'gjgc' || dict.raw.remark == 'all';
}else{ }else{
return !dict.raw.remark || dict.raw.remark == 'all'; return dict.raw.remark == null || dict.raw.remark == 'all';
} }
}else{ }else{
return false; return false;

4
ruoyi-ui/src/views/project/projectMeasure/projectMeasureDrawer.vue
View File

@ -285,9 +285,9 @@ export default {
showInfoType(dict) { showInfoType(dict) {
if (this.form.measureType) { if (this.form.measureType) {
if (this.form.measureType == '6') { if (this.form.measureType == '6') {
return dict.raw.remark == 'gjgc'; return dict.raw.remark == 'gjgc' || dict.raw.remark == 'all';
} else { } else {
return dict.raw.remark == null; return dict.raw.remark == null || dict.raw.remark == 'all';
} }
} else { } else {
return false; return false;

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

@ -723,7 +723,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
UNION ALL UNION ALL
select '97' as infotype,fli1.approve_status as checkState,count(1) as total from flow_labour_info fli1 select '97' as infotype,fli1.approve_status as checkState,count(1) as total from flow_labour_info fli1
left join sur_project sp on fli1.project_id=sp.id left join sur_project sp on fli1.project_id=sp.id
where fli1.is_del=0 and fli1.approve_status='100' where fli1.is_del=0
<if test="projectId &gt; 0"> and fli1.project_id=#{projectId}</if> <if test="projectId &gt; 0"> and fli1.project_id=#{projectId}</if>
<if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if> <if test="deptId &gt; 0 ">AND sp.deptid = #{deptId}</if>
<if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if> <if test="proType != null and proType != ''"> and sp.projectType = #{proType}</if>