mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改人员信息中的职位和角色，分月统计名称

master
OathK1per 2021-12-28 14:22:45 +08:00
parent b00bac8295
commit 064a49f1e7
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/cn/palmte/work/service/AccountService.java
View File

@ -103,7 +103,7 @@ public class AccountService {
Admin oldAdmin = adminRepository.findOne(userId); Admin oldAdmin = adminRepository.findOne(userId);
Dept dept = deptRepository.findOne(admin.getDeptId()); Dept dept = deptRepository.findOne(admin.getDeptId());
SysRole sysRole = sysRoleRepository.findOne(admin.getRoleId()); SysRole sysRole = sysRoleRepository.findOne(admin.getRoleId());
UserPosition userPosition = userPositionRepository.findOne(admin.getPositionId()); // UserPosition userPosition = userPositionRepository.findOne(admin.getPositionId());
if (oldAdmin == null) { if (oldAdmin == null) {
oldAdmin = new Admin(); oldAdmin = new Admin();
String userName = admin.getUserName(); String userName = admin.getUserName();
@ -115,7 +115,7 @@ public class AccountService {
oldAdmin.setRealName(admin.getRealName()); oldAdmin.setRealName(admin.getRealName());
oldAdmin.setDeptName(dept.getName()); oldAdmin.setDeptName(dept.getName());
oldAdmin.setPositionName(userPosition.getPositionName()); oldAdmin.setPositionName(admin.getPositionName());
oldAdmin.setPassword(newPassword); oldAdmin.setPassword(newPassword);
oldAdmin.setSalt(salt); oldAdmin.setSalt(salt);
oldAdmin.setEnabled(1); oldAdmin.setEnabled(1);
@ -126,10 +126,10 @@ public class AccountService {
} else { } else {
String userName = admin.getUserName(); String userName = admin.getUserName();
oldAdmin.setDeptId(admin.getDeptId()); oldAdmin.setDeptId(admin.getDeptId());
oldAdmin.setPositionId(admin.getPositionId()); // oldAdmin.setPositionId(admin.getPositionId());
oldAdmin.setRealName(admin.getRealName()); oldAdmin.setRealName(admin.getRealName());
oldAdmin.setDeptName(dept.getName()); oldAdmin.setDeptName(dept.getName());
oldAdmin.setPositionName(userPosition.getPositionName()); oldAdmin.setPositionName(admin.getPositionName());
//oldAdmin.setEmpCode(admin.getEmpCode()); //oldAdmin.setEmpCode(admin.getEmpCode());
oldAdmin.setWorkLocation(admin.getWorkLocation()); oldAdmin.setWorkLocation(admin.getWorkLocation());
oldAdmin.setDirectManager(admin.getDirectManager()); oldAdmin.setDirectManager(admin.getDirectManager());
@ -362,15 +362,15 @@ public class AccountService {
throw new Exception("职位不能为空"); throw new Exception("职位不能为空");
} }
UserPosition userPosition = userPositionRepository.findByPositionNameEquals(positionName.toString()); // UserPosition userPosition = userPositionRepository.findByPositionNameEquals(positionName.toString());
//
// if (null == userPosition) {
// throw new Exception("职位" + positionName.toString() + "不存在");
// }
if (null == userPosition) { Object sysRole = m.get("所属角色名称");
throw new Exception("职位" + positionName.toString() + "不存在");
}
Object sysRole = m.get("所属角色");
if (sysRole == null || StrKit.isBlank(sysRole.toString())) { if (sysRole == null || StrKit.isBlank(sysRole.toString())) {
throw new Exception("所属角色不能为空"); throw new Exception("所属角色名称不能为空");
} }
SysRole role = sysRoleRepository.findByNameEqualsAndDeletedEquals(sysRole.toString(), 0); SysRole role = sysRoleRepository.findByNameEqualsAndDeletedEquals(sysRole.toString(), 0);
@ -393,8 +393,8 @@ public class AccountService {
admin.setDeptId(dept.getId()); admin.setDeptId(dept.getId());
admin.setDeptName(dept.getName()); admin.setDeptName(dept.getName());
admin.setDirectManager(directManager.toString()); admin.setDirectManager(directManager.toString());
admin.setPositionId(userPosition.getId()); // admin.setPositionId(userPosition.getId());
admin.setPositionName(userPosition.getPositionName()); admin.setPositionName(positionName.toString());
admin.setRoleId(role.getId()); admin.setRoleId(role.getId());
admin.setRoleName(role.getName()); admin.setRoleName(role.getName());
admin.setCompanyEmail(companyEmail.toString()); admin.setCompanyEmail(companyEmail.toString());

16
src/main/resources/templates/admin/account_input.ftl
View File

@ -141,22 +141,18 @@
职位 职位
</div> </div>
<div class="am-u-sm-8 am-u-md-10"> <div class="am-u-sm-8 am-u-md-10">
<select id="positionId" name="positionId" <input name="positionName" class="js-ajax-validate"
data-am-selected="{btnSize: 'sm',maxHeight: 200,searchBox: 1}"> data-validate-async data-validation-message="请输入职位"
<#if positionList?exists> type="text" id="positionName" value="${account.positionName!}"
<#list positionList as node> minlength="1" maxlength="10" <#if userId!=-1>readonly</#if>
<option value="${node.id!}" <#if account.positionId! == node.id > required placeholder="请输入职位"/>
selected </#if>>${node.positionName}</option>
</#list>
</#if>
</select>
</div> </div>
</div> </div>
<div class="am-g am-form-group am-margin-top"> <div class="am-g am-form-group am-margin-top">
<div class="am-u-sm-4 am-u-md-2 am-text-right"> <div class="am-u-sm-4 am-u-md-2 am-text-right">
<span style="color: red;">*</span> <span style="color: red;">*</span>
角色 角色名称
</div> </div>
<div class="am-u-sm-8 am-u-md-10"> <div class="am-u-sm-8 am-u-md-10">
<select id="roleId" name="roleId" <select id="roleId" name="roleId"

2
src/main/resources/templates/admin/month_statistics.ftl
View File

@ -5,7 +5,7 @@
<div class="admin-content-body"> <div class="admin-content-body">
<div class="am-cf am-padding"> <div class="am-cf am-padding">
<div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">项目统计</strong> / <div class="am-fl am-cf"><strong class="am-text-primary am-text-lg">项目统计</strong> /
<small>分月项目统计</small></div> <small>项目分月统计</small></div>
</div> </div>
<form method="post" class="am-form" id="pmsForm"> <form method="post" class="am-form" id="pmsForm">