skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/SgDeviceSearchDTO.java
@@ -1,11 +1,17 @@ package cn.gistack.sm.sg.DTO; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; /** * 施工设备查询类 */ @Data @AllArgsConstructor @NoArgsConstructor @Builder public class SgDeviceSearchDTO { private String deviceName; private String deviceType; skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/VO/SgProjectInfoVO.java
@@ -32,4 +32,5 @@ private String Ptype; private String PtypeName; private Integer resubmit; private Integer sort; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxMapper.xml
@@ -3,7 +3,7 @@ <mapper namespace="cn.gistack.sm.sg.mapper.SgGxMapper"> <select id="queryPageList" resultType="cn.gistack.sm.sg.VO.SgGxVO"> select * from YWXT.SG_GX gx where 1=1 and GX_TYPE not in('sgzb','sgys') select * from YWXT.SG_GX gx where 1=1 and GX_TYPE not in('cldw','sgys') <if test="dto.gxType != null and dto.gxType != ''"> and gx.gx_type = #{dto.gxType} <if test="dto.childTypeList != null and !dto.childTypeList.isEmpty()"> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgGxStepMapper.xml
@@ -38,7 +38,7 @@ <select id="getDEviceGXtwo" resultType="cn.gistack.sm.sg.DO.SgGxStepDO"> select step.*,GX.GX_TYPE from YWXT.SG_GX_STEP step left join YWXT.SG_GX GX ON step.GX_INFO_ID = GX.ID where GX.GX_TYPE in ('sgzb','sgys') order by id asc GX.GX_TYPE in ('cldw','sgys') order by id asc </select> <select id="queryStepLists" resultType="cn.gistack.sm.sg.DO.SgGxStepDO"> skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectInfoMapper.xml
@@ -132,7 +132,8 @@ re.id AS reportId, pro.lon_lat, re.resubmit, d.price d.price, Pdict.sort FROM ywxt.sg_project_info pro LEFT JOIN SJZT_DW."dim_res_info_a" dria ON dria."res_cd" = pro.sk_id skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProjectPersonConfigMapper.xml
@@ -36,7 +36,7 @@ FROM ywxt.sg_project_info pro inner JOIN ywxt.sg_device d ON pro.id = d.program_id Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type or sgc.gx_device_type in ('sgzb','sgys') Left JOIN ywxt.sg_gx_config sgc ON d.device_type = sgc.gx_device_type or sgc.gx_device_type in ('cldw','sgys') left join ywxt.blade_role ro on ro.id = sgc.role_id left join ywxt.sg_project_person_config sppc on sgc.role_id = sppc.rold_id and sppc.program_id = pro.id left join ywxt.blade_user bu on sppc.user_id = bu.id skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgDeviceServiceImpl.java
@@ -52,8 +52,6 @@ @Override public List<SgDeviceDO> getDeviceList(String programId) { List<SgDeviceDO> list = new ArrayList<>(); QueryWrapper<SgDeviceDO> queryWrapper = new QueryWrapper<>(); queryWrapper.eq("program_id", programId); SgDeviceDO sg1 = new SgDeviceDO(); sg1.setId((long) 999); sg1.setDeviceName("测量定位"); @@ -61,7 +59,7 @@ sg1.setStatus(0); list.add(sg1); List<SgDeviceDO> sgDeviceDOS = baseMapper.selectList(queryWrapper); List<SgDeviceDO> sgDeviceDOS = baseMapper.queryPageList(null,SgDeviceSearchDTO.builder().projectId(programId).build()); if (CollectionUtils.isNotEmpty(sgDeviceDOS)) { list.addAll(sgDeviceDOS); } @@ -86,7 +84,7 @@ if(deviceId.equals("998")){ return sgGxStepMapper.queryStepLists("sgys"); }else if (deviceId.equals("999")){ return sgGxStepMapper.queryStepLists("sgzb"); return sgGxStepMapper.queryStepLists("cldw"); } List<SgGxStepDO> sgGxStepDOS = sgGxStepMapper.queryStepList(deviceId); return sgGxStepDOS; skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -285,7 +285,7 @@ } //加个项目及设备的状态判断 方便统计计算 if(gxStepId != 32 && if(gxStepId != 20 && gxStepId != 26 ) { if (sgDeviceDO != null && sgDeviceDO.getStatus() == 0) { sgDeviceDO.setStatus(1); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -162,7 +162,7 @@ public List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO) { List<PreAcceVO> palist = new ArrayList<>(); List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject( searchDTO); palist.add(handleQuery(25, list.get(0).getId())); palist.add(handleQuery(20, list.get(0).getId())); palist.add(handleQuery(26, list.get(0).getId())); List<SgProjectInfoDO> projectProgress = getProjectProgress(list); projectProgress.forEach(s->{ @@ -180,8 +180,11 @@ */ @NotNull public List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) { List<SgProjectInfoVO> sortedList = list.stream() .sorted(Comparator.comparing(SgProjectInfoVO::getSort)) .collect(Collectors.toList()); //项目分组 Map<Long, List<SgProjectInfoVO>> projectMap = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId)); Map<Long, List<SgProjectInfoVO>> projectMap = sortedList.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId)); List<SgProjectInfoDO> result = new ArrayList<>(); for (Map.Entry<Long, List<SgProjectInfoVO>> entry : projectMap.entrySet()) { List<SgDeviceDO> allDevice = new ArrayList<>(); @@ -210,6 +213,7 @@ if (CollectionUtils.isEmpty(gxList)){ continue; } gxList = list.stream().sorted(Comparator.comparing(SgProjectInfoVO::getPrice)).collect(Collectors.toList()); SgTypeVO typeVO = SgTypeVO.builder().typeName(gxList.get(0).getTypeName()).build(); List<SgDeviceDO> deviceDOS = new ArrayList<>(); //设备分组 @@ -676,7 +680,7 @@ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(stepIdForNull); preAcceVO.setName(sgGxStepDO.getGxStepName()); preAcceVO.setProgramId(programId); preAcceVO.setGxDeviceId(stepIdForNull != 25? (long)998:(long)999); preAcceVO.setGxDeviceId(stepIdForNull != 20? (long)998:(long)999); preAcceVO.setGxStepId(sgGxStepDO.getId()); }
