jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

dev_xd
姜玉琦 2025-02-23 22:08:11 +08:00
parent cb04fa4bca
commit 4c189dd5a4
3 changed files with 34 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserExtMapper.xml
View File

@ -21,12 +21,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectSysUserExtList" parameterType="SysUserExt" resultMap="SysUserExtResult">
<include refid="selectSysUserExtVo"/>
<where>
<if test="status != null and status != ''"> and status = #{status}</if>
<if test="comId != null and comId != 0"> and com_id = #{comId}</if>
<if test="projectId != null and projectId != 0"> and project_id = #{projectId}</if>
<if test="userId != null and userId != 0"> and user_id = #{userId}</if>
<if test="workType != null and workType != 0"> and work_type = #{workType}</if>
<if test="userType != null and userType != ''"> and user_type = #{userType}</if>
<if test="userId != null and userId != 0"> and user_id = #{userId}</if>
<if test="projectId != null and projectId != 0"> and project_id = #{projectId}</if>
<if test="comId != null and comId != 0"> and com_id = #{comId}</if>
<if test="status != null and status != ''"> and status = #{status}</if>
</where>
</select>

46
yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsUsersServiceImpl.java
View File

@ -79,6 +79,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
@Autowired
private SysUserMapper sysUserMapper;
private static final Logger log = LoggerFactory.getLogger(ProProjectInfoSubdeptsUsersServiceImpl.class);
/**
@ -1185,14 +1186,15 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
// 审核文件签名
ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
String filePath = proProjectInfoSubdeptsUsers.getEduFilePath().replace(ProfileConfig.profile, ProfileConfig.profilePath);
ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers();
userQuery.setWorkType(101L);
userQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId());
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
if(StringUtils.isNotEmpty(users)){
SysUserExt extQuery = new SysUserExt();
extQuery.setComId(proProjectInfoSubdeptsUsers.getComId());
extQuery.setWorkType(101L);
extQuery.setStatus(Convert.toStr(IsDelEnums.NO.getCode()));
List<SysUserExt> sysUserExtList = sysUserExtMapper.selectSysUserExtList(extQuery);
if(StringUtils.isNotEmpty(sysUserExtList)){
BasSignet query = new BasSignet();
query.setProjectId(users.get(0).getProjectId());
query.setUserId(users.get(0).getUserId());
query.setComId(sysUserExtList.get(0).getProjectId());
query.setUserId(sysUserExtList.get(0).getUserId());
List<BasSignet> signets = basSignetMapper.selectBasSignetList(query);
if(StringUtils.isNotEmpty(signets)){
String newFilePath = filePath.replace(".pdf","-c.pdf");
@ -1222,14 +1224,15 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
public Boolean findUserComSign(Long id){
// 审核文件签名
ProProjectInfoSubdeptsUsers proProjectInfoSubdeptsUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersById(id);
ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers();
userQuery.setWorkType(101L);
userQuery.setComId(proProjectInfoSubdeptsUsers.getComId());
List<ProProjectInfoSubdeptsUsers> users = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery);
if(StringUtils.isNotEmpty(users)){
SysUserExt extQuery = new SysUserExt();
extQuery.setComId(proProjectInfoSubdeptsUsers.getComId());
extQuery.setWorkType(101L);
extQuery.setStatus(Convert.toStr(IsDelEnums.NO.getCode()));
List<SysUserExt> sysUserExtList = sysUserExtMapper.selectSysUserExtList(extQuery);
if(StringUtils.isNotEmpty(sysUserExtList)){
BasSignet query = new BasSignet();
query.setComId(users.get(0).getComId());
query.setUserId(users.get(0).getUserId());
query.setComId(sysUserExtList.get(0).getComId());
query.setUserId(sysUserExtList.get(0).getUserId());
List<BasSignet> signets = basSignetMapper.selectBasSignetList(query);
if(StringUtils.isNotEmpty(signets)){
return true;
@ -1465,14 +1468,15 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu
throw new ServiceException("未查询安质部部长签名信息...");
}
ProProjectInfoSubdeptsUsers comUserQuery = new ProProjectInfoSubdeptsUsers();
comUserQuery.setWorkType(101L);
comUserQuery.setProjectId(proProjectInfoSubdeptsUsers.getProjectId());
List<ProProjectInfoSubdeptsUsers> comUsers = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(comUserQuery);
if(StringUtils.isNotEmpty(comUsers)){
SysUserExt extQuery = new SysUserExt();
extQuery.setComId(proProjectInfoSubdeptsUsers.getComId());
extQuery.setWorkType(101L);
extQuery.setStatus(Convert.toStr(IsDelEnums.NO.getCode()));
List<SysUserExt> sysUserExtList = sysUserExtMapper.selectSysUserExtList(extQuery);
if(StringUtils.isNotEmpty(sysUserExtList)){
BasSignet query = new BasSignet();
query.setProjectId(comUsers.get(0).getProjectId());
query.setUserId(comUsers.get(0).getUserId());
query.setComId(sysUserExtList.get(0).getProjectId());
query.setUserId(sysUserExtList.get(0).getUserId());
List<BasSignet> signets = basSignetMapper.selectBasSignetList(query);
if(StringUtils.isNotEmpty(signets)){
String newFilePath = filePath.replace(".pdf","-c.pdf");

10
yanzhu-ui-vue3/src/views/system/user/index.vue
View File

@ -216,12 +216,12 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.userType == '99'">
<el-col :span="24" v-if="form.userType == '08'">
<el-form-item label="证件号码" prop="cardCode">
<el-input v-model="form.cardCode" placeholder="请输入证件号码" maxlength="18" />
</el-form-item>
</el-col>
<el-col :span="24" v-if="form.userType == '99'">
<el-col :span="24" v-if="form.userType == '08'">
<el-form-item label="身份证信息">
<el-col :span="8">
<div class="div-header">头像面</div>
@ -486,7 +486,7 @@ function doCleanEditData() {
function doRoleChange() {
if (data.mode == 'add') {
if (form.value.userType == 99) {
if (form.value.userType == '08') {
data.rules = {
deptId: [{ required: true, message: "所属单位不能为空", trigger: "change" }],
userName: [{ required: false, message: "登录账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
@ -516,7 +516,7 @@ function doRoleChange() {
form.value.workType = '';
}
else {
if (form.value.userType == 99) {
if (form.value.userType == '08') {
data.rules = {
userName: [{ required: false, message: "登录账号不能为空", trigger: "blur" }, { min: 2, max: 20, message: "用户名称长度必须介于 2 和 20 之间", trigger: "blur" }],
nickName: [{ required: true, message: "用户姓名不能为空", trigger: "blur" }],
@ -735,7 +735,7 @@ function handleUpdate(row) {
form.value.postIds = response.postIds;
form.value.roleIds = response.roleIds;
form.value.workType = form.value.workType ? "" + form.value.workType : "";
if (form.value.userType == '99') {
if (form.value.userType == '08') {
let tmps = user_work_type.value.filter(d => d.value == form.value.workType);
if (tmps.length > 0) {
form.value.userWorkType = tmps[0].remark;