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 2804fc6c..1ae3f853 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
@@ -1,10 +1,13 @@
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 org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
+import java.util.Date;
+
/**
* 分包单位对象 pro_project_info_subdepts
*
@@ -66,6 +69,15 @@ public class ProProjectInfoSubdepts extends BaseEntity
@Excel(name = "负责人电话")
private String subDeptLeaderPhone;
+ /** 合同承包内容 */
+ @Excel(name = "合同承包内容")
+ private String contractInfos;
+
+ /** 进场时间 */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "进场时间")
+ private Date useDates;
+
/** 进场状态 */
@Excel(name = "进场状态")
private String useStatus;
@@ -181,7 +193,24 @@ public class ProProjectInfoSubdepts extends BaseEntity
{
return subDeptLeaderPhone;
}
- public void setUseStatus(String useStatus)
+
+ public String getContractInfos() {
+ return contractInfos;
+ }
+
+ public void setContractInfos(String contractInfos) {
+ this.contractInfos = contractInfos;
+ }
+
+ public Date getUseDates() {
+ return useDates;
+ }
+
+ public void setUseDates(Date useDates) {
+ this.useDates = useDates;
+ }
+
+ public void setUseStatus(String useStatus)
{
this.useStatus = useStatus;
}
@@ -248,6 +277,8 @@ public class ProProjectInfoSubdepts extends BaseEntity
.append("subDeptLeaderName", getSubDeptLeaderName())
.append("subDeptLeaderCode", getSubDeptLeaderCode())
.append("subDeptLeaderPhone", getSubDeptLeaderPhone())
+ .append("contractInfos", getContractInfos())
+ .append("useDates", getUseDates())
.append("useStatus", getUseStatus())
.append("approveStatus", getApproveStatus())
.append("qrCode", getQrCode())
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java
index 0ab18e12..73bbc81c 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/mapper/ProProjectInfoMapper.java
@@ -67,4 +67,11 @@ public interface ProProjectInfoMapper
* @return
*/
public int insertDept(ProDept proDept);
+
+ /**
+ * 在单位层级新增项目
+ * @param proDept
+ * @return
+ */
+ public int updateDept(ProDept proDept);
}
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 bfe3eb62..cb301d88 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
@@ -24,7 +24,7 @@ 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
left join pro_project_info pi on pi.id = pd.project_id
- left join sys_dept sd on sd.dept_id = pi.dept_id
+ left join sys_dept sd on sd.dept_id = pi.com_id