diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + + + @@ -484,7 +513,7 @@ - + @@ -493,7 +522,7 @@ - + @@ -683,7 +712,9 @@ - @@ -941,14 +972,12 @@ - - - - 1522229072869 - 1522302183280 @@ -1286,7 +1315,14 @@ - @@ -1316,7 +1352,7 @@ - @@ -1328,10 +1364,10 @@ - + - + @@ -1343,7 +1379,7 @@ - + @@ -1354,7 +1390,7 @@ - + @@ -1428,7 +1464,6 @@ - @@ -1453,7 +1488,8 @@ - @@ -1470,6 +1506,12 @@ @@ -1483,77 +1525,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,20 +1553,8 @@ - - - - - - - - - - - - - - + + @@ -1606,27 +1569,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -1641,73 +1586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1740,14 +1618,6 @@ - - - - - - - - @@ -1769,30 +1639,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1803,16 +1649,6 @@ - - - - - - - - - - @@ -1827,17 +1663,195 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index 3cdbfe6..d43c05f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,4 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -} +} \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + + + @@ -484,7 +513,7 @@ - + @@ -493,7 +522,7 @@ - + @@ -683,7 +712,9 @@ - @@ -941,14 +972,12 @@ - - - - 1522229072869 - 1522302183280 @@ -1286,7 +1315,14 @@ - @@ -1316,7 +1352,7 @@ - @@ -1328,10 +1364,10 @@ - + - + @@ -1343,7 +1379,7 @@ - + @@ -1354,7 +1390,7 @@ - + @@ -1428,7 +1464,6 @@ - @@ -1453,7 +1488,8 @@ - @@ -1470,6 +1506,12 @@ @@ -1483,77 +1525,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,20 +1553,8 @@ - - - - - - - - - - - - - - + + @@ -1606,27 +1569,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -1641,73 +1586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1740,14 +1618,6 @@ - - - - - - - - @@ -1769,30 +1639,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1803,16 +1649,6 @@ - - - - - - - - - - @@ -1827,17 +1663,195 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index 3cdbfe6..d43c05f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,4 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 47e6bb1..06ee17d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -107,7 +107,10 @@ this.setId(String.valueOf(pgPartition.getId())); this.setParName(pgPartition.getParName()); - this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); + if(Long.valueOf(pgPartition.getPgRoadId())==null||pgRoadManager.get(pgPartition.getPgRoadId())==null) + this.setRoad(""); + else + this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); this.setPgPosition(pgPartition.getPgPosition()); this.setPgNum(pgPartition.getPgNum()); this.setPgType(pgPartition.getPgType()); @@ -117,4 +120,4 @@ this.setActive(String.valueOf(pgPartition.getActive())); } -} +} \ No newline at end of file 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 96e8ba1..89a5df9 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -84,7 +84,7 @@ this.maintenanceDate = maintenanceDate; } - @Column(name="DUILD_CABIN") + @Column(name="BUILD_CABIN") public String getBuildCabin() { return buildCabin; } diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + + + @@ -484,7 +513,7 @@ - + @@ -493,7 +522,7 @@ - + @@ -683,7 +712,9 @@ - @@ -941,14 +972,12 @@ - - - - 1522229072869 - 1522302183280 @@ -1286,7 +1315,14 @@ - @@ -1316,7 +1352,7 @@ - @@ -1328,10 +1364,10 @@ - + - + @@ -1343,7 +1379,7 @@ - + @@ -1354,7 +1390,7 @@ - + @@ -1428,7 +1464,6 @@ - @@ -1453,7 +1488,8 @@ - @@ -1470,6 +1506,12 @@ @@ -1483,77 +1525,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,20 +1553,8 @@ - - - - - - - - - - - - - - + + @@ -1606,27 +1569,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -1641,73 +1586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1740,14 +1618,6 @@ - - - - - - - - @@ -1769,30 +1639,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1803,16 +1649,6 @@ - - - - - - - - - - @@ -1827,17 +1663,195 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index 3cdbfe6..d43c05f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,4 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 47e6bb1..06ee17d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -107,7 +107,10 @@ this.setId(String.valueOf(pgPartition.getId())); this.setParName(pgPartition.getParName()); - this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); + if(Long.valueOf(pgPartition.getPgRoadId())==null||pgRoadManager.get(pgPartition.getPgRoadId())==null) + this.setRoad(""); + else + this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); this.setPgPosition(pgPartition.getPgPosition()); this.setPgNum(pgPartition.getPgNum()); this.setPgType(pgPartition.getPgType()); @@ -117,4 +120,4 @@ this.setActive(String.valueOf(pgPartition.getActive())); } -} +} \ No newline at end of file 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 96e8ba1..89a5df9 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -84,7 +84,7 @@ this.maintenanceDate = maintenanceDate; } - @Column(name="DUILD_CABIN") + @Column(name="BUILD_CABIN") public String getBuildCabin() { return buildCabin; } 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 13ddd03..5463995 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -16,20 +12,52 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName){ + public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgAssetInSpectionRecord.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + 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(startTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgAssetInSpectionRecordList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord(); + + pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString())); + pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1])); + pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2])); + pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3])); + pgAssetInSpectionRecord.setState(String.valueOf(objects1[4])); + pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5])); + pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6])); + pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7])); + pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8])); + pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9])); + pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10])); + pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11])); + pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12])); + pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13])); + pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14])); + pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15])); + pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16])); + pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17])); + pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18])); + pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19])); + + pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - - criteria.addOrder(Order.desc("id")); - - List pgAssetInSpectionRecordList=criteria.list(); List pgAssetInSpectionRecordDtoList=new ArrayList<>(); for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList) { @@ -45,7 +73,6 @@ } } - public List getPgAssetInSpectionRecordStaticLisByTime( String startTime, String endTime, String staticType) { @@ -91,5 +118,4 @@ return pgAssetInSpectionRecordStaticList; } - } \ No newline at end of file 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 89dbc1d..4786bca 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgMaintanceRecordHead; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadDto; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,19 +13,41 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName){ + public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgMaintanceRecordHead.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,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(startTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgMaintanceRecordHeadList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgMaintanceRecordHead pgMaintanceRecordHead=new PgMaintanceRecordHead(); + pgMaintanceRecordHead.setId(Long.valueOf(objects1[0].toString())); + pgMaintanceRecordHead.setKeyId(String.valueOf(objects1[1])); + 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.setMaintenanceDate(String.valueOf(objects1[6])); + pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); + pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); + pgMaintanceRecordHead.setCreateDate(String.valueOf(objects1[9])); + pgMaintanceRecordHead.setCreator(String.valueOf(objects1[10])); + + pgMaintanceRecordHeadList.add(pgMaintanceRecordHead); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - criteria.addOrder(Order.desc("id")); - - List pgMaintanceRecordHeadList=criteria.list(); List pgMaintanceRecordHeadDtoList=new ArrayList<>(); for(PgMaintanceRecordHead pgMaintanceRecordHead : pgMaintanceRecordHeadList) { diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + + + @@ -484,7 +513,7 @@ - + @@ -493,7 +522,7 @@ - + @@ -683,7 +712,9 @@ - @@ -941,14 +972,12 @@ - - - - 1522229072869 - 1522302183280 @@ -1286,7 +1315,14 @@ - @@ -1316,7 +1352,7 @@ - @@ -1328,10 +1364,10 @@ - + - + @@ -1343,7 +1379,7 @@ - + @@ -1354,7 +1390,7 @@ - + @@ -1428,7 +1464,6 @@ - @@ -1453,7 +1488,8 @@ - @@ -1470,6 +1506,12 @@ @@ -1483,77 +1525,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,20 +1553,8 @@ - - - - - - - - - - - - - - + + @@ -1606,27 +1569,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -1641,73 +1586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1740,14 +1618,6 @@ - - - - - - - - @@ -1769,30 +1639,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1803,16 +1649,6 @@ - - - - - - - - - - @@ -1827,17 +1663,195 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index 3cdbfe6..d43c05f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,4 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 47e6bb1..06ee17d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -107,7 +107,10 @@ this.setId(String.valueOf(pgPartition.getId())); this.setParName(pgPartition.getParName()); - this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); + if(Long.valueOf(pgPartition.getPgRoadId())==null||pgRoadManager.get(pgPartition.getPgRoadId())==null) + this.setRoad(""); + else + this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); this.setPgPosition(pgPartition.getPgPosition()); this.setPgNum(pgPartition.getPgNum()); this.setPgType(pgPartition.getPgType()); @@ -117,4 +120,4 @@ this.setActive(String.valueOf(pgPartition.getActive())); } -} +} \ No newline at end of file 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 96e8ba1..89a5df9 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -84,7 +84,7 @@ this.maintenanceDate = maintenanceDate; } - @Column(name="DUILD_CABIN") + @Column(name="BUILD_CABIN") public String getBuildCabin() { return buildCabin; } 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 13ddd03..5463995 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -16,20 +12,52 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName){ + public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgAssetInSpectionRecord.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + 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(startTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgAssetInSpectionRecordList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord(); + + pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString())); + pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1])); + pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2])); + pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3])); + pgAssetInSpectionRecord.setState(String.valueOf(objects1[4])); + pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5])); + pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6])); + pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7])); + pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8])); + pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9])); + pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10])); + pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11])); + pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12])); + pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13])); + pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14])); + pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15])); + pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16])); + pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17])); + pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18])); + pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19])); + + pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - - criteria.addOrder(Order.desc("id")); - - List pgAssetInSpectionRecordList=criteria.list(); List pgAssetInSpectionRecordDtoList=new ArrayList<>(); for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList) { @@ -45,7 +73,6 @@ } } - public List getPgAssetInSpectionRecordStaticLisByTime( String startTime, String endTime, String staticType) { @@ -91,5 +118,4 @@ return pgAssetInSpectionRecordStaticList; } - } \ No newline at end of file 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 89dbc1d..4786bca 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgMaintanceRecordHead; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadDto; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,19 +13,41 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName){ + public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgMaintanceRecordHead.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,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(startTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgMaintanceRecordHeadList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgMaintanceRecordHead pgMaintanceRecordHead=new PgMaintanceRecordHead(); + pgMaintanceRecordHead.setId(Long.valueOf(objects1[0].toString())); + pgMaintanceRecordHead.setKeyId(String.valueOf(objects1[1])); + 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.setMaintenanceDate(String.valueOf(objects1[6])); + pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); + pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); + pgMaintanceRecordHead.setCreateDate(String.valueOf(objects1[9])); + pgMaintanceRecordHead.setCreator(String.valueOf(objects1[10])); + + pgMaintanceRecordHeadList.add(pgMaintanceRecordHead); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - criteria.addOrder(Order.desc("id")); - - List pgMaintanceRecordHeadList=criteria.list(); List pgMaintanceRecordHeadDtoList=new ArrayList<>(); for(PgMaintanceRecordHead pgMaintanceRecordHead : pgMaintanceRecordHeadList) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java index 08d3c1c..e336309 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgAssetRecordList") @Produces(MediaType.APPLICATION_JSON) public Map getPgAssetRecordList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgAssetInSpectionRecordDtoList=new ArrayList<>(); try{ - pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName); + pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime); if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0) msg="巡检信息获取成功"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 696851e..08d0ea5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; @@ -40,7 +41,7 @@ @FormParam("phoneNumber") String phoneNumber, @FormParam("personType") String personType, @FormParam("assetCode") String assetCode) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; @@ -84,10 +85,10 @@ @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) public Map getInPgPerson() throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgInPgInfoDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList<>(); try { pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) @@ -140,18 +141,23 @@ String msg = ""; PgInPgPerson pgInPgPerson = null; + PgInPgPersonDto pgInPgPersonDto=null; try { pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); if (pgInPgPerson == null) msg = "不存在人员信息"; - else + else { + pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson); msg = "人员信息获取成功"; + } } catch (Exception e) { e.printStackTrace(); msg = "人员信息获取失败"; } + + resultMap.put("msg", msg); - resultMap.put("result", pgInPgPerson); + resultMap.put("result", pgInPgPersonDto); return resultMap; } diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + + + @@ -484,7 +513,7 @@ - + @@ -493,7 +522,7 @@ - + @@ -683,7 +712,9 @@ - @@ -941,14 +972,12 @@ - - - - 1522229072869 - 1522302183280 @@ -1286,7 +1315,14 @@ - @@ -1316,7 +1352,7 @@ - @@ -1328,10 +1364,10 @@ - + - + @@ -1343,7 +1379,7 @@ - + @@ -1354,7 +1390,7 @@ - + @@ -1428,7 +1464,6 @@ - @@ -1453,7 +1488,8 @@ - @@ -1470,6 +1506,12 @@ @@ -1483,77 +1525,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,20 +1553,8 @@ - - - - - - - - - - - - - - + + @@ -1606,27 +1569,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -1641,73 +1586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1740,14 +1618,6 @@ - - - - - - - - @@ -1769,30 +1639,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1803,16 +1649,6 @@ - - - - - - - - - - @@ -1827,17 +1663,195 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index 3cdbfe6..d43c05f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,4 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 47e6bb1..06ee17d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -107,7 +107,10 @@ this.setId(String.valueOf(pgPartition.getId())); this.setParName(pgPartition.getParName()); - this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); + if(Long.valueOf(pgPartition.getPgRoadId())==null||pgRoadManager.get(pgPartition.getPgRoadId())==null) + this.setRoad(""); + else + this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); this.setPgPosition(pgPartition.getPgPosition()); this.setPgNum(pgPartition.getPgNum()); this.setPgType(pgPartition.getPgType()); @@ -117,4 +120,4 @@ this.setActive(String.valueOf(pgPartition.getActive())); } -} +} \ No newline at end of file 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 96e8ba1..89a5df9 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -84,7 +84,7 @@ this.maintenanceDate = maintenanceDate; } - @Column(name="DUILD_CABIN") + @Column(name="BUILD_CABIN") public String getBuildCabin() { return buildCabin; } 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 13ddd03..5463995 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -16,20 +12,52 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName){ + public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgAssetInSpectionRecord.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + 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(startTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgAssetInSpectionRecordList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord(); + + pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString())); + pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1])); + pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2])); + pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3])); + pgAssetInSpectionRecord.setState(String.valueOf(objects1[4])); + pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5])); + pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6])); + pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7])); + pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8])); + pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9])); + pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10])); + pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11])); + pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12])); + pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13])); + pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14])); + pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15])); + pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16])); + pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17])); + pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18])); + pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19])); + + pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - - criteria.addOrder(Order.desc("id")); - - List pgAssetInSpectionRecordList=criteria.list(); List pgAssetInSpectionRecordDtoList=new ArrayList<>(); for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList) { @@ -45,7 +73,6 @@ } } - public List getPgAssetInSpectionRecordStaticLisByTime( String startTime, String endTime, String staticType) { @@ -91,5 +118,4 @@ return pgAssetInSpectionRecordStaticList; } - } \ No newline at end of file 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 89dbc1d..4786bca 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgMaintanceRecordHead; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadDto; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,19 +13,41 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName){ + public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgMaintanceRecordHead.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,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(startTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgMaintanceRecordHeadList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgMaintanceRecordHead pgMaintanceRecordHead=new PgMaintanceRecordHead(); + pgMaintanceRecordHead.setId(Long.valueOf(objects1[0].toString())); + pgMaintanceRecordHead.setKeyId(String.valueOf(objects1[1])); + 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.setMaintenanceDate(String.valueOf(objects1[6])); + pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); + pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); + pgMaintanceRecordHead.setCreateDate(String.valueOf(objects1[9])); + pgMaintanceRecordHead.setCreator(String.valueOf(objects1[10])); + + pgMaintanceRecordHeadList.add(pgMaintanceRecordHead); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - criteria.addOrder(Order.desc("id")); - - List pgMaintanceRecordHeadList=criteria.list(); List pgMaintanceRecordHeadDtoList=new ArrayList<>(); for(PgMaintanceRecordHead pgMaintanceRecordHead : pgMaintanceRecordHeadList) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java index 08d3c1c..e336309 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgAssetRecordList") @Produces(MediaType.APPLICATION_JSON) public Map getPgAssetRecordList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgAssetInSpectionRecordDtoList=new ArrayList<>(); try{ - pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName); + pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime); if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0) msg="巡检信息获取成功"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 696851e..08d0ea5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; @@ -40,7 +41,7 @@ @FormParam("phoneNumber") String phoneNumber, @FormParam("personType") String personType, @FormParam("assetCode") String assetCode) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; @@ -84,10 +85,10 @@ @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) public Map getInPgPerson() throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgInPgInfoDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList<>(); try { pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) @@ -140,18 +141,23 @@ String msg = ""; PgInPgPerson pgInPgPerson = null; + PgInPgPersonDto pgInPgPersonDto=null; try { pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); if (pgInPgPerson == null) msg = "不存在人员信息"; - else + else { + pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson); msg = "人员信息获取成功"; + } } catch (Exception e) { e.printStackTrace(); msg = "人员信息获取失败"; } + + resultMap.put("msg", msg); - resultMap.put("result", pgInPgPerson); + resultMap.put("result", pgInPgPersonDto); 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 c2ac8fc..d741777 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgMaintanceList") @Produces(MediaType.APPLICATION_JSON) public Map getPgMaintanceList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgMaintanceRecordHeadDtoList=new ArrayList<>(); try{ - pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName); + pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime); if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0) msg="维护信息获取成功"; else diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..c9ecddb --- /dev/null +++ "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + + + @@ -484,7 +513,7 @@ - + @@ -493,7 +522,7 @@ - + @@ -683,7 +712,9 @@ - @@ -941,14 +972,12 @@ - - - - 1522229072869 - 1522302183280 @@ -1286,7 +1315,14 @@ - @@ -1316,7 +1352,7 @@ - @@ -1328,10 +1364,10 @@ - + - + @@ -1343,7 +1379,7 @@ - + @@ -1354,7 +1390,7 @@ - + @@ -1428,7 +1464,6 @@ - @@ -1453,7 +1488,8 @@ - @@ -1470,6 +1506,12 @@ @@ -1483,77 +1525,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,20 +1553,8 @@ - - - - - - - - - - - - - - + + @@ -1606,27 +1569,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -1641,73 +1586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1740,14 +1618,6 @@ - - - - - - - - @@ -1769,30 +1639,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1803,16 +1649,6 @@ - - - - - - - - - - @@ -1827,17 +1663,195 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index 3cdbfe6..d43c05f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,4 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 47e6bb1..06ee17d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -107,7 +107,10 @@ this.setId(String.valueOf(pgPartition.getId())); this.setParName(pgPartition.getParName()); - this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); + if(Long.valueOf(pgPartition.getPgRoadId())==null||pgRoadManager.get(pgPartition.getPgRoadId())==null) + this.setRoad(""); + else + this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); this.setPgPosition(pgPartition.getPgPosition()); this.setPgNum(pgPartition.getPgNum()); this.setPgType(pgPartition.getPgType()); @@ -117,4 +120,4 @@ this.setActive(String.valueOf(pgPartition.getActive())); } -} +} \ No newline at end of file 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 96e8ba1..89a5df9 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -84,7 +84,7 @@ this.maintenanceDate = maintenanceDate; } - @Column(name="DUILD_CABIN") + @Column(name="BUILD_CABIN") public String getBuildCabin() { return buildCabin; } 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 13ddd03..5463995 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -16,20 +12,52 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName){ + public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgAssetInSpectionRecord.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + 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(startTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgAssetInSpectionRecordList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord(); + + pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString())); + pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1])); + pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2])); + pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3])); + pgAssetInSpectionRecord.setState(String.valueOf(objects1[4])); + pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5])); + pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6])); + pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7])); + pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8])); + pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9])); + pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10])); + pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11])); + pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12])); + pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13])); + pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14])); + pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15])); + pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16])); + pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17])); + pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18])); + pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19])); + + pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - - criteria.addOrder(Order.desc("id")); - - List pgAssetInSpectionRecordList=criteria.list(); List pgAssetInSpectionRecordDtoList=new ArrayList<>(); for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList) { @@ -45,7 +73,6 @@ } } - public List getPgAssetInSpectionRecordStaticLisByTime( String startTime, String endTime, String staticType) { @@ -91,5 +118,4 @@ return pgAssetInSpectionRecordStaticList; } - } \ No newline at end of file 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 89dbc1d..4786bca 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgMaintanceRecordHead; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadDto; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,19 +13,41 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName){ + public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgMaintanceRecordHead.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,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(startTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgMaintanceRecordHeadList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgMaintanceRecordHead pgMaintanceRecordHead=new PgMaintanceRecordHead(); + pgMaintanceRecordHead.setId(Long.valueOf(objects1[0].toString())); + pgMaintanceRecordHead.setKeyId(String.valueOf(objects1[1])); + 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.setMaintenanceDate(String.valueOf(objects1[6])); + pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); + pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); + pgMaintanceRecordHead.setCreateDate(String.valueOf(objects1[9])); + pgMaintanceRecordHead.setCreator(String.valueOf(objects1[10])); + + pgMaintanceRecordHeadList.add(pgMaintanceRecordHead); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - criteria.addOrder(Order.desc("id")); - - List pgMaintanceRecordHeadList=criteria.list(); List pgMaintanceRecordHeadDtoList=new ArrayList<>(); for(PgMaintanceRecordHead pgMaintanceRecordHead : pgMaintanceRecordHeadList) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java index 08d3c1c..e336309 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgAssetRecordList") @Produces(MediaType.APPLICATION_JSON) public Map getPgAssetRecordList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgAssetInSpectionRecordDtoList=new ArrayList<>(); try{ - pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName); + pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime); if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0) msg="巡检信息获取成功"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 696851e..08d0ea5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; @@ -40,7 +41,7 @@ @FormParam("phoneNumber") String phoneNumber, @FormParam("personType") String personType, @FormParam("assetCode") String assetCode) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; @@ -84,10 +85,10 @@ @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) public Map getInPgPerson() throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgInPgInfoDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList<>(); try { pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) @@ -140,18 +141,23 @@ String msg = ""; PgInPgPerson pgInPgPerson = null; + PgInPgPersonDto pgInPgPersonDto=null; try { pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); if (pgInPgPerson == null) msg = "不存在人员信息"; - else + else { + pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson); msg = "人员信息获取成功"; + } } catch (Exception e) { e.printStackTrace(); msg = "人员信息获取失败"; } + + resultMap.put("msg", msg); - resultMap.put("result", pgInPgPerson); + resultMap.put("result", pgInPgPersonDto); 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 c2ac8fc..d741777 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgMaintanceList") @Produces(MediaType.APPLICATION_JSON) public Map getPgMaintanceList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgMaintanceRecordHeadDtoList=new ArrayList<>(); try{ - pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName); + pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime); if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0) msg="维护信息获取成功"; else diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..c9ecddb --- /dev/null +++ "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git "a/~$\350\257\264\346\230\21620181120.docx" "b/~$\350\257\264\346\230\21620181120.docx" new file mode 100644 index 0000000..c9ecddb --- /dev/null +++ "b/~$\350\257\264\346\230\21620181120.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" new file mode 100644 index 0000000..1e9d27c --- /dev/null +++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + + + @@ -484,7 +513,7 @@ - + @@ -493,7 +522,7 @@ - + @@ -683,7 +712,9 @@ - @@ -941,14 +972,12 @@ - - - - 1522229072869 - 1522302183280 @@ -1286,7 +1315,14 @@ - @@ -1316,7 +1352,7 @@ - @@ -1328,10 +1364,10 @@ - + - + @@ -1343,7 +1379,7 @@ - + @@ -1354,7 +1390,7 @@ - + @@ -1428,7 +1464,6 @@ - @@ -1453,7 +1488,8 @@ - @@ -1470,6 +1506,12 @@ @@ -1483,77 +1525,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,20 +1553,8 @@ - - - - - - - - - - - - - - + + @@ -1606,27 +1569,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -1641,73 +1586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1740,14 +1618,6 @@ - - - - - - - - @@ -1769,30 +1639,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1803,16 +1649,6 @@ - - - - - - - - - - @@ -1827,17 +1663,195 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index 3cdbfe6..d43c05f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,4 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 47e6bb1..06ee17d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -107,7 +107,10 @@ this.setId(String.valueOf(pgPartition.getId())); this.setParName(pgPartition.getParName()); - this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); + if(Long.valueOf(pgPartition.getPgRoadId())==null||pgRoadManager.get(pgPartition.getPgRoadId())==null) + this.setRoad(""); + else + this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); this.setPgPosition(pgPartition.getPgPosition()); this.setPgNum(pgPartition.getPgNum()); this.setPgType(pgPartition.getPgType()); @@ -117,4 +120,4 @@ this.setActive(String.valueOf(pgPartition.getActive())); } -} +} \ No newline at end of file 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 96e8ba1..89a5df9 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -84,7 +84,7 @@ this.maintenanceDate = maintenanceDate; } - @Column(name="DUILD_CABIN") + @Column(name="BUILD_CABIN") public String getBuildCabin() { return buildCabin; } 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 13ddd03..5463995 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -16,20 +12,52 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName){ + public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgAssetInSpectionRecord.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + 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(startTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgAssetInSpectionRecordList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord(); + + pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString())); + pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1])); + pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2])); + pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3])); + pgAssetInSpectionRecord.setState(String.valueOf(objects1[4])); + pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5])); + pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6])); + pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7])); + pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8])); + pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9])); + pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10])); + pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11])); + pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12])); + pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13])); + pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14])); + pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15])); + pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16])); + pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17])); + pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18])); + pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19])); + + pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - - criteria.addOrder(Order.desc("id")); - - List pgAssetInSpectionRecordList=criteria.list(); List pgAssetInSpectionRecordDtoList=new ArrayList<>(); for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList) { @@ -45,7 +73,6 @@ } } - public List getPgAssetInSpectionRecordStaticLisByTime( String startTime, String endTime, String staticType) { @@ -91,5 +118,4 @@ return pgAssetInSpectionRecordStaticList; } - } \ No newline at end of file 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 89dbc1d..4786bca 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgMaintanceRecordHead; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadDto; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,19 +13,41 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName){ + public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgMaintanceRecordHead.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,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(startTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgMaintanceRecordHeadList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgMaintanceRecordHead pgMaintanceRecordHead=new PgMaintanceRecordHead(); + pgMaintanceRecordHead.setId(Long.valueOf(objects1[0].toString())); + pgMaintanceRecordHead.setKeyId(String.valueOf(objects1[1])); + 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.setMaintenanceDate(String.valueOf(objects1[6])); + pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); + pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); + pgMaintanceRecordHead.setCreateDate(String.valueOf(objects1[9])); + pgMaintanceRecordHead.setCreator(String.valueOf(objects1[10])); + + pgMaintanceRecordHeadList.add(pgMaintanceRecordHead); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - criteria.addOrder(Order.desc("id")); - - List pgMaintanceRecordHeadList=criteria.list(); List pgMaintanceRecordHeadDtoList=new ArrayList<>(); for(PgMaintanceRecordHead pgMaintanceRecordHead : pgMaintanceRecordHeadList) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java index 08d3c1c..e336309 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgAssetRecordList") @Produces(MediaType.APPLICATION_JSON) public Map getPgAssetRecordList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgAssetInSpectionRecordDtoList=new ArrayList<>(); try{ - pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName); + pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime); if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0) msg="巡检信息获取成功"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 696851e..08d0ea5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; @@ -40,7 +41,7 @@ @FormParam("phoneNumber") String phoneNumber, @FormParam("personType") String personType, @FormParam("assetCode") String assetCode) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; @@ -84,10 +85,10 @@ @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) public Map getInPgPerson() throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgInPgInfoDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList<>(); try { pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) @@ -140,18 +141,23 @@ String msg = ""; PgInPgPerson pgInPgPerson = null; + PgInPgPersonDto pgInPgPersonDto=null; try { pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); if (pgInPgPerson == null) msg = "不存在人员信息"; - else + else { + pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson); msg = "人员信息获取成功"; + } } catch (Exception e) { e.printStackTrace(); msg = "人员信息获取失败"; } + + resultMap.put("msg", msg); - resultMap.put("result", pgInPgPerson); + resultMap.put("result", pgInPgPersonDto); 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 c2ac8fc..d741777 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgMaintanceList") @Produces(MediaType.APPLICATION_JSON) public Map getPgMaintanceList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgMaintanceRecordHeadDtoList=new ArrayList<>(); try{ - pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName); + pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime); if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0) msg="维护信息获取成功"; else diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..c9ecddb --- /dev/null +++ "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git "a/~$\350\257\264\346\230\21620181120.docx" "b/~$\350\257\264\346\230\21620181120.docx" new file mode 100644 index 0000000..c9ecddb --- /dev/null +++ "b/~$\350\257\264\346\230\21620181120.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" new file mode 100644 index 0000000..1e9d27c --- /dev/null +++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" deleted file mode 100644 index aa2a92c..0000000 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ /dev/null 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\21620181120.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\21620181120.docx" new file mode 100644 index 0000000..70b12e0 --- /dev/null +++ "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\21620181120.docx" Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + + + @@ -484,7 +513,7 @@ - + @@ -493,7 +522,7 @@ - + @@ -683,7 +712,9 @@ - @@ -941,14 +972,12 @@ - - - - 1522229072869 - 1522302183280 @@ -1286,7 +1315,14 @@ - @@ -1316,7 +1352,7 @@ - @@ -1328,10 +1364,10 @@ - + - + @@ -1343,7 +1379,7 @@ - + @@ -1354,7 +1390,7 @@ - + @@ -1428,7 +1464,6 @@ - @@ -1453,7 +1488,8 @@ - @@ -1470,6 +1506,12 @@ @@ -1483,77 +1525,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1578,20 +1553,8 @@ - - - - - - - - - - - - - - + + @@ -1606,27 +1569,9 @@ - - - - - - - - - - - - - - - - - - - - - + + + @@ -1641,73 +1586,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1740,14 +1618,6 @@ - - - - - - - - @@ -1769,30 +1639,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -1803,16 +1649,6 @@ - - - - - - - - - - @@ -1827,17 +1663,195 @@ - + - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java index 3cdbfe6..d43c05f 100644 --- a/src/main/java/com/casic/PgInterface/core/util/DateUtils.java +++ b/src/main/java/com/casic/PgInterface/core/util/DateUtils.java @@ -9,4 +9,4 @@ public static SimpleDateFormat sdf_day = new SimpleDateFormat("yyyy-MM-dd"); public static SimpleDateFormat sdf_day_time = new SimpleDateFormat("yyyyMMddhhmmss"); public static final SimpleDateFormat sdf4 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -} +} \ No newline at end of file diff --git a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java index 47e6bb1..06ee17d 100644 --- a/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java +++ b/src/main/java/com/casic/PgInterface/devTable/dto/PgPartitionDto.java @@ -107,7 +107,10 @@ this.setId(String.valueOf(pgPartition.getId())); this.setParName(pgPartition.getParName()); - this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); + if(Long.valueOf(pgPartition.getPgRoadId())==null||pgRoadManager.get(pgPartition.getPgRoadId())==null) + this.setRoad(""); + else + this.setRoad(pgRoadManager.get(pgPartition.getPgRoadId()).getRoadName()); this.setPgPosition(pgPartition.getPgPosition()); this.setPgNum(pgPartition.getPgNum()); this.setPgType(pgPartition.getPgType()); @@ -117,4 +120,4 @@ this.setActive(String.valueOf(pgPartition.getActive())); } -} +} \ No newline at end of file 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 96e8ba1..89a5df9 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java +++ b/src/main/java/com/casic/PgInterface/maintenance/domain/PgMaintanceRecordHead.java @@ -84,7 +84,7 @@ this.maintenanceDate = maintenanceDate; } - @Column(name="DUILD_CABIN") + @Column(name="BUILD_CABIN") public String getBuildCabin() { return buildCabin; } 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 13ddd03..5463995 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgAssetInSpectionRecordManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgAssetInSpectionRecord; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordDto; import com.casic.PgInterface.maintenance.dto.PgAssetInSpectionRecordStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -16,20 +12,52 @@ @Service public class PgAssetInSpectionRecordManager extends HibernateEntityDao { - public List getPgAssetInSpectionRecordLsit(String recordNo, String planName){ + public List getPgAssetInSpectionRecordLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgAssetInSpectionRecord.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + 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(startTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(create_date,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgAssetInSpectionRecordList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgAssetInSpectionRecord pgAssetInSpectionRecord=new PgAssetInSpectionRecord(); + + pgAssetInSpectionRecord.setId(Long.valueOf(objects1[0].toString())); + pgAssetInSpectionRecord.setKeyId(String.valueOf(objects1[1])); + pgAssetInSpectionRecord.setPlanId(String.valueOf(objects1[2])); + pgAssetInSpectionRecord.setCreateDate(String.valueOf(objects1[3])); + pgAssetInSpectionRecord.setState(String.valueOf(objects1[4])); + pgAssetInSpectionRecord.setCreator(String.valueOf(objects1[5])); + pgAssetInSpectionRecord.setPlanName(String.valueOf(objects1[6])); + pgAssetInSpectionRecord.setRecordNo(String.valueOf(objects1[7])); + pgAssetInSpectionRecord.setPlanNo(String.valueOf(objects1[8])); + pgAssetInSpectionRecord.setResponsibleDept(String.valueOf(objects1[9])); + pgAssetInSpectionRecord.setInspectionPerson(String.valueOf(objects1[10])); + pgAssetInSpectionRecord.setPatrolMan(String.valueOf(objects1[11])); + pgAssetInSpectionRecord.setOperateDate(String.valueOf(objects1[12])); + pgAssetInSpectionRecord.setRemark(String.valueOf(objects1[13])); + pgAssetInSpectionRecord.setBuildCabin(String.valueOf(objects1[14])); + pgAssetInSpectionRecord.setProject(String.valueOf(objects1[15])); + pgAssetInSpectionRecord.setStartPileNo(String.valueOf(objects1[16])); + pgAssetInSpectionRecord.setEndPileNo(String.valueOf(objects1[17])); + pgAssetInSpectionRecord.setInspectionPrace(String.valueOf(objects1[18])); + pgAssetInSpectionRecord.setOtherPatrolMan(String.valueOf(objects1[19])); + + pgAssetInSpectionRecordList.add(pgAssetInSpectionRecord); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - - criteria.addOrder(Order.desc("id")); - - List pgAssetInSpectionRecordList=criteria.list(); List pgAssetInSpectionRecordDtoList=new ArrayList<>(); for(PgAssetInSpectionRecord pgAssetInSpectionRecord : pgAssetInSpectionRecordList) { @@ -45,7 +73,6 @@ } } - public List getPgAssetInSpectionRecordStaticLisByTime( String startTime, String endTime, String staticType) { @@ -91,5 +118,4 @@ return pgAssetInSpectionRecordStaticList; } - } \ No newline at end of file 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 89dbc1d..4786bca 100644 --- a/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java +++ b/src/main/java/com/casic/PgInterface/maintenance/manager/PgMaintanceRecordHeadManager.java @@ -1,13 +1,9 @@ package com.casic.PgInterface.maintenance.manager; import com.casic.PgInterface.core.hibernate.HibernateEntityDao; -import com.casic.PgInterface.core.util.StringUtils; import com.casic.PgInterface.maintenance.domain.PgMaintanceRecordHead; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadDto; import com.casic.PgInterface.maintenance.dto.PgMaintanceRecordHeadStatic; -import org.hibernate.Criteria; -import org.hibernate.criterion.Order; -import org.hibernate.criterion.Restrictions; import org.springframework.stereotype.Service; import java.util.ArrayList; @@ -17,19 +13,41 @@ public class PgMaintanceRecordHeadManager extends HibernateEntityDao { - public List getPgMaintanceRecordHeadLsit(String recordNo, String planName){ + public List getPgMaintanceRecordHeadLsit(String recordNo, String planName,String startTime,String endTime){ try { - Criteria criteria = createCriteria(PgMaintanceRecordHead.class); - if (StringUtils.isNotBlank(recordNo)) { - criteria.add(Restrictions.eq("recordNo", recordNo)); + String sql="select ID,KEY_ID,PLAN_KEY_ID,PLAN_NAME,RECORD_NO,REOAIRMAN,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(startTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd')>to_date('"+startTime+"','yyyy-MM-dd')"; + if(endTime!=null) + sql+=" and to_date(CREATEDATE,'yyyy-MM-dd') objects=this.getSession().createSQLQuery(sql).list(); + + List pgMaintanceRecordHeadList=new ArrayList<>(); + for(Object[] objects1:objects){ + PgMaintanceRecordHead pgMaintanceRecordHead=new PgMaintanceRecordHead(); + pgMaintanceRecordHead.setId(Long.valueOf(objects1[0].toString())); + pgMaintanceRecordHead.setKeyId(String.valueOf(objects1[1])); + 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.setMaintenanceDate(String.valueOf(objects1[6])); + pgMaintanceRecordHead.setBuildCabin(String.valueOf(objects1[7])); + pgMaintanceRecordHead.setProject(String.valueOf(objects1[8])); + pgMaintanceRecordHead.setCreateDate(String.valueOf(objects1[9])); + pgMaintanceRecordHead.setCreator(String.valueOf(objects1[10])); + + pgMaintanceRecordHeadList.add(pgMaintanceRecordHead); } - if (StringUtils.isNotBlank(planName)) { - criteria.add(Restrictions.ge("planName", planName)); - } - criteria.addOrder(Order.desc("id")); - - List pgMaintanceRecordHeadList=criteria.list(); List pgMaintanceRecordHeadDtoList=new ArrayList<>(); for(PgMaintanceRecordHead pgMaintanceRecordHead : pgMaintanceRecordHeadList) { diff --git a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java index 08d3c1c..e336309 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgAssetRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgAssetRecordList") @Produces(MediaType.APPLICATION_JSON) public Map getPgAssetRecordList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgAssetInSpectionRecordDtoList=new ArrayList<>(); try{ - pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName); + pgAssetInSpectionRecordDtoList=pgAssetInSpectionRecordManager.getPgAssetInSpectionRecordLsit(recordNo,planName,startTime,endTime); if(pgAssetInSpectionRecordDtoList!=null&&pgAssetInSpectionRecordDtoList.size()!=0) msg="巡检信息获取成功"; else diff --git a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java index 696851e..08d0ea5 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgInPgPersonRs.java @@ -3,6 +3,7 @@ import com.casic.PgInterface.patroler.domain.PgInPgPerson; import com.casic.PgInterface.patroler.domain.PgInPgStatus; import com.casic.PgInterface.patroler.dto.PgInPgInfoDto; +import com.casic.PgInterface.patroler.dto.PgInPgPersonDto; import com.casic.PgInterface.patroler.manager.PgInPgPersonManager; import com.casic.PgInterface.patroler.manager.PgInPgStatusManager; import org.springframework.stereotype.Component; @@ -40,7 +41,7 @@ @FormParam("phoneNumber") String phoneNumber, @FormParam("personType") String personType, @FormParam("assetCode") String assetCode) throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String result = ""; String msg = ""; @@ -84,10 +85,10 @@ @Path("getInPgPerson") @Produces(MediaType.APPLICATION_JSON) public Map getInPgPerson() throws Exception { - Map resultMap = new HashMap(); + Map resultMap = new HashMap<>(); String msg = ""; - List pgInPgInfoDtoList = new ArrayList(); + List pgInPgInfoDtoList = new ArrayList<>(); try { pgInPgInfoDtoList = pgInPgPersonManager.getPgInPersonList(0); if (pgInPgInfoDtoList == null || pgInPgInfoDtoList.size() == 0) @@ -140,18 +141,23 @@ String msg = ""; PgInPgPerson pgInPgPerson = null; + PgInPgPersonDto pgInPgPersonDto=null; try { pgInPgPerson = pgInPgPersonManager.getPersonByUserName(userName); if (pgInPgPerson == null) msg = "不存在人员信息"; - else + else { + pgInPgPersonDto=new PgInPgPersonDto(pgInPgPerson); msg = "人员信息获取成功"; + } } catch (Exception e) { e.printStackTrace(); msg = "人员信息获取失败"; } + + resultMap.put("msg", msg); - resultMap.put("result", pgInPgPerson); + resultMap.put("result", pgInPgPersonDto); 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 c2ac8fc..d741777 100644 --- a/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java +++ b/src/main/java/com/casic/PgInterface/rs/PgMaintanceRecordRs.java @@ -29,13 +29,15 @@ @Path("getPgMaintanceList") @Produces(MediaType.APPLICATION_JSON) public Map getPgMaintanceList(@FormParam("recordNo") String recordNo, - @FormParam("planName") String planName){ + @FormParam("planName") String planName, + @FormParam("startTime") String startTime, + @FormParam("endTime") String endTime){ Map resultMap=new HashMap<>(); String msg=""; List pgMaintanceRecordHeadDtoList=new ArrayList<>(); try{ - pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName); + pgMaintanceRecordHeadDtoList=pgMaintanceRecordHeadManager.getPgMaintanceRecordHeadLsit(recordNo,planName,startTime,endTime); if(pgMaintanceRecordHeadDtoList!=null&&pgMaintanceRecordHeadDtoList.size()!=0) msg="维护信息获取成功"; else diff --git "a/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" new file mode 100644 index 0000000..c9ecddb --- /dev/null +++ "b/~$\346\216\247\345\210\266\346\216\245\345\217\243\350\257\264\346\230\216.docx" Binary files differ diff --git "a/~$\350\257\264\346\230\21620181120.docx" "b/~$\350\257\264\346\230\21620181120.docx" new file mode 100644 index 0000000..c9ecddb --- /dev/null +++ "b/~$\350\257\264\346\230\21620181120.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" new file mode 100644 index 0000000..1e9d27c --- /dev/null +++ "b/\346\216\245\345\217\243\350\257\264\346\230\21620181120.docx" Binary files differ diff --git "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" "b/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" deleted file mode 100644 index aa2a92c..0000000 --- "a/\346\216\245\345\217\243\350\257\264\346\230\216\346\226\260\351\234\200\346\261\202.docx" +++ /dev/null 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\21620181120.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\21620181120.docx" new file mode 100644 index 0000000..70b12e0 --- /dev/null +++ "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\21620181120.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\216\346\226\260\351\234\200\346\261\202.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\216\346\226\260\351\234\200\346\261\202.docx" deleted file mode 100644 index 70b12e0..0000000 --- "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\216\346\226\260\351\234\200\346\261\202.docx" +++ /dev/null Binary files differ diff --git "a/\350\256\276\345\244\207\346\216\247\345\210\266\346\216\245\345\217\243.docx" "b/\350\256\276\345\244\207\346\216\247\345\210\266\346\216\245\345\217\243.docx" deleted file mode 100644 index f0ff4e8..0000000 --- "a/\350\256\276\345\244\207\346\216\247\345\210\266\346\216\245\345\217\243.docx" +++ /dev/null Binary files differ diff --git a/.idea/misc.xml b/.idea/misc.xml index 9da4340..3b47332 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -29,7 +29,7 @@ - + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index f9ed8bc..ae60eb8 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -6,61 +6,20 @@ - - - - - - + + - - - - - - - + + - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -94,38 +53,43 @@ - + + + + + + - + - + - + - + @@ -133,8 +97,8 @@ - - + + @@ -145,21 +109,21 @@ - - + + - + - + - + @@ -171,28 +135,67 @@ - + - - - - - - - - - - - + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -257,9 +260,6 @@ @@ -347,10 +350,10 @@ - @@ -377,7 +380,6 @@ - @@ -418,7 +420,7 @@ - + @@ -427,7 +429,16 @@ - + + + + + + + + + + @@ -437,7 +448,7 @@ - + @@ -447,12 +458,30 @@ + + + + + + + + + + + + + + + + +