diff --git a/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue b/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue index e2022c84..94dfc19d 100644 --- a/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue +++ b/ruoyi-ui/src/views/project/surProjectSchedule/ProjectScheduleDlg.vue @@ -11,7 +11,7 @@ - + diff --git a/ruoyi-ui/src/views/project/surProjectSchedule/index.vue b/ruoyi-ui/src/views/project/surProjectSchedule/index.vue index 78779a8a..99528d72 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-ui/src/views/trouble/pshProblemmodifyDraft/index.vue b/ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue index ec9fd587..85ee59d4 100644 --- a/ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue +++ b/ruoyi-ui/src/views/trouble/pshProblemmodifyDraft/index.vue @@ -629,6 +629,7 @@ export default { isDel: 0 } this.smzSspProblemmodifyDraftList.push(row); + this.changeProject(row.projectId,row); this.$notify({ title: '新增成功', message: '已新增一行新数据,提交后生效!', diff --git a/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue b/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue index 98412db7..f642e8af 100644 --- a/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue +++ b/ruoyi-ui/src/views/trouble/sspProblemmodifyDraft/index.vue @@ -629,6 +629,7 @@ export default { isDel: 0 } this.smzSspProblemmodifyDraftList.push(row); + this.changeProject(row.projectId,row); this.$notify({ title: '新增成功', message: '已新增一行新数据,提交后生效!', diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java index 9446771f..62d2f35d 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/controller/SmzSspProblemmodifyDraftController.java @@ -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 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 list = smzSspProblemmodifyDraftService.selectSmzSspProblemmodifyDraftList(smzSspProblemmodifyDraft); ExcelUtil util = new ExcelUtil(SmzSspProblemmodifyDraft.class); util.exportExcel(response, list, "随手拍问题整改质量留痕信息数据"); diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java index b9c78d79..4da16e7a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyDraftServiceImpl.java @@ -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()); - insert.setProblemArea(smzSspProblemmodifyDraft.getProblemArea()); + //兼容项目名称为空的异常... + 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());