diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b20026b..c61db81 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,17 @@ - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -128,6 +83,7 @@ getPgCameraListByPartition getPgConstructionList statisticType + reoair @@ -151,6 +107,12 @@ @@ -174,10 +136,10 @@ - @@ -185,6 +147,8 @@ + + @@ -226,7 +190,7 @@ - + @@ -235,7 +199,7 @@ - + @@ -245,17 +209,7 @@ - - - - - - - - - - - + @@ -265,25 +219,6 @@ - - - - - - - - - - - - - - - - - - - @@ -297,14 +232,12 @@ - - - + @@ -428,18 +361,19 @@ - + + + - - - + - + @@ -450,7 +384,7 @@ - + @@ -494,76 +428,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -662,13 +526,6 @@ - - - - - - - @@ -718,13 +575,6 @@ - - - - - - - @@ -732,36 +582,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -797,12 +621,6 @@ - - - - - - @@ -817,11 +635,42 @@ + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + @@ -843,44 +692,141 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java index 89a5df9..5346b57 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -13,7 +13,7 @@ private String planKeyId;//维修保养计划ID private String planName;//维修保养名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -66,15 +66,16 @@ this.recordNo = recordNo; } - @Column(name="REOAIRMAN") - public String getReoairMan() { - return reoairMan; + @Column(name="REPAIRMAN") + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + @Column(name="MAINTENANCE_DATE") public String getMaintenanceDate() { return maintenanceDate; diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b20026b..c61db81 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,17 @@ - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -128,6 +83,7 @@ getPgCameraListByPartition getPgConstructionList statisticType + reoair @@ -151,6 +107,12 @@ @@ -174,10 +136,10 @@ - @@ -185,6 +147,8 @@ + + @@ -226,7 +190,7 @@ - + @@ -235,7 +199,7 @@ - + @@ -245,17 +209,7 @@ - - - - - - - - - - - + @@ -265,25 +219,6 @@ - - - - - - - - - - - - - - - - - - - @@ -297,14 +232,12 @@ - - - + @@ -428,18 +361,19 @@ - + + + - - - + - + @@ -450,7 +384,7 @@ - + @@ -494,76 +428,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -662,13 +526,6 @@ - - - - - - - @@ -718,13 +575,6 @@ - - - - - - - @@ -732,36 +582,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -797,12 +621,6 @@ - - - - - - @@ -817,11 +635,42 @@ + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + @@ -843,44 +692,141 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java index 89a5df9..5346b57 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -13,7 +13,7 @@ private String planKeyId;//维修保养计划ID private String planName;//维修保养名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -66,15 +66,16 @@ this.recordNo = recordNo; } - @Column(name="REOAIRMAN") - public String getReoairMan() { - return reoairMan; + @Column(name="REPAIRMAN") + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + @Column(name="MAINTENANCE_DATE") public String getMaintenanceDate() { return maintenanceDate; diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java index 2922121..17c180a 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java @@ -9,7 +9,7 @@ private Long id; private String planName;//维修柏安阳名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -40,14 +40,15 @@ this.recordNo = recordNo; } - public String getReoairMan() { - return reoairMan; + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + public String getMaintenanceDate() { return maintenanceDate; } @@ -95,7 +96,7 @@ pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId()); pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName()); pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo()); - pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan()); + pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan()); pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate()); pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin()); pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject()); diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java index 5463995..c41ca7d 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -12,15 +12,14 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ + public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){ try { String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," + "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," + "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1"; - if(recordNo!=null) - sql+=" and RECORD_NO like '%"+recordNo+"%'"; - if(planName!=null) - sql+=" and PLAN_NAME like '%"+planName+"%'"; + + if(patrolMan!=null) + sql+=" and PATROL_MAN like '%"+patrolMan+"%'"; if(startTime!=null) sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; if(endTime!=null) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b20026b..c61db81 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,17 @@ - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -128,6 +83,7 @@ getPgCameraListByPartition getPgConstructionList statisticType + reoair @@ -151,6 +107,12 @@ @@ -174,10 +136,10 @@ - @@ -185,6 +147,8 @@ + + @@ -226,7 +190,7 @@ - + @@ -235,7 +199,7 @@ - + @@ -245,17 +209,7 @@ - - - - - - - - - - - + @@ -265,25 +219,6 @@ - - - - - - - - - - - - - - - - - - - @@ -297,14 +232,12 @@ - - - + @@ -428,18 +361,19 @@ - + + + - - - + - + @@ -450,7 +384,7 @@ - + @@ -494,76 +428,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -662,13 +526,6 @@ - - - - - - - @@ -718,13 +575,6 @@ - - - - - - - @@ -732,36 +582,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -797,12 +621,6 @@ - - - - - - @@ -817,11 +635,42 @@ + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + @@ -843,44 +692,141 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java index 89a5df9..5346b57 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -13,7 +13,7 @@ private String planKeyId;//维修保养计划ID private String planName;//维修保养名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -66,15 +66,16 @@ this.recordNo = recordNo; } - @Column(name="REOAIRMAN") - public String getReoairMan() { - return reoairMan; + @Column(name="REPAIRMAN") + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + @Column(name="MAINTENANCE_DATE") public String getMaintenanceDate() { return maintenanceDate; diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java index 2922121..17c180a 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java @@ -9,7 +9,7 @@ private Long id; private String planName;//维修柏安阳名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -40,14 +40,15 @@ this.recordNo = recordNo; } - public String getReoairMan() { - return reoairMan; + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + public String getMaintenanceDate() { return maintenanceDate; } @@ -95,7 +96,7 @@ pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId()); pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName()); pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo()); - pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan()); + pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan()); pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate()); pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin()); pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject()); diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java index 5463995..c41ca7d 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -12,15 +12,14 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ + public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){ try { String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," + "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," + "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1"; - if(recordNo!=null) - sql+=" and RECORD_NO like '%"+recordNo+"%'"; - if(planName!=null) - sql+=" and PLAN_NAME like '%"+planName+"%'"; + + if(patrolMan!=null) + sql+=" and PATROL_MAN like '%"+patrolMan+"%'"; if(startTime!=null) sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; if(endTime!=null) diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java index 4786bca..0903f22 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -13,14 +13,12 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ + public List getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){ try { - String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," + + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," + "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1"; - if(recordNo!=null) - sql+=" and RECORD_NO like '%"+recordNo+"%'"; - if(planName!=null) - sql+=" and PLAN_NAME like '%"+planName+"%'"; + if(repairMan!=null) + sql+=" and REPAIRMAN like '%"+repairMan+"%'"; if(startTime!=null) sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; if(endTime!=null) @@ -38,7 +36,7 @@ pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2])); pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3])); pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4])); - pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5])); + pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5])); pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6])); pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java index e336309..66f4d09 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java @@ -28,8 +28,7 @@ @POST @Path("getPgAssetRecordList") @Produces(MediaType.APPLICATION_JSON) - public Map getPgAssetRecordList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName, + public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan, @FormParam("startTime") String startTime, @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); @@ -37,7 +36,7 @@ List pgAssetInSpectionRecordDtoList=new ArrayList<>(); try{ - pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime); + pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime); if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0) msg="巡检信息获取成功"; else @@ -49,7 +48,7 @@ } resultMap.put("msg",msg); - resultMap.put("resutl",pgAssetInSpectionRecordDtoList); + resultMap.put("result",pgAssetInSpectionRecordDtoList); return resultMap; } diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b20026b..c61db81 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,17 @@ - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -128,6 +83,7 @@ getPgCameraListByPartition getPgConstructionList statisticType + reoair @@ -151,6 +107,12 @@ @@ -174,10 +136,10 @@ - @@ -185,6 +147,8 @@ + + @@ -226,7 +190,7 @@ - + @@ -235,7 +199,7 @@ - + @@ -245,17 +209,7 @@ - - - - - - - - - - - + @@ -265,25 +219,6 @@ - - - - - - - - - - - - - - - - - - - @@ -297,14 +232,12 @@ - - - + @@ -428,18 +361,19 @@ - + + + - - - + - + @@ -450,7 +384,7 @@ - + @@ -494,76 +428,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -662,13 +526,6 @@ - - - - - - - @@ -718,13 +575,6 @@ - - - - - - - @@ -732,36 +582,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -797,12 +621,6 @@ - - - - - - @@ -817,11 +635,42 @@ + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + @@ -843,44 +692,141 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java index 89a5df9..5346b57 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -13,7 +13,7 @@ private String planKeyId;//维修保养计划ID private String planName;//维修保养名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -66,15 +66,16 @@ this.recordNo = recordNo; } - @Column(name="REOAIRMAN") - public String getReoairMan() { - return reoairMan; + @Column(name="REPAIRMAN") + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + @Column(name="MAINTENANCE_DATE") public String getMaintenanceDate() { return maintenanceDate; diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java index 2922121..17c180a 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java @@ -9,7 +9,7 @@ private Long id; private String planName;//维修柏安阳名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -40,14 +40,15 @@ this.recordNo = recordNo; } - public String getReoairMan() { - return reoairMan; + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + public String getMaintenanceDate() { return maintenanceDate; } @@ -95,7 +96,7 @@ pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId()); pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName()); pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo()); - pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan()); + pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan()); pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate()); pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin()); pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject()); diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java index 5463995..c41ca7d 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -12,15 +12,14 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ + public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){ try { String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," + "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," + "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1"; - if(recordNo!=null) - sql+=" and RECORD_NO like '%"+recordNo+"%'"; - if(planName!=null) - sql+=" and PLAN_NAME like '%"+planName+"%'"; + + if(patrolMan!=null) + sql+=" and PATROL_MAN like '%"+patrolMan+"%'"; if(startTime!=null) sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; if(endTime!=null) diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java index 4786bca..0903f22 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -13,14 +13,12 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ + public List getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){ try { - String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," + + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," + "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1"; - if(recordNo!=null) - sql+=" and RECORD_NO like '%"+recordNo+"%'"; - if(planName!=null) - sql+=" and PLAN_NAME like '%"+planName+"%'"; + if(repairMan!=null) + sql+=" and REPAIRMAN like '%"+repairMan+"%'"; if(startTime!=null) sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; if(endTime!=null) @@ -38,7 +36,7 @@ pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2])); pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3])); pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4])); - pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5])); + pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5])); pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6])); pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java index e336309..66f4d09 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java @@ -28,8 +28,7 @@ @POST @Path("getPgAssetRecordList") @Produces(MediaType.APPLICATION_JSON) - public Map getPgAssetRecordList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName, + public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan, @FormParam("startTime") String startTime, @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); @@ -37,7 +36,7 @@ List pgAssetInSpectionRecordDtoList=new ArrayList<>(); try{ - pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime); + pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime); if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0) msg="巡检信息获取成功"; else @@ -49,7 +48,7 @@ } resultMap.put("msg",msg); - resultMap.put("resutl",pgAssetInSpectionRecordDtoList); + resultMap.put("result",pgAssetInSpectionRecordDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java index d741777..d735cc9 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java @@ -28,8 +28,7 @@ @POST @Path("getPgMaintanceList") @Produces(MediaType.APPLICATION_JSON) - public Map getPgMaintanceList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName, + public Map getPgMaintanceList(@FormParam("repairMan") String repairMan, @FormParam("startTime") String startTime, @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); @@ -37,7 +36,7 @@ List pgMaintanceRecordHeadDtoList=new ArrayList<>(); try{ - pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime); + pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime); if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0) msg="维护信息获取成功"; else @@ -49,9 +48,9 @@ } resultMap.put("msg",msg); - resultMap.put("resutl",pgMaintanceRecordHeadDtoList); + resultMap.put("result",pgMaintanceRecordHeadDtoList); return resultMap; } -} +} \ No newline at end of file diff --git "a/~$\350\257\264\346\230\21620190522.docx" "b/~$\350\257\264\346\230\21620190522.docx" new file mode 100644 index 0000000..5e5bd25 --- /dev/null +++ "b/~$\350\257\264\346\230\21620190522.docx" Binary files differ diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b20026b..c61db81 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,7 +6,17 @@ - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -128,6 +83,7 @@ getPgCameraListByPartition getPgConstructionList statisticType + reoair @@ -151,6 +107,12 @@ @@ -174,10 +136,10 @@ - @@ -185,6 +147,8 @@ + + @@ -226,7 +190,7 @@ - + @@ -235,7 +199,7 @@ - + @@ -245,17 +209,7 @@ - - - - - - - - - - - + @@ -265,25 +219,6 @@ - - - - - - - - - - - - - - - - - - - @@ -297,14 +232,12 @@ - - - + @@ -428,18 +361,19 @@ - + + + - - - + - + @@ -450,7 +384,7 @@ - + @@ -494,76 +428,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -662,13 +526,6 @@ - - - - - - - @@ -718,13 +575,6 @@ - - - - - - - @@ -732,36 +582,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -797,12 +621,6 @@ - - - - - - @@ -817,11 +635,42 @@ + + + + + + + + + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + @@ -843,44 +692,141 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + - + + + + + + + + - + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java index 89a5df9..5346b57 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -13,7 +13,7 @@ private String planKeyId;//维修保养计划ID private String planName;//维修保养名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -66,15 +66,16 @@ this.recordNo = recordNo; } - @Column(name="REOAIRMAN") - public String getReoairMan() { - return reoairMan; + @Column(name="REPAIRMAN") + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + @Column(name="MAINTENANCE_DATE") public String getMaintenanceDate() { return maintenanceDate; diff --git a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java index 2922121..17c180a 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java +++ b/src/main/java/com/casic/PgInterface/maintenance/dto/PgMaintanceRecordHeadDto.java @@ -9,7 +9,7 @@ private Long id; private String planName;//维修柏安阳名称 private String recordNo;//维修保养单号 - private String reoairMan;//维修人 + private String repairMan;//维修人 private String maintenanceDate;//维修保养日期 private String buildCabin;//舱室 private String project;//所属项目 @@ -40,14 +40,15 @@ this.recordNo = recordNo; } - public String getReoairMan() { - return reoairMan; + public String getRepairMan() { + return repairMan; } - public void setReoairMan(String reoairMan) { - this.reoairMan = reoairMan; + public void setRepairMan(String repairMan) { + this.repairMan = repairMan; } + public String getMaintenanceDate() { return maintenanceDate; } @@ -95,7 +96,7 @@ pgMaintanceRecordHeadDto.setId(pgMaintanceRecordHead.getId()); pgMaintanceRecordHeadDto.setPlanName(pgMaintanceRecordHead.getPlanName()); pgMaintanceRecordHeadDto.setRecordNo(pgMaintanceRecordHead.getRecordNo()); - pgMaintanceRecordHeadDto.setReoairMan(pgMaintanceRecordHead.getReoairMan()); + pgMaintanceRecordHeadDto.setRepairMan(pgMaintanceRecordHead.getRepairMan()); pgMaintanceRecordHeadDto.setMaintenanceDate(pgMaintanceRecordHead.getMaintenanceDate()); pgMaintanceRecordHeadDto.setBuildCabin(pgMaintanceRecordHead.getBuildCabin()); pgMaintanceRecordHeadDto.setProject(pgMaintanceRecordHead.getProject()); diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java index 5463995..c41ca7d 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -12,15 +12,14 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ + public List getPgAssetInSpectionRecordLsit(String patrolMan, String startTime,String endTime){ try { String sql="select ID,KEY_ID,PLAN_ID,CREATE_DATE,STATE,CREATOR,PLAN_NAME,RECORD_NO,PLAN_NO," + "RESPONSIBIE_DEPT,INSPECTION_PERSON,PATROL_MAN,OPERATE_DATE,REMARK,BUILD_CABIN,PROJECT," + "START_PILE_NO,END_PILE_NO,INSPECTION_PRACE,OTHER_PATROL_MAN from PG_ASSET_INSPECTION_RECORD where 1=1"; - if(recordNo!=null) - sql+=" and RECORD_NO like '%"+recordNo+"%'"; - if(planName!=null) - sql+=" and PLAN_NAME like '%"+planName+"%'"; + + if(patrolMan!=null) + sql+=" and PATROL_MAN like '%"+patrolMan+"%'"; if(startTime!=null) sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; if(endTime!=null) diff --git a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java index 4786bca..0903f22 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -13,14 +13,12 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ + public List getPgMaintanceRecordHeadLsit(String repairMan,String startTime,String endTime){ try { - String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,MAINTENANCE_DATE," + + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REPAIRMAN,MAINTENANCE_DATE," + "BUILD_CABIN,PROJECT,CREATEDATE,CREATOR from PG_MAINTANCERECORD_HEAD where 1=1"; - if(recordNo!=null) - sql+=" and RECORD_NO like '%"+recordNo+"%'"; - if(planName!=null) - sql+=" and PLAN_NAME like '%"+planName+"%'"; + if(repairMan!=null) + sql+=" and REPAIRMAN like '%"+repairMan+"%'"; if(startTime!=null) sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; if(endTime!=null) @@ -38,7 +36,7 @@ pgMaintanceRecordHead.setPlanKeyId(String.valueOf(objects1[2])); pgMaintanceRecordHead.setPlanName(String.valueOf(objects1[3])); pgMaintanceRecordHead.setRecordNo(String.valueOf(objects1[4])); - pgMaintanceRecordHead.setReoairMan(String.valueOf(objects1[5])); + pgMaintanceRecordHead.setRepairMan(String.valueOf(objects1[5])); pgMaintanceRecordHead.setMaintenanceDate(String.valueOf(objects1[6])); pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java index e336309..66f4d09 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java @@ -28,8 +28,7 @@ @POST @Path("getPgAssetRecordList") @Produces(MediaType.APPLICATION_JSON) - public Map getPgAssetRecordList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName, + public Map getPgAssetRecordList(@FormParam("patrolMan") String patrolMan, @FormParam("startTime") String startTime, @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); @@ -37,7 +36,7 @@ List pgAssetInSpectionRecordDtoList=new ArrayList<>(); try{ - pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime); + pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(patrolMan,startTime,endTime); if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0) msg="巡检信息获取成功"; else @@ -49,7 +48,7 @@ } resultMap.put("msg",msg); - resultMap.put("resutl",pgAssetInSpectionRecordDtoList); + resultMap.put("result",pgAssetInSpectionRecordDtoList); return resultMap; } diff --git a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java index d741777..d735cc9 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java @@ -28,8 +28,7 @@ @POST @Path("getPgMaintanceList") @Produces(MediaType.APPLICATION_JSON) - public Map getPgMaintanceList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName, + public Map getPgMaintanceList(@FormParam("repairMan") String repairMan, @FormParam("startTime") String startTime, @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); @@ -37,7 +36,7 @@ List pgMaintanceRecordHeadDtoList=new ArrayList<>(); try{ - pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime); + pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(repairMan,startTime,endTime); if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0) msg="维护信息获取成功"; else @@ -49,9 +48,9 @@ } resultMap.put("msg",msg); - resultMap.put("resutl",pgMaintanceRecordHeadDtoList); + resultMap.put("result",pgMaintanceRecordHeadDtoList); return resultMap; } -} +} \ No newline at end of file diff --git "a/~$\350\257\264\346\230\21620190522.docx" "b/~$\350\257\264\346\230\21620190522.docx" new file mode 100644 index 0000000..5e5bd25 --- /dev/null +++ "b/~$\350\257\264\346\230\21620190522.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620190522.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620190522.docx" index e582b92..833b97a 100644 --- "a/\346\216\245\345\217\243\350\257\264\346\230\21620190522.docx" +++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620190522.docx" Binary files differ diff --git "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" index 4e542c2..ff3fe91 100644 --- "a/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" +++ "b/\347\256\241\345\273\212\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241\350\257\264\346\230\21620190522.docx" Binary files differ