diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java
index b77cc28f..a0210d6c 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProProjectInfo.java
@@ -87,6 +87,57 @@ public class ProProjectInfo extends BaseEntity
@Excel(name = "纬度")
private String latitude;
+ @Excel(name = "技术负责人")
+ private String techLeader;
+ @Excel(name = "技术负责人联系电话")
+ private String techLeaderPhone;
+ @Excel(name = "省份")
+ private String province;
+ @Excel(name = "城市")
+ private String city;
+ @Excel(name = "区县")
+ private String district;
+
+ public String getTechLeader() {
+ return techLeader;
+ }
+
+ public void setTechLeader(String techLeader) {
+ this.techLeader = techLeader;
+ }
+
+ public String getTechLeaderPhone() {
+ return techLeaderPhone;
+ }
+
+ public void setTechLeaderPhone(String techLeaderPhone) {
+ this.techLeaderPhone = techLeaderPhone;
+ }
+
+ public String getProvince() {
+ return province;
+ }
+
+ public void setProvince(String province) {
+ this.province = province;
+ }
+
+ public String getCity() {
+ return city;
+ }
+
+ public void setCity(String city) {
+ this.city = city;
+ }
+
+ public String getDistrict() {
+ return district;
+ }
+
+ public void setDistrict(String district) {
+ this.district = district;
+ }
+
/** 项目工期 */
@Excel(name = "项目工期")
private Long projectTimeLimit;
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 05ce0e52..c1d5c35c 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
@@ -57,6 +57,33 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
@Excel(name = "工人姓名")
private String userName;
+ /** 联系电话 */
+ @Excel(name = "联系电话")
+ private String userPhone;
+
+ /** 证件类型(字典) */
+ @Excel(name = "证件类型(字典)")
+ private String certificateType;
+
+ /** 证件号码 */
+ @Excel(name = "证件号码")
+ private String certificateCode;
+
+ /** 班组编号(外键） */
+ @Excel(name = "班组编号")
+ private Long subDeptGroup;
+
+ @Excel(name = "班组")
+ private String subDeptGroupName;
+
+ public String getSubDeptGroupName() {
+ return subDeptGroupName;
+ }
+
+ public void setSubDeptGroupName(String subDeptGroupName) {
+ this.subDeptGroupName = subDeptGroupName;
+ }
+
/** 工种类型 */
@Excel(name = "工种类型")
private String craftType;
@@ -65,6 +92,67 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
@Excel(name = "工种岗位")
private String craftPost;
+ /** 民族 */
+ @Excel(name = "民族")
+ private String nation;
+
+ /** 年龄 */
+ @Excel(name = "年龄")
+ private Long age;
+
+ /** 性别 */
+ @Excel(name = "性别")
+ private String sex;
+
+ /** 文化程度(字典) */
+ @Excel(name = "文化程度(字典)")
+ private String educationalType;
+
+ /** 出生日期 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd")
+ private Date birthDay;
+
+ /** 籍贯 */
+ @Excel(name = "籍贯")
+ private String nativePlace;
+
+ /** 家庭地址 */
+ @Excel(name = "家庭地址")
+ private String address;
+
+ /** 紧急联系人 */
+ @Excel(name = "紧急联系人")
+ private String emergencyContact;
+
+ /** 紧急联系人电话 */
+ @Excel(name = "紧急联系人电话")
+ private String contactPhone;
+
+ /** 工资卡银行 */
+ @Excel(name = "工资卡银行")
+ private String bankName;
+
+ /** 工资卡号 */
+ @Excel(name = "工资卡号")
+ private String bankCardNo;
+
+ /** 开户网点 */
+ @Excel(name = "开户网点")
+ private String bankOffice;
+
+ /** 身份证头像面 */
+ @Excel(name = "身份证头像面")
+ private String certificatePhoto1;
+
+ /** 身份证国徽面 */
+ @Excel(name = "身份证国徽面")
+ private String certificatePhoto2;
+
+ /** 人脸识别头像 */
+ @Excel(name = "人脸识别头像")
+ private String faceImage;
+
/** 学习状态 */
@Excel(name = "学习状态")
private String eduStatus;
@@ -115,6 +203,15 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
{
return id;
}
+ public void setComId(Long comId)
+ {
+ this.comId = comId;
+ }
+
+ public Long getComId()
+ {
+ return comId;
+ }
public void setProjectId(Long projectId)
{
this.projectId = projectId;
@@ -133,6 +230,15 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
{
return subDeptId;
}
+ public void setSubDeptType(String subDeptType)
+ {
+ this.subDeptType = subDeptType;
+ }
+
+ public String getSubDeptType()
+ {
+ return subDeptType;
+ }
public void setSubDeptName(String subDeptName)
{
this.subDeptName = subDeptName;
@@ -151,6 +257,15 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
{
return userId;
}
+ public void setUserType(String userType)
+ {
+ this.userType = userType;
+ }
+
+ public String getUserType()
+ {
+ return userType;
+ }
public void setUserName(String userName)
{
this.userName = userName;
@@ -160,6 +275,42 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
{
return userName;
}
+ public void setUserPhone(String userPhone)
+ {
+ this.userPhone = userPhone;
+ }
+
+ public String getUserPhone()
+ {
+ return userPhone;
+ }
+ public void setCertificateType(String certificateType)
+ {
+ this.certificateType = certificateType;
+ }
+
+ public String getCertificateType()
+ {
+ return certificateType;
+ }
+ public void setCertificateCode(String certificateCode)
+ {
+ this.certificateCode = certificateCode;
+ }
+
+ public String getCertificateCode()
+ {
+ return certificateCode;
+ }
+ public void setSubDeptGroup(Long subDeptGroup)
+ {
+ this.subDeptGroup = subDeptGroup;
+ }
+
+ public Long getSubDeptGroup()
+ {
+ return subDeptGroup;
+ }
public void setCraftType(String craftType)
{
this.craftType = craftType;
@@ -178,6 +329,141 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
{
return craftPost;
}
+ public void setNation(String nation)
+ {
+ this.nation = nation;
+ }
+
+ public String getNation()
+ {
+ return nation;
+ }
+ public void setAge(Long age)
+ {
+ this.age = age;
+ }
+
+ public Long getAge()
+ {
+ return age;
+ }
+ public void setSex(String sex)
+ {
+ this.sex = sex;
+ }
+
+ public String getSex()
+ {
+ return sex;
+ }
+ public void setEducationalType(String educationalType)
+ {
+ this.educationalType = educationalType;
+ }
+
+ public String getEducationalType()
+ {
+ return educationalType;
+ }
+ public void setBirthDay(Date birthDay)
+ {
+ this.birthDay = birthDay;
+ }
+
+ public Date getBirthDay()
+ {
+ return birthDay;
+ }
+ public void setNativePlace(String nativePlace)
+ {
+ this.nativePlace = nativePlace;
+ }
+
+ public String getNativePlace()
+ {
+ return nativePlace;
+ }
+ public void setAddress(String address)
+ {
+ this.address = address;
+ }
+
+ public String getAddress()
+ {
+ return address;
+ }
+ public void setEmergencyContact(String emergencyContact)
+ {
+ this.emergencyContact = emergencyContact;
+ }
+
+ public String getEmergencyContact()
+ {
+ return emergencyContact;
+ }
+ public void setContactPhone(String contactPhone)
+ {
+ this.contactPhone = contactPhone;
+ }
+
+ public String getContactPhone()
+ {
+ return contactPhone;
+ }
+ public void setBankName(String bankName)
+ {
+ this.bankName = bankName;
+ }
+
+ public String getBankName()
+ {
+ return bankName;
+ }
+ public void setBankCardNo(String bankCardNo)
+ {
+ this.bankCardNo = bankCardNo;
+ }
+
+ public String getBankCardNo()
+ {
+ return bankCardNo;
+ }
+ public void setBankOffice(String bankOffice)
+ {
+ this.bankOffice = bankOffice;
+ }
+
+ public String getBankOffice()
+ {
+ return bankOffice;
+ }
+ public void setCertificatePhoto1(String certificatePhoto1)
+ {
+ this.certificatePhoto1 = certificatePhoto1;
+ }
+
+ public String getCertificatePhoto1()
+ {
+ return certificatePhoto1;
+ }
+ public void setCertificatePhoto2(String certificatePhoto2)
+ {
+ this.certificatePhoto2 = certificatePhoto2;
+ }
+
+ public String getCertificatePhoto2()
+ {
+ return certificatePhoto2;
+ }
+ public void setFaceImage(String faceImage)
+ {
+ this.faceImage = faceImage;
+ }
+
+ public String getFaceImage()
+ {
+ return faceImage;
+ }
public void setEduStatus(String eduStatus)
{
this.eduStatus = eduStatus;
@@ -277,41 +563,39 @@ public class ProProjectInfoSubdeptsUsers extends BaseEntity
this.projectName = projectName;
}
- public Long getComId() {
- return comId;
- }
-
- public void setComId(Long comId) {
- this.comId = comId;
- }
-
- public String getSubDeptType() {
- return subDeptType;
- }
-
- public void setSubDeptType(String subDeptType) {
- this.subDeptType = subDeptType;
- }
-
- public String getUserType() {
- return userType;
- }
-
- public void setUserType(String userType) {
- this.userType = userType;
- }
-
@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("userType", getUserType())
.append("userName", getUserName())
+ .append("userPhone", getUserPhone())
+ .append("certificateType", getCertificateType())
+ .append("certificateCode", getCertificateCode())
+ .append("subDeptGroup", getSubDeptGroup())
.append("craftType", getCraftType())
.append("craftPost", getCraftPost())
+ .append("nation", getNation())
+ .append("age", getAge())
+ .append("sex", getSex())
+ .append("educationalType", getEducationalType())
+ .append("birthDay", getBirthDay())
+ .append("nativePlace", getNativePlace())
+ .append("address", getAddress())
+ .append("emergencyContact", getEmergencyContact())
+ .append("contactPhone", getContactPhone())
+ .append("bankName", getBankName())
+ .append("bankCardNo", getBankCardNo())
+ .append("bankOffice", getBankOffice())
+ .append("certificatePhoto1", getCertificatePhoto1())
+ .append("certificatePhoto2", getCertificatePhoto2())
+ .append("faceImage", getFaceImage())
.append("eduStatus", getEduStatus())
.append("eduFilePath", getEduFilePath())
.append("eduSignPath", getEduSignPath())
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml
index cb301d88..e16b7cc7 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoDeptsMapper.xml
@@ -22,7 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select pd.id, pd.project_id, pi.project_name, pd.dept_type, pd.dept_name, pd.dept_code, leader, phone, pd.is_del, pd.create_by, pd.create_time, pd.update_by, pd.update_time, pd.remark from pro_project_info_depts pd
+ select pd.id, pd.project_id, pi.project_name, pd.dept_type, pd.dept_name, pd.dept_code, pd.leader, pd.phone, pd.is_del, pd.create_by, pd.create_time, pd.update_by, pd.update_time, pd.remark
+ from pro_project_info_depts pd
left join pro_project_info pi on pi.id = pd.project_id
left join sys_dept sd on sd.dept_id = pi.com_id
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml
index 7ad97600..de4a86f9 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProProjectInfoMapper.xml
@@ -23,6 +23,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
+
+
+
+
+
@@ -72,7 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select pi.id, pi.com_id, sd.dept_name as com_name, pi.dis_dept_id, pi.project_name, pi.project_code, pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark
+ select pi.id, pi.com_id, sd.dept_name as com_name, pi.dis_dept_id, pi.project_name, pi.project_code,
+ pi.tech_leader,pi.tech_leader_phone,pi.province,pi.city,pi.district,
+ pi.simple_name, pi.project_type, pi.project_level, pi.project_regional, pi.project_package, pi.project_address, pi.project_nature, pi.licence_number, pi.project_person, pi.project_person_phone, pi.longitude, pi.latitude, pi.project_time_limit, pi.total_investment, pi.floor_area, pi.total_output_value, pi.planned_completion_time, pi.scheduled_start_time, pi.actual_operating_time, pi.actual_completion_time, pi.contract_amount, pi.paid_amount, pi.on_account_amount, pi.project_schedule, pi.project_summarize, pi.project_qr_code, pi.project_status, pi.project_sort, pi.is_del, pi.create_by, pi.create_time, pi.update_by, pi.update_time, pi.remark
from pro_project_info pi
left join sys_dept sd on sd.dept_id = pi.com_id
@@ -88,6 +97,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and pi.project_name like concat('%', #{projectName}, '%')
and pi.project_code = #{projectCode}
and pi.simple_name like concat('%', #{simpleName}, '%')
+
+ and pi.tech_leader like concat('%', #{techLeader}, '%')
+ and pi.tech_leader_phone like concat('%', #{techLeaderPhone}, '%')
+ and pi.province like concat('%', #{province}, '%')
+ and pi.city like concat('%', #{city}, '%')
+ and pi.district like concat('%', #{district}, '%')
+
and pi.project_type = #{projectType}
and pi.project_level = #{projectLevel}
and pi.project_person = #{projectPerson}
@@ -102,6 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"