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

提交代码

dev_xds
姜玉琦 2024-02-17 14:19:24 +08:00
parent e3933ca4d9
commit aa9ad12c7d
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/statistics/statisticsProject/index.vue
View File

@ -178,7 +178,7 @@
<el-tag v-if="scope.row.aijk==0" type="danger" effect="dark">未开通</el-tag>
</template>
</el-table-column>
<el-table-column label="项目延迟摄影" align="center" prop="yssys" width="120" show-overflow-tooltip/>
<el-table-column label="项目全景" align="center" prop="yssys" width="120" show-overflow-tooltip/>
</el-table-column>
<el-table-column label="工程管理" align="center">
<el-table-column label="项目标准化" align="center" prop="bzh" width="120" show-overflow-tooltip/>

12
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java
View File

@ -9,7 +9,9 @@ import com.ruoyi.common.enums.PublicStateEnum;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.SysDeptMapper;
import com.yanzhu.jh.project.domain.SurProject;
import com.yanzhu.jh.project.domain.SurProjectUserinfo;
import com.yanzhu.jh.project.mapper.SurProjectMapper;
import com.yanzhu.jh.project.mapper.SurProjectUserinfoMapper;
import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo;
import com.yanzhu.jh.trouble.domain.SmzSspFileinfo;
@ -34,6 +36,9 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
@Autowired
private SysDeptMapper deptMapper;
@Autowired
private SurProjectMapper surProjectMapper;
@Autowired
private SmzSspAuditinfoMapper smzSspAuditinfoMapper;
@ -118,7 +123,11 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
if(smzSspProblemmodify.getSmarkUrl()!=null){
smzSspProblemmodify.setMarksPicture(smzSspProblemmodify.getSmarkUrl().split(",")[0]);
}
smzSspProblemmodify.setCreateTime(DateUtils.getNowDate());
//兼容项目名称为空的异常...
if(StringUtils.isEmpty(smzSspProblemmodify.getProblemArea())){
SurProject surProject = surProjectMapper.selectSurProjectById(smzSspProblemmodify.getProjectId());
smzSspProblemmodify.setProblemArea(surProject.getProjectName());
}
SysDept sysDept = deptMapper.selectDeptByUserName(smzSspProblemmodify.getCreateUser());
//当前角色时管理员时，修改角色为集团公司
String roleType = "";
@ -152,6 +161,7 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi
roleType = DeptTypeEnum.FBDWTYPE.getCode();
}
smzSspProblemmodify.setRoleType(Convert.toInt(roleType));
smzSspProblemmodify.setCreateTime(DateUtils.getNowDate());
smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify);
SmzSspAuditinfo smzSspAuditinfo = new SmzSspAuditinfo();
smzSspAuditinfo.setMainId(smzSspProblemmodify.getId());

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

@ -610,8 +610,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSmzSspProblemmodifyListAndUnitName" parameterType="SmzSspProblemmodifyWhere" resultMap="SmzSspProblemmodifyResult">
select ssp.id, ssp.projectId, ssp.infoType, ssp.problemArea, ssp.workParts, ssp.changeInfo, ssp.lordSent, ssp.lordSentUser, ssp.copySend, ssp.copySendUser, ssp.checkState, ssp.nickedArea, ssp.nickedTime, ssp.projectType, ssp.processName, ssp.projectName, ssp.nickedInfo, ssp.checkUser, ssp.checkUserPhone, ssp.isDel, ssp.createUser, ssp.createTime, ssp.updateUser, ssp.updateTime, ssp.marks_picture, ssp.marks_video, ssp.smark_url, ssp.danger_type,
ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, ssp.createBy
,sp.dept_Name deptName,ssp.dangerLabel,ssp.chkLabel
ssp.recheckSend, ssp.recheckSendUser, ssp.roleType, ssp.createBy, ssp.problemType,
sp.dept_Name deptName,ssp.dangerLabel,ssp.chkLabel
from (
SELECT c.*,a.dict_label dangerLabel,b.dict_label chkLabel FROM
vw_smz_ssp_problemmodify_audit c,sys_dict_data a,sys_dict_data b WHERE c.danger_Type=a.dict_value AND a.dict_type='ssp_aqyhlx'