From e3e1c2fc2b195dd442dc9e65a431ca91d66e9040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?= <7507756+jiang_yuqi@user.noreply.gitee.com> Date: Thu, 24 Aug 2023 18:42:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/common/annotation/Log.java | 5 + .../ruoyi/framework/aspectj/LogAspect.java | 10 +- .../framework/config/SecurityConfig.java | 2 +- .../ruoyi/system/mapper/SysDeptMapper.java | 16 + .../service/impl/SysUserServiceImpl.java | 2 +- .../resources/mapper/system/SysDeptMapper.xml | 14 + .../resources/mapper/system/SysUserMapper.xml | 2 +- ruoyi-ui/src/api/wxsetting/wxMenConfig.js | 44 +++ .../projectChecking/projectCheckingDrawer.vue | 2 +- .../project/surBuildNode/buildNodeDrawer.vue | 3 +- .../src/views/wxsetting/wxMenConfig/index.vue | 352 ++++++++++++++++++ .../project/ProjectCheckingController.java | 6 +- .../ProjectProblemmodifyController.java | 150 ++++++++ .../project/ProjectUserinfoController.java | 14 +- .../controller/WechatUserLoginController.java | 12 +- .../system/mapper/WechatUserLoginMapper.java | 8 + .../service/IWechatUserLoginService.java | 8 + .../impl/WechatUserLoginServiceImpl.java | 11 + .../mapper/WechatUserLoginMapper.xml | 21 ++ .../jh/project/domain/SurProjectUserinfo.java | 27 ++ .../mapper/SurProjectUserinfoMapper.java | 16 + .../service/ISurProjectUserinfoService.java | 9 + .../impl/SurProjectCheckingServiceImpl.java | 6 +- .../impl/SurProjectUserinfoServiceImpl.java | 78 +++- .../jh/trouble/domain/SmzSspFileinfo.java | 123 ++++++ .../trouble/domain/SmzSspProblemmodify.java | 38 +- .../trouble/mapper/SmzSspAuditinfoMapper.java | 35 ++ .../mapper/SmzSspProblemmodifyMapper.java | 16 + .../service/ISmzSspAuditinfoService.java | 8 + .../service/ISmzSspProblemmodifyService.java | 17 + .../impl/SmzSspAuditinfoServiceImpl.java | 65 +++- .../impl/SmzSspProblemmodifyServiceImpl.java | 126 ++++++- .../controller/SurMenuConfigController.java | 104 ++++++ .../jh/wxsetting/domain/SurMenuConfig.java | 134 +++++++ .../wxsetting/domain/SurMenuConfigRole.java | 52 +++ .../wxsetting/mapper/SurMenuConfigMapper.java | 87 +++++ .../service/ISurMenuConfigService.java | 61 +++ .../impl/SurMenuConfigServiceImpl.java | 133 +++++++ .../project/SurProjectCheckingMapper.xml | 5 +- .../project/SurProjectUnitInfoMapper.xml | 1 + .../project/SurProjectUserinfoMapper.xml | 28 +- .../mapper/trouble/SmzSspAuditinfoMapper.xml | 25 +- .../trouble/SmzSspProblemmodifyMapper.xml | 109 +++++- .../mapper/wxsetting/SurMenuConfigMapper.xml | 110 ++++++ 44 files changed, 2059 insertions(+), 36 deletions(-) create mode 100644 ruoyi-ui/src/api/wxsetting/wxMenConfig.js create mode 100644 ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue create mode 100644 ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspFileinfo.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/controller/SurMenuConfigController.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfig.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfigRole.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/mapper/SurMenuConfigMapper.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/ISurMenuConfigService.java create mode 100644 yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/impl/SurMenuConfigServiceImpl.java create mode 100644 yanzhu-jh/src/main/resources/mapper/wxsetting/SurMenuConfigMapper.xml diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java index 1eb8e49c..7c00ccc2 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/Log.java @@ -48,4 +48,9 @@ public @interface Log * 排除指定的请求参数 */ public String[] excludeParamNames() default {}; + + /** + * 昵称 + */ + public String nickname() default ""; } diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java index 381992a6..f9d6dbae 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java @@ -101,13 +101,9 @@ public class LogAspect if (loginUser != null) { operLog.setOperName(loginUser.getUsername()); - /*********************getAuthentication未获取用户信息时，从cookies中获取操作人信息***************************/ - }else if(ServletUtils.getRequest().getCookies()!=null && ServletUtils.getRequest().getCookies().length>0){ - for(Cookie cookie:ServletUtils.getRequest().getCookies()){ - if(cookie.getName().equals("username")){ - operLog.setOperName(cookie.getValue()); - } - } + /*********************getAuthentication未获取用户信息时，从RequestURI中获取操作人信息***************************/ + }else if(ServletUtils.getRequest().getHeader("Username")!=null){ + operLog.setOperName(ServletUtils.getRequest().getHeader("Username")); } if (e != null) diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java index 60152ad0..fd87ae15 100644 --- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java @@ -111,7 +111,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter // 过滤请求 .authorizeRequests() // 对于登录login 注册register 验证码captchaImage 允许匿名访问 - .antMatchers("/login","/wechatLogin/**", "/common/**", "/register", "/captchaImage", "/weixin/**","/bgscreen/**","/publics/**","/system/dict/data/**").permitAll() + .antMatchers("/login","/wechat/**", "/common/**", "/register", "/captchaImage", "/weixin/**","/bgscreen/**","/publics/**","/system/dict/data/**").permitAll() // 静态资源，可匿名访问 .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/**/img/**", "/profile/**").permitAll() .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**").permitAll() diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java index 12ae2985..70856d38 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java @@ -124,4 +124,20 @@ public interface SysDeptMapper * @return 结果 */ public int deleteDeptById(Long deptId); + + /** + * 根据项目ID查询部门信息 + * + * @param projectId 项目ID + * @return 部门信息 + */ + public SysDept selectDeptByProjectId(Long projectId); + + /** + * 根据用户名称查询部门信息 + * + * @param userName 用户名称 + * @return 部门信息 + */ + public SysDept selectDeptByUserName(String userName); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index cf1f7f0b..c11b7fca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -367,7 +367,7 @@ public class SysUserServiceImpl implements ISysUserService // for(Long id:userIds){ // SysUserRole sr = new SysUserRole(); // sr.setUserId(id); -// sr.setRoleId(95L); +// sr.setRoleId(5L); // sysUserRoleList.add(sr); // } // userRoleMapper.batchUserRole(sysUserRoleList); diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 6bf2aac1..19c453bf 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -186,4 +186,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update sys_dept set del_flag = '2' where dept_id = #{deptId} + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index f1d04c37..d486714d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -217,7 +217,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ruoyi-ui/src/api/wxsetting/wxMenConfig.js b/ruoyi-ui/src/api/wxsetting/wxMenConfig.js new file mode 100644 index 00000000..c3cb20ec --- /dev/null +++ b/ruoyi-ui/src/api/wxsetting/wxMenConfig.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询菜单配置列表 +export function listWxMenConfig(query) { + return request({ + url: '/wxsetting/wxMenConfig/list', + method: 'get', + params: query + }) +} + +// 查询菜单配置详细 +export function getWxMenConfig(id) { + return request({ + url: '/wxsetting/wxMenConfig/' + id, + method: 'get' + }) +} + +// 新增菜单配置 +export function addWxMenConfig(data) { + return request({ + url: '/wxsetting/wxMenConfig', + method: 'post', + data: data + }) +} + +// 修改菜单配置 +export function updateWxMenConfig(data) { + return request({ + url: '/wxsetting/wxMenConfig', + method: 'put', + data: data + }) +} + +// 删除菜单配置 +export function delWxMenConfig(id) { + return request({ + url: '/wxsetting/wxMenConfig/' + id, + method: 'delete' + }) +} diff --git a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue index 0e26f889..ef2b4443 100644 --- a/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue +++ b/ruoyi-ui/src/views/project/projectChecking/projectCheckingDrawer.vue @@ -401,7 +401,7 @@ export default { this.$api.publics .queryUnitList({ projectId: project.id, - unitType: 2, + unitTypes: "2,4".split(","), }) .then((d) => { this.nodes = d.rows; diff --git a/ruoyi-ui/src/views/project/surBuildNode/buildNodeDrawer.vue b/ruoyi-ui/src/views/project/surBuildNode/buildNodeDrawer.vue index cea55bea..3a78bc6f 100644 --- a/ruoyi-ui/src/views/project/surBuildNode/buildNodeDrawer.vue +++ b/ruoyi-ui/src/views/project/surBuildNode/buildNodeDrawer.vue @@ -14,7 +14,7 @@ 导出 导入 diff --git a/ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue b/ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue new file mode 100644 index 00000000..4c8157a8 --- /dev/null +++ b/ruoyi-ui/src/views/wxsetting/wxMenConfig/index.vue @@ -0,0 +1,352 @@ + + + diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java index c715867c..a93c8b55 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java @@ -17,14 +17,14 @@ import org.springframework.web.bind.annotation.*; * @Date: 2020/7/7 18:03 */ @RestController -@RequestMapping("/weixin/projectchecking") +@RequestMapping("/wechat/projectchecking") public class ProjectCheckingController extends BaseController { @Autowired ISurProjectCheckingService surProjectCheckingService; /** - * 查询当前用户举牌验收项目列表 + * 查询当前用户举牌验收项目列表 * @param surProjectChecking * @return */ @@ -34,7 +34,7 @@ public class ProjectCheckingController extends BaseController { } /** - * 查询当前用户举牌验收项目列表 + * 查询举牌验收详情 * @param id * @return */ diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java new file mode 100644 index 00000000..404a28e6 --- /dev/null +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectProblemmodifyController.java @@ -0,0 +1,150 @@ +package com.ruoyi.web.project; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysDictData; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.enums.PublicStateEnum; +import com.ruoyi.system.service.ISysDictDataService; +import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; +import com.yanzhu.jh.trouble.service.ISmzSspAuditinfoService; +import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +/** + * @version : V1.0 + * @ClassName: ProjectProblemmodifyController + * @Description: 项目问题修改 + * @Auther: JiangYuQi + * @Date: 2020/7/7 18:03 + */ +@RestController +@RequestMapping("/wechat/projectProblemmodify") + + +public class ProjectProblemmodifyController extends BaseController { + + @Autowired + ISysDictDataService sysDictDataService; + + @Autowired + ISmzSspAuditinfoService smzSspAuditinfoService; + + @Autowired + ISmzSspProblemmodifyService smzSspProblemmodifyService; + + + + /** + * 查询当前用户问题整改列表 + * @param smzSspProblemmodify + * @return + */ + @GetMapping("/list") + public AjaxResult list(SmzSspProblemmodify smzSspProblemmodify){ + return success(smzSspProblemmodifyService.selectWechatSmzSspProblemmodifyList(smzSspProblemmodify)); + } + + /** + * 查询当前用户问题整改列表 + * @param smzSspProblemmodify + * @return + */ + @GetMapping("/queryCount") + public AjaxResult queryCount(SmzSspProblemmodify smzSspProblemmodify){ + return success(smzSspProblemmodifyService.findProblemmodifyGroupByCheckState(smzSspProblemmodify)); + } + + /** + * 查询问题整改详情 + * @param id + * @return + */ + @GetMapping("/info") + public AjaxResult info(Long id){ + return success(smzSspProblemmodifyService.selectSmzSspProblemmodifyInfoById(id)); + } + + /** + * 删除质量整改 + */ + @Log(title = "质量整改", businessType = BusinessType.DELETE) + @GetMapping("/removeSafety") + public AjaxResult removeSafety(@RequestParam Long id) + { + return toAjax(smzSspProblemmodifyService.deleteSmzSspProblemmodifyById(id)); + } + + /** + * 删除质量整改 + */ + @Log(title = "质量隐患排查", businessType = BusinessType.DELETE) + @GetMapping("/removeQuality") + public AjaxResult removeQuality(@RequestParam Long id) + { + return toAjax(smzSspProblemmodifyService.deleteSmzSspProblemmodifyById(id)); + } + + /** + * 新增问题整改 + * @param smzSspProblemmodify + * @return + */ + @PostMapping("/addSafety") + @Log(title = "安全隐患排查", businessType = BusinessType.INSERT) + public AjaxResult addSafety(@RequestBody SmzSspProblemmodify smzSspProblemmodify){ + return success(smzSspProblemmodifyService.insertSmzSspProblemmodify(smzSspProblemmodify)); + } + + /** + * 新增问题整改 + * @param smzSspProblemmodify + * @return + */ + @PostMapping("/addQuality") + @Log(title = "质量隐患排查", businessType = BusinessType.INSERT) + public AjaxResult addQuality(@RequestBody SmzSspProblemmodify smzSspProblemmodify){ + return success(smzSspProblemmodifyService.insertSmzSspProblemmodify(smzSspProblemmodify)); + } + + /** + * 查询问题整改详情 + * @param id + * @return + */ + @GetMapping("/queryAuditInfo") + public AjaxResult queryAuditInfo(@RequestParam Long id){ + return success(smzSspAuditinfoService.selectLastSmzSspAuditinfoByMainId(id)); + } + + /** + * 提交问题整改 + * @param smzSspAuditinfo + * @return + */ + @PostMapping("/modifyProblem") + @Log(title = "举牌验收", businessType = BusinessType.INSERT) + public AjaxResult modifyProblem(@RequestBody SmzSspAuditinfo smzSspAuditinfo){ + return success(smzSspAuditinfoService.insertSmzSspAuditinfo(smzSspAuditinfo)); + } + + /** + * 查询隐患类型 + * @param type + * @return + */ + @GetMapping("/queryDangerType") + public AjaxResult queryDangerType(@RequestParam String type){ + SysDictData dictData = new SysDictData(); + dictData.setDictType(type); + dictData.setStatus(PublicStateEnum.OK.getCode()); + return success(sysDictDataService.selectDictDataList(dictData)); + } + + + +} diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java index 683f7f4f..c917d883 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectUserinfoController.java @@ -7,6 +7,7 @@ import com.yanzhu.jh.project.service.ISurProjectUserinfoService; 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.RequestParam; import org.springframework.web.bind.annotation.RestController; /** @@ -17,7 +18,7 @@ import org.springframework.web.bind.annotation.RestController; * @Date: 2020/7/7 18:03 */ @RestController -@RequestMapping("/weixin/projectuserinfo") +@RequestMapping("/wechat/projectuserinfo") public class ProjectUserinfoController extends BaseController { @Autowired @@ -32,4 +33,15 @@ public class ProjectUserinfoController extends BaseController { public AjaxResult list(SurProjectUserinfo surProjectUserinfo){ return success(surProjectUserinfoService.selectProjectUnitUser(surProjectUserinfo)); } + + /** + * 查询项目整改人，复检人，抄送人 + * @param projectId + * @param loginName + * @return + */ + @GetMapping("/queryAllProjectUserByParams") + public AjaxResult queryAllProjectUserByParams(@RequestParam Long projectId, String loginName){ + return success(surProjectUserinfoService.queryAllProjectUserInfo(projectId,loginName)); + } } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/controller/WechatUserLoginController.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/system/controller/WechatUserLoginController.java index b78f706c..a5b4dbf3 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/controller/WechatUserLoginController.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/system/controller/WechatUserLoginController.java @@ -19,7 +19,7 @@ import org.springframework.web.bind.annotation.*; * @Date: 2020/7/7 18:03 */ @RestController -@RequestMapping("/wechatLogin") +@RequestMapping("/wechat") public class WechatUserLoginController extends BaseController { @Autowired @@ -83,4 +83,14 @@ public class WechatUserLoginController extends BaseController { return wechatUserLoginService.getOpenId(code,appId); } + /** + * 根据用户查询菜单信息 + * @param username + * @return + */ + @GetMapping("/selectRoleMenuList") + public Object selectRoleMenuList(String username){ + return wechatUserLoginService.selectRoleMenuList(username); + } + } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/mapper/WechatUserLoginMapper.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/system/mapper/WechatUserLoginMapper.java index 81486cb8..98b60b41 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/mapper/WechatUserLoginMapper.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/system/mapper/WechatUserLoginMapper.java @@ -1,5 +1,6 @@ package com.ruoyi.web.system.mapper; +import java.util.List; import java.util.Map; /** @@ -60,4 +61,11 @@ public interface WechatUserLoginMapper { */ Map getUserNameByOpenId(String openId); + /** + * 根据用户查询菜单信息 + * @param username + * @return + */ + public List> selectRoleMenuList(String username); + } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/IWechatUserLoginService.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/IWechatUserLoginService.java index f936ae1f..5f5aca19 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/IWechatUserLoginService.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/IWechatUserLoginService.java @@ -2,6 +2,7 @@ package com.ruoyi.web.system.service; import com.ruoyi.common.core.domain.model.LoginUser; +import java.util.List; import java.util.Map; /** @@ -34,4 +35,11 @@ public interface IWechatUserLoginService { * @return */ public LoginUser getLoginUserByOpenId(String openId); + + /** + * 根据用户查询菜单信息 + * @param username + * @return + */ + public List> selectRoleMenuList(String username); } diff --git a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/impl/WechatUserLoginServiceImpl.java b/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/impl/WechatUserLoginServiceImpl.java index 808f4ca9..468fce97 100644 --- a/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/impl/WechatUserLoginServiceImpl.java +++ b/ruoyi-wechat/src/main/java/com/ruoyi/web/system/service/impl/WechatUserLoginServiceImpl.java @@ -162,4 +162,15 @@ public class WechatUserLoginServiceImpl implements IWechatUserLoginService { json.remove("session_key"); return json; } + + /** + * 根据用户查询菜单信息 + * @param username + * @return + */ + @Override + public List> selectRoleMenuList(String username) { + return wechatUserLoginMapper.selectRoleMenuList(username); + } + } diff --git a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml index fa669066..50569cd7 100644 --- a/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml +++ b/ruoyi-wechat/src/main/resources/mapper/WechatUserLoginMapper.xml @@ -110,4 +110,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select count(1) from sys_user_openid where openId=#{openId} and isDel=0 + + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectUserinfo.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectUserinfo.java index 25c0fd88..26832f9a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectUserinfo.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/domain/SurProjectUserinfo.java @@ -62,6 +62,9 @@ public class SurProjectUserinfo extends BaseEntity private Long[] projectIds; private Long[] userIds; private String jobTypeName; + private String roleId; + private String deptTypeFlag; + private String deptAncestors; public void setProjectName(String projectName) { this.projectName = projectName; @@ -192,6 +195,30 @@ public class SurProjectUserinfo extends BaseEntity this.state = false; } + public String getRoleId() { + return roleId; + } + + public void setRoleId(String roleId) { + this.roleId = roleId; + } + + public String getDeptTypeFlag() { + return deptTypeFlag; + } + + public void setDeptTypeFlag(String deptTypeFlag) { + this.deptTypeFlag = deptTypeFlag; + } + + public String getDeptAncestors() { + return deptAncestors; + } + + public void setDeptAncestors(String deptAncestors) { + this.deptAncestors = deptAncestors; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectUserinfoMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectUserinfoMapper.java index 64b7d558..7eea8618 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectUserinfoMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/mapper/SurProjectUserinfoMapper.java @@ -30,6 +30,22 @@ public interface SurProjectUserinfoMapper */ public List selectSurProjectUserinfoList(SurProjectUserinfo surProjectUserinfo); + /** + * 查询项目部门用户列表 + * + * @param surProjectUserinfo 项目用户 + * @return 项目用户集合 + */ + public List selectProjectDeptUserinfoList(SurProjectUserinfo surProjectUserinfo); + + /** + * 查询项目用户信息 + * + * @param surProjectUserinfo 项目用户 + * @return 项目用户集合 + */ + public List querySurProjectUserinfoByParams(SurProjectUserinfo surProjectUserinfo); + /** * 新增项目用户 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java index ba808c85..4dbcddb7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/ISurProjectUserinfoService.java @@ -40,6 +40,15 @@ public interface ISurProjectUserinfoService */ public List selectProjectUnitUser(SurProjectUserinfo surProjectUserinfo); + /** + * 查询项目相关人员 + * + * @param projectId 项目主键 + * @param loginName 项目用户 + * @return 项目用户集合 + */ + public List queryAllProjectUserInfo(Long projectId, String loginName); + /** * 新增项目用户 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java index 88b60cec..78a1c611 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectCheckingServiceImpl.java @@ -81,7 +81,11 @@ public class SurProjectCheckingServiceImpl implements ISurProjectCheckingService } } dataMap.put("sum",sum);//验收数 - dataMap.put("okSum",okSum*100/sum);//合格率 + if(sum>0){ + dataMap.put("okSum",okSum*100/sum);//合格率 + }else{ + dataMap.put("okSum",100);//合格率 + } return dataMap; } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java index dff57b3f..17be87cf 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/project/service/impl/SurProjectUserinfoServiceImpl.java @@ -1,9 +1,6 @@ package com.yanzhu.jh.project.service.impl; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; +import java.util.*; import com.ruoyi.common.annotation.DataScope; import com.ruoyi.common.core.domain.entity.SysDept; @@ -11,9 +8,11 @@ import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.text.Convert; import com.ruoyi.common.enums.DeptTypeEnum; import com.ruoyi.common.enums.PublicStateEnum; +import com.ruoyi.common.enums.SysRoleEnum; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.system.mapper.SysDeptMapper; +import com.ruoyi.system.mapper.SysRoleMapper; import com.ruoyi.system.mapper.SysUserMapper; import com.yanzhu.jh.project.domain.SurProject; import com.yanzhu.jh.project.domain.SurProjectUnitInfo; @@ -44,6 +43,9 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService @Autowired private SysUserMapper sysUserMapper; + @Autowired + private SysRoleMapper sysRoleMapper; + @Autowired private SurProjectUnitInfoMapper surProjectUnitInfoMapper; @@ -100,6 +102,74 @@ public class SurProjectUserinfoServiceImpl implements ISurProjectUserinfoService return projectUnitUserInfoList; } + + /** + * 根据不同角色查询项目人员信息 + * + * @param projectId 项目主键 + * @param loginName 用户名称 + * @return 项目用户集合 + */ + @Override + public List queryAllProjectUserInfo(Long projectId, String loginName) { + String nowRole = Convert.toStr(sysRoleMapper.getUserMinRoleIdByLoginName(loginName)); + //查询出公司信息 + SurProjectUnitInfo surProjectUnitInfo = new SurProjectUnitInfo(); + surProjectUnitInfo.setProjectId(projectId); + List surProjectUnitInfoList = surProjectUnitInfoMapper.selectSurProjectUnitInfoList(surProjectUnitInfo); + List projectUserList = new ArrayList<>(); + SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo(); + surProjectUserinfo.setProjectId(projectId); + surProjectUserinfo.setCreateBy(loginName); + //根据项目主键查询所有项目人员 + projectUserList = surProjectUserinfoMapper.selectSurProjectUserinfoList(surProjectUserinfo); + //根据角色查询项目单位人员信息 + if(SysRoleEnum.ADMIN.getCode().equals(nowRole) || SysRoleEnum.SUPR.getCode().equals(nowRole) || SysRoleEnum.JTGS.getCode().equals(nowRole) || SysRoleEnum.ZGS.getCode().equals(nowRole)){ + surProjectUserinfo.setRoleId(SysRoleEnum.ZGS.getCode()); + //查询所属项目部门信息 + SysDept sysDept = deptMapper.selectDeptByProjectId(projectId); + surProjectUserinfo.setDeptId(sysDept.getDeptId()); + }else if(SysRoleEnum.JLDW.getCode().equals(nowRole)){ + //监理单位只能选择监理单位 + surProjectUserinfo.setRoleId(SysRoleEnum.JLDW.getCode()); + //查询部门信息 + SysDept sysDept = deptMapper.selectDeptByUserName(loginName); + surProjectUserinfo.setDeptId(sysDept.getDeptId()); + }else if(SysRoleEnum.ZBDW.getCode().equals(nowRole)){ + //总包单位只能选择总包单位 + surProjectUserinfo.setRoleId(SysRoleEnum.ZBDW.getCode()); + //查询部门信息 + SysDept sysDept = deptMapper.selectDeptByUserName(loginName); + surProjectUserinfo.setDeptId(sysDept.getDeptId()); + }else if(SysRoleEnum.FBDW.getCode().equals(nowRole)){ + //分包单位只能选择分包单位 + surProjectUserinfo.setRoleId(SysRoleEnum.FBDW.getCode()); + //查询部门信息 + SysDept sysDept = deptMapper.selectDeptByUserName(loginName); + surProjectUserinfo.setDeptId(sysDept.getDeptId()); + } + //查询相关人员 + List deptUserList = new ArrayList<>(); + + if(!SysRoleEnum.COMMON.getCode().equals(nowRole)){ + deptUserList = surProjectUserinfoMapper.selectProjectDeptUserinfoList(surProjectUserinfo); + projectUserList.addAll(deptUserList); + } + for(SurProjectUnitInfo unitInfo:surProjectUnitInfoList){ + List userInfoList = new ArrayList<>(); + for(SurProjectUserinfo userinfo:projectUserList){ + //同一部门组装数据 + if(unitInfo.getUnitId().equals(userinfo.getDeptId())){ + userInfoList.add(userinfo); + }else if(userinfo.getDeptAncestors()!=null && userinfo.getDeptAncestors().indexOf(Convert.toStr(unitInfo.getUnitId()))>-1){ + userInfoList.add(userinfo); + } + } + unitInfo.setUserinfoList(userInfoList); + } + return surProjectUnitInfoList; + } + /** * 新增项目用户 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspFileinfo.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspFileinfo.java new file mode 100644 index 00000000..f0549fb7 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspFileinfo.java @@ -0,0 +1,123 @@ +package com.yanzhu.jh.trouble.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 随手拍文件信息对象 smz_ssp_fileinfo + * + * @author JiangYuQi + * @date 2023-08-23 + */ +public class SmzSspFileinfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 审核表id */ + @Excel(name = "审核表id") + private Long auditId; + + /** 文件类型（0图片，1视频） */ + @Excel(name = "文件类型", readConverterExp = "0=图片，1视频") + private Long fileType; + + /** 文件的url */ + @Excel(name = "文件的url") + private String fileUrl; + + /** 删除状态（0未删除，1已删除） */ + @Excel(name = "删除状态", readConverterExp = "0=未删除，1已删除") + private Long isDel; + + /** 创建人 */ + @Excel(name = "创建人") + private String createUser; + + /** 修改人 */ + @Excel(name = "修改人") + private String updateUser; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setAuditId(Long auditId) + { + this.auditId = auditId; + } + + public Long getAuditId() + { + return auditId; + } + public void setFileType(Long fileType) + { + this.fileType = fileType; + } + + public Long getFileType() + { + return fileType; + } + public void setFileUrl(String fileUrl) + { + this.fileUrl = fileUrl; + } + + public String getFileUrl() + { + return fileUrl; + } + public void setIsDel(Long isDel) + { + this.isDel = isDel; + } + + public Long getIsDel() + { + return isDel; + } + public void setCreateUser(String createUser) + { + this.createUser = createUser; + } + + public String getCreateUser() + { + return createUser; + } + public void setUpdateUser(String updateUser) + { + this.updateUser = updateUser; + } + + public String getUpdateUser() + { + return updateUser; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("auditId", getAuditId()) + .append("fileType", getFileType()) + .append("fileUrl", getFileUrl()) + .append("isDel", getIsDel()) + .append("createUser", getCreateUser()) + .append("createTime", getCreateTime()) + .append("updateUser", getUpdateUser()) + .append("updateTime", getUpdateTime()) + .toString(); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java index a487a206..10e6740a 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/domain/SmzSspProblemmodify.java @@ -112,6 +112,8 @@ public class SmzSspProblemmodify extends BaseEntity @Excel(name = "创建人") private String createUser; + private String createUserName; + /** 修改人 */ @Excel(name = "修改人") private String updateUser; @@ -124,8 +126,10 @@ public class SmzSspProblemmodify extends BaseEntity private String recheckSend; private String recheckSendUser; private Integer roleType; - + private String dangerTypeName; + private String deptName;//检查单位 private String vDel; + private String flag;//整改超时标识 public void setId(Long id) { @@ -390,6 +394,38 @@ public class SmzSspProblemmodify extends BaseEntity this.vDel = vDel; } + public String getDangerTypeName() { + return dangerTypeName; + } + + public void setDangerTypeName(String dangerTypeName) { + this.dangerTypeName = dangerTypeName; + } + + public String getDeptName() { + return deptName; + } + + public void setDeptName(String deptName) { + this.deptName = deptName; + } + + public String getCreateUserName() { + return createUserName; + } + + public void setCreateUserName(String createUserName) { + this.createUserName = createUserName; + } + + public String getFlag() { + return flag; + } + + public void setFlag(String flag) { + this.flag = flag; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspAuditinfoMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspAuditinfoMapper.java index 71afebba..c6181de7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspAuditinfoMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspAuditinfoMapper.java @@ -2,6 +2,7 @@ package com.yanzhu.jh.trouble.mapper; import java.util.List; import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; +import com.yanzhu.jh.trouble.domain.SmzSspFileinfo; /** * 随手拍流程信息Mapper接口 @@ -19,6 +20,15 @@ public interface SmzSspAuditinfoMapper */ public SmzSspAuditinfo selectSmzSspAuditinfoById(Long id); + /** + * 查询随手拍流程信息 + * + * @param mainId 随手拍流程信息主键 + * @return 随手拍流程信息 + */ + public SmzSspAuditinfo selectLastSmzSspAuditinfoByMainId(Long mainId); + + /** * 查询随手拍流程信息列表 * @@ -58,4 +68,29 @@ public interface SmzSspAuditinfoMapper * @return 结果 */ public int deleteSmzSspAuditinfoByIds(Long[] ids); + + /** + * 批量删除随手拍文件信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSmzSspFileinfoByAuditIds(Long[] ids); + + /** + * 批量新增随手拍文件信息 + * + * @param smzSspFileinfoList 随手拍文件信息列表 + * @return 结果 + */ + public int batchSmzSspFileinfo(List smzSspFileinfoList); + + + /** + * 通过随手拍流程信息主键删除随手拍文件信息信息 + * + * @param id 随手拍流程信息ID + * @return 结果 + */ + public int deleteSmzSspFileinfoByAuditId(Long id); } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java index de452646..89a7dd84 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/mapper/SmzSspProblemmodifyMapper.java @@ -22,6 +22,14 @@ public interface SmzSspProblemmodifyMapper */ public SmzSspProblemmodify selectSmzSspProblemmodifyById(Long id); + /** + * 查询质量整改详情 + * + * @param id 质量整改主键 + * @return 质量整改 + */ + public SmzSspProblemmodify selectSmzSspProblemmodifyInfoById(Long id); + /** * 查询质量整改列表 * @@ -30,6 +38,14 @@ public interface SmzSspProblemmodifyMapper */ public List selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify); + /** + * 查询质量整改列表 + * + * @param smzSspProblemmodify 质量整改 + * @return 质量整改集合 + */ + public List selectWechatSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify); + /** * 根据状态分组统计数量 * @param smzSspProblemmodify 查询条件 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspAuditinfoService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspAuditinfoService.java index f45ca782..2338b5f7 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspAuditinfoService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspAuditinfoService.java @@ -19,6 +19,14 @@ public interface ISmzSspAuditinfoService */ public SmzSspAuditinfo selectSmzSspAuditinfoById(Long id); + /** + * 查询随手拍流程信息 + * + * @param mainId 随手拍流程信息主键 + * @return 随手拍流程信息 + */ + public SmzSspAuditinfo selectLastSmzSspAuditinfoByMainId(Long mainId); + /** * 查询随手拍流程信息列表 * diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java index 8e305bf3..5a56b807 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/ISmzSspProblemmodifyService.java @@ -3,6 +3,7 @@ package com.yanzhu.jh.trouble.service; import java.util.List; import java.util.Map; +import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; @@ -22,6 +23,14 @@ public interface ISmzSspProblemmodifyService */ public SmzSspProblemmodify selectSmzSspProblemmodifyById(Long id); + /** + * 查询质量整改详情 + * + * @param id 质量整改主键 + * @return 质量整改 + */ + public SmzSspProblemmodify selectSmzSspProblemmodifyInfoById(Long id); + /** * 查询质量整改列表 * @@ -30,6 +39,14 @@ public interface ISmzSspProblemmodifyService */ public List selectSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify); + /** + * 查询质量整改列表 + * + * @param smzSspProblemmodify 质量整改 + * @return 质量整改集合 + */ + public List selectWechatSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify); + /** * 根据状态分组统计数量 * @param smzSspProblemmodify 查询条件 diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspAuditinfoServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspAuditinfoServiceImpl.java index af11d023..8d513bae 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspAuditinfoServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspAuditinfoServiceImpl.java @@ -1,12 +1,19 @@ package com.yanzhu.jh.trouble.service.impl; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.yanzhu.jh.trouble.domain.SmzSspFileinfo; +import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; +import com.yanzhu.jh.trouble.mapper.SmzSspProblemmodifyMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.trouble.mapper.SmzSspAuditinfoMapper; import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; import com.yanzhu.jh.trouble.service.ISmzSspAuditinfoService; +import org.springframework.transaction.annotation.Transactional; /** * 随手拍流程信息Service业务层处理 @@ -20,6 +27,9 @@ public class SmzSspAuditinfoServiceImpl implements ISmzSspAuditinfoService @Autowired private SmzSspAuditinfoMapper smzSspAuditinfoMapper; + @Autowired + private SmzSspProblemmodifyMapper smzSspProblemmodifyMapper; + /** * 查询随手拍流程信息 * @@ -32,6 +42,16 @@ public class SmzSspAuditinfoServiceImpl implements ISmzSspAuditinfoService return smzSspAuditinfoMapper.selectSmzSspAuditinfoById(id); } + /** + * 查询随手拍流程信息 + * + * @param mainId 随手拍流程信息主键 + * @return 随手拍流程信息 + */ + @Override + public SmzSspAuditinfo selectLastSmzSspAuditinfoByMainId(Long mainId) { + return smzSspAuditinfoMapper.selectLastSmzSspAuditinfoByMainId(mainId); + } /** * 查询随手拍流程信息列表 * @@ -51,10 +71,53 @@ public class SmzSspAuditinfoServiceImpl implements ISmzSspAuditinfoService * @return 结果 */ @Override + @Transactional public int insertSmzSspAuditinfo(SmzSspAuditinfo smzSspAuditinfo) { smzSspAuditinfo.setCreateTime(DateUtils.getNowDate()); - return smzSspAuditinfoMapper.insertSmzSspAuditinfo(smzSspAuditinfo); + int res = smzSspAuditinfoMapper.insertSmzSspAuditinfo(smzSspAuditinfo); + SmzSspProblemmodify smzSspProblemmodify = smzSspProblemmodifyMapper.selectSmzSspProblemmodifyById(smzSspAuditinfo.getMainId()); + switch (smzSspAuditinfo.getProcessState()){ + case "0": smzSspProblemmodify.setCheckState(1L); break; + case "2": smzSspProblemmodify.setCheckState(3L); break; + case "4": smzSspProblemmodify.setCheckState(4L); break; + default:break; + } + smzSspProblemmodifyMapper.updateSmzSspProblemmodify(smzSspProblemmodify); + insertSmzSspFileinfo(smzSspAuditinfo); + return res; + } + + /** + * 新增随手拍文件信息信息 + * + * @param smzSspAuditinfo 随手拍流程信息对象 + */ + private void insertSmzSspFileinfo(SmzSspAuditinfo smzSspAuditinfo) + { + if(smzSspAuditinfo.getFileUrls()!=null){ + String fileUrls[] = smzSspAuditinfo.getFileUrls().split(","); + Long id = smzSspAuditinfo.getId(); + if (StringUtils.isNotNull(fileUrls)) + { + List list = new ArrayList(); + for (String fileUrl: fileUrls) + { + SmzSspFileinfo smzSspFileinfo = new SmzSspFileinfo(); + smzSspFileinfo.setAuditId(id); + smzSspFileinfo.setFileType(0L); + smzSspFileinfo.setFileUrl(fileUrl); + smzSspFileinfo.setIsDel(0L); + smzSspFileinfo.setCreateUser(smzSspAuditinfo.getCreateUser()); + smzSspFileinfo.setCreateTime(new Date()); + list.add(smzSspFileinfo); + } + if (list.size() > 0) + { + smzSspAuditinfoMapper.batchSmzSspFileinfo(list); + } + } + } } /** diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java index e96f6abe..5292b6a9 100644 --- a/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/trouble/service/impl/SmzSspProblemmodifyServiceImpl.java @@ -1,16 +1,26 @@ package com.yanzhu.jh.trouble.service.impl; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; +import com.ruoyi.common.core.domain.entity.SysDept; +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.enums.DeptTypeEnum; +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.SurProjectUserinfo; +import com.yanzhu.jh.project.mapper.SurProjectUserinfoMapper; +import com.yanzhu.jh.trouble.domain.SmzSspAuditinfo; +import com.yanzhu.jh.trouble.domain.SmzSspFileinfo; import com.yanzhu.jh.trouble.domain.where.SmzSspProblemmodifyWhere; +import com.yanzhu.jh.trouble.mapper.SmzSspAuditinfoMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.yanzhu.jh.trouble.mapper.SmzSspProblemmodifyMapper; import com.yanzhu.jh.trouble.domain.SmzSspProblemmodify; import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyService; +import org.springframework.transaction.annotation.Transactional; /** * 质量整改Service业务层处理 @@ -21,9 +31,18 @@ import com.yanzhu.jh.trouble.service.ISmzSspProblemmodifyService; @Service public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyService { + @Autowired + private SysDeptMapper deptMapper; + + @Autowired + private SmzSspAuditinfoMapper smzSspAuditinfoMapper; + @Autowired private SmzSspProblemmodifyMapper smzSspProblemmodifyMapper; + @Autowired + private SurProjectUserinfoMapper surProjectUserinfoMapper; + /** * 查询质量整改 * @@ -36,6 +55,16 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi return smzSspProblemmodifyMapper.selectSmzSspProblemmodifyById(id); } + /** + * 查询质量整改详情 + * + * @param id 质量整改主键 + * @return 质量整改 + */ + public SmzSspProblemmodify selectSmzSspProblemmodifyInfoById(Long id) { + return smzSspProblemmodifyMapper.selectSmzSspProblemmodifyInfoById(id); + } + /** * 查询质量整改列表 * @@ -48,6 +77,16 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi return smzSspProblemmodifyMapper.selectSmzSspProblemmodifyList(smzSspProblemmodify); } + /** + * 查询质量整改列表 + * + * @param smzSspProblemmodify 质量整改 + * @return 质量整改集合 + */ + public List selectWechatSmzSspProblemmodifyList(SmzSspProblemmodify smzSspProblemmodify) { + return smzSspProblemmodifyMapper.selectWechatSmzSspProblemmodifyList(smzSspProblemmodify); + } + /** * 根据状态分组统计数量 * @param smzSspProblemmodify 查询条件 @@ -73,10 +112,56 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi * @return 结果 */ @Override + @Transactional public int insertSmzSspProblemmodify(SmzSspProblemmodify smzSspProblemmodify) { + if(smzSspProblemmodify.getSmarkUrl()!=null){ + smzSspProblemmodify.setMarksPicture(smzSspProblemmodify.getSmarkUrl().split(",")[0]); + } smzSspProblemmodify.setCreateTime(DateUtils.getNowDate()); - return smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify); + SysDept sysDept = deptMapper.selectDeptByUserName(smzSspProblemmodify.getCreateUser()); + //当前角色时管理员时，修改角色为集团公司 + String roleType = ""; + if(DeptTypeEnum.JTGS.getCode().equals(sysDept.getTypeFlag())){ + SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo(); + surProjectUserinfo.setProjectId(smzSspProblemmodify.getProjectId()); + surProjectUserinfo.setCreateBy(smzSspProblemmodify.getCreateUser()); + List datalist = surProjectUserinfoMapper.querySurProjectUserinfoByParams(surProjectUserinfo); + if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).getJobType())){ + //说明是甲方经理 + roleType = DeptTypeEnum.JFDBTYPE.getCode(); + }else{ + roleType = DeptTypeEnum.JTGSTYPE.getCode(); + } + }else if(DeptTypeEnum.ZGS.getCode().equals(sysDept.getTypeFlag())){ + SurProjectUserinfo surProjectUserinfo = new SurProjectUserinfo(); + surProjectUserinfo.setProjectId(smzSspProblemmodify.getProjectId()); + surProjectUserinfo.setCreateBy(smzSspProblemmodify.getCreateUser()); + List datalist = surProjectUserinfoMapper.querySurProjectUserinfoByParams(surProjectUserinfo); + if(datalist!=null && datalist.size()>0 && datalist.get(0)!=null && PublicStateEnum.USERTYPE_JFJL.getCode().equals(datalist.get(0).getJobType())){ + //说明是甲方经理 + roleType = DeptTypeEnum.JFDBTYPE.getCode(); + }else{ + roleType = DeptTypeEnum.ZGSTYPE.getCode(); + } + }else if(DeptTypeEnum.JLDW.getCode().equals(sysDept.getTypeFlag())){ + roleType = DeptTypeEnum.JLDWTYPE.getCode(); + }else if(DeptTypeEnum.ZBDW.getCode().equals(sysDept.getTypeFlag())){ + roleType = DeptTypeEnum.ZBDWTYPE.getCode(); + }else if(DeptTypeEnum.FBDW.getCode().equals(sysDept.getTypeFlag())){ + roleType = DeptTypeEnum.FBDWTYPE.getCode(); + } + smzSspProblemmodify.setRoleType(Convert.toInt(roleType)); + smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify); + SmzSspAuditinfo smzSspAuditinfo = new SmzSspAuditinfo(); + smzSspAuditinfo.setMainId(smzSspProblemmodify.getId()); + smzSspAuditinfo.setProcessState("1"); + smzSspAuditinfo.setCreateUser(smzSspProblemmodify.getCreateUser()); + smzSspAuditinfo.setCreateTime(new Date()); + int res = smzSspAuditinfoMapper.insertSmzSspAuditinfo(smzSspAuditinfo); + smzSspAuditinfo.setFileUrls(smzSspProblemmodify.getSmarkUrl()); + insertSmzSspFileinfo(smzSspAuditinfo); + return res; } /** @@ -155,4 +240,37 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi public Long countTimeout(SmzSspProblemmodifyWhere where) { return (long) smzSspProblemmodifyMapper.countTimeout(where); } + + /** + * 新增随手拍文件信息信息 + * + * @param smzSspAuditinfo 随手拍流程信息对象 + */ + private void insertSmzSspFileinfo(SmzSspAuditinfo smzSspAuditinfo) + { + if(smzSspAuditinfo.getFileUrls()!=null){ + String fileUrls[] = smzSspAuditinfo.getFileUrls().split(","); + Long id = smzSspAuditinfo.getId(); + if (StringUtils.isNotNull(fileUrls)) + { + List list = new ArrayList(); + for (String fileUrl: fileUrls) + { + SmzSspFileinfo smzSspFileinfo = new SmzSspFileinfo(); + smzSspFileinfo.setAuditId(id); + smzSspFileinfo.setFileType(0L); + smzSspFileinfo.setFileUrl(fileUrl); + smzSspFileinfo.setIsDel(0L); + smzSspFileinfo.setCreateUser(smzSspAuditinfo.getCreateUser()); + smzSspFileinfo.setCreateTime(new Date()); + list.add(smzSspFileinfo); + } + if (list.size() > 0) + { + smzSspAuditinfoMapper.batchSmzSspFileinfo(list); + } + } + } + } + } diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/controller/SurMenuConfigController.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/controller/SurMenuConfigController.java new file mode 100644 index 00000000..8e82fd4b --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/controller/SurMenuConfigController.java @@ -0,0 +1,104 @@ +package com.yanzhu.jh.wxsetting.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.enums.BusinessType; +import com.yanzhu.jh.wxsetting.domain.SurMenuConfig; +import com.yanzhu.jh.wxsetting.service.ISurMenuConfigService; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 菜单配置Controller + * + * @author JiangYuQi + * @date 2023-08-24 + */ +@RestController +@RequestMapping("/wxsetting/wxMenConfig") +public class SurMenuConfigController extends BaseController +{ + @Autowired + private ISurMenuConfigService surMenuConfigService; + + /** + * 查询菜单配置列表 + */ + @PreAuthorize("@ss.hasPermi('wxsetting:wxMenConfig:list')") + @GetMapping("/list") + public TableDataInfo list(SurMenuConfig surMenuConfig) + { + startPage(); + List list = surMenuConfigService.selectSurMenuConfigList(surMenuConfig); + return getDataTable(list); + } + + /** + * 导出菜单配置列表 + */ + @PreAuthorize("@ss.hasPermi('wxsetting:wxMenConfig:export')") + @Log(title = "菜单配置", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, SurMenuConfig surMenuConfig) + { + List list = surMenuConfigService.selectSurMenuConfigList(surMenuConfig); + ExcelUtil util = new ExcelUtil(SurMenuConfig.class); + util.exportExcel(response, list, "菜单配置数据"); + } + + /** + * 获取菜单配置详细信息 + */ + @PreAuthorize("@ss.hasPermi('wxsetting:wxMenConfig:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(surMenuConfigService.selectSurMenuConfigById(id)); + } + + /** + * 新增菜单配置 + */ + @PreAuthorize("@ss.hasPermi('wxsetting:wxMenConfig:add')") + @Log(title = "菜单配置", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody SurMenuConfig surMenuConfig) + { + return toAjax(surMenuConfigService.insertSurMenuConfig(surMenuConfig)); + } + + /** + * 修改菜单配置 + */ + @PreAuthorize("@ss.hasPermi('wxsetting:wxMenConfig:edit')") + @Log(title = "菜单配置", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody SurMenuConfig surMenuConfig) + { + return toAjax(surMenuConfigService.updateSurMenuConfig(surMenuConfig)); + } + + /** + * 删除菜单配置 + */ + @PreAuthorize("@ss.hasPermi('wxsetting:wxMenConfig:remove')") + @Log(title = "菜单配置", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(surMenuConfigService.deleteSurMenuConfigByIds(ids)); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfig.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfig.java new file mode 100644 index 00000000..8b3e1f81 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfig.java @@ -0,0 +1,134 @@ +package com.yanzhu.jh.wxsetting.domain; + +import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 菜单配置对象 sur_menu_config + * + * @author JiangYuQi + * @date 2023-08-24 + */ +public class SurMenuConfig extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** $column.columnComment */ + private Long id; + + /** 菜单名称 */ + @Excel(name = "菜单名称") + private String menuName; + + /** 菜单标识 */ + @Excel(name = "菜单标识") + private String menuIdenti; + + /** 菜单图片 */ + @Excel(name = "菜单图片") + private String menuImg; + + /** 菜单地址 */ + @Excel(name = "菜单地址") + private String menuUrl; + + /** 删除状态（0 未删除 1 已删除） */ + private Long delFlag; + + /** 菜单排序 */ + @Excel(name = "菜单排序") + private Integer menuSort; + + /** 菜单配置角色信息 */ + private List surMenuConfigRoleList; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMenuName(String menuName) + { + this.menuName = menuName; + } + + public String getMenuName() + { + return menuName; + } + public void setMenuIdenti(String menuIdenti) + { + this.menuIdenti = menuIdenti; + } + + public String getMenuIdenti() + { + return menuIdenti; + } + public void setMenuImg(String menuImg) + { + this.menuImg = menuImg; + } + + public String getMenuImg() + { + return menuImg; + } + public void setMenuUrl(String menuUrl) + { + this.menuUrl = menuUrl; + } + + public String getMenuUrl() + { + return menuUrl; + } + public void setDelFlag(Long delFlag) + { + this.delFlag = delFlag; + } + + public Long getDelFlag() + { + return delFlag; + } + + public List getSurMenuConfigRoleList() + { + return surMenuConfigRoleList; + } + + public void setSurMenuConfigRoleList(List surMenuConfigRoleList) + { + this.surMenuConfigRoleList = surMenuConfigRoleList; + } + + public Integer getMenuSort() { + return menuSort; + } + + public void setMenuSort(Integer menuSort) { + this.menuSort = menuSort; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("menuName", getMenuName()) + .append("menuIdenti", getMenuIdenti()) + .append("menuImg", getMenuImg()) + .append("menuUrl", getMenuUrl()) + .append("delFlag", getDelFlag()) + .append("createTime", getCreateTime()) + .append("surMenuConfigRoleList", getSurMenuConfigRoleList()) + .toString(); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfigRole.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfigRole.java new file mode 100644 index 00000000..abee0c2b --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/domain/SurMenuConfigRole.java @@ -0,0 +1,52 @@ +package com.yanzhu.jh.wxsetting.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 菜单配置角色对象 sur_menu_config_role + * + * @author JiangYuQi + * @date 2023-08-24 + */ +public class SurMenuConfigRole extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 菜单关系主键 */ + @Excel(name = "菜单关系主键") + private Long smcid; + + /** 角色主键 */ + @Excel(name = "角色主键") + private Long roleId; + + public void setSmcid(Long smcid) + { + this.smcid = smcid; + } + + public Long getSmcid() + { + return smcid; + } + public void setRoleId(Long roleId) + { + this.roleId = roleId; + } + + public Long getRoleId() + { + return roleId; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("smcid", getSmcid()) + .append("roleId", getRoleId()) + .toString(); + } +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/mapper/SurMenuConfigMapper.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/mapper/SurMenuConfigMapper.java new file mode 100644 index 00000000..062eb22c --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/mapper/SurMenuConfigMapper.java @@ -0,0 +1,87 @@ +package com.yanzhu.jh.wxsetting.mapper; + +import java.util.List; +import com.yanzhu.jh.wxsetting.domain.SurMenuConfig; +import com.yanzhu.jh.wxsetting.domain.SurMenuConfigRole; + +/** + * 菜单配置Mapper接口 + * + * @author JiangYuQi + * @date 2023-08-24 + */ +public interface SurMenuConfigMapper +{ + /** + * 查询菜单配置 + * + * @param id 菜单配置主键 + * @return 菜单配置 + */ + public SurMenuConfig selectSurMenuConfigById(Long id); + + /** + * 查询菜单配置列表 + * + * @param surMenuConfig 菜单配置 + * @return 菜单配置集合 + */ + public List selectSurMenuConfigList(SurMenuConfig surMenuConfig); + + /** + * 新增菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + public int insertSurMenuConfig(SurMenuConfig surMenuConfig); + + /** + * 修改菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + public int updateSurMenuConfig(SurMenuConfig surMenuConfig); + + /** + * 删除菜单配置 + * + * @param id 菜单配置主键 + * @return 结果 + */ + public int deleteSurMenuConfigById(Long id); + + /** + * 批量删除菜单配置 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSurMenuConfigByIds(Long[] ids); + + /** + * 批量删除菜单配置角色 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSurMenuConfigRoleBySmcids(Long[] ids); + + /** + * 批量新增菜单配置角色 + * + * @param surMenuConfigRoleList 菜单配置角色列表 + * @return 结果 + */ + public int batchSurMenuConfigRole(List surMenuConfigRoleList); + + + /** + * 通过菜单配置主键删除菜单配置角色信息 + * + * @param id 菜单配置ID + * @return 结果 + */ + public int deleteSurMenuConfigRoleBySmcid(Long id); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/ISurMenuConfigService.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/ISurMenuConfigService.java new file mode 100644 index 00000000..09ba0260 --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/ISurMenuConfigService.java @@ -0,0 +1,61 @@ +package com.yanzhu.jh.wxsetting.service; + +import java.util.List; +import com.yanzhu.jh.wxsetting.domain.SurMenuConfig; + +/** + * 菜单配置Service接口 + * + * @author JiangYuQi + * @date 2023-08-24 + */ +public interface ISurMenuConfigService +{ + /** + * 查询菜单配置 + * + * @param id 菜单配置主键 + * @return 菜单配置 + */ + public SurMenuConfig selectSurMenuConfigById(Long id); + + /** + * 查询菜单配置列表 + * + * @param surMenuConfig 菜单配置 + * @return 菜单配置集合 + */ + public List selectSurMenuConfigList(SurMenuConfig surMenuConfig); + + /** + * 新增菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + public int insertSurMenuConfig(SurMenuConfig surMenuConfig); + + /** + * 修改菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + public int updateSurMenuConfig(SurMenuConfig surMenuConfig); + + /** + * 批量删除菜单配置 + * + * @param ids 需要删除的菜单配置主键集合 + * @return 结果 + */ + public int deleteSurMenuConfigByIds(Long[] ids); + + /** + * 删除菜单配置信息 + * + * @param id 菜单配置主键 + * @return 结果 + */ + public int deleteSurMenuConfigById(Long id); +} diff --git a/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/impl/SurMenuConfigServiceImpl.java b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/impl/SurMenuConfigServiceImpl.java new file mode 100644 index 00000000..944d83de --- /dev/null +++ b/yanzhu-jh/src/main/java/com/yanzhu/jh/wxsetting/service/impl/SurMenuConfigServiceImpl.java @@ -0,0 +1,133 @@ +package com.yanzhu.jh.wxsetting.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.yanzhu.jh.wxsetting.domain.SurMenuConfigRole; +import com.yanzhu.jh.wxsetting.mapper.SurMenuConfigMapper; +import com.yanzhu.jh.wxsetting.domain.SurMenuConfig; +import com.yanzhu.jh.wxsetting.service.ISurMenuConfigService; +import com.ruoyi.common.utils.SecurityUtils; +/** + * 菜单配置Service业务层处理 + * + * @author JiangYuQi + * @date 2023-08-24 + */ +@Service +public class SurMenuConfigServiceImpl implements ISurMenuConfigService +{ + @Autowired + private SurMenuConfigMapper surMenuConfigMapper; + + /** + * 查询菜单配置 + * + * @param id 菜单配置主键 + * @return 菜单配置 + */ + @Override + public SurMenuConfig selectSurMenuConfigById(Long id) + { + return surMenuConfigMapper.selectSurMenuConfigById(id); + } + + /** + * 查询菜单配置列表 + * + * @param surMenuConfig 菜单配置 + * @return 菜单配置 + */ + @Override + public List selectSurMenuConfigList(SurMenuConfig surMenuConfig) + { + return surMenuConfigMapper.selectSurMenuConfigList(surMenuConfig); + } + + /** + * 新增菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + @Transactional + @Override + public int insertSurMenuConfig(SurMenuConfig surMenuConfig) + { + surMenuConfig.setCreateTime(DateUtils.getNowDate()); + int rows = surMenuConfigMapper.insertSurMenuConfig(surMenuConfig); + insertSurMenuConfigRole(surMenuConfig); + return rows; + } + + /** + * 修改菜单配置 + * + * @param surMenuConfig 菜单配置 + * @return 结果 + */ + @Transactional + @Override + public int updateSurMenuConfig(SurMenuConfig surMenuConfig) + { + surMenuConfigMapper.deleteSurMenuConfigRoleBySmcid(surMenuConfig.getId()); + insertSurMenuConfigRole(surMenuConfig); + return surMenuConfigMapper.updateSurMenuConfig(surMenuConfig); + } + + /** + * 批量删除菜单配置 + * + * @param ids 需要删除的菜单配置主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteSurMenuConfigByIds(Long[] ids) + { + surMenuConfigMapper.deleteSurMenuConfigRoleBySmcids(ids); + return surMenuConfigMapper.deleteSurMenuConfigByIds(ids); + } + + /** + * 删除菜单配置信息 + * + * @param id 菜单配置主键 + * @return 结果 + */ + @Transactional + @Override + public int deleteSurMenuConfigById(Long id) + { + surMenuConfigMapper.deleteSurMenuConfigRoleBySmcid(id); + return surMenuConfigMapper.deleteSurMenuConfigById(id); + } + + /** + * 新增菜单配置角色信息 + * + * @param surMenuConfig 菜单配置对象 + */ + public void insertSurMenuConfigRole(SurMenuConfig surMenuConfig) + { + List surMenuConfigRoleList = surMenuConfig.getSurMenuConfigRoleList(); + Long id = surMenuConfig.getId(); + if (StringUtils.isNotNull(surMenuConfigRoleList)) + { + List list = new ArrayList(); + for (SurMenuConfigRole surMenuConfigRole : surMenuConfigRoleList) + { + surMenuConfigRole.setSmcid(id); + list.add(surMenuConfigRole); + } + if (list.size() > 0) + { + surMenuConfigMapper.batchSurMenuConfigRole(list); + } + } + } +} diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml index 744b3356..51e67f78 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectCheckingMapper.xml @@ -52,8 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spc.project_id = #{projectId} and sp.projectName like concat('%', #{projectName}, '%') - and spc.dept_id = #{deptId} - and (spc.dept_id = #{deptId} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName}) + and spc.dept_id = #{deptId} and sd.dept_name like concat('%', #{deptName}, '%') and spc.group_dept_id = #{groupDeptId} @@ -74,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and (sp.deptId = #{nowDept} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName}) - and (spui.unitId = #{nowDept} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName}) + and spui.unitId = #{nowDept} and spu.is_del=0 and (spu.user_id = #{nowUser} or spc.quality_user=#{nowUserName} or spc.supervise_user=#{nowUserName}) diff --git a/yanzhu-jh/src/main/resources/mapper/project/SurProjectUnitInfoMapper.xml b/yanzhu-jh/src/main/resources/mapper/project/SurProjectUnitInfoMapper.xml index 3bb7261c..c177760f 100644 --- a/yanzhu-jh/src/main/resources/mapper/project/SurProjectUnitInfoMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/project/SurProjectUnitInfoMapper.xml @@ -45,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + order by sdd.dict_sort - + + + + + + - + + + + + + delete from smz_ssp_fileinfo where auditId in + #{auditId} + + + delete from smz_ssp_fileinfo where auditId = #{auditId} + + + insert into smz_ssp_fileinfo( id, auditId, fileType, fileUrl, isDel, createUser, createTime, updateUser, updateTime) values + ( #{item.id}, #{item.auditId}, #{item.fileType}, #{item.fileUrl}, #{item.isDel}, #{item.createUser}, #{item.createTime}, #{item.updateUser}, #{item.updateTime}) + + \ No newline at end of file diff --git a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml index a38f92f9..40b672af 100644 --- a/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml +++ b/yanzhu-jh/src/main/resources/mapper/trouble/SmzSspProblemmodifyMapper.xml @@ -33,11 +33,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + @@ -89,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spui.unitId = #{nowDept} - and (ssp.lordSentUser = #{nowUser} or ssp.copySendUser = #{nowUser} or ssp.recheckSendUser = #{nowUser} or ssp.createUser = #{nowUser} ) + and (ssp.lordSentUser = #{nowUser} or ssp.copySendUser like concat('%', #{nowUser}, '%') or ssp.recheckSendUser = #{nowUser} or ssp.createUser = #{nowUser} ) and ssp.checkState in (0,3) and ssp.checkState in (1) and ssp.checkState = 4 @@ -98,6 +102,65 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" order by createTime desc + + @@ -129,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sur_project_unit_info spui on spui.projectId = sp.id WHERE ssp.isDel=0 + and ssp.projectId = #{projectId} and (date(NOW()) ]]> date(ssp.nickedTime) and (ssp.updateTime is null or date(ssp.updateTime) ]]> date(ssp.nickedTime))) and infoType=#{infoType} and ssp.problemArea like concat('%', #{problemArea}, '%') @@ -143,19 +208,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and spui.unitId = #{nowDept} - and (ssp.lordSentUser = #{nowUser} or ssp.copySendUser = #{nowUser} or ssp.recheckSendUser = #{nowUser} or ssp.createUser = #{nowUser} ) + and (ssp.lordSentUser = #{nowUser} or ssp.copySendUser like concat('%', #{nowUser}, '%') or ssp.recheckSendUser = #{nowUser} or ssp.createUser = #{nowUser} ) + + insert into smz_ssp_problemmodify projectId, infoType, + marks_picture, + marks_video, problemArea, workParts, changeInfo, @@ -172,15 +256,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" nickedInfo, checkUser, checkUserPhone, + smark_url, isDel, createUser, createTime, updateUser, updateTime, + danger_type, + recheckSend, + recheckSendUser, + roleType, #{projectId}, #{infoType}, + #{marksPicture}, + #{marksVideo}, #{problemArea}, #{workParts}, #{changeInfo}, @@ -197,11 +288,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{nickedInfo}, #{checkUser}, #{checkUserPhone}, + #{smarkUrl}, #{isDel}, #{createUser}, #{createTime}, #{updateUser}, #{updateTime}, + #{dangerType}, + #{recheckSend}, + #{recheckSendUser}, + #{roleType}, @@ -210,6 +306,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" projectId = #{projectId}, infoType = #{infoType}, + marks_picture = #{marksPicture}, + marks_video = #{marksVideo}, problemArea = #{problemArea}, workParts = #{workParts}, changeInfo = #{changeInfo}, @@ -226,11 +324,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" nickedInfo = #{nickedInfo}, checkUser = #{checkUser}, checkUserPhone = #{checkUserPhone}, + smark_url = #{smarkUrl}, isDel = #{isDel}, createUser = #{createUser}, createTime = #{createTime}, updateUser = #{updateUser}, updateTime = #{updateTime}, + danger_type = #{dangerType}, + recheckSend = #{recheckSend}, + recheckSendUser = #{recheckSendUser}, + roleType = #{roleType}, where id = #{id} diff --git a/yanzhu-jh/src/main/resources/mapper/wxsetting/SurMenuConfigMapper.xml b/yanzhu-jh/src/main/resources/mapper/wxsetting/SurMenuConfigMapper.xml new file mode 100644 index 00000000..0aa454ea --- /dev/null +++ b/yanzhu-jh/src/main/resources/mapper/wxsetting/SurMenuConfigMapper.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + select id, menu_name, menu_identi, menu_img, menu_url, del_flag, create_time from sur_menu_config + + + + + + + + insert into sur_menu_config + + menu_name, + menu_identi, + menu_img, + menu_url, + del_flag, + create_time, + + + #{menuName}, + #{menuIdenti}, + #{menuImg}, + #{menuUrl}, + #{delFlag}, + #{createTime}, + + + + + update sur_menu_config + + menu_name = #{menuName}, + menu_identi = #{menuIdenti}, + menu_img = #{menuImg}, + menu_url = #{menuUrl}, + del_flag = #{delFlag}, + create_time = #{createTime}, + + where id = #{id} + + + + delete from sur_menu_config where id = #{id} + + + + delete from sur_menu_config where id in + + #{id} + + + + + delete from sur_menu_config_role where smcid in + + #{smcid} + + + + + delete from sur_menu_config_role where smcid = #{smcid} + + + + insert into sur_menu_config_role( smcid, role_id) values + + ( #{item.smcid}, #{item.roleId}) + + + \ No newline at end of file