diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java
index 6cd7e264..fd5ab19e 100755
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/bim/domain/BimModelInfo.java
@@ -68,6 +68,16 @@ public class BimModelInfo extends BaseEntity
private String projectName;
private String deptName;
+ private String bimConfig;
+
+ public String getBimConfig() {
+ return bimConfig;
+ }
+
+ public void setBimConfig(String bimConfig) {
+ this.bimConfig = bimConfig;
+ }
+
public Double getUnit() {
return unit;
}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlan.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlan.java
index 45e78405..1c5368d8 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlan.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlan.java
@@ -97,6 +97,16 @@ public class ProPlan extends BaseEntity
@Excel(name = "班组ID")
private Long groupId;
+ private String noBim;
+
+ public String getNoBim() {
+ return noBim;
+ }
+
+ public void setNoBim(String noBim) {
+ this.noBim = noBim;
+ }
+
/** 班组名称 */
@Excel(name = "班组名称")
private String groupName;
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlanSchedule.java b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlanSchedule.java
index 9f54b4c8..ee411ce0 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlanSchedule.java
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/java/com/yanzhu/manage/domain/ProPlanSchedule.java
@@ -55,10 +55,6 @@ public class ProPlanSchedule extends BaseEntity
@Excel(name = "任务名称")
private String taskName;
- /** BIM构建 */
- @Excel(name = "BIM构建")
- private String bimId;
-
/** 进度百分比 */
@Excel(name = "进度百分比")
private Long schedulePercent;
@@ -184,15 +180,7 @@ public class ProPlanSchedule extends BaseEntity
{
return taskName;
}
- public void setBimId(String bimId)
- {
- this.bimId = bimId;
- }
- public String getBimId()
- {
- return bimId;
- }
public Double getTaskDuation() {
return taskDuation;
@@ -325,7 +313,6 @@ public class ProPlanSchedule extends BaseEntity
.append("taskId", getTaskId())
.append("taskUniqueId", getTaskUniqueId())
.append("taskName", getTaskName())
- .append("bimId", getBimId())
.append("schedulePercent", getSchedulePercent())
.append("finishDate", getFinishDate())
.append("description", getDescription())
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml
index 69027f15..7802544f 100755
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/bim/BimModelInfoMapper.xml
@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
@@ -35,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
sp.dept_name projectName,
sd.dept_name com_name,pd.sub_dept_name dept_name,bmi.unit,
bmi.dept_id, bmi.model_name, bmi.lightweightName, bmi.gis_json, bmi.model_status, bmi.model_type,
- bmi.file_type, bmi.file_size, bmi.show_sand, bmi.status, bmi.remark, bmi.create_by, bmi.create_time, bmi.update_by, bmi.update_time,bmi.is_del
+ bmi.file_type, bmi.file_size, bmi.show_sand, bmi.status, bmi.remark, bmi.create_by, bmi.create_time, bmi.update_by, bmi.update_time,bmi.is_del,bmi.bim_config
from bim_model_info bmi
left join sys_dept sp on sp.dept_id = bmi.project_id
left join sys_dept sd on sd.dept_id = bmi.com_id
@@ -117,7 +118,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
project_id = #{projectId},
dept_id = #{deptId},
model_name = #{modelName},
- lightweightName = #{lightweightName},
gis_json = #{gisJson},
model_status = #{modelStatus},
model_type = #{modelType},
@@ -132,8 +132,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
create_time = #{createTime},
update_by = #{updateBy},
update_time = #{updateTime},
+ bim_config = #{bimConfig},
- where model_id = #{modelId}
+ where lightweightName = #{lightweightName}
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml
index 1e8b24c5..1d8f1faa 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/manage/ProPlanMapper.xml
@@ -38,10 +38,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
select pp.id, pp.comid, pp.project_id, pp.task_id, pp.task_unique_id, pp.parent_id, pp.task_type,
pp.task_outline_level, pp.task_name, pp.task_duation, pp.start_date, pp.finish_date,
- pp.predecessors, pp.plan_start_date, pp.plan_finish_date, pp.bim_id, pp.operator, pp.operator_id,
+ pp.predecessors, pp.plan_start_date, pp.plan_finish_date,
+
+ pp.bim_id,
+
+
+
+ left(ifnull(pp.bim_id,''),10) bim_id,
+
+ pp.operator, pp.operator_id,
pp.group_id, pp.group_name, pp.schedule_node, pp.is_del, pp.create_by, pp.create_time, pp.update_by, pp.update_time, pp.remark,
dp.`dept_name` comp_name,pi.`project_name`,
CASE
@@ -69,8 +77,43 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN pro_project_info pi ON pp.`project_id`=pi.`id`
+
+ select pp.id, pp.comid, pp.project_id, pp.task_id, pp.task_unique_id, pp.parent_id, pp.task_type,
+ pp.task_outline_level, pp.task_name, pp.task_duation, pp.start_date, pp.finish_date,
+ pp.predecessors, pp.plan_start_date, pp.plan_finish_date,
+
+ pp.bim_id,
+
+ pp.operator, pp.operator_id,
+ pp.group_id, pp.group_name, pp.schedule_node, pp.is_del, pp.create_by, pp.create_time, pp.update_by, pp.update_time, pp.remark,
+ dp.`dept_name` comp_name,pi.`project_name`,
+ CASE
+ WHEN pp.start_date IS NULL THEN
+ 'wks'
+ WHEN pp.start_date IS NOT NULL
+ AND pp.finish_date IS NOT NULL
+ AND date(pp.plan_finish_date) = ]]> date(pp.finish_date) THEN
+ 'zcwc'
+ WHEN pp.start_date IS NOT NULL
+ AND pp.finish_date IS NOT NULL
+ AND date(pp.plan_finish_date) date(pp.finish_date) THEN
+ 'zhwc'
+ WHEN pp.start_date IS NOT NULL
+ AND pp.finish_date IS NULL
+ AND date(pp.plan_finish_date) = ]]> date(NOW()) THEN
+ 'zcjxz'
+ WHEN pp.start_date IS NOT NULL
+ AND pp.finish_date IS NULL
+ AND date(pp.plan_finish_date) date(NOW()) THEN
+ 'zhjxz'
+ END AS task_status
+ from pro_plan pp
+ LEFT JOIN sys_dept dp ON pp.`comid`=dp.`dept_id`
+ LEFT JOIN pro_project_info pi ON pp.`project_id`=pi.`id`
+
+