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

提交代码

dev_xds
姜玉琦 2024-03-14 13:51:45 +08:00
parent ca690cb5e6
commit 7b40942bcc
6 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue
View File

@ -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="5" />
<image-upload v-model="form.image" :limit="5" :fileSize="15"/>
</el-form-item>
</el-col>
<el-col :span="12">

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

@ -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="5" />
<image-upload v-model="form.image" :limit="5" :fileSize="15"/>
</el-form-item>
</el-col>
<el-col :span="12">

1
ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue
View File

@ -629,6 +629,7 @@ export default {
isDel: 0
}
this.smzSspProblemmodifyDraftList.push(row);
this.changeProject(row.projectId,row);
this.$notify({
title: '新增成功',
message: '已新增一行新数据，提交后生效！',

1
ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue
View File

@ -629,6 +629,7 @@ export default {
isDel: 0
}
this.smzSspProblemmodifyDraftList.push(row);
this.changeProject(row.projectId,row);
this.$notify({
title: '新增成功',
message: '已新增一行新数据，提交后生效！',

20
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java
View File

@ -3,6 +3,9 @@ package com.yanzhu.jh.trouble.controller;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.enums.SysRoleEnum;
import com.ruoyi.system.service.ISysDeptService;
import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@ -33,6 +36,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
@RequestMapping("/trouble/smzSspProblemmodifyDraft")
public class SmzSspProblemmodifyDraftController extends BaseController
{
@Autowired
private ISysDeptService sysDeptService;
@Autowired
private ISmzSspProblemmodifyDraftService smzSspProblemmodifyDraftService;
@ -44,6 +50,13 @@ public class SmzSspProblemmodifyDraftController extends BaseController
public TableDataInfo list(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft)
{
startPage();
smzSspProblemmodifyDraft.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodifyDraft.getNowRole())){
smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(getDeptId()));
}
smzSspProblemmodifyDraft.setNowUserName(getLoginUser().getUsername());
List<SmzSspProblemmodifyDraft> list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft);
return getDataTable(list);
}
@ -56,6 +69,13 @@ public class SmzSspProblemmodifyDraftController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, SmzSspProblemmodifyDraft smzSspProblemmodifyDraft)
{
smzSspProblemmodifyDraft.setNowRole(Convert.toStr(getUserFirstRole()));
if(SysRoleEnum.ZGS.getCode().equals(smzSspProblemmodifyDraft.getNowRole())){
smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(sysDeptService.getZGSDeptId(getDeptId())));
}else{
smzSspProblemmodifyDraft.setProjectDeptId(Convert.toStr(getDeptId()));
}
smzSspProblemmodifyDraft.setNowUserName(getLoginUser().getUsername());
List<SmzSspProblemmodifyDraft> list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft);
ExcelUtil<SmzSspProblemmodifyDraft> util = new ExcelUtil<SmzSspProblemmodifyDraft>(SmzSspProblemmodifyDraft.class);
util.exportExcel(response, list, "随手拍问题整改质量留痕信息数据");

7
yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java
View File

@ -90,7 +90,6 @@ public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodify
@Transactional
public int insertSmzSspProblemmodifyDraft(SmzSspProblemmodifyDraft smzSspProblemmodifyDraft)
{
//当前角色时管理员时，修改角色为集团公司
String roleType = getRoleType(smzSspProblemmodifyDraft.getProjectId(),smzSspProblemmodifyDraft.getCreateUser());
AtomicInteger count = new AtomicInteger();
@ -98,7 +97,13 @@ public class SmzSspProblemmodifyDraftServiceImpl implements ISmzSspProblemmodify
SmzSspProblemmodifyDraft insert = new SmzSspProblemmodifyDraft();
insert.setProjectId(smzSspProblemmodifyDraft.getProjectId());
insert.setInfoType(smzSspProblemmodifyDraft.getInfoType());
//兼容项目名称为空的异常...
if(StringUtils.isEmpty(smzSspProblemmodifyDraft.getProblemArea())){
SurProject surProject = surProjectMapper.selectSurProjectById(smzSspProblemmodifyDraft.getProjectId());
insert.setProblemArea(surProject.getProjectName());
}else{
insert.setProblemArea(smzSspProblemmodifyDraft.getProblemArea());
}
insert.setLordSent(smzSspProblemmodifyDraft.getLordSent());
insert.setLordSentUser(smzSspProblemmodifyDraft.getLordSentUser());
insert.setCheckState(smzSspProblemmodifyDraft.getCheckState());