java110-db/src/main/resources/mapper/community/InspectionPlanV1ServiceDaoImplMapper.xml
@@ -363,4 +363,146 @@ </if> </select> <select id="queryRouteInspectionPlansCount" parameterType="Map" resultType="Map"> select count(1) count from inspection_plan t left join inspection_route ir on t.inspection_route_id = ir.inspection_route_id and ir.status_cd = '0' where 1=1 and ir.inspection_route_id = #{inspectionRouteId} <if test="inspectionPlanName !=null and inspectionPlanName != ''"> and t.inspection_plan_name= #{inspectionPlanName} </if> <if test="createUserId !=null and createUserId != ''"> and t.create_user_id= #{createUserId} </if> <if test="canReexamine !=null and canReexamine != ''"> and t.can_reexamine= #{canReexamine} </if> <if test="inspectionRouteId !=null and inspectionRouteId != ''"> and t.inspection_route_id= #{inspectionRouteId} </if> <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod != ''"> and t.inspection_plan_period= #{inspectionPlanPeriod} </if> <if test="remark !=null and remark != ''"> and t.remark= #{remark} </if> <if test="createUserName !=null and createUserName != ''"> and t.create_user_name= #{createUserName} </if> <if test="statusCd !=null and statusCd != ''"> and t.status_cd= #{statusCd} </if> <if test="signType !=null and signType != ''"> and t.sign_type= #{signType} </if> <if test="startTime !=null and startTime != ''"> and t.start_time= #{startTime} </if> <if test="inspectionPlanId !=null and inspectionPlanId != ''"> and t.inspection_plan_id= #{inspectionPlanId} </if> <if test="endTime !=null and endTime != ''"> and t.end_time= #{endTime} </if> <if test="startDate !=null and startDate != ''"> and t.start_date= #{startDate} </if> <if test="endDate !=null and endDate != ''"> and t.end_date= #{endDate} </if> <if test="state !=null and state != ''"> and t.state= #{state} </if> <if test="communityId !=null and communityId != ''"> and t.community_id= #{communityId} </if> <if test="beforeTime !=null and beforeTime != ''"> and t.before_time = #{beforeTime} </if> </select> <select id="queryRouteInspectionPlans" parameterType="Map" resultType="Map"> select t.inspection_plan_name,t.inspection_plan_name inspectionPlanName,t.create_user_id,t.create_user_id createUserId,t.inspection_route_id,t.inspection_route_id inspectionRouteId ,t.can_reexamine,t.can_reexamine canReexamine,t.inspection_plan_period,t.inspection_plan_period inspectionPlanPeriod,t.remark,t.create_user_name,t.create_user_name createUserName,t.status_cd,t.status_cd statusCd,t.sign_type,t.sign_type signType,t.start_time,t.start_time startTime,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.end_time,t.end_time endTime,t.state,t.community_id,t.community_id communityId, DATE_FORMAT(t.start_date,'%Y-%m-%d') startDate,DATE_FORMAT(t.end_date,'%Y-%m-%d') endDate,t.inspection_month inspectionMonth,t.inspection_day inspectionDay, t.inspection_workday inspectionWorkday,t.before_time beforeTime,t.create_time createTime, d.name stateName, c.name inspectionPlanPeriodName, i.name signTypeName, ir.route_name inspectionRouteName from inspection_plan t left join inspection_route ir on t.inspection_route_id = ir.inspection_route_id and ir.status_cd = '0' inner join t_dict d on t.state = d.status_cd and d.table_name = 'inspection_plan' and d.table_columns = 'state' inner join t_dict c on t.inspection_plan_period = c.status_cd and c.table_name = 'inspection_plan' and c.table_columns = 'inspection_plan_period' inner join t_dict i on t.sign_type = i.status_cd and i.table_name = 'inspection_plan' and i.table_columns = 'sign_type' where 1=1 and ir.inspection_route_id = #{inspectionRouteId} <if test="inspectionPlanName !=null and inspectionPlanName != ''"> and t.inspection_plan_name= #{inspectionPlanName} </if> <if test="createUserId !=null and createUserId != ''"> and t.create_user_id= #{createUserId} </if> <if test="canReexamine !=null and canReexamine != ''"> and t.can_reexamine= #{canReexamine} </if> <if test="inspectionRouteId !=null and inspectionRouteId != ''"> and t.inspection_route_id= #{inspectionRouteId} </if> <if test="inspectionPlanPeriod !=null and inspectionPlanPeriod != ''"> and t.inspection_plan_period= #{inspectionPlanPeriod} </if> <if test="remark !=null and remark != ''"> and t.remark= #{remark} </if> <if test="createUserName !=null and createUserName != ''"> and t.create_user_name= #{createUserName} </if> <if test="statusCd !=null and statusCd != ''"> and t.status_cd= #{statusCd} </if> <if test="signType !=null and signType != ''"> and t.sign_type= #{signType} </if> <if test="startTime !=null and startTime != ''"> and t.start_time= #{startTime} </if> <if test="inspectionPlanId !=null and inspectionPlanId != ''"> and t.inspection_plan_id= #{inspectionPlanId} </if> <if test="endTime !=null and endTime != ''"> and t.end_time= #{endTime} </if> <if test="startDate !=null and startDate != ''"> and t.start_date= #{startDate} </if> <if test="endDate !=null and endDate != ''"> and t.end_date= #{endDate} </if> <if test="beforeTime !=null and beforeTime != ''"> and t.before_time = #{beforeTime} </if> <if test="state !=null and state != ''"> and t.state= #{state} </if> <if test="communityId !=null and communityId != ''"> and t.community_id= #{communityId} </if> order by t.create_time desc <if test="page != -1 and page != null "> limit #{page}, #{row} </if> </select> </mapper> java110-db/src/main/resources/mapper/community/InspectionTaskV1ServiceDaoImplMapper.xml
@@ -363,4 +363,146 @@ </select> <select id="queryRouteInspectionTasksCount" parameterType="Map" resultType="Map"> select count(1) count from inspection_task t left join inspection_plan ip on t.inspection_plan_id = ip.inspection_plan_id and ip.status_cd = '0' left join inspection_route ir on ip.inspection_route_id = ir.inspection_route_id and ir.status_cd = '0' where 1=1 and ir.inspection_route_id = #{inspectionRouteId} <if test="planUserId !=null and planUserId != ''"> and t.plan_user_id= #{planUserId} </if> <if test="actInsTime !=null and actInsTime != ''"> and t.act_ins_time= #{actInsTime} </if> <if test="planInsTime !=null and planInsTime != ''"> and t.plan_ins_time= #{planInsTime} </if> <if test="originalPlanUserName !=null and originalPlanUserName != ''"> and t.original_plan_user_name= #{originalPlanUserName} </if> <if test="ipStaffId !=null and ipStaffId != ''"> and t.ip_staff_id= #{ipStaffId} </if> <if test="transferDesc !=null and transferDesc != ''"> and t.transfer_desc= #{transferDesc} </if> <if test="statusCd !=null and statusCd != ''"> and t.status_cd= #{statusCd} </if> <if test="actUserName !=null and actUserName != ''"> and t.act_user_name= #{actUserName} </if> <if test="originalPlanUserId !=null and originalPlanUserId != ''"> and t.original_plan_user_id= #{originalPlanUserId} </if> <if test="taskType !=null and taskType != ''"> and t.task_type= #{taskType} </if> <if test="signType !=null and signType != ''"> and t.sign_type= #{signType} </if> <if test="planEndTime !=null and planEndTime != ''"> and t.plan_end_time= #{planEndTime} </if> <if test="inspectionPlanId !=null and inspectionPlanId != ''"> and t.inspection_plan_id= #{inspectionPlanId} </if> <if test="planUserName !=null and planUserName != ''"> and t.plan_user_name= #{planUserName} </if> <if test="communityId !=null and communityId != ''"> and t.community_id= #{communityId} </if> <if test="actUserId !=null and actUserId != ''"> and t.act_user_id= #{actUserId} </if> <if test="taskId !=null and taskId != ''"> and t.task_id= #{taskId} </if> <if test="state !=null and state != ''"> and t.state= #{state} </if> </select> <!-- 查询巡检任务信息 add by wuxw 2018-07-03 --> <select id="queryRouteInspectionTasks" parameterType="Map" resultType="Map"> select t.plan_user_id,t.plan_user_id planUserId,t.act_ins_time,t.act_ins_time actInsTime,t.plan_ins_time,t.plan_ins_time planInsTime,t.original_plan_user_name,t.original_plan_user_name originalPlanUserName,t.ip_staff_id,t.ip_staff_id ipStaffId,t.transfer_desc,t.transfer_desc transferDesc,t.status_cd,t.status_cd statusCd,t.act_user_name,t.act_user_name actUserName,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.task_type,t.task_type taskType,t.sign_type,t.sign_type signType,t.plan_end_time,t.plan_end_time planEndTime,t.inspection_plan_id,t.inspection_plan_id inspectionPlanId,t.plan_user_name,t.plan_user_name planUserName,t.community_id,t.community_id communityId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId,ip.inspection_plan_name inspectionPlanName,ir.inspection_route_id inspectionRouteId from inspection_task t left join inspection_plan ip on t.inspection_plan_id = ip.inspection_plan_id and ip.status_cd = '0' left join inspection_route ir on ip.inspection_route_id = ir.inspection_route_id and ir.status_cd = '0' where 1=1 and ir.inspection_route_id = #{inspectionRouteId} <if test="planUserId !=null and planUserId != ''"> and t.plan_user_id= #{planUserId} </if> <if test="actInsTime !=null and actInsTime != ''"> and t.act_ins_time= #{actInsTime} </if> <if test="planInsTime !=null and planInsTime != ''"> and t.plan_ins_time= #{planInsTime} </if> <if test="originalPlanUserName !=null and originalPlanUserName != ''"> and t.original_plan_user_name= #{originalPlanUserName} </if> <if test="ipStaffId !=null and ipStaffId != ''"> and t.ip_staff_id= #{ipStaffId} </if> <if test="transferDesc !=null and transferDesc != ''"> and t.transfer_desc= #{transferDesc} </if> <if test="statusCd !=null and statusCd != ''"> and t.status_cd= #{statusCd} </if> <if test="actUserName !=null and actUserName != ''"> and t.act_user_name= #{actUserName} </if> <if test="originalPlanUserId !=null and originalPlanUserId != ''"> and t.original_plan_user_id= #{originalPlanUserId} </if> <if test="taskType !=null and taskType != ''"> and t.task_type= #{taskType} </if> <if test="signType !=null and signType != ''"> and t.sign_type= #{signType} </if> <if test="planEndTime !=null and planEndTime != ''"> and t.plan_end_time= #{planEndTime} </if> <if test="inspectionPlanId !=null and inspectionPlanId != ''"> and t.inspection_plan_id= #{inspectionPlanId} </if> <if test="planUserName !=null and planUserName != ''"> and t.plan_user_name= #{planUserName} </if> <if test="communityId !=null and communityId != ''"> and t.community_id= #{communityId} </if> <if test="actUserId !=null and actUserId != ''"> and t.act_user_id= #{actUserId} </if> <if test="taskId !=null and taskId != ''"> and t.task_id= #{taskId} </if> <if test="state !=null and state != ''"> and t.state= #{state} </if> order by t.create_time desc <if test="page != -1 and page != null "> limit #{page}, #{row} </if> </select> </mapper> java110-interface/src/main/java/com/java110/intf/community/IInspectionPlanV1InnerServiceSMO.java
@@ -70,4 +70,10 @@ @RequestMapping(value = "/queryPointInspectionPlans", method = RequestMethod.POST) List<InspectionPlanDto> queryPointInspectionPlans(@RequestBody InspectionPlanDto inspectionPlanDto); @RequestMapping(value = "/queryRouteInspectionPlansCount", method = RequestMethod.POST) int queryRouteInspectionPlansCount(@RequestBody InspectionPlanDto inspectionPlanDto); @RequestMapping(value = "/queryRouteInspectionPlans", method = RequestMethod.POST) List<InspectionPlanDto> queryRouteInspectionPlans(@RequestBody InspectionPlanDto inspectionPlanDto); } java110-interface/src/main/java/com/java110/intf/community/IInspectionTaskV1InnerServiceSMO.java
@@ -72,4 +72,10 @@ @RequestMapping(value = "/queryPointInspectionTasks", method = RequestMethod.POST) List<InspectionTaskDto> queryPointInspectionTasks(@RequestBody InspectionTaskDto inspectionTaskDto); @RequestMapping(value = "/queryRouteInspectionTasksCount", method = RequestMethod.POST) int queryRouteInspectionTasksCount(@RequestBody InspectionTaskDto inspectionTaskDto); @RequestMapping(value = "/queryRouteInspectionTasks", method = RequestMethod.POST) List<InspectionTaskDto> queryRouteInspectionTasks(@RequestBody InspectionTaskDto inspectionTaskDto); } service-acct/src/main/java/com/java110/acct/cmd/payment/ListPaymentPoolCmd.java
@@ -18,6 +18,7 @@ import com.alibaba.fastjson.JSONObject; import com.java110.acct.dao.IPaymentPoolValueV1ServiceDao; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.CmdContextUtils; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; @@ -70,6 +71,7 @@ super.validatePageInfo(reqJson); Assert.hasKeyAndValue(reqJson, "communityId", "communityId不能为空"); } @Override service-community/src/main/java/com/java110/community/cmd/inspection/QueryRouteInspectionPlanCmd.java
New file @@ -0,0 +1,105 @@ package com.java110.community.cmd.inspection; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.inspection.InspectionPlanDto; import com.java110.dto.inspection.InspectionPlanStaffDto; import com.java110.intf.community.IInspectionPlanStaffV1InnerServiceSMO; import com.java110.intf.community.IInspectionPlanV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.utils.util.ListUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.text.ParseException; import java.util.ArrayList; import java.util.List; /** * 根据巡检点查询巡检计划 */ @Java110Cmd(serviceCode = "inspection.queryRouteInspectionPlan") public class QueryRouteInspectionPlanCmd extends Cmd { @Autowired private IInspectionPlanV1InnerServiceSMO inspectionPlanV1InnerServiceSMOImpl; @Autowired private IInspectionPlanStaffV1InnerServiceSMO inspectionPlanStaffV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { super.validatePageInfo(reqJson); Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "未包含巡检路线"); Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区"); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { InspectionPlanDto inspectionPlanDto = BeanConvertUtil.covertBean(reqJson, InspectionPlanDto.class); int count = inspectionPlanV1InnerServiceSMOImpl.queryRouteInspectionPlansCount(inspectionPlanDto); List<InspectionPlanDto> inspectionPlans = null; if (count > 0) { inspectionPlans = BeanConvertUtil.covertBeanList(inspectionPlanV1InnerServiceSMOImpl.queryRouteInspectionPlans(inspectionPlanDto), InspectionPlanDto.class); queryStaffs(inspectionPlans); } else { inspectionPlans = new ArrayList<>(); } ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionPlans); ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK); context.setResponseEntity(responseEntity); } /** * 查询员工 * * @param inspectionPlans */ private void queryStaffs(List<InspectionPlanDto> inspectionPlans) { if (ListUtil.isNull(inspectionPlans)) { return; } List<String> planIds = new ArrayList<>(); for (InspectionPlanDto inspectionPlanDto : inspectionPlans) { planIds.add(inspectionPlanDto.getInspectionPlanId()); } InspectionPlanStaffDto inspectionPlanStaffDto = new InspectionPlanStaffDto(); inspectionPlanStaffDto.setInspectionPlanIds(planIds.toArray(new String[planIds.size()])); inspectionPlanStaffDto.setCommunityId(inspectionPlans.get(0).getCommunityId()); List<InspectionPlanStaffDto> inspectionPlanStaffDtos = inspectionPlanStaffV1InnerServiceSMOImpl.queryInspectionPlanStaffs(inspectionPlanStaffDto); if (ListUtil.isNull(inspectionPlanStaffDtos)) { return; } List<InspectionPlanStaffDto> staffDtos = null; for (InspectionPlanDto inspectionPlanDto : inspectionPlans) { staffDtos = new ArrayList<>(); for (InspectionPlanStaffDto tmpInspectionPlanStaffDto : inspectionPlanStaffDtos) { if (inspectionPlanDto.getInspectionPlanId().equals(tmpInspectionPlanStaffDto.getInspectionPlanId())) { staffDtos.add(tmpInspectionPlanStaffDto); } } inspectionPlanDto.setStaffs(staffDtos); } } } service-community/src/main/java/com/java110/community/cmd/inspection/QueryRouteInspectionTaskCmd.java
New file @@ -0,0 +1,58 @@ package com.java110.community.cmd.inspection; import com.alibaba.fastjson.JSONObject; import com.java110.core.annotation.Java110Cmd; import com.java110.core.context.ICmdDataFlowContext; import com.java110.core.event.cmd.Cmd; import com.java110.core.event.cmd.CmdEvent; import com.java110.dto.inspection.InspectionTaskDto; import com.java110.intf.community.IInspectionTaskV1InnerServiceSMO; import com.java110.utils.exception.CmdException; import com.java110.utils.util.Assert; import com.java110.utils.util.BeanConvertUtil; import com.java110.vo.ResultVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import java.text.ParseException; import java.util.ArrayList; import java.util.List; /** * 查询巡检点对应的巡检任务 */ @Java110Cmd(serviceCode = "inspection.queryRouteInspectionTask") public class QueryRouteInspectionTaskCmd extends Cmd { @Autowired private IInspectionTaskV1InnerServiceSMO inspectionTaskV1InnerServiceSMOImpl; @Override public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { super.validatePageInfo(reqJson); Assert.hasKeyAndValue(reqJson, "inspectionRouteId", "未包含巡检点"); Assert.hasKeyAndValue(reqJson, "communityId", "未包含小区"); } @Override public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException { InspectionTaskDto inspectionTaskDto = BeanConvertUtil.covertBean(reqJson, InspectionTaskDto.class); int count = inspectionTaskV1InnerServiceSMOImpl.queryRouteInspectionTasksCount(inspectionTaskDto); List<InspectionTaskDto> inspectionTaskDtos = null; if (count > 0) { inspectionTaskDtos = BeanConvertUtil.covertBeanList(inspectionTaskV1InnerServiceSMOImpl.queryRouteInspectionTasks(inspectionTaskDto), InspectionTaskDto.class); } else { inspectionTaskDtos = new ArrayList<>(); } ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, inspectionTaskDtos); ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK); context.setResponseEntity(responseEntity); } } service-community/src/main/java/com/java110/community/dao/IInspectionPlanV1ServiceDao.java
@@ -73,4 +73,8 @@ int queryPointInspectionPlansCount(Map info); List<Map> queryPointInspectionPlans(Map info); int queryRouteInspectionPlansCount(Map info); List<Map> queryRouteInspectionPlans(Map info); } service-community/src/main/java/com/java110/community/dao/IInspectionTaskV1ServiceDao.java
@@ -73,4 +73,8 @@ int queryPointInspectionTasksCount(Map info); List<Map> queryPointInspectionTasks(Map info); int queryRouteInspectionTasksCount(Map info); List<Map> queryRouteInspectionTasks(Map info); } service-community/src/main/java/com/java110/community/dao/impl/InspectionPlanV1ServiceDaoImpl.java
@@ -140,5 +140,24 @@ return infos; } @Override public int queryRouteInspectionPlansCount(Map info) { List<Map> infos = sqlSessionTemplate.selectList("inspectionPlanV1ServiceDaoImpl.queryRouteInspectionPlansCount", info); if (infos.size() < 1) { return 0; } return Integer.parseInt(infos.get(0).get("count").toString()); } @Override public List<Map> queryRouteInspectionPlans(Map info) { logger.debug("查询 getInspectionPlanInfo 入参 info : {}",info); List<Map> infos = sqlSessionTemplate.selectList("inspectionPlanV1ServiceDaoImpl.queryRouteInspectionPlans",info); return infos; } } service-community/src/main/java/com/java110/community/dao/impl/InspectionTaskV1ServiceDaoImpl.java
@@ -129,5 +129,23 @@ return infos; } @Override public int queryRouteInspectionTasksCount(Map info) { List<Map> infos = sqlSessionTemplate.selectList("inspectionTaskV1ServiceDaoImpl.queryRouteInspectionTasksCount", info); if (infos.size() < 1) { return 0; } return Integer.parseInt(infos.get(0).get("count").toString()); } @Override public List<Map> queryRouteInspectionTasks(Map info) { logger.debug("查询 getInspectionTaskInfo 入参 info : {}",info); List<Map> infos = sqlSessionTemplate.selectList("inspectionTaskV1ServiceDaoImpl.queryRouteInspectionTasks",info); return infos; } } service-community/src/main/java/com/java110/community/smo/impl/InspectionPlanV1InnerServiceSMOImpl.java
@@ -103,4 +103,24 @@ return inspectionPlans; } @Override public int queryRouteInspectionPlansCount(@RequestBody InspectionPlanDto inspectionPlanDto) { return inspectionPlanV1ServiceDaoImpl.queryRouteInspectionPlansCount(BeanConvertUtil.beanCovertMap(inspectionPlanDto)); } @Override public List<InspectionPlanDto> queryRouteInspectionPlans(@RequestBody InspectionPlanDto inspectionPlanDto) { //校验是否传了 分页信息 int page = inspectionPlanDto.getPage(); if (page != PageDto.DEFAULT_PAGE) { inspectionPlanDto.setPage((page - 1) * inspectionPlanDto.getRow()); } List<InspectionPlanDto> inspectionPlans = BeanConvertUtil.covertBeanList(inspectionPlanV1ServiceDaoImpl.queryRouteInspectionPlans(BeanConvertUtil.beanCovertMap(inspectionPlanDto)), InspectionPlanDto.class); return inspectionPlans; } } service-community/src/main/java/com/java110/community/smo/impl/InspectionTaskV1InnerServiceSMOImpl.java
@@ -107,4 +107,24 @@ return inspectionTasks; } @Override public int queryRouteInspectionTasksCount(@RequestBody InspectionTaskDto inspectionTaskDto) { return inspectionTaskV1ServiceDaoImpl.queryRouteInspectionTasksCount(BeanConvertUtil.beanCovertMap(inspectionTaskDto)); } @Override public List<InspectionTaskDto> queryRouteInspectionTasks(@RequestBody InspectionTaskDto inspectionTaskDto) { int page = inspectionTaskDto.getPage(); if (page != PageDto.DEFAULT_PAGE) { inspectionTaskDto.setPage((page - 1) * inspectionTaskDto.getRow()); } List<InspectionTaskDto> inspectionTasks = BeanConvertUtil.covertBeanList( inspectionTaskV1ServiceDaoImpl.queryRouteInspectionTasks(BeanConvertUtil.beanCovertMap(inspectionTaskDto)), InspectionTaskDto.class); return inspectionTasks; } } service-job/src/main/java/com/java110/job/importData/adapt/ImportMeterMachineQueueDataAdapt.java
@@ -93,7 +93,7 @@ meterTypeDto.setTypeName(importMeterMachineDto.getMeterType()); List<MeterTypeDto> meterTypeDtos = meterTypeV1InnerServiceSMOImpl.queryMeterTypes(meterTypeDto); Assert.listOnlyOne(meterTypeDtos, "房屋不存在"); Assert.listOnlyOne(meterTypeDtos, "抄表类型不存在"); MeterMachinePo meterMachinePo = BeanConvertUtil.covertBean(importMeterMachineDto, MeterMachinePo.class);