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 a4825a77..f28282bf 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
@@ -76,6 +76,16 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
@Excel(name = "班组")
private String subDeptGroupName;
+ public int getHasRegister() {
+ return hasRegister;
+ }
+
+ public void setHasRegister(int hasRegister) {
+ this.hasRegister = hasRegister;
+ }
+
+ private int hasRegister;
+
public String getAdmitGuid() {
return admitGuid;
}
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 cbdf6280..ffc16080 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
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -62,7 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
psu.sup_illness_status, psu.is_del, psu.create_by, psu.create_time, psu.update_by, psu.update_time,
psu.user_phone,psu.certificate_type,psu.certificate_code,psu.sub_dept_group,psu.sub_dept_group_name,psu.nation,psu.age,psu.sex,
psu.educational_type,psu.birth_day,psu.native_place,psu.address,psu.emergency_contact,psu.contact_phone,
- psu.bank_name,psu.bank_card_no,psu.bank_office,psu.certificate_photo1,psu.certificate_photo2,psu.face_image,psu.admit_guid,
+ psu.bank_name,psu.bank_card_no,psu.bank_office,psu.certificate_photo1,psu.certificate_photo2,psu.face_image,psu.admit_guid,psu.has_register,
psu.remark
from pro_project_info_subdepts_users psu
left join pro_project_info pi on pi.id = psu.project_id
@@ -81,6 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and psu.user_name like concat('%', #{userName}, '%')
and psu.user_phone like concat('%', #{userPhone}, '%')
and psu.craft_type = #{craftType}
+ and psu.has_register = #{hasRegister}
and psu.sub_dept_group = #{subDeptGroup}
and psu.craft_post = #{craftPost}
and psu.edu_status = #{eduStatus}
@@ -142,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sub_step,
illness_status,
sup_illness_status,
+ has_register,
is_del,
create_by,
create_time,
@@ -190,6 +193,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{subStep},
#{illnessStatus},
#{supIllnessStatus},
+ #{hasRegister},
#{isDel},
#{createBy},
#{createTime},
@@ -242,6 +246,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sub_step = #{subStep},
illness_status = #{illnessStatus},
sup_illness_status = #{supIllnessStatus},
+ has_register = #{hasRegister},
is_del = #{isDel},
create_by = #{createBy},
create_time = #{createTime},
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 381bf6d2..a3c51d6e 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
@@ -58,7 +58,8 @@ public class BusExamUserServiceImpl implements IBusExamUserService
SysUser cache = SecurityUtils.getLoginUser().getSysUser();
busExamUser.setCreateTime(DateUtils.getNowDate());
- return busExamUserMapper.insertBusExamUser(busExamUser);
+ busExamUserMapper.insertBusExamUser(busExamUser);
+ return busExamUser;
}
/**
diff --git a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
index d3bb8d55..77042f5d 100644
--- a/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
+++ b/yanzhu-ui-vue3/src/views/manage/proProjectInfoSubdeptsUsers/index.vue
@@ -101,7 +101,7 @@
-
+
@@ -356,7 +356,7 @@ function doSubDeptChange(type) {
}else{
if ( !form.value.subDeptId) {
data.deptGroups = [];
- form.value.subDeptId = "";
+ form.value.subDeptGroup = "";
form.value.groupName = "";
form.value.craftPostName = "";
form.value.craftTypeName = "";
@@ -372,7 +372,7 @@ function doSubDeptChange(type) {
data.deptGroups = d.rows || [];
if (data.deptGroups.length > 0) {
let dg = data.deptGroups[0];
- form.value.subDeptId = dg.id;
+ form.value.subDeptGroup = dg.id;
form.value.groupName = dg.groupName;
form.value.craftTypeName = getCraftType(dg.craftType);
form.value.craftPostName = getCraftPost(dg.craftPost).label;
@@ -389,6 +389,7 @@ function doDeptGroupChange() {
data.isManager = false
if (!form.value.subDeptGroup) {
form.value.groupName = "";
+ form.value.subDeptGroup ="";
form.value.craftPostName = "";
form.value.craftTypeName = "";
form.value.craftType = "";
@@ -440,7 +441,7 @@ function loadSubDepts(cb) {
data.subdepts = d.rows || [];
if (data.subdepts.length > 0) {
let sd = data.subdepts[0];
- form.value.subDeptId = sd.id;
+ form.value.subDeptId = ""+sd.id;
doSubDeptChange();
}
cb && cb();
@@ -566,6 +567,11 @@ loadSubDepts();
.el-upload__tip {
display: none;
}
+ .el-upload-list--picture-card{
+ .el-upload-list__item{
+ width:240px;
+ }
+ }
}
.div-header {
@@ -584,6 +590,11 @@ loadSubDepts();
.el-upload__tip {
display: none;
}
+ .el-upload-list--picture-card{
+ .el-upload-list__item{
+ width:240px;
+ }
+ }
}
.face-image {