diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java index 9afa1c1a..ca40b368 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/SmzSspProblemmodifyController.java @@ -81,6 +81,17 @@ public class SmzSspProblemmodifyController extends BaseController return toAjax(smzSspProblemmodifyService.insertSmzSspProblemmodify(smzSspProblemmodify)); } + /** + * 新增安全隐患整改 + */ + @RequiresPermissions("trouble:problemmodify:add") + @Log(title = "安全隐患整改", businessType = BusinessType.INSERT) + @PostMapping("/batchAdd") + public AjaxResult batchAdd(@RequestBody List list) + { + return toAjax(smzSspProblemmodifyService.insertSmzSspProblemmodifies(list)); + } + /** * 修改安全隐患整改 */ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISmzSspProblemmodifyService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISmzSspProblemmodifyService.java index f5625027..c6f57138 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISmzSspProblemmodifyService.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/ISmzSspProblemmodifyService.java @@ -58,4 +58,6 @@ public interface ISmzSspProblemmodifyService * @return 结果 */ public int deleteSmzSspProblemmodifyById(Long id); + + public int insertSmzSspProblemmodifies(List list); } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java index e6e1a541..81c4972e 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java @@ -246,7 +246,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsUsers.setCreateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsers.setSubStep(2L); proProjectInfoSubdeptsUsers.setApproveStatus(ApproveStatus.passed.getCode()); - proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.JSDWGL.getCode()); //查询管理班组 ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup(); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SmzSspProblemmodifyServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SmzSspProblemmodifyServiceImpl.java index 6bc8e626..bbfa3a6f 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SmzSspProblemmodifyServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/SmzSspProblemmodifyServiceImpl.java @@ -2,6 +2,7 @@ package com.yanzhu.manage.service.impl; import java.util.List; +import com.yanzhu.common.core.context.SecurityContextHolder; import com.yanzhu.common.core.utils.DateUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -55,6 +56,7 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi public int insertSmzSspProblemmodify(SmzSspProblemmodify smzSspProblemmodify) { smzSspProblemmodify.setCreateTime(DateUtils.getNowDate()); + smzSspProblemmodify.setCreateBy(SecurityContextHolder.getUserName()); return smzSspProblemmodifyMapper.insertSmzSspProblemmodify(smzSspProblemmodify); } @@ -68,6 +70,7 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi public int updateSmzSspProblemmodify(SmzSspProblemmodify smzSspProblemmodify) { smzSspProblemmodify.setUpdateTime(DateUtils.getNowDate()); + smzSspProblemmodify.setUpdateBy(SecurityContextHolder.getUserName()); return smzSspProblemmodifyMapper.updateSmzSspProblemmodify(smzSspProblemmodify); } @@ -94,4 +97,13 @@ public class SmzSspProblemmodifyServiceImpl implements ISmzSspProblemmodifyServi { return smzSspProblemmodifyMapper.deleteSmzSspProblemmodifyById(id); } + + @Override + public int insertSmzSspProblemmodifies(List list) { + list.stream().forEach(it->{ + it.setCreateTime(DateUtils.getNowDate()); + it.setCreateBy(SecurityContextHolder.getUserName()); + }); + return 0; + } } diff --git a/yanzhu-ui-vue3/src/views/system/user/index.vue b/yanzhu-ui-vue3/src/views/system/user/index.vue index b08a5a72..519c3918 100644 --- a/yanzhu-ui-vue3/src/views/system/user/index.vue +++ b/yanzhu-ui-vue3/src/views/system/user/index.vue @@ -184,7 +184,7 @@ {{ dict.label - }} + }} @@ -222,19 +222,25 @@ - +
头像面
- + + +
国徽面
- + + +
人脸识别头像
- + + +
", arr) return arr; } function getUserTree() { @@ -404,9 +455,15 @@ getUserTree(); } } - .td-select { .el-select { + .td-select { + .el-select { width: 100%; } + .is-err{ + &::after{ + bottom:-15px; + } + } } .is-err{ position: relative; @@ -420,7 +477,10 @@ getUserTree(); left: 0px; font-size:12px; position:absolute; - bottom: -6px; + bottom: -7px; + } + .el-select__wrapper,.el-textarea__inner,.el-input__wrapper{ + box-shadow: inset 0 0 0 1px red; } } }