diff --git a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java index 3a5c4804..2dab7ac1 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/EamWorkOrderInData.java @@ -34,17 +34,8 @@ public class EamWorkOrderInData extends EamWorkOrderData{ private String actualOperatorName; private String isReturn; private String difficultyRemark; - - @Override - public String getDifficultyRemark() { - return difficultyRemark; - } - - @Override - public void setDifficultyRemark(String difficultyRemark) { - this.difficultyRemark = difficultyRemark; - } - + private String planPeriod; + private String planCycle; // 审核员名称 private String checkerName; private String codeDesc; @@ -123,6 +114,30 @@ public class EamWorkOrderInData extends EamWorkOrderData{ private List informationList; + public String getPlanPeriod() { + return planPeriod; + } + + public void setPlanPeriod(String planPeriod) { + this.planPeriod = planPeriod; + } + + public String getPlanCycle() { + return planCycle; + } + + public void setPlanCycle(String planCycle) { + this.planCycle = planCycle; + } + @Override + public String getDifficultyRemark() { + return difficultyRemark; + } + + @Override + public void setDifficultyRemark(String difficultyRemark) { + this.difficultyRemark = difficultyRemark; + } public Date getActualStartDate() { return actualStartDate; } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index 2b6c4206..d6e2f8f2 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java @@ -1789,6 +1789,7 @@ public class EamServiceImpl implements EamService { searchData.setPlanID(inData.getPlanID()); searchData.setItemType(inData.getItemType()); searchData.setObjectID(inData.getObjectID()); + searchData.setBuNo(inData.getBuNo()); List availableDataList = eamMapper.searchPlanItemAvailable(searchData); result.get(i).setAvailableList(availableDataList); } diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index 3437497f..776d3806 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -766,7 +766,9 @@ ELSE DATEDIFF(MINUTE, a.CreateDate, a.reach_date) END AS responseTime, a.check_type, - a.is_return + a.is_return, + ewo.plan_period, + ewo.plan_cycle FROM eam_workOrder a left join eam_object as eo on eo.site = a.site and eo.ObjectID = a.ObjectID and eo.bu_no = a.bu_no left join sys_department as sd ON eo.site = sd.site and eo.dept_id = sd.department_id and eo.bu_no = sd.bu_no