diff --git a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java index 44fe0fae..27096cf8 100644 --- a/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java +++ b/yanzhu-api/yanzhu-api-system/src/main/java/com/yanzhu/system/api/domain/SysUser.java @@ -426,8 +426,8 @@ public class SysUser extends BaseEntity @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("comId", getComId()) .append("userId", getUserId()) + .append("comId", getComId()) .append("deptId", getDeptId()) .append("userName", getUserName()) .append("nickName", getNickName()) diff --git a/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java b/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java index 8c6488d9..c77389a3 100644 --- a/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java +++ b/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysLoginService.java @@ -21,6 +21,7 @@ import com.yanzhu.system.api.RemoteUserService; import com.yanzhu.system.api.domain.SysUser; import com.yanzhu.system.api.model.LoginUser; +import java.util.HashMap; import java.util.Map; import java.util.Objects; @@ -53,7 +54,7 @@ public class SysLoginService public LoginUser login(String username, String password) { // 用户名或密码为空 错误 - if (StringUtils.isAnyBlank(username, password)) + if (StringUtils.isAnyBlank(username, password)) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写"); throw new ServiceException("用户/密码必须填写"); diff --git a/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysPasswordService.java b/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysPasswordService.java index d352e406..0d0bf968 100644 --- a/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysPasswordService.java +++ b/yanzhu-auth/src/main/java/com/yanzhu/auth/service/SysPasswordService.java @@ -42,7 +42,7 @@ public class SysPasswordService public void validate(SysUser user, String password) { String username = user.getUserName(); - + redisService.setCacheObject(getCacheKey(username), 0, lockTime, TimeUnit.MINUTES); Integer retryCount = redisService.getCacheObject(getCacheKey(username)); if (retryCount == null) diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UseStateEnums.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UseStateEnums.java index dfc7dbaf..e718eef7 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UseStateEnums.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/enums/UseStateEnums.java @@ -7,9 +7,9 @@ package com.yanzhu.common.core.enums; */ public enum UseStateEnums { - AW("0", "待入场"), - IN("1", "进场"), - OUT("2", "离场"); + AW("9", "待入场"), + IN("0", "进场"), + OUT("1", "离场"); private final String code; private final String info; diff --git a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/DateUtils.java b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/DateUtils.java index a5086add..b4116de1 100644 --- a/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/DateUtils.java +++ b/yanzhu-common/yanzhu-common-core/src/main/java/com/yanzhu/common/core/utils/DateUtils.java @@ -3,11 +3,8 @@ package com.yanzhu.common.core.utils; import java.lang.management.ManagementFactory; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; +import java.time.*; +import java.time.format.DateTimeFormatter; import java.util.Calendar; import java.util.Date; import org.apache.commons.lang3.time.DateFormatUtils; @@ -193,4 +190,36 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault()); return Date.from(zdt.toInstant()); } + + /** + * 根据出生日期计算年龄 + * @param birthDay + * @return + */ + public static int calculatedAgeByBirthDay(String birthDay){ + int age = 0; + try { + // 出生日期 + LocalDate birthDate = LocalDate.parse(birthDay, DateTimeFormatter.ofPattern("yyyy-MM-dd")); + // 当前日期 + LocalDate currentDate = LocalDate.now(); + // 计算年龄 + Period period = Period.between(birthDate, currentDate); + age = period.getYears(); + }catch (Exception e){ + try { + Calendar now = Calendar.getInstance(); + now.setTime(new Date()); // 当前时间 + Calendar birth = Calendar.getInstance(); + birth.setTime(parseDate(birthDay, parsePatterns)); + age = now.get(Calendar.YEAR) - birth.get(Calendar.YEAR); + if (now.get(Calendar.DAY_OF_YEAR) > birth.get(Calendar.DAY_OF_YEAR)) { + age += 1; + } + }catch (Exception ex){ + ex.printStackTrace(); + } + } + return age; + } } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java index 6f739440..10c377b8 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdepts.java @@ -112,13 +112,13 @@ public class ProProjectInfoSubdepts extends BaseEntity @Excel(name = "删除标识") private Long isDel; - /** 委托人正面照片 */ - private String leaderCardImgPos; - /** 委托人反面照片 */ - private String leaderCardImgInv; - /** 委托人半身照片 */ + /** 委托人进场照片 */ private String leaderUserPicture; - /** 委托代理人学历 */ + + /** 委托人详细信息 */ + private String leaderUserInfos; + + /** 委托人学历信息 */ private String leaderDegreeGrade; /** @@ -311,22 +311,6 @@ public class ProProjectInfoSubdepts extends BaseEntity this.projectName = projectName; } - public String getLeaderCardImgPos() { - return leaderCardImgPos; - } - - public void setLeaderCardImgPos(String leaderCardImgPos) { - this.leaderCardImgPos = leaderCardImgPos; - } - - public String getLeaderCardImgInv() { - return leaderCardImgInv; - } - - public void setLeaderCardImgInv(String leaderCardImgInv) { - this.leaderCardImgInv = leaderCardImgInv; - } - public String getLeaderUserPicture() { return leaderUserPicture; } @@ -375,6 +359,14 @@ public class ProProjectInfoSubdepts extends BaseEntity this.subDeptTypeName = subDeptTypeName; } + public String getLeaderUserInfos() { + return leaderUserInfos; + } + + public void setLeaderUserInfos(String leaderUserInfos) { + this.leaderUserInfos = leaderUserInfos; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java index 363ee891..debcd368 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsGroup.java @@ -92,16 +92,14 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity @Excel(name = "删除标识") private Long isDel; - /** 班组长正面照片 */ - private String groupLeaderCardImgPos; - /** 班组长反面照片 */ - private String groupLeaderCardImgInv; /** 班组长半身照片 */ private String groupLeaderUserPicture; - /** 班组长半身照片 */ + /** 班组长委托代理书 */ private String groupLeaderSubPowerPath; /** 班组长学历信息 */ private String groupLeaderDegreeGrade; + /** 班组长人员信息 */ + private String groupLeaderUserInfos; public void setId(Long id) { @@ -282,22 +280,6 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity this.projectName = projectName; } - public String getGroupLeaderCardImgPos() { - return groupLeaderCardImgPos; - } - - public void setGroupLeaderCardImgPos(String groupLeaderCardImgPos) { - this.groupLeaderCardImgPos = groupLeaderCardImgPos; - } - - public String getGroupLeaderCardImgInv() { - return groupLeaderCardImgInv; - } - - public void setGroupLeaderCardImgInv(String groupLeaderCardImgInv) { - this.groupLeaderCardImgInv = groupLeaderCardImgInv; - } - public String getGroupLeaderUserPicture() { return groupLeaderUserPicture; } @@ -322,6 +304,14 @@ public class ProProjectInfoSubdeptsGroup extends BaseEntity this.groupLeaderDegreeGrade = groupLeaderDegreeGrade; } + public String getGroupLeaderUserInfos() { + return groupLeaderUserInfos; + } + + public void setGroupLeaderUserInfos(String groupLeaderUserInfos) { + this.groupLeaderUserInfos = groupLeaderUserInfos; + } + @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java index 19d30a4c..965d57ce 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoSubdeptsUsers.java @@ -3,14 +3,11 @@ package com.yanzhu.manage.domain; import com.fasterxml.jackson.annotation.JsonFormat; import com.yanzhu.common.core.annotation.Excel; import com.yanzhu.common.core.web.domain.BaseEntity; -import com.yanzhu.system.api.domain.SysUser; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; /** - * 分包单位工人对象 pro_project_info_subdepts_users + * 花名册人员 对象pro_project_info_subdepts_users * * @author JiangYuQi * @date 2024-08-25 @@ -19,105 +16,179 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity { private static final long serialVersionUID = 1L; - @Excel(name = "所属项目") - private String projectName; - /** 分包单位名称 */ - @Excel(name = "所属单位") - private String subDeptName; - /** 主键 */ private Long id; /** 上级主键 */ private Long parId; - @Excel(name = "姓名") - private String userName; - @Excel(name = "身份证") - private String cardCode; - @Excel(name = "性别") - private String userSex; - @Excel(name = "民族") - private String userNation; - @Excel(name = "年龄") - private Integer userAge; - /** 公司主键 */ - private Long comId; - /** 项目主键 */ + @Excel(name = "所属单位") + private String comName; + /** 项目主键 */ private Long projectId; - /** 分包单位 */ + @Excel(name = "项目名称") + private String projectName; + /** 分包单位 */ private Long subDeptId; - /** 单位类型 */ + /** 分包单位名称 */ + private String subDeptName; + /** 单位类型 */ private String subDeptType; + + @Excel(name = "单位类型") private String subDeptTypeName; - /** 用户主键 */ - - private Long userId; + /** + * 用户岗位&&判断用户权限--- + */ + @Excel(name = "用户岗位") + private String userPost; /** 班组编号(外键） */ - private Long subDeptGroup; /** 班组名称 */ @Excel(name = "班组名称") private String subDeptGroupName; - /** 工种类型 */ + /** 委托书 */ + private String subDeptPowerPath; + /** 用户主键 */ + private Long userId; + + /** 人员姓名 */ + @Excel(name = "人员姓名") + private String userName; + + /** 证件类型 */ + @Excel(name = "证件类型") + private String cardType; + + /** 证件号码 */ + @Excel(name = "证件号码") + private String cardCode; + + /** 人员性别 */ + @Excel(name = "人员性别") + private String userSex; + + /** 人员年龄 **/ + @Excel(name = "人员年龄") + private int userAge; + + /** 所属民族 **/ + @Excel(name = "所属民族") + private String userNation; + + /** 用户肖像 */ + @Excel(name = "入场照片") + private String userPicture; + + /** 手机号码 */ + @Excel(name = "联系电话") + private String userPhone; + + /** 劳务人员学历 */ + private String degreeGrade; + + /** 劳务人员学历 */ + @Excel(name = "学历类型") + private String degreeGradeName; + + /** 手机号码 */ + private String userInfos; + + /** 工种类型 */ private String craftType; + @Excel(name = "工种类型") private String craftTypeName; - /** 工种岗位 */ + /** 工种岗位 */ private String craftPost; + @Excel(name = "工种岗位") private String craftPostName; - /** 委托书 */ - @Excel(name = "委托书") - private String subDeptPowerPath; - - @Excel(name = "状态") - private String enterState; /** 学习状态 */ - @Excel(name = "学习状态") + @Excel(name = "安全教育状态") private String eduStatus; /** 学习文件地址 */ - private String eduFilePath; - /** 学习签名地址 */ - - private String eduSignPath; - /** 学习时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - + @Excel(name = "学习时间") private Date eduDate; /** 审批状态 */ - + @Excel(name = "审批状态") private Long approveStatus; - /** 进场状态 */ + /** 进场时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "进场时间") + private Date useDate; + /** 进场状态 */ + @Excel(name = "进场状态") private String useStatus; - /** 进行步骤 */ + /** 进场状态 */ + @Excel(name = "进场唯一代码") + private String admitGuid; + /** 二维码 */ + private String qrCode; + + /** 疾病状态 */ + @Excel(name = "疾病状态") + private Long illnessStatus; + + /** 严重疾病状态 */ + @Excel(name = "严重疾病状态") + private Long supIllnessStatus; + + /** 进行步骤 */ private Long subStep; - private String comName; + /** 删除标识 */ + @Excel(name = "数据状态") + private Long isDel; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public Long getParId() { + return parId; + } + + public void setParId(Long parId) { + this.parId = parId; + } + + public Long getComId() { + return comId; + } + + public void setComId(Long comId) { + this.comId = comId; + } public String getComName() { return comName; @@ -127,37 +198,92 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity this.comName = comName; } - /** 疾病状态 */ - - private Long illnessStatus; - - /** 严重疾病状态 */ - - private Long supIllnessStatus; - - private String phoneNumber; - - /** 劳务人员学历 */ - private String degreeGrade; - - /** 劳务人员学历 */ - private String degreeGradeName; - - /** - * 用户岗位 - */ - private String userPost; - /** - * 二维码 - */ - private String qrCode; - - public String getEnterState() { - return enterState; + public Long getProjectId() { + return projectId; } - public void setEnterState(String enterState) { - this.enterState = enterState; + public void setProjectId(Long projectId) { + this.projectId = projectId; + } + + public String getProjectName() { + return projectName; + } + + public void setProjectName(String projectName) { + this.projectName = projectName; + } + + public Long getSubDeptId() { + return subDeptId; + } + + public void setSubDeptId(Long subDeptId) { + this.subDeptId = subDeptId; + } + + public String getSubDeptName() { + return subDeptName; + } + + public void setSubDeptName(String subDeptName) { + this.subDeptName = subDeptName; + } + + public String getSubDeptType() { + return subDeptType; + } + + public void setSubDeptType(String subDeptType) { + this.subDeptType = subDeptType; + } + + public String getSubDeptTypeName() { + return subDeptTypeName; + } + + public void setSubDeptTypeName(String subDeptTypeName) { + this.subDeptTypeName = subDeptTypeName; + } + + public String getUserPost() { + return userPost; + } + + public void setUserPost(String userPost) { + this.userPost = userPost; + } + + public Long getSubDeptGroup() { + return subDeptGroup; + } + + public void setSubDeptGroup(Long subDeptGroup) { + this.subDeptGroup = subDeptGroup; + } + + public String getSubDeptGroupName() { + return subDeptGroupName; + } + + public void setSubDeptGroupName(String subDeptGroupName) { + this.subDeptGroupName = subDeptGroupName; + } + + public String getSubDeptPowerPath() { + return subDeptPowerPath; + } + + public void setSubDeptPowerPath(String subDeptPowerPath) { + this.subDeptPowerPath = subDeptPowerPath; + } + + public Long getUserId() { + return userId; + } + + public void setUserId(Long userId) { + this.userId = userId; } public String getUserName() { @@ -168,6 +294,14 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity this.userName = userName; } + public String getCardType() { + return cardType; + } + + public void setCardType(String cardType) { + this.cardType = cardType; + } + public String getCardCode() { return cardCode; } @@ -184,275 +318,20 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity this.userSex = userSex; } - public String getUserNation() { - return userNation; + public String getUserPicture() { + return userPicture; } - public void setUserNation(String userNation) { - this.userNation = userNation; + public void setUserPicture(String userPicture) { + this.userPicture = userPicture; } - public Integer getUserAge() { - return userAge; + public String getUserPhone() { + return userPhone; } - public void setUserAge(Integer userAge) { - this.userAge = userAge; - } - - public String getCraftTypeName() { - return craftTypeName; - } - - public void setCraftTypeName(String craftTypeName) { - this.craftTypeName = craftTypeName; - } - - public String getCraftPostName() { - return craftPostName; - } - - public void setCraftPostName(String craftPostName) { - this.craftPostName = craftPostName; - } - - public SysUser getUser() { - return user; - } - - public void setUser(SysUser user) { - this.user = user; - } - - public String getAdmitGuid() { - return admitGuid; - } - - public void setAdmitGuid(String admitGuid) { - this.admitGuid = admitGuid; - } - - private String admitGuid; - private SysUser user; - - /** 删除标识 */ - - private Long isDel; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public Long getParId() { - return parId; - } - - public void setParId(Long parId) { - this.parId = parId; - } - - public void setComId(Long comId) - { - this.comId = comId; - } - - public Long getComId() - { - return comId; - } - public void setProjectId(Long projectId) - { - this.projectId = projectId; - } - - public Long getProjectId() - { - return projectId; - } - public void setSubDeptId(Long subDeptId) - { - this.subDeptId = subDeptId; - } - - public Long getSubDeptId() - { - return subDeptId; - } - public void setSubDeptType(String subDeptType) - { - this.subDeptType = subDeptType; - } - - public String getSubDeptType() - { - return subDeptType; - } - public void setSubDeptName(String subDeptName) - { - this.subDeptName = subDeptName; - } - - public String getSubDeptName() - { - return subDeptName; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setSubDeptGroup(Long subDeptGroup) - { - this.subDeptGroup = subDeptGroup; - } - - public Long getSubDeptGroup() - { - return subDeptGroup; - } - public void setSubDeptGroupName(String subDeptGroupName) - { - this.subDeptGroupName = subDeptGroupName; - } - - public String getSubDeptGroupName() - { - return subDeptGroupName; - } - public void setCraftType(String craftType) - { - this.craftType = craftType; - } - - public String getCraftType() - { - return craftType; - } - public void setCraftPost(String craftPost) - { - this.craftPost = craftPost; - } - - public String getCraftPost() - { - return craftPost; - } - public void setEduStatus(String eduStatus) - { - this.eduStatus = eduStatus; - } - - public String getEduStatus() - { - return eduStatus; - } - public void setEduFilePath(String eduFilePath) - { - this.eduFilePath = eduFilePath; - } - - public String getEduFilePath() - { - return eduFilePath; - } - public void setEduSignPath(String eduSignPath) - { - this.eduSignPath = eduSignPath; - } - - public String getEduSignPath() - { - return eduSignPath; - } - public void setEduDate(Date eduDate) - { - this.eduDate = eduDate; - } - - public Date getEduDate() - { - return eduDate; - } - public void setApproveStatus(Long approveStatus) - { - this.approveStatus = approveStatus; - } - - public Long getApproveStatus() - { - return approveStatus; - } - public void setUseStatus(String useStatus) - { - this.useStatus = useStatus; - } - - public String getUseStatus() - { - return useStatus; - } - public void setSubStep(Long subStep) - { - this.subStep = subStep; - } - - public Long getSubStep() - { - return subStep; - } - public void setIllnessStatus(Long illnessStatus) - { - this.illnessStatus = illnessStatus; - } - - public Long getIllnessStatus() - { - return illnessStatus; - } - public void setSupIllnessStatus(Long supIllnessStatus) - { - this.supIllnessStatus = supIllnessStatus; - } - - public Long getSupIllnessStatus() - { - return supIllnessStatus; - } - public void setIsDel(Long isDel) - { - this.isDel = isDel; - } - - public Long getIsDel() - { - return isDel; - } - - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public String getPhoneNumber() { - return phoneNumber; - } - - public void setPhoneNumber(String phoneNumber) { - this.phoneNumber = phoneNumber; + public void setUserPhone(String userPhone) { + this.userPhone = userPhone; } public String getDegreeGrade() { @@ -463,20 +342,116 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity this.degreeGrade = degreeGrade; } - public String getSubDeptPowerPath() { - return subDeptPowerPath; + public String getDegreeGradeName() { + return degreeGradeName; } - public void setSubDeptPowerPath(String subDeptPowerPath) { - this.subDeptPowerPath = subDeptPowerPath; + public void setDegreeGradeName(String degreeGradeName) { + this.degreeGradeName = degreeGradeName; } - public String getUserPost() { - return userPost; + public String getUserInfos() { + return userInfos; } - public void setUserPost(String userPost) { - this.userPost = userPost; + public void setUserInfos(String userInfos) { + this.userInfos = userInfos; + } + + public String getCraftType() { + return craftType; + } + + public void setCraftType(String craftType) { + this.craftType = craftType; + } + + public String getCraftTypeName() { + return craftTypeName; + } + + public void setCraftTypeName(String craftTypeName) { + this.craftTypeName = craftTypeName; + } + + public String getCraftPost() { + return craftPost; + } + + public void setCraftPost(String craftPost) { + this.craftPost = craftPost; + } + + public String getCraftPostName() { + return craftPostName; + } + + public void setCraftPostName(String craftPostName) { + this.craftPostName = craftPostName; + } + + public String getEduFilePath() { + return eduFilePath; + } + + public void setEduFilePath(String eduFilePath) { + this.eduFilePath = eduFilePath; + } + + public int getUserAge() { + return userAge; + } + + public void setUserAge(int userAge) { + this.userAge = userAge; + } + + public String getEduStatus() { + return eduStatus; + } + + public void setEduStatus(String eduStatus) { + this.eduStatus = eduStatus; + } + + public Date getEduDate() { + return eduDate; + } + + public void setEduDate(Date eduDate) { + this.eduDate = eduDate; + } + + public Long getApproveStatus() { + return approveStatus; + } + + public void setApproveStatus(Long approveStatus) { + this.approveStatus = approveStatus; + } + + public Date getUseDate() { + return useDate; + } + + public void setUseDate(Date useDate) { + this.useDate = useDate; + } + + public String getUseStatus() { + return useStatus; + } + + public void setUseStatus(String useStatus) { + this.useStatus = useStatus; + } + + public String getAdmitGuid() { + return admitGuid; + } + + public void setAdmitGuid(String admitGuid) { + this.admitGuid = admitGuid; } public String getQrCode() { @@ -487,52 +462,90 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity this.qrCode = qrCode; } - public String getSubDeptTypeName() { - return subDeptTypeName; + public Long getIllnessStatus() { + return illnessStatus; } - public void setSubDeptTypeName(String subDeptTypeName) { - this.subDeptTypeName = subDeptTypeName; + public void setIllnessStatus(Long illnessStatus) { + this.illnessStatus = illnessStatus; } - public String getDegreeGradeName() { - return degreeGradeName; + public Long getSupIllnessStatus() { + return supIllnessStatus; } - public void setDegreeGradeName(String degreeGradeName) { - this.degreeGradeName = degreeGradeName; + public void setSupIllnessStatus(Long supIllnessStatus) { + this.supIllnessStatus = supIllnessStatus; + } + + public Long getSubStep() { + return subStep; + } + + public void setSubStep(Long subStep) { + this.subStep = subStep; + } + + public Long getIsDel() { + return isDel; + } + + public void setIsDel(Long isDel) { + this.isDel = isDel; + } + + public String getUserNation() { + return userNation; + } + + public void setUserNation(String userNation) { + this.userNation = userNation; } @Override public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("comId", getComId()) - .append("projectId", getProjectId()) - .append("subDeptId", getSubDeptId()) - .append("subDeptType", getSubDeptType()) - .append("subDeptName", getSubDeptName()) - .append("userId", getUserId()) - .append("subDeptGroup", getSubDeptGroup()) - .append("subDeptGroupName", getSubDeptGroupName()) - .append("userPost", getUserPost()) - .append("craftType", getCraftType()) - .append("craftPost", getCraftPost()) - .append("eduStatus", getEduStatus()) - .append("eduFilePath", getEduFilePath()) - .append("eduSignPath", getEduSignPath()) - .append("eduDate", getEduDate()) - .append("approveStatus", getApproveStatus()) - .append("useStatus", getUseStatus()) - .append("subStep", getSubStep()) - .append("illnessStatus", getIllnessStatus()) - .append("supIllnessStatus", getSupIllnessStatus()) - .append("isDel", getIsDel()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); + return "ProProjectInfoSubdeptsUsers{" + + "id=" + id + + ", parId=" + parId + + ", comId=" + comId + + ", comName='" + comName + '\'' + + ", projectId=" + projectId + + ", projectName='" + projectName + '\'' + + ", subDeptId=" + subDeptId + + ", subDeptName='" + subDeptName + '\'' + + ", subDeptType='" + subDeptType + '\'' + + ", subDeptTypeName='" + subDeptTypeName + '\'' + + ", userPost='" + userPost + '\'' + + ", subDeptGroup=" + subDeptGroup + + ", subDeptGroupName='" + subDeptGroupName + '\'' + + ", subDeptPowerPath='" + subDeptPowerPath + '\'' + + ", userId=" + userId + + ", userName='" + userName + '\'' + + ", cardType='" + cardType + '\'' + + ", cardCode='" + cardCode + '\'' + + ", userSex='" + userSex + '\'' + + ", userAge=" + userAge + + ", userPicture='" + userPicture + '\'' + + ", userPhone='" + userPhone + '\'' + + ", degreeGrade='" + degreeGrade + '\'' + + ", degreeGradeName='" + degreeGradeName + '\'' + + ", userInfos='" + userInfos + '\'' + + ", craftType='" + craftType + '\'' + + ", craftTypeName='" + craftTypeName + '\'' + + ", craftPost='" + craftPost + '\'' + + ", craftPostName='" + craftPostName + '\'' + + ", eduStatus='" + eduStatus + '\'' + + ", eduFilePath='" + eduFilePath + '\'' + + ", eduDate=" + eduDate + + ", approveStatus=" + approveStatus + + ", useDate=" + useDate + + ", useStatus='" + useStatus + '\'' + + ", admitGuid='" + admitGuid + '\'' + + ", qrCode='" + qrCode + '\'' + + ", illnessStatus=" + illnessStatus + + ", supIllnessStatus=" + supIllnessStatus + + ", subStep=" + subStep + + ", isDel=" + isDel + + '}'; } } diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoUsers.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoUsers.java deleted file mode 100644 index de2b445e..00000000 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfoUsers.java +++ /dev/null @@ -1,190 +0,0 @@ -package com.yanzhu.manage.domain; - -import com.yanzhu.common.core.annotation.Excel; -import com.yanzhu.common.core.web.domain.BaseEntity; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -/** - * 项目人员对象 pro_project_info_users - * - * @author JiangYuQi - * @date 2024-08-25 - */ -public class ProProjectInfoUsers extends BaseEntity -{ - private static final long serialVersionUID = 1L; - - /** 主键 */ - private Long id; - - /** 公司主键 */ - @Excel(name = "公司主键") - private Long comId; - - /** 公司名称 */ - @Excel(name = "公司名称") - private String comName; - - /** 项目主键 */ - @Excel(name = "项目主键") - private Long projectId; - - /** 项目名称 */ - @Excel(name = "项目名称") - private String projectName; - - /** 用户主键 */ - @Excel(name = "用户主键") - private Long userId; - - /** 用户姓名 */ - @Excel(name = "用户姓名") - private String userName; - - /** 用户编号 */ - @Excel(name = "用户编号") - private String userCode; - - /** 用户电话 */ - @Excel(name = "用户电话") - private String userPhone; - - /** 进场状态 */ - @Excel(name = "进场状态") - private String useStatus; - - /** 项目排序 */ - @Excel(name = "项目排序") - private Long sortBy; - - /** 删除标识 */ - @Excel(name = "删除标识") - private Long isDel; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public Long getComId() { - return comId; - } - - public void setComId(Long comId) { - this.comId = comId; - } - - public void setProjectId(Long projectId) - { - this.projectId = projectId; - } - - public Long getProjectId() - { - return projectId; - } - public void setUserId(Long userId) - { - this.userId = userId; - } - - public Long getUserId() - { - return userId; - } - public void setUserName(String userName) - { - this.userName = userName; - } - - public String getUserName() - { - return userName; - } - public void setUserCode(String userCode) - { - this.userCode = userCode; - } - - public String getUserCode() - { - return userCode; - } - public void setUserPhone(String userPhone) - { - this.userPhone = userPhone; - } - - public String getUserPhone() - { - return userPhone; - } - public void setUseStatus(String useStatus) - { - this.useStatus = useStatus; - } - - public String getUseStatus() - { - return useStatus; - } - public void setIsDel(Long isDel) - { - this.isDel = isDel; - } - - public Long getIsDel() - { - return isDel; - } - - public String getComName() { - return comName; - } - - public void setComName(String comName) { - this.comName = comName; - } - - public String getProjectName() { - return projectName; - } - - public void setProjectName(String projectName) { - this.projectName = projectName; - } - - public Long getSortBy() { - return sortBy; - } - - public void setSortBy(Long sortBy) { - this.sortBy = sortBy; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("comId", getComId()) - .append("projectId", getProjectId()) - .append("userId", getUserId()) - .append("userName", getUserName()) - .append("userCode", getUserCode()) - .append("userPhone", getUserPhone()) - .append("useStatus", getUseStatus()) - .append("isDel", getIsDel()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/BasSignetMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/BasSignetMapper.java index 2e5ce8f4..18d83bdd 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/BasSignetMapper.java +++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/BasSignetMapper.java @@ -2,6 +2,7 @@ package com.yanzhu.manage.mapper; import java.util.List; import com.yanzhu.manage.domain.BasSignet; +import org.apache.ibatis.annotations.Param; /** * 业务签名管理Mapper接口 @@ -51,6 +52,15 @@ public interface BasSignetMapper */ public int deleteBasSignetById(Long id); + /** + * 删除业务签名管理 + * + * @param proId 项目主键 + * @param userId 用户主键 + * @return 结果 + */ + public int deleteBasSignetByParams(@Param("proId") Long proId, @Param("userId") Long userId); + /** * 批量删除业务签名管理 * diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoUsersMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoUsersMapper.java deleted file mode 100644 index cb30254f..00000000 --- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoUsersMapper.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.yanzhu.manage.mapper; - -import java.util.List; -import java.util.Map; - -import com.yanzhu.manage.domain.ProProjectInfoUsers; - -/** - * 项目人员Mapper接口 - * - * @author JiangYuQi - * @date 2024-08-25 - */ -public interface ProProjectInfoUsersMapper -{ - /** - * 查询项目人员 - * - * @param id 项目人员主键 - * @return 项目人员 - */ - public ProProjectInfoUsers selectProProjectInfoUsersById(Long id); - - /** - * 查询项目人员列表 - * - * @param proProjectInfoUsers 项目人员 - * @return 项目人员集合 - */ - public List selectProProjectInfoUsersList(ProProjectInfoUsers proProjectInfoUsers); - - /** - * 新增项目人员 - * - * @param proProjectInfoUsers 项目人员 - * @return 结果 - */ - public int insertProProjectInfoUsers(ProProjectInfoUsers proProjectInfoUsers); - - /** - * 修改项目人员 - * - * @param proProjectInfoUsers 项目人员 - * @return 结果 - */ - public int updateProProjectInfoUsers(ProProjectInfoUsers proProjectInfoUsers); - - /** - * 删除项目人员 - * - * @param id 项目人员主键 - * @return 结果 - */ - public int deleteProProjectInfoUsersById(Long id); - - /** - * 批量删除项目人员 - * - * @param ids 需要删除的数据主键集合 - * @return 结果 - */ - public int deleteProProjectInfoUsersByIds(Long[] ids); - - /** - * 批量取消项目人员的默认项目 - * - * @param userId 用户主键 - * @return 结果 - */ - public int cancelDefaultSortByUserId(Long userId); - - /** - * 根据用户编号查询入场项目信息 - * - * @param userId 用户ID - * @return 结果 - */ - public List> selectProjectsByUserId(Long userId); -} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BasSignetMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BasSignetMapper.xml index b62f9c94..9445d2f0 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BasSignetMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/BasSignetMapper.xml @@ -101,6 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" delete from bas_signet where id = #{id} + + delete from bas_signet where project_id = #{proId} and user_id = #{userId} + + delete from bas_signet where id in diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml index 39a6d94d..8fbb3559 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoSubdeptsUsersMapper.xml @@ -3,12 +3,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + + - + @@ -17,78 +18,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - + + + + + + + + + + + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - SELECT psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, psu.sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.sub_dept_group, - psu.sub_dept_group_name, psu.user_post, psu.craft_type, psu.craft_post, psu.edu_status, psu.edu_file_path, psu.edu_sign_path, psu.edu_date, psu.approve_status, - psu.use_status, psu.qr_code, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, - psu.remark, psu.degree_grade, dic4.dict_label as degree_grade_name, su.`user_name`,su.`nick_name`,su.`user_type`,su.`card_type`,su.`card_code`,su.admitGuid,su.admitGuid usAdmitGuid, - dic1.dict_label craft_type_name,dic2.dict_label craft_post_name,psu.enter_state,sd.dept_name comName, - su.`user_picture`, su.`card_img_inv`,su.`card_img_pos`,su.`user_infos`,su.`email`,su.`phonenumber`,su.`sex`,su.`avatar`,su.`login_ip`,su.`login_date` - FROM pro_project_info_subdepts_users psu - LEFT JOIN sys_user su ON psu.user_id=su.user_id - LEFT JOIN pro_project_info pi ON pi.id = psu.project_id - LEFT JOIN sys_dept sd ON sd.dept_id = pi.com_id - LEFT JOIN sys_dict_data dic1 ON psu.`craft_type`=dic1.`dict_value` AND dic1.`dict_type`='pro_craft_type' - LEFT JOIN sys_dict_data dic2 ON psu.`craft_post`=dic2.`dict_value` AND dic2.`dict_type`='pro_craft_post' - LEFT JOIN sys_dict_data dic3 ON psu.`sub_dept_type`=dic3.`dict_value` AND dic3.`dict_type`='sub_dept_type' - LEFT JOIN sys_dict_data dic4 ON psu.`degree_grade`=dic4.`dict_value` AND dic4.`dict_type`='educational_type' + select psu.id, psu.par_id, psu.com_id, psu.project_id, pi.project_name, psu.sub_dept_id, psu.sub_dept_type, dic3.dict_label as sub_dept_type_name, psu.sub_dept_name, psu.sub_dept_power_path, psu.user_id, psu.user_post, psu.sub_dept_group, + psu.sub_dept_group_name, psu.user_name, psu.card_type, psu.card_code, psu.user_sex, psu.user_picture, psu.user_phone, psu.degree_grade, dic4.dict_label as degree_grade_name, psu.user_infos, psu.craft_type, psu.craft_post, psu.edu_status, psu.edu_file_path, psu.edu_date, psu.approve_status, + psu.use_date, psu.use_status, psu.admit_guid, psu.qr_code, psu.sub_step, psu.illness_status, psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time, + psu.remark + from pro_project_info_subdepts_users psu + left join pro_project_info pi on pi.id = psu.project_id + left join sys_dept sd on sd.dept_id = pi.com_id + left join sys_dict_data dic1 on psu.`craft_type`=dic1.`dict_value` and dic1.`dict_type`='pro_craft_type' + left join sys_dict_data dic2 on psu.`craft_post`=dic2.`dict_value` and dic2.`dict_type`='pro_craft_post' + left join sys_dict_data dic3 on psu.`sub_dept_type`=dic3.`dict_value` and dic3.`dict_type`='sub_dept_type' + left join sys_dict_data dic4 on psu.`degree_grade`=dic4.`dict_value` and dic4.`dict_type`='educational_type' @@ -140,29 +118,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sub_dept_name, sub_dept_power_path, user_id, + user_post, sub_dept_group, sub_dept_group_name, - user_post, + user_name, + card_type, + card_code, + user_sex, + user_picture, + user_phone, + degree_grade, + user_infos, craft_type, craft_post, edu_status, edu_file_path, - edu_sign_path, edu_date, approve_status, + use_date, use_status, + admit_guid, qr_code, sub_step, illness_status, sup_illness_status, is_del, - enter_state, create_by, create_time, update_by, update_time, remark, - degree_grade, #{parId}, @@ -173,29 +158,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{subDeptName}, #{subDeptPowerPath}, #{userId}, + #{userPost}, #{subDeptGroup}, #{subDeptGroupName}, - #{userPost}, + #{userName}, + #{cardType}, + #{cardCode}, + #{userSex}, + #{userPicture}, + #{userPhone}, + #{degreeGrade}, + #{userInfos}, #{craftType}, #{craftPost}, #{eduStatus}, #{eduFilePath}, - #{eduSignPath}, #{eduDate}, #{approveStatus}, + #{useDate}, #{useStatus}, + #{admitGuid}, #{qrCode}, #{subStep}, #{illnessStatus}, #{supIllnessStatus}, #{isDel}, - #{enterState}, #{createBy}, #{createTime}, #{updateBy}, #{updateTime}, #{remark}, - #{degreeGrade}, @@ -210,43 +202,50 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" sub_dept_name = #{subDeptName}, sub_dept_power_path = #{subDeptPowerPath}, user_id = #{userId}, + user_post = #{userPost}, sub_dept_group = #{subDeptGroup}, sub_dept_group_name = #{subDeptGroupName}, - user_post = #{userPost}, + user_name = #{userName}, + card_type = #{cardType}, + card_code = #{cardCode}, + user_sex = #{userSex}, + user_picture = #{userPicture}, + user_phone = #{userPhone}, + degree_grade = #{degreeGrade}, + user_infos = #{userInfos}, craft_type = #{craftType}, craft_post = #{craftPost}, edu_status = #{eduStatus}, edu_file_path = #{eduFilePath}, - edu_sign_path = #{eduSignPath}, edu_date = #{eduDate}, approve_status = #{approveStatus}, + use_date = #{useDate}, use_status = #{useStatus}, + admit_guid = #{admitGuid}, qr_code = #{qrCode}, sub_step = #{subStep}, illness_status = #{illnessStatus}, sup_illness_status = #{supIllnessStatus}, is_del = #{isDel}, - enter_state = #{enterState}, create_by = #{createBy}, create_time = #{createTime}, update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, - degree_grade = #{degreeGrade}, where id = #{id} - - delete from pro_project_info_subdepts_users where id = #{id} - + + update pro_project_info_subdepts_users set is_del = 2 where id = #{id} + - - delete from pro_project_info_subdepts_users where id in + + update pro_project_info_subdepts_users set is_del = 2 where id in #{id} - + - - - and sd.dept_id = #{activeComId} - and pu.com_id = #{comId} - and pu.project_id = #{projectId} - and pi.project_name like concat('%', #{projectName}, '%') - and pu.user_id = #{userId} - and pu.user_name like concat('%', #{userName}, '%') - and pu.user_code = #{userCode} - and pu.user_phone = #{userPhone} - and pu.use_status = #{useStatus} - and pu.is_del = #{isDel} - - order by pu.id desc - - - - - - insert into pro_project_info_users - - com_id, - project_id, - user_id, - user_name, - user_code, - user_phone, - use_status, - sort_by, - is_del, - create_by, - create_time, - update_by, - update_time, - remark, - - - #{comId}, - #{projectId}, - #{userId}, - #{userName}, - #{userCode}, - #{userPhone}, - #{useStatus}, - #{sortBy}, - #{isDel}, - #{createBy}, - #{createTime}, - #{updateBy}, - #{updateTime}, - #{remark}, - - - - - update pro_project_info_users - - com_id = #{comId}, - project_id = #{projectId}, - user_id = #{userId}, - user_name = #{userName}, - user_code = #{userCode}, - user_phone = #{userPhone}, - use_status = #{useStatus}, - sort_by = #{sortBy}, - is_del = #{isDel}, - create_by = #{createBy}, - create_time = #{createTime}, - update_by = #{updateBy}, - update_time = #{updateTime}, - remark = #{remark}, - - where id = #{id} - - - - update pro_project_info_users set is_del=1 where id = #{id} - - - - update pro_project_info_users set is_del=1 where id in - - #{id} - - - - - update pro_project_info_users set sort_by=100 where user_id = #{userId} - - - - - - \ No newline at end of file diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysMenuMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysMenuMapper.xml index 47a229a3..03f33c01 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysMenuMapper.xml @@ -117,7 +117,7 @@ left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_user_role ur on rm.role_id = ur.role_id left join sys_role r on r.role_id = ur.role_id - left join sys_role_dept rd on rd.role_id = r.role.id + left join sys_role_dept rd on rd.role_id = r.role_id where m.status = '0' and r.status = '0' and ur.user_id = #{userId} and rd.dept_id = #{deptId} diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml index c4a25e8d..a554abc0 100644 --- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml +++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/system/SysUserMapper.xml @@ -198,7 +198,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into sys_user( - user_id, com_id, dept_id, user_name, @@ -221,7 +220,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, create_time )values( - #{userId}, #{comId}, #{deptId}, #{userName}, diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/config/SystemUtils.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/config/SystemUtils.java index 30aca37e..df15529d 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/config/SystemUtils.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/config/SystemUtils.java @@ -26,8 +26,8 @@ public class SystemUtils { */ @Bean public void initSettings() { - if(!Objects.equals("dev",active)){ + //if(!Objects.equals("dev",active)){ isLinux = true; - } + //} } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BasSignetController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BasSignetController.java index e912f2d3..f472cd58 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BasSignetController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/BasSignetController.java @@ -71,7 +71,7 @@ public class BasSignetController extends BaseController { if(Objects.nonNull(pageBasSignet.getId())){ BasSignet basSignet = basSignetService.selectBasSignetById(pageBasSignet.getId()); - basSignet.setSignetPath(pageBasSignet.getSignetPath()+".sign.png.min.png"); + basSignet.setSignetPath(pageBasSignet.getSignetPath()+".sign.png"); basSignet.setUpdateBy(DataSourceEnuns.APP.getInfo()); basSignet.setUpdateTime(DateUtils.getNowDate()); return toAjax(basSignetService.updateBasSignet(basSignet)); @@ -81,7 +81,7 @@ public class BasSignetController extends BaseController basSignet.setComId(proProjectInfo.getComId()); basSignet.setProjectId(proProjectInfo.getId()); basSignet.setUserId(SecurityUtils.getUserId()); - basSignet.setSignetPath(pageBasSignet.getSignetPath()+".sign.png.min.png"); + basSignet.setSignetPath(pageBasSignet.getSignetPath()+".sign.png"); basSignet.setCreateBy(DataSourceEnuns.APP.getInfo()); basSignet.setCreateTime(DateUtils.getNowDate()); return toAjax(basSignetService.insertBasSignet(basSignet)); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java index 13425e07..d7bbc2e5 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoSubdeptsUsersController.java @@ -1,6 +1,8 @@ package com.yanzhu.manage.controller; import com.alibaba.fastjson2.JSONObject; +import com.yanzhu.common.core.text.Convert; +import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.poi.ExcelUtil; import com.yanzhu.common.core.web.controller.BaseController; import com.yanzhu.common.core.web.domain.AjaxResult; @@ -13,13 +15,12 @@ import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; import com.yanzhu.manage.service.IUniService; -import com.yanzhu.system.api.domain.SysUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.List; +import java.util.Objects; /** * 分包单位工人Controller @@ -78,21 +79,16 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController { List list = proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersList(proProjectInfoSubdeptsUsers); for(ProProjectInfoSubdeptsUsers u :list){ - SysUser su=u.getUser(); - u.setUserName(su.getUserName()); - u.setCardCode(su.getCardCode()); - u.setUserSex(su.getSex()); - u.setEnterState("0".equals(u.getEnterState())?"在场":"离场"); - JSONObject jo=JSONObject.parseObject(su.getUserInfos()); - u.setUserNation(jo.getString("nation")); - Date dt=jo.getDate("birthDay"); - if(dt!=null){ - int age=(int)((new Date().getTime()-dt.getTime())/1000/3600/24/365); - u.setUserAge(age); + if(Objects.nonNull(u.getUserInfos())){ + JSONObject jo = JSONObject.parseObject(u.getUserInfos()); + u.setUserNation(jo.getString("nation")); + if(Objects.nonNull(jo.getString("birthDay"))){ + u.setUserAge(DateUtils.calculatedAgeByBirthDay(jo.getString("birthDay"))); + } } } ExcelUtil util = new ExcelUtil(ProProjectInfoSubdeptsUsers.class); - util.exportExcel(response, list, "分包单位工人数据"); + util.exportExcel(response, list, "花名册人员数据"); } /** @@ -160,14 +156,14 @@ public class ProProjectInfoSubdeptsUsersController extends BaseController public AjaxResult updateEnterState(@RequestBody List ids,@PathVariable int state){ try { for (Long id : ids) { - ProProjectInfoSubdeptsUsers user=proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersById(id); - if(user!=null) { + ProProjectInfoSubdeptsUsers user = proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersById(id); + if(Objects.nonNull(user)) { if (state == 0) {//进场 uniService.syncUserAuthDevice(id); } else { uniService.syncUserRevoke(id); } - user.setEnterState(""+state); + user.setUseStatus(Convert.toStr(state)); proProjectInfoSubdeptsUsersService.updateProProjectInfoSubdeptsUsers(user); } } diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoUsersController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoUsersController.java deleted file mode 100644 index 2997a53e..00000000 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/ProProjectInfoUsersController.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.yanzhu.manage.controller; - -import com.yanzhu.common.core.domain.R; -import com.yanzhu.common.core.utils.poi.ExcelUtil; -import com.yanzhu.common.core.web.controller.BaseController; -import com.yanzhu.common.core.web.domain.AjaxResult; -import com.yanzhu.common.core.web.page.TableDataInfo; -import com.yanzhu.common.log.annotation.Log; -import com.yanzhu.common.log.enums.BusinessType; -import com.yanzhu.common.security.annotation.InnerAuth; -import com.yanzhu.common.security.annotation.RequiresPermissions; -import com.yanzhu.manage.domain.ProProjectInfoUsers; -import com.yanzhu.manage.service.IProProjectInfoUsersService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - -/** - * 项目人员Controller - * - * @author JiangYuQi - * @date 2024-08-25 - */ -@RestController -@RequestMapping("/proProjectInfoUsers") -public class ProProjectInfoUsersController extends BaseController -{ - @Autowired - private IProProjectInfoUsersService proProjectInfoUsersService; - - /** - * 查询项目人员列表 - */ - @RequiresPermissions("manage:proProjectInfoUsers:list") - @GetMapping("/list") - public TableDataInfo list(ProProjectInfoUsers proProjectInfoUsers) - { - startPage(); - List list = proProjectInfoUsersService.selectProProjectInfoUsersList(proProjectInfoUsers); - return getDataTable(list); - } - - /** - * 导出项目人员列表 - */ - @RequiresPermissions("manage:proProjectInfoUsers:export") - @Log(title = "项目人员", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(HttpServletResponse response, ProProjectInfoUsers proProjectInfoUsers) - { - List list = proProjectInfoUsersService.selectProProjectInfoUsersList(proProjectInfoUsers); - ExcelUtil util = new ExcelUtil(ProProjectInfoUsers.class); - util.exportExcel(response, list, "项目人员数据"); - } - - /** - * 获取项目人员详细信息 - */ - @RequiresPermissions("manage:proProjectInfoUsers:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) - { - return success(proProjectInfoUsersService.selectProProjectInfoUsersById(id)); - } - - /** - * 新增项目人员 - */ - @RequiresPermissions("manage:proProjectInfoUsers:add") - @Log(title = "项目人员", businessType = BusinessType.INSERT) - @PostMapping - public AjaxResult add(@RequestBody ProProjectInfoUsers proProjectInfoUsers) - { - return toAjax(proProjectInfoUsersService.insertProProjectInfoUsers(proProjectInfoUsers)); - } - - /** - * 修改项目人员 - */ - @RequiresPermissions("manage:proProjectInfoUsers:edit") - @Log(title = "项目人员", businessType = BusinessType.UPDATE) - @PutMapping - public AjaxResult edit(@RequestBody ProProjectInfoUsers proProjectInfoUsers) - { - return toAjax(proProjectInfoUsersService.updateProProjectInfoUsers(proProjectInfoUsers)); - } - - /** - * 删除项目人员 - */ - @RequiresPermissions("manage:proProjectInfoUsers:remove") - @Log(title = "项目人员", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) - { - return toAjax(proProjectInfoUsersService.deleteProProjectInfoUsersByIds(ids)); - } - - /** - * 修改为默认项目 - */ - @GetMapping("/changeDefaultProject/{id}") - public AjaxResult changeDefaultProject(@PathVariable("id") Long id) - { - return toAjax(proProjectInfoUsersService.editDefaultProjectById(id)); - } - - /** - * 获取当前用户入场项目信息 - */ - @InnerAuth - @GetMapping("/projects/{userId}") - public R>> getProjects(@PathVariable("userId") Long userId) - { - List> list = proProjectInfoUsersService.selectProjectsByUserId(userId); - return R.ok(list); - } -} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/UniCallBackController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/UniCallBackController.java index 641b9fb3..b52b88f7 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/UniCallBackController.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/UniCallBackController.java @@ -31,9 +31,9 @@ public class UniCallBackController { @Autowired private IAttendanceUbiDeviceService attendanceUbiDeviceService; + /** * 识别回调 - * @param jo * @return */ @PostMapping("/recognize") @@ -121,38 +121,36 @@ public class UniCallBackController { ProProjectInfoSubdeptsUsers userWhere=new ProProjectInfoSubdeptsUsers(); userWhere.setProjectId(projectId); userWhere.setAdmitGuid(admitGuid); - List userList=proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersList(userWhere); - if(userList.size()>0){ - ProProjectInfoSubdeptsUsers proUser=userList.get(0); - if(proUser!=null && proUser.getUser()!=null){ - AttendanceUbiData addData=new AttendanceUbiData(); - addData.setAdmitGuid(admitGuid); - addData.setComName(proUser.getComName()); - addData.setProjectName(proUser.getProjectName()); - addData.setSubDeptId(proUser.getSubDeptId()); - addData.setSubDeptName(proUser.getSubDeptName()); - addData.setComId(proUser.getComId()); - addData.setUserId(proUser.getUserId()); - addData.setProjectId(projectId); - addData.setEventGuid(eventGuid); - addData.setUserName(proUser.getUser().getUserName()); - addData.setSubDeptGroup(proUser.getSubDeptGroup()); - addData.setSubDeptGroupName(proUser.getSubDeptGroupName()); - addData.setCraftPost(proUser.getCraftPost()); - addData.setCraftType(proUser.getCraftType()); - if(device.getDirection()==0) { - addData.setInTime(showTime); - addData.setInData(data); - addData.setInPhoto(filePath); - }else{ - addData.setOutPhoto(filePath); - addData.setOutData(data); - addData.setOutTime(showTime); - } - addData.setDeviceNo(deviceNo); - attendanceUbiDataService.insertAttendanceUbiData(addData); - return AjaxResult.success("增加成功"); + List userList = proProjectInfoSubdeptsUsersService.selectProProjectInfoSubdeptsUsersList(userWhere); + if(userList!=null && userList.size()>0){ + ProProjectInfoSubdeptsUsers proUser = userList.get(0); + AttendanceUbiData addData = new AttendanceUbiData(); + addData.setAdmitGuid(admitGuid); + addData.setComName(proUser.getComName()); + addData.setProjectName(proUser.getProjectName()); + addData.setSubDeptId(proUser.getSubDeptId()); + addData.setSubDeptName(proUser.getSubDeptName()); + addData.setComId(proUser.getComId()); + addData.setUserId(proUser.getUserId()); + addData.setProjectId(projectId); + addData.setEventGuid(eventGuid); + addData.setUserName(proUser.getUserName()); + addData.setSubDeptGroup(proUser.getSubDeptGroup()); + addData.setSubDeptGroupName(proUser.getSubDeptGroupName()); + addData.setCraftPost(proUser.getCraftPost()); + addData.setCraftType(proUser.getCraftType()); + if(device.getDirection()==0) { + addData.setInTime(showTime); + addData.setInData(data); + addData.setInPhoto(filePath); + }else{ + addData.setOutPhoto(filePath); + addData.setOutData(data); + addData.setOutTime(showTime); } + addData.setDeviceNo(deviceNo); + attendanceUbiDataService.insertAttendanceUbiData(addData); + return AjaxResult.success("增加成功"); } }else{ //修改操作 diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/DeptGroupEnums.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/DeptGroupEnums.java new file mode 100644 index 00000000..c4fd28f7 --- /dev/null +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/enums/DeptGroupEnums.java @@ -0,0 +1,29 @@ +package com.yanzhu.manage.enums; + +/** + * 单位班组枚举 + */ +public enum DeptGroupEnums { + + MANAGE("DEFAULT", "管理班组"); + + private final String code; + private final String info; + + DeptGroupEnums(String code, String info) + { + this.code = code; + this.info = info; + } + + public String getCode() + { + return code; + } + + public String getInfo() + { + return info; + } + +} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoUsersService.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoUsersService.java deleted file mode 100644 index 4a1cfe73..00000000 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/IProProjectInfoUsersService.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.yanzhu.manage.service; - -import java.util.List; -import java.util.Map; - -import com.yanzhu.manage.domain.ProProjectInfoUsers; - -/** - * 项目人员Service接口 - * - * @author JiangYuQi - * @date 2024-08-25 - */ -public interface IProProjectInfoUsersService -{ - /** - * 查询项目人员 - * - * @param id 项目人员主键 - * @return 项目人员 - */ - public ProProjectInfoUsers selectProProjectInfoUsersById(Long id); - - /** - * 查询项目人员列表 - * - * @param proProjectInfoUsers 项目人员 - * @return 项目人员集合 - */ - public List selectProProjectInfoUsersList(ProProjectInfoUsers proProjectInfoUsers); - - /** - * 新增项目人员 - * - * @param proProjectInfoUsers 项目人员 - * @return 结果 - */ - public int insertProProjectInfoUsers(ProProjectInfoUsers proProjectInfoUsers); - - /** - * 修改项目人员 - * - * @param proProjectInfoUsers 项目人员 - * @return 结果 - */ - public int updateProProjectInfoUsers(ProProjectInfoUsers proProjectInfoUsers); - - /** - * 批量删除项目人员 - * - * @param ids 需要删除的项目人员主键集合 - * @return 结果 - */ - public int deleteProProjectInfoUsersByIds(Long[] ids); - - /** - * 删除项目人员信息 - * - * @param id 项目人员主键 - * @return 结果 - */ - public int deleteProProjectInfoUsersById(Long id); - - /** - * 修改项目人员的默认项目 - * - * @param id 项目人员主键 - * @return 结果 - */ - public int editDefaultProjectById(Long id); - - /** - * 根据用户编号查询入场项目信息 - * - * @param userId 用户ID - * @return 结果 - */ - public List> selectProjectsByUserId(Long userId); -} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java index 00efea63..211e2657 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java @@ -184,7 +184,7 @@ public class BusExamUserServiceImpl implements IBusExamUserService BusExamUser busExamUser = new BusExamUser(); ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); query.setProjectId(proId); - query.setPhoneNumber(phoneNumber); + query.setUserPhone(phoneNumber); List userList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); if(StringUtils.isEmpty(userList)){ throw new ServiceException("用户信息异常...不能抽取试题..."); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java index b51fc635..e5d079dc 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java @@ -145,7 +145,7 @@ public class BusTrainingVideoServiceImpl implements IBusTrainingVideoService List menuVos = new ArrayList<>(); ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); query.setProjectId(proId); - query.setPhoneNumber(phoneNumber); + query.setUserPhone(phoneNumber); List userList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); if(StringUtils.isEmpty(userList)){ throw new ServiceException("用户信息异常..."); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java index 17fffccc..c42816a6 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoServiceImpl.java @@ -20,6 +20,7 @@ import com.yanzhu.manage.mapper.ProProjectInfoMapper; import com.yanzhu.manage.mapper.ProProjectInfoSettingMapper; import com.yanzhu.manage.service.IProProjectInfoService; import com.yanzhu.manage.utils.WxQrCodeUtils; +import com.yanzhu.manage.utils.pdf.FileUtil; import com.yanzhu.system.api.RemoteDeptService; import com.yanzhu.system.api.domain.SysDept; import com.yanzhu.system.api.domain.SysUser; @@ -32,6 +33,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; +import java.io.File; import java.util.List; /** @@ -154,7 +156,8 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService String savePath = ProfileConfig.profilePath+"/"+filePath; String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=1&QRPID="+proProjectInfo.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=1&QRPID="+proProjectInfo.getId(),280); + FileUtil.copyFile(file,new File(savePath)); proProjectInfo.setProjectQrCode(profilePath); proProjectInfoMapper.updateProProjectInfo(proProjectInfo); }catch (Exception e){ @@ -184,8 +187,9 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); // 生成二维码 - String scene = "QRPID="+proProjectInfo.getId()+"&signType=1"; - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", scene, accessToken); + String pagePath = "pages/project_qr/index?QRPID="+proProjectInfo.getId()+"&signType=1"; + File file = wxMaService.getQrcodeService().createQrcode(pagePath,280); + FileUtil.copyFile(file,new File(savePath)); proProjectInfo.setProjectQrCode(profilePath); }catch (Exception e){ log.error(e.getMessage()); @@ -246,8 +250,9 @@ public class ProProjectInfoServiceImpl implements IProProjectInfoService String filePath = DateUtils.datePath()+"/"+System.currentTimeMillis()+".png"; String savePath = ProfileConfig.profilePath+"/"+filePath; String profilePath = ProfileConfig.profile+"/"+filePath; + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=1&QRPID="+proProjectInfo.getId(),280); + FileUtil.copyFile(file,new File(savePath)); log.info("accessToken...{}",accessToken); - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=1&QRPID="+proProjectInfo.getId(), accessToken); proProjectInfo.setProjectQrCode(profilePath); res = proProjectInfoMapper.updateProProjectInfo(proProjectInfo); }catch (Exception e){ diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java index 8ce443ae..ee2b56d5 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java @@ -2,7 +2,10 @@ package com.yanzhu.manage.service.impl; import cn.binarywang.wx.miniapp.api.WxMaService; import com.yanzhu.common.core.constant.SecurityConstants; -import com.yanzhu.common.core.enums.*; +import com.yanzhu.common.core.enums.ApproveStatus; +import com.yanzhu.common.core.enums.CardTypeEnums; +import com.yanzhu.common.core.enums.ShiFouEnums; +import com.yanzhu.common.core.enums.UseStateEnums; import com.yanzhu.common.core.exception.ServiceException; import com.yanzhu.common.core.utils.DateUtils; import com.yanzhu.common.core.utils.StringUtils; @@ -17,7 +20,7 @@ import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper; import com.yanzhu.manage.service.IProProjectInfoSubdeptsGroupService; import com.yanzhu.manage.service.IUniService; -import com.yanzhu.manage.utils.WxQrCodeUtils; +import com.yanzhu.manage.utils.pdf.FileUtil; import com.yanzhu.system.api.RemoteUserService; import com.yanzhu.system.api.domain.SysUser; import org.slf4j.Logger; @@ -26,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.File; import java.util.List; import java.util.Objects; @@ -102,21 +106,17 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsGroup.setSubDeptCode(info.getSubDeptCode()); proProjectInfoSubdeptsGroup.setSubDeptType(info.getSubDeptType()); } + proProjectInfoSubdeptsGroup.setCreateBy(SecurityUtils.getUsername()); + proProjectInfoSubdeptsGroup.setCreateTime(DateUtils.getNowDate()); + int res = proProjectInfoSubdeptsGroupMapper.insertProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); // 班组组长信息 - if(StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ + if(res>0 && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ SysUser sysUser = new SysUser(); sysUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); sysUser.setNickName(proProjectInfoSubdeptsGroup.getGroupLeaderName()); - sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode()); - sysUser.setCardType(CardTypeEnums.SFZ.getCode()); sysUser.setPhonenumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); - sysUser.setCardCode(proProjectInfoSubdeptsGroup.getGroupLeaderCode()); - sysUser.setUserPicture(proProjectInfoSubdeptsGroup.getGroupLeaderUserPicture()); - sysUser.setCardImgPos(proProjectInfoSubdeptsGroup.getGroupLeaderCardImgPos()); - sysUser.setCardImgInv(proProjectInfoSubdeptsGroup.getGroupLeaderCardImgInv()); - sysUser.setSex(StringUtils.judgeGender(proProjectInfoSubdeptsGroup.getGroupLeaderCode())); - sysUser.setCreateBy(SecurityUtils.getUsername()); - sysUser.setCreateTime(DateUtils.getNowDate()); + sysUser.setUpdateBy(SecurityUtils.getUsername()); + sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdeptsGroup.getSubDeptName()); sysUser.setActiveProjectId(proProjectInfoSubdeptsGroup.getProjectId()); Long userId = sysUser.getUserId(); @@ -126,13 +126,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu // 已注册账号！！忽略异常... } if(Objects.nonNull(userId)){ - proProjectInfoSubdeptsGroup.setCreateBy(SecurityUtils.getUsername()); - proProjectInfoSubdeptsGroup.setCreateTime(DateUtils.getNowDate()); - int res = proProjectInfoSubdeptsGroupMapper.insertProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); - // 系统添加的人员默认增加入场信息 uniService.syncUniUser(userId,info.getId()); - if(res>0){ // 保存单位人员信息 ProProjectInfoSubdeptsUsers subdeptsUser = new ProProjectInfoSubdeptsUsers(); @@ -146,9 +141,16 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); subdeptsUser.setUserId(userId); subdeptsUser.setUserPost(UserPostEnums.BZZ.getCode()); + subdeptsUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderName()); + subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); + subdeptsUser.setCardCode(proProjectInfoSubdeptsGroup.getGroupLeaderCode()); + subdeptsUser.setUserPhone(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); + subdeptsUser.setUserPicture(proProjectInfoSubdeptsGroup.getGroupLeaderUserPicture()); + subdeptsUser.setUserSex(StringUtils.judgeGender(proProjectInfoSubdeptsGroup.getGroupLeaderCode())); + subdeptsUser.setDegreeGrade(proProjectInfoSubdeptsGroup.getGroupLeaderDegreeGrade()); + subdeptsUser.setUserInfos(proProjectInfoSubdeptsGroup.getGroupLeaderUserInfos()); subdeptsUser.setCraftType(proProjectInfoSubdeptsGroup.getCraftType()); subdeptsUser.setCraftPost(proProjectInfoSubdeptsGroup.getCraftPost()); - subdeptsUser.setDegreeGrade(proProjectInfoSubdeptsGroup.getGroupLeaderDegreeGrade()); subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); subdeptsUser.setSubStep(1L); subdeptsUser.setUseStatus(UseStateEnums.IN.getCode()); @@ -164,7 +166,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); // 生成二维码 - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=4&QRPID="+info.getId()+"&PARID="+subdeptsUser.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(),280); + FileUtil.copyFile(file,new File(savePath)); subdeptsUser.setQrCode(profilePath); res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); }catch (Exception e){ @@ -172,10 +175,9 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu } } } - return res; } } - return 0; + return res; } /** @@ -188,21 +190,18 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu @Transactional public int updateProProjectInfoSubdeptsGroup(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup) { + proProjectInfoSubdeptsGroup.setUpdateBy(SecurityUtils.getUsername()); + proProjectInfoSubdeptsGroup.setUpdateTime(DateUtils.getNowDate()); + int res = proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); + // 班组组长信息 - if(StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ + if(res>0 && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ SysUser sysUser = new SysUser(); sysUser.setUserName(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); sysUser.setNickName(proProjectInfoSubdeptsGroup.getGroupLeaderName()); - sysUser.setUserType(UserTypeEnums.FBBZZZ.getCode()); - sysUser.setCardType(CardTypeEnums.SFZ.getCode()); sysUser.setPhonenumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); - sysUser.setCardCode(proProjectInfoSubdeptsGroup.getGroupLeaderCode()); - sysUser.setUserPicture(proProjectInfoSubdeptsGroup.getGroupLeaderUserPicture()); - sysUser.setCardImgPos(proProjectInfoSubdeptsGroup.getGroupLeaderCardImgPos()); - sysUser.setCardImgInv(proProjectInfoSubdeptsGroup.getGroupLeaderCardImgInv()); - sysUser.setSex(StringUtils.judgeGender(proProjectInfoSubdeptsGroup.getGroupLeaderCode())); - sysUser.setCreateBy(SecurityUtils.getUsername()); - sysUser.setCreateTime(DateUtils.getNowDate()); + sysUser.setUpdateBy(SecurityUtils.getUsername()); + sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdeptsGroup.getSubDeptName()); sysUser.setActiveProjectId(proProjectInfoSubdeptsGroup.getProjectId()); Long userId = sysUser.getUserId(); @@ -211,18 +210,13 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu }catch (Exception e){ // 已注册账号！！忽略异常... } - if(Objects.nonNull(userId)){ - proProjectInfoSubdeptsGroup.setUpdateBy(SecurityUtils.getUsername()); - proProjectInfoSubdeptsGroup.setUpdateTime(DateUtils.getNowDate()); - int res = proProjectInfoSubdeptsGroupMapper.updateProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); - // 判断班组组长是否变更 ProProjectInfoSubdeptsGroup entity = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupById(proProjectInfoSubdeptsGroup.getId()); if(Objects.equals(entity.getGroupLeaderPhone(),proProjectInfoSubdeptsGroup.getGroupLeaderPhone())){ ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); query.setProjectId(proProjectInfoSubdeptsGroup.getProjectId()); - query.setPhoneNumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); + query.setUserPhone(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); if (StringUtils.isEmpty(dataList)) { throw new ServiceException("用户信息异常..."); @@ -230,6 +224,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu ProProjectInfoSubdeptsUsers subdeptsUser = dataList.get(0); subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdeptsGroup.getGroupLeaderSubPowerPath()); subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); + subdeptsUser.setUserPost(UserPostEnums.BZZ.getCode()); subdeptsUser.setCraftType(proProjectInfoSubdeptsGroup.getCraftType()); subdeptsUser.setCraftPost(proProjectInfoSubdeptsGroup.getCraftPost()); @@ -241,7 +236,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu // 判断当前用户是否已有账号 ProProjectInfoSubdeptsUsers query = new ProProjectInfoSubdeptsUsers(); query.setProjectId(proProjectInfoSubdeptsGroup.getProjectId()); - query.setPhoneNumber(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); + query.setUserPhone(proProjectInfoSubdeptsGroup.getGroupLeaderPhone()); List dataList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(query); if (StringUtils.isEmpty(dataList)) { if(res>0){ @@ -274,7 +269,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); // 生成二维码 - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=4&QRPID="+subdeptsUser.getProjectName()+"&PARID="+subdeptsUser.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(),280); + FileUtil.copyFile(file,new File(savePath)); subdeptsUser.setQrCode(profilePath); res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); }catch (Exception e){ @@ -300,7 +296,8 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); // 生成二维码 - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=4&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(),280); + FileUtil.copyFile(file,new File(savePath)); subdeptsUser.setQrCode(profilePath); res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); }catch (Exception e){ @@ -313,7 +310,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu return res; } } - return 0; + return res; } /** diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java index aeabeaf1..654661ca 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java @@ -13,25 +13,24 @@ import com.yanzhu.common.security.utils.SecurityUtils; import com.yanzhu.manage.config.ProfileConfig; import com.yanzhu.manage.domain.ProProjectInfo; import com.yanzhu.manage.domain.ProProjectInfoSubdepts; +import com.yanzhu.manage.domain.ProProjectInfoSubdeptsGroup; import com.yanzhu.manage.domain.ProProjectInfoSubdeptsUsers; -import com.yanzhu.manage.enums.CraftTypeEnums; -import com.yanzhu.manage.enums.SubDeptsEnums; -import com.yanzhu.manage.enums.CraftPostEnums; -import com.yanzhu.manage.enums.UserPostEnums; +import com.yanzhu.manage.enums.*; +import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsGroupMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsMapper; import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper; import com.yanzhu.manage.service.IProProjectInfoSubdeptsService; import com.yanzhu.manage.service.IUniService; -import com.yanzhu.manage.utils.WxQrCodeUtils; +import com.yanzhu.manage.utils.pdf.FileUtil; import com.yanzhu.system.api.RemoteUserService; import com.yanzhu.system.api.domain.SysUser; -import me.chanjar.weixin.mp.api.WxMpService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.File; import java.util.List; import java.util.Objects; @@ -62,6 +61,9 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept @Autowired private ProProjectInfoSubdeptsUsersMapper proProjectInfoSubdeptsUsersMapper; + @Autowired + private ProProjectInfoSubdeptsGroupMapper proProjectInfoSubdeptsGroupMapper; + private static final Logger log = LoggerFactory.getLogger(ProProjectInfoSubdeptsServiceImpl.class); /** @@ -111,16 +113,9 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept SysUser sysUser = new SysUser(); sysUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); sysUser.setNickName(proProjectInfoSubdepts.getSubDeptLeaderName()); - sysUser.setUserType(UserTypeEnums.FBWTDL.getCode()); sysUser.setPhonenumber(proProjectInfoSubdepts.getSubDeptLeaderPhone()); - sysUser.setCardType(CardTypeEnums.SFZ.getCode()); - sysUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); - sysUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); - sysUser.setCardImgPos(proProjectInfoSubdepts.getLeaderCardImgPos()); - sysUser.setCardImgInv(proProjectInfoSubdepts.getLeaderCardImgInv()); - sysUser.setSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); - sysUser.setCreateBy(SecurityUtils.getUsername()); - sysUser.setCreateTime(DateUtils.getNowDate()); + sysUser.setUpdateBy(SecurityUtils.getUsername()); + sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdepts.getSubDeptName()); sysUser.setActiveProjectId(proProjectInfoSubdepts.getProjectId()); try { @@ -132,12 +127,30 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept } } } - proProjectInfoSubdepts.setCreateBy(SecurityUtils.getUsername()); proProjectInfoSubdepts.setApproveStatus(ApproveStatus.passed.getCode()); + proProjectInfoSubdepts.setCreateBy(SecurityUtils.getUsername()); proProjectInfoSubdepts.setCreateTime(DateUtils.getNowDate()); int res = proProjectInfoSubdeptsMapper.insertProProjectInfoSubdepts(proProjectInfoSubdepts); + + // 保存单位管理班组 + ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup = new ProProjectInfoSubdeptsGroup(); + proProjectInfoSubdeptsGroup.setComId(proProjectInfoSubdepts.getComId()); + proProjectInfoSubdeptsGroup.setProjectId(proProjectInfoSubdepts.getProjectId()); + proProjectInfoSubdeptsGroup.setSubDeptId(proProjectInfoSubdepts.getId()); + proProjectInfoSubdeptsGroup.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); + proProjectInfoSubdeptsGroup.setSubDeptName(proProjectInfoSubdepts.getSubDeptName()); + proProjectInfoSubdeptsGroup.setGroupName(DeptGroupEnums.MANAGE.getInfo()); + proProjectInfoSubdeptsGroup.setGroupCode(DeptGroupEnums.MANAGE.getCode()); + proProjectInfoSubdeptsGroup.setCraftType(CraftTypeEnums.GLRY.getCode()); + proProjectInfoSubdeptsGroup.setApproveStatus(proProjectInfoSubdepts.getApproveStatus()); + proProjectInfoSubdeptsGroup.setUseStatus(proProjectInfoSubdepts.getUseStatus()); + proProjectInfoSubdeptsGroup.setCreateBy(SecurityUtils.getUsername()); + proProjectInfoSubdeptsGroup.setCreateTime(DateUtils.getNowDate()); + proProjectInfoSubdeptsGroupMapper.insertProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); + // 将人员信息同步至单位人员表 if(res>0 && (Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(),SubDeptsEnums.LWFB.getCode()))){ + // 保存单位人员信息 ProProjectInfoSubdeptsUsers subdeptsUser = new ProProjectInfoSubdeptsUsers(); subdeptsUser.setComId(info.getComId()); @@ -145,12 +158,21 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept subdeptsUser.setSubDeptId(proProjectInfoSubdepts.getId()); subdeptsUser.setSubDeptName(proProjectInfoSubdepts.getSubDeptName()); subdeptsUser.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); + subdeptsUser.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); + subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdepts.getSubDeptLeaderPowerPath()); subdeptsUser.setUserId(proProjectInfoSubdepts.getSubDeptLeaderId()); subdeptsUser.setUserPost(UserPostEnums.WTDL.getCode()); + subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); + subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); + subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); + subdeptsUser.setUserSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); + subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); + subdeptsUser.setUserInfos(proProjectInfoSubdepts.getLeaderUserInfos()); subdeptsUser.setCraftType(CraftTypeEnums.GLRY.getCode()); subdeptsUser.setCraftPost(CraftPostEnums.WTDL.getCode()); - subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); subdeptsUser.setSubStep(1L); subdeptsUser.setCreateBy(SecurityUtils.getUsername()); @@ -167,7 +189,8 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); // 生成二维码 - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=2&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+subdeptsUser.getProjectId()+"&PARID="+subdeptsUser.getId(),280); + FileUtil.copyFile(file,new File(savePath)); subdeptsUser.setQrCode(profilePath); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); proProjectInfoSubdepts.setQrCode(profilePath); @@ -201,16 +224,9 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept SysUser sysUser = new SysUser(); sysUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); sysUser.setNickName(proProjectInfoSubdepts.getSubDeptLeaderName()); - sysUser.setUserType(UserTypeEnums.FBWTDL.getCode()); sysUser.setPhonenumber(proProjectInfoSubdepts.getSubDeptLeaderPhone()); - sysUser.setCardType(CardTypeEnums.SFZ.getCode()); - sysUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); - sysUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); - sysUser.setCardImgPos(proProjectInfoSubdepts.getLeaderCardImgPos()); - sysUser.setCardImgInv(proProjectInfoSubdepts.getLeaderCardImgInv()); - sysUser.setSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); - sysUser.setCreateBy(DataSourceEnuns.APP.getInfo()); - sysUser.setCreateTime(DateUtils.getNowDate()); + sysUser.setUpdateBy(DataSourceEnuns.APP.getInfo()); + sysUser.setUpdateTime(DateUtils.getNowDate()); sysUser.setRemark(proProjectInfoSubdepts.getSubDeptName()); sysUser.setActiveProjectId(proProjectInfoSubdepts.getProjectId()); try { @@ -226,6 +242,23 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept proProjectInfoSubdepts.setApproveStatus(ApproveStatus.await.getCode()); proProjectInfoSubdepts.setCreateTime(DateUtils.getNowDate()); int res = proProjectInfoSubdeptsMapper.insertProProjectInfoSubdepts(proProjectInfoSubdepts); + + // 保存单位管理班组 + ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup = new ProProjectInfoSubdeptsGroup(); + proProjectInfoSubdeptsGroup.setComId(proProjectInfoSubdepts.getComId()); + proProjectInfoSubdeptsGroup.setProjectId(proProjectInfoSubdepts.getProjectId()); + proProjectInfoSubdeptsGroup.setSubDeptId(proProjectInfoSubdepts.getId()); + proProjectInfoSubdeptsGroup.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); + proProjectInfoSubdeptsGroup.setSubDeptName(proProjectInfoSubdepts.getSubDeptName()); + proProjectInfoSubdeptsGroup.setGroupName(DeptGroupEnums.MANAGE.getInfo()); + proProjectInfoSubdeptsGroup.setGroupCode(DeptGroupEnums.MANAGE.getCode()); + proProjectInfoSubdeptsGroup.setCraftType(CraftTypeEnums.GLRY.getCode()); + proProjectInfoSubdeptsGroup.setApproveStatus(proProjectInfoSubdepts.getApproveStatus()); + proProjectInfoSubdeptsGroup.setUseStatus(proProjectInfoSubdepts.getUseStatus()); + proProjectInfoSubdeptsGroup.setCreateBy(SecurityUtils.getUsername()); + proProjectInfoSubdeptsGroup.setCreateTime(DateUtils.getNowDate()); + proProjectInfoSubdeptsGroupMapper.insertProProjectInfoSubdeptsGroup(proProjectInfoSubdeptsGroup); + // 将人员信息同步至单位人员表 if(res>0 && (Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(),SubDeptsEnums.LWFB.getCode()))){ // 保存单位人员信息 @@ -235,12 +268,21 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept subdeptsUser.setSubDeptId(proProjectInfoSubdepts.getId()); subdeptsUser.setSubDeptName(proProjectInfoSubdepts.getSubDeptName()); subdeptsUser.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); + subdeptsUser.setSubDeptGroup(proProjectInfoSubdeptsGroup.getId()); + subdeptsUser.setSubDeptGroupName(proProjectInfoSubdeptsGroup.getGroupName()); subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdepts.getSubDeptLeaderPowerPath()); subdeptsUser.setUserId(proProjectInfoSubdepts.getSubDeptLeaderId()); subdeptsUser.setUserPost(UserPostEnums.WTDL.getCode()); + subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); + subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); + subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); + subdeptsUser.setUserSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); + subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); + subdeptsUser.setUserInfos(proProjectInfoSubdepts.getLeaderUserInfos()); subdeptsUser.setCraftType(CraftTypeEnums.GLRY.getCode()); subdeptsUser.setCraftPost(CraftPostEnums.WTDL.getCode()); - subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); subdeptsUser.setApproveStatus(ApproveStatus.await.getCode()); if(Objects.isNull(subdeptsUser.getSubStep()) || subdeptsUser.getSubStep()<1){ @@ -267,31 +309,6 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept if(Objects.isNull(info)){ throw new ServiceException("项目信息异常..."); } - if(Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.LWFB.getCode())){ - // 单位委托人信息 - if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){ - SysUser sysUser = new SysUser(); - sysUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); - sysUser.setNickName(proProjectInfoSubdepts.getSubDeptLeaderName()); - sysUser.setPhonenumber(proProjectInfoSubdepts.getSubDeptLeaderPhone()); - sysUser.setUserType(UserTypeEnums.FBWTDL.getCode()); - sysUser.setCardType(CardTypeEnums.SFZ.getCode()); - sysUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); - sysUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); - sysUser.setCardImgPos(proProjectInfoSubdepts.getLeaderCardImgPos()); - sysUser.setCardImgInv(proProjectInfoSubdepts.getLeaderCardImgInv()); - sysUser.setSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); - sysUser.setUpdateBy(SecurityUtils.getUsername()); - sysUser.setUpdateTime(DateUtils.getNowDate()); - sysUser.setRemark(proProjectInfoSubdepts.getSubDeptName()); - sysUser.setActiveProjectId(proProjectInfoSubdepts.getProjectId()); - try { - remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); - }catch (Exception e){ - e.printStackTrace(); - } - } - } proProjectInfoSubdepts.setUpdateBy(SecurityUtils.getUsername()); proProjectInfoSubdepts.setUpdateTime(DateUtils.getNowDate()); int res = proProjectInfoSubdeptsMapper.updateProProjectInfoSubdepts(proProjectInfoSubdepts); @@ -304,14 +321,33 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept subdeptsUser.setComId(info.getComId()); subdeptsUser.setProjectId(info.getId()); subdeptsUser.setSubDeptId(proProjectInfoSubdepts.getId()); + + //查询管理班组 + ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup(); + query.setProjectId(proProjectInfoSubdepts.getProjectId()); + query.setSubDeptId(proProjectInfoSubdepts.getId()); + query.setGroupCode(DeptGroupEnums.MANAGE.getCode()); + List groups = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query); + + if(Objects.nonNull(groups) && groups.size()>0){ + subdeptsUser.setSubDeptGroup(groups.get(0).getId()); + subdeptsUser.setSubDeptGroupName(groups.get(0).getGroupName()); + } } subdeptsUser.setSubDeptName(proProjectInfoSubdepts.getSubDeptName()); subdeptsUser.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdepts.getSubDeptLeaderPowerPath()); subdeptsUser.setUserId(proProjectInfoSubdepts.getSubDeptLeaderId()); + subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); + subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); + subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); + subdeptsUser.setUserSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); + subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); + subdeptsUser.setUserInfos(proProjectInfoSubdepts.getLeaderUserInfos()); subdeptsUser.setCraftType(CraftTypeEnums.GLRY.getCode()); subdeptsUser.setCraftPost(CraftPostEnums.WTDL.getCode()); - subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); if(Objects.isNull(subdeptsUser.getApproveStatus())){ subdeptsUser.setApproveStatus(ApproveStatus.passed.getCode()); @@ -319,11 +355,13 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept if(Objects.isNull(subdeptsUser.getSubStep()) || subdeptsUser.getSubStep()<1){ subdeptsUser.setSubStep(1L); } - subdeptsUser.setCreateBy(SecurityUtils.getUsername()); - subdeptsUser.setCreateTime(DateUtils.getNowDate()); if(Objects.isNull(subdeptsUser.getId())){ + subdeptsUser.setCreateBy(SecurityUtils.getUsername()); + subdeptsUser.setCreateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(subdeptsUser); }else{ + subdeptsUser.setUpdateBy(SecurityUtils.getUsername()); + subdeptsUser.setUpdateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); } } @@ -344,34 +382,6 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept if(Objects.isNull(info)){ throw new ServiceException("项目信息异常..."); } - if(Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.ZYFB.getCode()) || Objects.equals(proProjectInfoSubdepts.getSubDeptType(), SubDeptsEnums.LWFB.getCode())){ - // 单位委托人信息 - if(StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderName()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderCode()) && StringUtils.isNotEmpty(proProjectInfoSubdepts.getSubDeptLeaderPhone())){ - SysUser sysUser = new SysUser(); - sysUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); - sysUser.setNickName(proProjectInfoSubdepts.getSubDeptLeaderName()); - sysUser.setPhonenumber(proProjectInfoSubdepts.getSubDeptLeaderPhone()); - sysUser.setUserType(UserTypeEnums.FBWTDL.getCode()); - sysUser.setCardType(CardTypeEnums.SFZ.getCode()); - sysUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); - sysUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); - sysUser.setCardImgPos(proProjectInfoSubdepts.getLeaderCardImgPos()); - sysUser.setCardImgInv(proProjectInfoSubdepts.getLeaderCardImgInv()); - sysUser.setSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); - sysUser.setUpdateBy(DataSourceEnuns.APP.getInfo()); - sysUser.setUpdateTime(DateUtils.getNowDate()); - sysUser.setRemark(proProjectInfoSubdepts.getSubDeptName()); - sysUser.setActiveProjectId(proProjectInfoSubdepts.getProjectId()); - try { - R userResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER); - proProjectInfoSubdepts.setSubDeptLeaderId(userResult.getData()); - }catch (Exception e){ - // 已注册账号！！忽略异常... - e.printStackTrace(); - } - } - } - proProjectInfoSubdepts.setUpdateBy(DataSourceEnuns.APP.getInfo()); proProjectInfoSubdepts.setUpdateTime(DateUtils.getNowDate()); int res = proProjectInfoSubdeptsMapper.updateProProjectInfoSubdepts(proProjectInfoSubdepts); @@ -384,15 +394,33 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept subdeptsUser.setComId(info.getComId()); subdeptsUser.setProjectId(info.getId()); subdeptsUser.setSubDeptId(proProjectInfoSubdepts.getId()); + + //查询管理班组 + ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup(); + query.setProjectId(proProjectInfoSubdepts.getProjectId()); + query.setSubDeptId(proProjectInfoSubdepts.getId()); + query.setGroupCode(DeptGroupEnums.MANAGE.getCode()); + List groups = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query); + + if(Objects.nonNull(groups) && groups.size()>0){ + subdeptsUser.setSubDeptGroup(groups.get(0).getId()); + subdeptsUser.setSubDeptGroupName(groups.get(0).getGroupName()); + } } + subdeptsUser.setUserName(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setCardType(CardTypeEnums.SFZ.getCode()); + subdeptsUser.setCardCode(proProjectInfoSubdepts.getSubDeptLeaderCode()); + subdeptsUser.setUserPhone(proProjectInfoSubdepts.getSubDeptLeaderPhone()); + subdeptsUser.setUserPicture(proProjectInfoSubdepts.getLeaderUserPicture()); + subdeptsUser.setUserSex(StringUtils.judgeGender(proProjectInfoSubdepts.getSubDeptLeaderCode())); + subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); + subdeptsUser.setUserInfos(proProjectInfoSubdepts.getLeaderUserInfos()); subdeptsUser.setSubDeptName(proProjectInfoSubdepts.getSubDeptName()); subdeptsUser.setSubDeptType(proProjectInfoSubdepts.getSubDeptType()); subdeptsUser.setSubDeptPowerPath(proProjectInfoSubdepts.getSubDeptLeaderPowerPath()); - subdeptsUser.setUserId(proProjectInfoSubdepts.getSubDeptLeaderId()); - subdeptsUser.setCraftType(UserPostEnums.WTDL.getCode()); + subdeptsUser.setUserPost(UserPostEnums.WTDL.getCode()); subdeptsUser.setCraftType(CraftTypeEnums.GLRY.getCode()); subdeptsUser.setCraftPost(CraftPostEnums.WTDL.getCode()); - subdeptsUser.setDegreeGrade(proProjectInfoSubdepts.getLeaderDegreeGrade()); subdeptsUser.setEduStatus(ShiFouEnums.FOU.getCodeStr()); if(Objects.isNull(subdeptsUser.getApproveStatus())){ subdeptsUser.setApproveStatus(ApproveStatus.await.getCode()); @@ -400,11 +428,14 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept if(Objects.isNull(subdeptsUser.getSubStep()) || subdeptsUser.getSubStep()<1){ subdeptsUser.setSubStep(1L); } - subdeptsUser.setCreateBy(DataSourceEnuns.APP.getInfo()); - subdeptsUser.setCreateTime(DateUtils.getNowDate()); + if(Objects.isNull(subdeptsUser.getId())){ + subdeptsUser.setCreateBy(DataSourceEnuns.APP.getInfo()); + subdeptsUser.setCreateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(subdeptsUser); }else{ + subdeptsUser.setUpdateBy(DataSourceEnuns.APP.getInfo()); + subdeptsUser.setUpdateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(subdeptsUser); } } @@ -464,7 +495,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept ProProjectInfoSubdepts data = dataList.get(0); ProProjectInfoSubdeptsUsers userQuery = new ProProjectInfoSubdeptsUsers(); userQuery.setProjectId(proId); - userQuery.setPhoneNumber(phoneNumber); + userQuery.setUserId(data.getSubDeptLeaderId()); List userList = proProjectInfoSubdeptsUsersMapper.selectProProjectInfoSubdeptsUsersList(userQuery); if(StringUtils.isNotEmpty(userList)){ data.setProProjectInfoSubdeptsUsers(userList.get(0)); 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 06d73456..a521ae06 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 @@ -14,13 +14,11 @@ import com.yanzhu.manage.enums.CraftPostEnums; import com.yanzhu.manage.enums.CraftTypeEnums; import com.yanzhu.manage.enums.SignetKeyEnums; import com.yanzhu.manage.enums.UserPostEnums; -import com.yanzhu.manage.mapper.BasTemplateMapper; -import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsGroupMapper; -import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsMapper; -import com.yanzhu.manage.mapper.ProProjectInfoSubdeptsUsersMapper; +import com.yanzhu.manage.mapper.*; import com.yanzhu.manage.service.IProProjectInfoSubdeptsUsersService; import com.yanzhu.manage.service.IUniService; import com.yanzhu.manage.utils.WxQrCodeUtils; +import com.yanzhu.manage.utils.pdf.FileUtil; import com.yanzhu.manage.utils.pdf.PoiUtil; import com.yanzhu.security.utils.DictUtils; import com.yanzhu.system.api.RemoteFlowService; @@ -52,6 +50,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu @Autowired private WxMaService wxMaService; + @Autowired + private BasSignetMapper basSignetMapper; + @Autowired private BasTemplateMapper basTemplateMapper; @@ -114,22 +115,20 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proProjectInfoSubdeptsUsers.setUserPost(UserPostEnums.LWGR.getCode()); } proProjectInfoSubdeptsUsers.setUseStatus(UseStateEnums.IN.getCode()); - proProjectInfoSubdeptsUsers.setCreateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsers.setCreateBy(SecurityUtils.getUsername()); + proProjectInfoSubdeptsUsers.setCreateTime(DateUtils.getNowDate()); proProjectInfoSubdeptsUsers.setSubStep(1L); proProjectInfoSubdeptsUsers.setApproveStatus(ApproveStatus.passed.getCode()); - SysUser user = proProjectInfoSubdeptsUsers.getUser(); - if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.WTDL)){ - user.setUserType(UserTypeEnums.FBWTDL.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.XMJL)){ - user.setUserType(UserTypeEnums.FBXMJL.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.BZZ)){ - user.setUserType(UserTypeEnums.FBBZZZ.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.LWGR)){ - user.setUserType(UserTypeEnums.FBLWRY.getCode()); - } - user.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId()); - Long userId= remoteUserService.registerUserInfo(user, SecurityConstants.INNER).getData(); + + SysUser sysUser = new SysUser(); + sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone()); + sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName()); + sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone()); + sysUser.setUpdateBy(SecurityUtils.getUsername()); + sysUser.setUpdateTime(DateUtils.getNowDate()); + sysUser.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId()); + Long userId= remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); + proProjectInfoSubdeptsUsers.setUserId(userId); uniService.syncUniUser(userId,proProjectInfoSubdeptsUsers.getProjectId()); int res = proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); @@ -143,9 +142,11 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu log.info("accessToken...{}",accessToken); // 生成二维码 if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.XMJL.getCode())){ - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(), UserPostEnums.BZZ.getCode())){ - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); } proProjectInfoSubdeptsUsers.setQrCode(profilePath); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); @@ -169,7 +170,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu if(Objects.isNull(parUsers)){ throw new ServiceException("用户信息异常...请重新扫码"); } - SysUser user = proProjectInfoSubdeptsUsers.getUser(); proProjectInfoSubdeptsUsers.setComId(parUsers.getComId()); proProjectInfoSubdeptsUsers.setProjectId(parUsers.getProjectId()); @@ -202,9 +202,9 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proSubdeptsGroup.setGroupName(pre+craftPostName+"班组"+count); proSubdeptsGroup.setCraftType(proProjectInfoSubdeptsUsers.getCraftType()); proSubdeptsGroup.setCraftPost(proProjectInfoSubdeptsUsers.getCraftPost()); - proSubdeptsGroup.setGroupLeaderName(user.getNickName()); - proSubdeptsGroup.setGroupLeaderCode(user.getCardCode()); - proSubdeptsGroup.setGroupLeaderPhone(user.getPhonenumber()); + proSubdeptsGroup.setGroupLeaderName(proProjectInfoSubdeptsUsers.getUserName()); + proSubdeptsGroup.setGroupLeaderCode(proProjectInfoSubdeptsUsers.getCardCode()); + proSubdeptsGroup.setGroupLeaderPhone(proProjectInfoSubdeptsUsers.getUserPhone()); proSubdeptsGroup.setUseStatus(UseStateEnums.AW.getCode()); proSubdeptsGroup.setApproveStatus(ApproveStatus.await.getCode()); proSubdeptsGroup.setCreateBy(DataSourceEnuns.APP.getInfo()); @@ -219,24 +219,15 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu } } // 完善人员信息... - user.setUserName(proProjectInfoSubdeptsUsers.getPhoneNumber()); - user.setPhonenumber(proProjectInfoSubdeptsUsers.getPhoneNumber()); - if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.WTDL)){ - user.setUserType(UserTypeEnums.FBWTDL.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.XMJL)){ - user.setUserType(UserTypeEnums.FBXMJL.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.BZZ)){ - user.setUserType(UserTypeEnums.FBBZZZ.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.LWGR)){ - user.setUserType(UserTypeEnums.FBLWRY.getCode()); - } - user.setCardType(CardTypeEnums.SFZ.getCode()); - user.setSex(StringUtils.judgeGender(user.getCardCode())); - user.setCreateBy(DataSourceEnuns.APP.getInfo()); - user.setCreateTime(DateUtils.getNowDate()); - user.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName()); - user.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId()); - Long userId = remoteUserService.registerUserInfo(user, SecurityConstants.INNER).getData(); + SysUser sysUser = new SysUser(); + sysUser.setUserName(proProjectInfoSubdeptsUsers.getUserPhone()); + sysUser.setNickName(proProjectInfoSubdeptsUsers.getUserName()); + sysUser.setPhonenumber(proProjectInfoSubdeptsUsers.getUserPhone()); + sysUser.setUpdateBy(SecurityUtils.getUsername()); + sysUser.setUpdateTime(DateUtils.getNowDate()); + sysUser.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName()); + sysUser.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId()); + Long userId = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER).getData(); proProjectInfoSubdeptsUsers.setUserId(userId); proProjectInfoSubdeptsUsersMapper.insertProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); return proProjectInfoSubdeptsUsers; @@ -261,22 +252,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu } proProjectInfoSubdeptsUsers.setUpdateBy(SecurityUtils.getUsername()); proProjectInfoSubdeptsUsers.setUpdateTime(DateUtils.getNowDate()); - SysUser user = proProjectInfoSubdeptsUsers.getUser(); - // 完善人员信息... - if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.WTDL)){ - user.setUserType(UserTypeEnums.FBWTDL.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.XMJL)){ - user.setUserType(UserTypeEnums.FBXMJL.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.BZZ)){ - user.setUserType(UserTypeEnums.FBBZZZ.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.LWGR)){ - user.setUserType(UserTypeEnums.FBLWRY.getCode()); - } - user.setUpdateBy(SecurityUtils.getUsername()); - user.setUpdateTime(DateUtils.getNowDate()); - user.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId()); - Long userId = remoteUserService.registerUserInfo(user, SecurityConstants.INNER).getData(); - proProjectInfoSubdeptsUsers.setUserId(userId); return proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); } @@ -294,7 +269,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu if(Objects.isNull(parUsers)){ throw new ServiceException("用户信息异常...请重新扫码"); } - SysUser user = proProjectInfoSubdeptsUsers.getUser(); proProjectInfoSubdeptsUsers.setComId(parUsers.getComId()); proProjectInfoSubdeptsUsers.setProjectId(parUsers.getProjectId()); @@ -316,7 +290,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu ProProjectInfoSubdeptsGroup query = new ProProjectInfoSubdeptsGroup(); query.setProjectId(proProjectInfoSubdeptsUsers.getProjectId()); query.setSubDeptId(proProjectInfoSubdeptsUsers.getSubDeptId()); - query.setGroupLeaderPhone(user.getPhonenumber()); + query.setGroupLeaderPhone(proProjectInfoSubdeptsUsers.getUserPhone()); List groupList = proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(query); if(StringUtils.isNotEmpty(groupList)){ ProProjectInfoSubdeptsGroup proSubdeptsGroup = groupList.get(0); @@ -389,25 +363,6 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu } } - // 完善人员信息 - user.setUserName(user.getPhonenumber()); - if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.WTDL)){ - user.setUserType(UserTypeEnums.FBWTDL.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.XMJL)){ - user.setUserType(UserTypeEnums.FBXMJL.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.BZZ)){ - user.setUserType(UserTypeEnums.FBBZZZ.getCode()); - }else if(Objects.equals(proProjectInfoSubdeptsUsers.getUserPost(),UserPostEnums.LWGR)){ - user.setUserType(UserTypeEnums.FBLWRY.getCode()); - } - user.setCardType(CardTypeEnums.SFZ.getCode()); - user.setSex(StringUtils.judgeGender(user.getCardCode())); - user.setUpdateBy(DataSourceEnuns.APP.getInfo()); - user.setUpdateTime(DateUtils.getNowDate()); - user.setRemark(proProjectInfoSubdeptsUsers.getSubDeptName()); - user.setActiveProjectId(proProjectInfoSubdeptsUsers.getProjectId()); - Long userId = remoteUserService.registerUserInfo(user, SecurityConstants.INNER).getData(); - proProjectInfoSubdeptsUsers.setUserId(userId); proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proProjectInfoSubdeptsUsers); return proProjectInfoSubdeptsUsers; } @@ -509,13 +464,14 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu dirFile.mkdirs(); } proSubdeptsUser.setSubStep(100L); - proSubdeptsUser.setEduSignPath(signetFileVo.getImgPath()); + proSubdeptsUser.setEduSignPath(signetFileVo.getImgPath()+".sign.png"); proSubdeptsUser.setEduFilePath(saveEdusFilePath); // word文件转PDF文件 Map dataMap = getUserDataMap(proSubdeptsUser); try { PoiUtil.createPdfByWordTemplate(temPath, saveWordFilePath, dataMap); }catch (Exception e){ + e.printStackTrace(); throw new ServiceException("承诺书生成失败...服务器异常！！！"); } @@ -524,6 +480,19 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu proSubdeptsUser.setApproveStatus(ApproveStatus.check.getCode()); } int res = proProjectInfoSubdeptsUsersMapper.updateProProjectInfoSubdeptsUsers(proSubdeptsUser); + + // 保存业务签名 + basSignetMapper.deleteBasSignetByParams(proSubdeptsUser.getProjectId(),proSubdeptsUser.getUserId()); + BasSignet basSignet = new BasSignet(); + basSignet.setComId(proSubdeptsUser.getComId()); + basSignet.setProjectId(proSubdeptsUser.getProjectId()); + basSignet.setUserId(proSubdeptsUser.getUserId()); + basSignet.setSignetPath(proSubdeptsUser.getEduSignPath()+".sign.png"); + basSignet.setSignetNumber(1L); + basSignet.setCreateBy(DataSourceEnuns.APP.getInfo()); + basSignet.setCreateTime(DateUtils.getNowDate()); + basSignetMapper.insertBasSignet(basSignet); + // 待审核时启动工作流审批 if(res>0 && Objects.equals(proSubdeptsUser.getApproveStatus(),ApproveStatus.check.getCode())){ // 工作流配置查询 @@ -584,7 +553,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); // 生成二维码 - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=2&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=2&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); proProjectInfoSubdepts.setQrCode(profilePath); proProjectInfoSubdeptsUsers.setQrCode(profilePath); }catch (Exception e){ @@ -599,7 +569,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); // 生成二维码 - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=3&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); proProjectInfoSubdeptsUsers.setQrCode(profilePath); }catch (Exception e){ log.error(e.getMessage()); @@ -615,7 +586,8 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu String profilePath = ProfileConfig.profile+"/"+filePath; log.info("accessToken...{}",accessToken); // 生成二维码 - WxQrCodeUtils.generateQrCode(savePath, "pages/project_qr/index", "SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(), accessToken); + File file = wxMaService.getQrcodeService().createQrcode("pages/project_qr/index?SIGID=4&QRPID="+proProjectInfoSubdeptsUsers.getProjectId()+"&PARID="+proProjectInfoSubdeptsUsers.getId(),280); + FileUtil.copyFile(file,new File(savePath)); proProjectInfoSubdeptsUsers.setQrCode(profilePath); }catch (Exception e){ log.error(e.getMessage()); @@ -648,7 +620,7 @@ public class ProProjectInfoSubdeptsUsersServiceImpl implements IProProjectInfoSu String userPicturePath = proSubdeptsUser.getUser().getUserPicture().replaceAll(ProfileConfig.profile, ProfileConfig.profilePath); dataMap.put("fUserPicture", userPicturePath+".min.jpg"); String userSignPath = proSubdeptsUser.getEduSignPath().replaceAll(ProfileConfig.profile, ProfileConfig.profilePath); - dataMap.put("fUserSign", userSignPath+".sign.png.min.png"); + dataMap.put("fUserSign", userSignPath+".sign.png"); dataMap.put("fGroupSign", SignetKeyEnums.GROUP_SIGN.getCode()); dataMap.put("fProjectSign", SignetKeyEnums.PROJECT_SIGN.getCode()); dataMap.put("fCompanySign", SignetKeyEnums.COMPANY_SIGN.getCode()); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoUsersServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoUsersServiceImpl.java deleted file mode 100644 index 7947dac7..00000000 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoUsersServiceImpl.java +++ /dev/null @@ -1,133 +0,0 @@ -package com.yanzhu.manage.service.impl; - -import com.yanzhu.common.core.context.SecurityContextHolder; -import com.yanzhu.common.core.utils.DateUtils; -import com.yanzhu.common.security.utils.SecurityUtils; -import com.yanzhu.manage.domain.ProProjectInfoUsers; -import com.yanzhu.manage.mapper.ProProjectInfoUsersMapper; -import com.yanzhu.manage.service.IProProjectInfoUsersService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import java.util.List; -import java.util.Map; - -/** - * 项目人员Service业务层处理 - * - * @author JiangYuQi - * @date 2024-08-25 - */ -@Service -public class ProProjectInfoUsersServiceImpl implements IProProjectInfoUsersService -{ - @Autowired - private ProProjectInfoUsersMapper proProjectInfoUsersMapper; - - /** - * 查询项目人员 - * - * @param id 项目人员主键 - * @return 项目人员 - */ - @Override - public ProProjectInfoUsers selectProProjectInfoUsersById(Long id) - { - return proProjectInfoUsersMapper.selectProProjectInfoUsersById(id); - } - - /** - * 查询项目人员列表 - * - * @param proProjectInfoUsers 项目人员 - * @return 项目人员 - */ - @Override - public List selectProProjectInfoUsersList(ProProjectInfoUsers proProjectInfoUsers) - { - return proProjectInfoUsersMapper.selectProProjectInfoUsersList(proProjectInfoUsers); - } - - /** - * 新增项目人员 - * - * @param proProjectInfoUsers 项目人员 - * @return 结果 - */ - @Override - public int insertProProjectInfoUsers(ProProjectInfoUsers proProjectInfoUsers) - { - proProjectInfoUsers.setCreateTime(DateUtils.getNowDate()); - proProjectInfoUsers.setCreateBy(SecurityContextHolder.getUserName()); - return proProjectInfoUsersMapper.insertProProjectInfoUsers(proProjectInfoUsers); - } - - /** - * 修改项目人员 - * - * @param proProjectInfoUsers 项目人员 - * @return 结果 - */ - @Override - public int updateProProjectInfoUsers(ProProjectInfoUsers proProjectInfoUsers) - { - proProjectInfoUsers.setUpdateTime(DateUtils.getNowDate()); - proProjectInfoUsers.setUpdateBy(SecurityContextHolder.getUserName()); - return proProjectInfoUsersMapper.updateProProjectInfoUsers(proProjectInfoUsers); - } - - /** - * 批量删除项目人员 - * - * @param ids 需要删除的项目人员主键 - * @return 结果 - */ - @Override - public int deleteProProjectInfoUsersByIds(Long[] ids) - { - return proProjectInfoUsersMapper.deleteProProjectInfoUsersByIds(ids); - } - - /** - * 删除项目人员信息 - * - * @param id 项目人员主键 - * @return 结果 - */ - @Override - public int deleteProProjectInfoUsersById(Long id) - { - return proProjectInfoUsersMapper.deleteProProjectInfoUsersById(id); - } - - /** - * 修改项目人员的默认项目 - * - * @param id 项目人员主键 - * @return 结果 - */ - @Override - @Transactional - public int editDefaultProjectById(Long id){ - int res = proProjectInfoUsersMapper.cancelDefaultSortByUserId(SecurityUtils.getUserId()); - if(res>0){ - ProProjectInfoUsers entity = new ProProjectInfoUsers(); - entity.setId(id); - entity.setSortBy(0L); - proProjectInfoUsersMapper.updateProProjectInfoUsers(entity); - } - return res; - } - - /** - * 根据用户编号查询入场项目信息 - * - * @param userId 用户ID - * @return 结果 - */ - @Override - public List> selectProjectsByUserId(Long userId){ - return proProjectInfoUsersMapper.selectProjectsByUserId(userId); - } -} diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java index 0e186e78..294469ed 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/UniServiceImpl.java @@ -513,8 +513,8 @@ public class UniServiceImpl implements IUniService{ faceJo.put("url",user.getUserPicture()); //faceJo.put("url","https://uniubi-aiot.oss-cn-hangzhou.aliyuncs.com/detect/20241007/211204-71D9BCBE526C4F57B8D31ECAE03AEBFB"); faceJo.put("faceTag",""); - HttpServletRequest request =((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); - String url= request.getRemoteAddr(); + HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest(); + //String url= request.getRemoteAddr(); if(StringUtils.isNotEmpty(faceGuid)){ JSONObject faceDel=new JSONObject(); faceDel.put("projectId",projectId); @@ -522,13 +522,15 @@ public class UniServiceImpl implements IUniService{ faceDel.put("faceGuid",faceGuid); faceDelete(faceDel); } + //注册图像 - JSONObject faceRes= faceRegister(faceJo); + JSONObject faceRes = faceRegister(faceJo); if(faceRes!=null) { jo.put("faceGuid", faceRes.getString("faceGuid")); jo.put("uniFaceInfo", faceRes.toJSONString()); hasUpdate=true; } + user.setUserInfos(jo.toJSONString()); if(hasUpdate){ Long ret= remoteUserService.registerUserInfo(user,SecurityConstants.INNER).getData(); diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/WxQrCodeUtils.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/WxQrCodeUtils.java index 5927b592..b122f95a 100644 --- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/WxQrCodeUtils.java +++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/utils/WxQrCodeUtils.java @@ -18,6 +18,15 @@ public class WxQrCodeUtils { */ public static void generateQrCode(String filePath, String page, String scene, String accessToken) { try { + // 文件夹生成 + File desc = new File(filePath); + if (!desc.exists()) + { + if (!desc.getParentFile().exists()) + { + desc.getParentFile().mkdirs(); + } + } //调用微信接口生成二维码 URL url = new URL("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token=" + accessToken); HttpURLConnection httpURLConnection = (HttpURLConnection) url.openConnection(); @@ -31,11 +40,11 @@ public class WxQrCodeUtils { PrintWriter printWriter = new PrintWriter(httpURLConnection.getOutputStream()); // 发送请求参数 JSONObject paramJson = new JSONObject(); - //这就是你二维码里携带的参数 String型 名称不可变 + // 这就是你二维码里携带的参数 String型 名称不可变 paramJson.put("scene", scene); - //注意该接口传入的是page而不是path + // 注意该接口传入的是page而不是path paramJson.put("page", page); - //这是设置扫描二维码后跳转的页面 + // 这是设置扫描二维码后跳转的页面 paramJson.put("width", 200); paramJson.put("is_hyaline", true); paramJson.put("auto_color", true); @@ -43,7 +52,7 @@ public class WxQrCodeUtils { // flush输出流的缓冲 printWriter.flush(); - //开始获取数据 + // 开始获取数据 BufferedInputStream bis = new BufferedInputStream(httpURLConnection.getInputStream()); OutputStream os = new FileOutputStream(new File(filePath)); int len; diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java index 8326aa33..25c33e86 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/controller/SysUserController.java @@ -32,10 +32,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; import java.io.IOException; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -141,14 +138,29 @@ public class SysUserController extends BaseController { sysUser.setActiveProjectName(Convert.toStr(list.get(0).get("project_name"))); } } - // 角色集合 - Set roles = permissionService.getRolePermission(sysUser); - // 权限集合 - Set permissions = permissionService.getMenuPermission(sysUser); + LoginUser sysUserVo = new LoginUser(); sysUserVo.setSysUser(sysUser); - sysUserVo.setRoles(roles); - sysUserVo.setPermissions(permissions); + if(Objects.nonNull(sysUser.getRoles()) && sysUser.getRoles().size()>0){ + // 权限集合 + if(StringUtils.isNotEmpty(sysUser.getUserType())){ + if(Objects.equals(UserTypeEnums.ZSRY.getCode(),sysUser.getUserType()) || Objects.equals(UserTypeEnums.LSRY.getCode(),sysUser.getUserType())){ + // 角色集合 + Set roles = permissionService.getRolePermission(sysUser); + sysUserVo.setRoles(roles); + Set permissions = permissionService.getMenuPermission(sysUser); + sysUserVo.setPermissions(permissions); + }else{ + Set roles = sysUser.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toSet()); + sysUserVo.setRoles(roles); + } + } + }else{ + Set roles = new HashSet(); + roles.add("visitors"); + sysUserVo.setRoles(roles); + } + return R.ok(sysUserVo); } @@ -214,14 +226,28 @@ public class SysUserController extends BaseController { @GetMapping("getInfo") public AjaxResult getInfo() { SysUser user = SecurityUtils.getLoginUser().getSysUser(); - // 角色集合 - Set roles = permissionService.getRolePermission(user); - // 权限集合 - Set permissions = permissionService.getMenuPermission(user); AjaxResult ajax = AjaxResult.success(); ajax.put("user", user); - ajax.put("roles", roles); - ajax.put("permissions", permissions); + if(Objects.nonNull(user.getRoles()) && user.getRoles().size()>0){ + // 权限集合 + if(StringUtils.isNotEmpty(user.getUserType())){ + if(Objects.equals(UserTypeEnums.ZSRY.getCode(),user.getUserType()) || Objects.equals(UserTypeEnums.LSRY.getCode(),user.getUserType())){ + // 角色集合 + Set roles = permissionService.getRolePermission(user); + ajax.put("roles", roles); + // 权限集合 + Set permissions = permissionService.getMenuPermission(user); + ajax.put("permissions", permissions); + }else{ + Set roles = user.getRoles().stream().map(SysRole::getRoleKey).collect(Collectors.toSet()); + ajax.put("roles", roles); + } + } + }else{ + Set roles = new HashSet(); + roles.add("visitors"); + ajax.put("roles", roles); + } return ajax; } diff --git a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java index 4302d4e6..54ac5605 100644 --- a/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java +++ b/yanzhu-modules/yanzhu-system/src/main/java/com/yanzhu/system/service/impl/SysUserServiceImpl.java @@ -337,7 +337,7 @@ public class SysUserServiceImpl implements ISysUserService userMapper.insertUser(user); } Long userId = user.getUserId(); - if(Objects.nonNull(info.getUserType()) && Objects.nonNull(user.getActiveProjectId())){ + if(Objects.nonNull(user.getUserType()) && Objects.nonNull(user.getActiveProjectId())){ // 删除用户与角色关联 List sysUserRoleList = new ArrayList<>(); SysUserRole userRole = new SysUserRole(); @@ -345,7 +345,7 @@ public class SysUserServiceImpl implements ISysUserService userRole.setDeptId(user.getActiveProjectId()); userRoleMapper.deleteUserRoleByUserRole(userRole); - if(Objects.equals(info.getUserType(), UserTypeEnums.FBWTDL.getCode())){ + if(Objects.equals(user.getUserType(), UserTypeEnums.FBWTDL.getCode())){ List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBWTDL.getKeys()+"_"+user.getActiveProjectId()); if(StringUtils.isEmpty(list)){ //新增单位角色... @@ -356,7 +356,7 @@ public class SysUserServiceImpl implements ISysUserService } sysUserRoleList.add(userRole); userRoleMapper.batchUserRole(sysUserRoleList); - }else if(Objects.equals(info.getUserType(), UserTypeEnums.FBXMJL.getCode())){ + }else if(Objects.equals(user.getUserType(), UserTypeEnums.FBXMJL.getCode())){ List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBXMJL.getKeys()+"_"+user.getActiveProjectId()); if(StringUtils.isEmpty(list)){ //新增单位角色... @@ -367,7 +367,7 @@ public class SysUserServiceImpl implements ISysUserService } sysUserRoleList.add(userRole); userRoleMapper.batchUserRole(sysUserRoleList); - }else if(Objects.equals(info.getUserType(), UserTypeEnums.FBBZZZ.getCode())){ + }else if(Objects.equals(user.getUserType(), UserTypeEnums.FBBZZZ.getCode())){ List list = roleMapper.findDeptRoleListByDeptIdAndKey(user.getActiveProjectId(),UserTypeEnums.FBBZZZ.getKeys()+"_"+user.getActiveProjectId()); if(StringUtils.isEmpty(list)){ //新增单位角色... diff --git a/yanzhu-ui-app/miniprogram/config.js b/yanzhu-ui-app/miniprogram/config.js index 93df9fa6..13d0c4df 100644 --- a/yanzhu-ui-app/miniprogram/config.js +++ b/yanzhu-ui-app/miniprogram/config.js @@ -4,7 +4,8 @@ module.exports = { appId: "wx46466c7828eede2b", baseUrl: 'https:xiangguan.sxyanzhu.com', //baseUrl: 'http://127.0.0.1:8080', - baseImgUrl: 'https:xiangguan.sxyanzhu.com/file', + baseImgUrl: 'https:xiangguan.sxyanzhu.com', + //baseImgUrl: 'https:xiangguan.sxyanzhu.com/file', //baseImgUrl: 'http://127.0.0.1:9300', noSecuritys:['/code','/auth/wxLogin','/auth/getMaOpenId','/auth/getMaPhoneNumber','/auth/maLogin'] }; \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/login/login.js b/yanzhu-ui-app/miniprogram/pages/login/login.js index f609224c..f346abb4 100644 --- a/yanzhu-ui-app/miniprogram/pages/login/login.js +++ b/yanzhu-ui-app/miniprogram/pages/login/login.js @@ -141,11 +141,8 @@ Page({ encryptedData: e.detail.encryptedData } maLogin(data).then(res =>{ - setToken(res.access_token) - //跳转页面 - wx.redirectTo({ - url: '../index/index', - }) + setToken(res.data.access_token); + this.getUserInfoByCache(); }) }else{ //用户决绝授权 diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml index 9f7a8ff5..ac284c32 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/approveTask/index.wxml @@ -5,6 +5,7 @@ + 返回 diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml index 8b04dac8..01898b13 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/detailTask/index.wxml @@ -5,6 +5,7 @@ + 返回 diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml index 08f8c2af..00163495 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDepts/index.wxml @@ -4,6 +4,7 @@ + 返回 diff --git a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml index fcdb1608..90ad6443 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_flowable/subDeptsUsers/index.wxml @@ -4,6 +4,7 @@ + 返回 diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.js b/yanzhu-ui-app/miniprogram/pages/project_info/index.js index 48c5057c..9ecff1d0 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_info/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.js @@ -371,7 +371,7 @@ Page({ findProSubDeptsUserByParams(proId).then(res => { app.globalData.subDeptUserData = res.data; this.setData({ - subDeptUserInfo: res.data + subDeptUserInfo: res.data[0] }); }); }, diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml index 1277211d..bbd27366 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxml @@ -78,7 +78,7 @@ - + 劳务人员 @@ -114,7 +114,7 @@ - + 今日出勤 @@ -143,8 +143,8 @@ - - + {{subDeptUserInfo.qrCode+'------------------'}} + 我的二维码 diff --git a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxss b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxss index 6c216bda..c5b2a97a 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_info/index.wxss +++ b/yanzhu-ui-app/miniprogram/pages/project_info/index.wxss @@ -248,4 +248,8 @@ .qrcode image{ width: 100px; height: 100px; +} + +.bt30{ + margin-bottom: 20px; } \ No newline at end of file diff --git a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js index 3796aa87..dbaab7b9 100644 --- a/yanzhu-ui-app/miniprogram/pages/project_qr/index.js +++ b/yanzhu-ui-app/miniprogram/pages/project_qr/index.js @@ -284,9 +284,11 @@ Page({ findProSubDeptsInfo(this.data.proId, phoneNumber).then(deptRes => { if (deptRes.code == 200 && deptRes.data) { deptRes.data.subDeptLeaderPhone = phoneNumber; - deptRes.data.leaderDegreeGrade = deptRes.data.proProjectInfoSubdeptsUsers.degreeGrade; - deptRes.data.eduFilePath = deptRes.data.proProjectInfoSubdeptsUsers.eduFilePath; - deptRes.data.subStep = deptRes.data.proProjectInfoSubdeptsUsers.subStep; + if(deptRes.data.proProjectInfoSubdeptsUsers){ + deptRes.data.leaderDegreeGrade = deptRes.data.proProjectInfoSubdeptsUsers.degreeGrade; + deptRes.data.eduFilePath = deptRes.data.proProjectInfoSubdeptsUsers.eduFilePath; + deptRes.data.subStep = deptRes.data.proProjectInfoSubdeptsUsers.subStep; + } if (deptRes.data.subDeptInfos) { let subDeptInfosJSON = JSON.parse(deptRes.data.subDeptInfos); deptRes.data.subDeptInfos = subDeptInfosJSON; @@ -783,14 +785,17 @@ Page({ * 下载签名文件 */ downloadSignetFiles() { - let that = this; + let _baseUrl = config.baseUrl; + let _eduFilePath = this.data.form.eduFilePath; wx.downloadFile({ // 示例 url，并非真实存在 - url: config.baseUrl + '/file/NoSecurity/download?fileName=' + that.data.form.eduFilePath, + url: _baseUrl + '/file/NoSecurity/download?fileName=' + _eduFilePath, success: function (res) { const filePath = res.tempFilePath + const fileTypes = filePath.split("."); wx.openDocument({ filePath: filePath, + fileType: fileTypes[fileTypes.length - 1], success: function (res) { console.log('打开文档成功') }, @@ -1415,7 +1420,9 @@ Page({ //验证图片上传完毕 if (uploads.length == uploadFiles.length) { _form.subDeptInfos = JSON.stringify(subDeptInfos); + wx.showLoading({mask: true,title: '正在处理'}); registerSubDepts(_form).then(res => { + wx.hideLoading({success: (res) => {}}); if (res.code == 200) { this.setData({ "form.id": res.data.id, @@ -1602,7 +1609,9 @@ Page({ userInfos.bankCardNo = userModel.bankCardNo; userModel.userInfos = JSON.stringify(userInfos); _form.user = userModel; + wx.showLoading({mask: true,title: '正在处理'}); registerSubDeptsUsers(_form).then(res => { + wx.hideLoading({success: (res) => {}}); if (res.code == 200) { this.setData({ "form.id": res.data.id, @@ -1775,9 +1784,10 @@ Page({ * 这里考虑上传图片异步问题，封装为同步 */ syncUploadImage(file) { + let _baseUrl = config.baseUrl; return new Promise((resolve, reject) => { wx.uploadFile({ - url: config.baseUrl + "/file/NoSecurity/upload", // 上传的服务器接口地址 + url: _baseUrl + "/file/NoSecurity/upload", // 上传的服务器接口地址 filePath: file, header: { "Content-Type": "application/x-www-form-urlencoded;charset=UTF-8" diff --git a/yanzhu-ui-app/miniprogram/pages/sign_mags/index.js b/yanzhu-ui-app/miniprogram/pages/sign_mags/index.js index 681ada0e..43ad309a 100644 --- a/yanzhu-ui-app/miniprogram/pages/sign_mags/index.js +++ b/yanzhu-ui-app/miniprogram/pages/sign_mags/index.js @@ -121,6 +121,15 @@ Page({ }); }, + /** + * 返回上级页面 + */ + BACK() { + wx.redirectTo({ + url: '../project_more/index', + }) + }, + /** * 生命周期函数--监听页面初次渲染完成 */ diff --git a/yanzhu-ui-app/miniprogram/pages/sign_mags/index.wxml b/yanzhu-ui-app/miniprogram/pages/sign_mags/index.wxml index 48d92d74..0f88f160 100644 --- a/yanzhu-ui-app/miniprogram/pages/sign_mags/index.wxml +++ b/yanzhu-ui-app/miniprogram/pages/sign_mags/index.wxml @@ -4,6 +4,7 @@ + 返回