diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/StAlarmRecordMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/StAlarmRecordMapper.java index 75a9cd3..7f94a4d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/StAlarmRecordMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/StAlarmRecordMapper.java @@ -5,16 +5,17 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.hnac.hzims.operational.config.entity.StAlarmRecordEntity; import com.hnac.hzims.operational.config.vo.StAlarmRecordVo; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface StAlarmRecordMapper extends BaseMapper { - Long insertReturnId(StAlarmRecordEntity record); + Long insertReturnId(@Param(value = "record") StAlarmRecordEntity record); - List selectPageList(IPage page, StAlarmRecordVo vo); + List selectPageList(IPage page,@Param(value = "vo") StAlarmRecordVo vo); - List selectByStAlarmRecordVoList(StAlarmRecordVo vo); + List selectByStAlarmRecordVoList(@Param(value = "vo") StAlarmRecordVo vo); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/StAlarmRecordMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/StAlarmRecordMapper.xml index f1d88ef..db5c4d7 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/StAlarmRecordMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/config/mapper/StAlarmRecordMapper.xml @@ -85,9 +85,9 @@ status, phone_record, process_desc, create_time, processor, process_time ) - values (#{id,jdbcType=BIGINT}, #{stationId,jdbcType=VARCHAR}, #{realId,jdbcType=VARCHAR}, - #{status,jdbcType=TINYINT}, #{phoneRecord,jdbcType=VARCHAR}, #{processDesc,jdbcType=VARCHAR}, - #{createTime,jdbcType=TIMESTAMP}, #{processor,jdbcType=VARCHAR}, #{processTime,jdbcType=TIMESTAMP} + values (#{record.id,jdbcType=BIGINT}, #{record.stationId,jdbcType=VARCHAR}, #{record.realId,jdbcType=VARCHAR}, + #{record.status,jdbcType=TINYINT}, #{record.phoneRecord,jdbcType=VARCHAR}, #{record.processDesc,jdbcType=VARCHAR}, + #{record.createTime,jdbcType=TIMESTAMP}, #{record.processor,jdbcType=VARCHAR}, #{record.processTime,jdbcType=TIMESTAMP} ) diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.java index 6a777b8..711dd88 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.java @@ -57,17 +57,17 @@ public interface OperDefectMapper extends UserDataScopeBaseMapper createDept); - List selectDefectList(String emCode,List list); + List selectDefectList(@Param("emCode") String emCode,@Param("list") List list); - List selectDefectByEmCodeList(String emCode); + List selectDefectByEmCodeList(@Param("emCode") String emCode); @InterceptorIgnore(tenantLine = "true") - List getFaultByFaultCode(Map params); + List getFaultByFaultCode(@Param("params") Map params); @InterceptorIgnore(tenantLine = "true") - List> getDefectConclusion(Map params); + List> getDefectConclusion(@Param("params") Map params); - Boolean updateDefectInfo(OperDefectEntity entity); + Boolean updateDefectInfo(@Param("params") OperDefectEntity entity); /** * 获取某时间段内的缺陷 diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.xml index 5f4cdb4..d2a0125 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.xml @@ -160,15 +160,15 @@ hod.`IS_DELETED` =0 and hop.`FAULT_NAME` is not null - - and DATE_FORMAT(hod.`create_time`,'%Y-%m-%d') >= #{startDate} + + and DATE_FORMAT(hod.`create_time`,'%Y-%m-%d') >= #{params.startDate} - - and DATE_FORMAT(hod.`create_time`,'%Y-%m-%d') <= #{endDate} + + and DATE_FORMAT(hod.`create_time`,'%Y-%m-%d') <= #{params.endDate} - + and hod.`CREATE_DEPT` in - + #{item} @@ -183,15 +183,15 @@ hod.`IS_DELETED` =0 and hop.`FAULT_NAME` is not null - - and DATE_FORMAT(hod.`act_end_time`,'%Y-%m-%d') >= #{startDate} + + and DATE_FORMAT(hod.`act_end_time`,'%Y-%m-%d') >= #{params.startDate} - - and DATE_FORMAT(hod.`act_end_time`,'%Y-%m-%d') <= #{endDate} + + and DATE_FORMAT(hod.`act_end_time`,'%Y-%m-%d') <= #{params.endDate} - + and hod.`CREATE_DEPT` in - + #{item} @@ -231,22 +231,22 @@ update hzims_oper_defect - - ACT_HOURS = #{actHours,jdbcType=VARCHAR}, + + ACT_HOURS = #{params.actHours,jdbcType=VARCHAR}, - - ACT_START_TIME = #{actStartTime,jdbcType=DATE}, + + ACT_START_TIME = #{params.actStartTime,jdbcType=DATE}, - - ACT_END_TIME = #{actEndTime,jdbcType=DATE}, + + ACT_END_TIME = #{params.actEndTime,jdbcType=DATE}, - - DISPOSE_DESC = #{disposeDesc,jdbcType=VARCHAR}, + + DISPOSE_DESC = #{params.disposeDesc,jdbcType=VARCHAR}, - - HANDLE_STATUS = #{handleStatus,jdbcType=VARCHAR}, + + HANDLE_STATUS = #{params.handleStatus,jdbcType=VARCHAR}, - where DEFECT_CODE = #{defectCode,jdbcType=VARCHAR} + where DEFECT_CODE = #{params.defectCode,jdbcType=VARCHAR} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperFaultMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperFaultMapper.java index 7dc5f90..5ea872b 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperFaultMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperFaultMapper.java @@ -3,6 +3,7 @@ package com.hnac.hzims.operational.defect.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.hnac.hzims.operational.defect.entity.OperFaultEntity; import com.hnac.hzims.operational.defect.vo.FaultVO; +import org.apache.ibatis.annotations.Param; import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper; import java.util.List; @@ -16,5 +17,5 @@ public interface OperFaultMapper extends UserDataScopeBaseMapper listByTenantId(String tenantId); + List listByTenantId(@Param(value = "tenantId") String tenantId); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java index c1e7006..ea7d32e 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java @@ -26,7 +26,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper selectTheDaySunData(String date); + List selectTheDaySunData(@Param(value = "date") String date); /** * 获取当天已甄别数据 @@ -34,7 +34,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper selectTheDayScreenedData(String date); + List selectTheDayScreenedData(@Param(value = "date") String date); /** * 获取当天未甄别 @@ -42,7 +42,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper selectTheDayUnDisposedData(String date); + List selectTheDayUnDisposedData(@Param(value = "date") String date); /** @@ -51,7 +51,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper selectTheDayScreenedPhenomenonData(String date); + List selectTheDayScreenedPhenomenonData(@Param(value = "date") String date); /** @@ -60,7 +60,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper selectTheDayHandleData(String date); + List selectTheDayHandleData(@Param(value = "date") String date); /** * 获取当天处理中数据 @@ -68,7 +68,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper selectTheDaySolvedData(String date); + List selectTheDaySolvedData(@Param(value = "date") String date); /** * 获取当天已定论数据 @@ -76,7 +76,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper selectTheDayConclusion(String date); + List selectTheDayConclusion(@Param(value = "date") String date); /** * 获取个人月报现象小结 @@ -85,7 +85,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper> getPhenomenonConclusion(Map params); + List> getPhenomenonConclusion(@Param(value = "params") Map params); List selectListByStatus(@Param(value = "emCode") String emCode, diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.xml index e92d8e9..7c5fded 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.xml @@ -53,14 +53,14 @@ from hzims_oper_phenomenon hop hop.`IS_DELETED` = 0 - - and DATE_FORMAT(hop.`CREATE_TIME`,'%Y-%m-%s') >= #{startDate} + + and DATE_FORMAT(hop.`CREATE_TIME`,'%Y-%m-%s') >= #{params.startDate} - - and DATE_FORMAT(hop.`CREATE_TIME`,'%Y-%m-%s') <= #{endDate} + + and DATE_FORMAT(hop.`CREATE_TIME`,'%Y-%m-%s') <= #{params.endDate} and hop.`CREATE_DEPT` in - + #{item} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java index badfeaf..8109243 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java @@ -22,15 +22,15 @@ public interface ImsDutyClassMapper extends UserDataScopeBaseMapper getList(ImsDutyClassEntity imsDutyClass); + List getList(@Param(value = "params") ImsDutyClassEntity imsDutyClass); @UserDataAuth ImsDutyClassVO getClassTypeId(); - List selectListByClassTypeId(Long classTypeId); + List selectListByClassTypeId(@Param(value = "classTypeId") Long classTypeId); - Integer selectJoinClassTypeId(List list); + Integer selectJoinClassTypeId(@Param(value = "list") List list); String getClassTypeIds(@Param("createDept") Long createDept,@Param("classTypeId") Long classTypeId); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml index 8a6e138..cc0665d 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml @@ -44,17 +44,17 @@ from hz_ims_duty_class where IS_DELETED = 0 - - AND CLASS_TYPE_ID = #{classTypeId} + + AND CLASS_TYPE_ID = #{params.classTypeId} - - AND CLASS_NAME = #{className} + + AND CLASS_NAME = #{params.className} - - AND START_TIME = #{startTime} + + AND START_TIME = #{params.startTime} - - AND END_TIME = #{endTime} + + AND END_TIME = #{params.endTime} @@ -148,14 +148,14 @@ from hz_ims_duty_main IS_DELETED =0 - - and `DUTY_DATE` >= #{startDate} + + and `DUTY_DATE` >= #{params.startDate} - - and `DUTY_DATE` <= #{endDate} + + and `DUTY_DATE` <= #{params.endDate} - - and `DUTY_PERSON_IDS` like concat ("%", #{userId},"%") + + and `DUTY_PERSON_IDS` like concat ("%", #{params.userId},"%") diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java index 33347cf..d429c88 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java @@ -23,7 +23,7 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper selectByPersonId(Map params); + List selectByPersonId(@Param(value = "params") Map params); /** * 查询所有值班信息(不分页) @@ -31,31 +31,31 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper selectByDateListAll(String dutyDate,Long personId); + List selectByDateListAll(@Param(value = "dutyDate") String dutyDate,@Param(value = "personId") Long personId); - ImsSchedulingVo selectByIdOne(Long id,Long preDutyId); - ImsSchedulingVo selectByIdOneV2(Long id,Long preDutyId); + ImsSchedulingVo selectByIdOne(@Param(value = "id") Long id,@Param(value = "preDutyId") Long preDutyId); + ImsSchedulingVo selectByIdOneV2(@Param(value = "id") Long id,@Param(value = "preDutyId") Long preDutyId); - ImsSchedulingVo selectByPreDutyIdOne(Long preDutyId); + ImsSchedulingVo selectByPreDutyIdOne(@Param(value = "preDutyId") Long preDutyId); - ImsDutyMainEntity selectMainByIdOne(Long id); + ImsDutyMainEntity selectMainByIdOne(@Param(value = "id") Long id); - void deleteByUserId(List list); - void deleteDate(String date); + void deleteByUserId(@Param(value = "list") List list); + void deleteDate(@Param(value = "date") String date); @UserDataAuth - void deleteBatchDate(List list); + void deleteBatchDate(@Param(value = "list") List list); List selectByDateList(@Param(value = "date")String date,@Param(value = "deptId") Long deptId); - Integer selectMainJoinGroupId(List list); + Integer selectMainJoinGroupId(@Param(value = "list") List list); List selectByDateAndDept(@Param(value = "date") String date,@Param(value = "deptId") Long deptId); - List selectDutyMainByDept(List list); - List selectDutyMainByDeptV2(List list); + List selectDutyMainByDept(@Param(value = "list") List list); + List selectDutyMainByDeptV2(@Param(value = "list") List list); List selectSchedulingVoByDateList(@Param("startDate") String startDate, @Param("endDate") String endDate); @@ -64,11 +64,11 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper selectDutyMainInfoVoV2(@Param("deptId") Long deptId); - DutyMainInfoVo selectDutyMainInfoSign(Long preDutyId); - DutyMainInfoVo selectDutyMainInfoSignV2(Long preDutyId); + DutyMainInfoVo selectDutyMainInfoSign(@Param(value = "preDutyId") Long preDutyId); + DutyMainInfoVo selectDutyMainInfoSignV2(@Param(value = "preDutyId") Long preDutyId); - DutyMainInfoVo queryDutyInfo(Long dutyId); - DutyMainInfoVo queryDutyInfoV2(Long dutyId); + DutyMainInfoVo queryDutyInfo(@Param(value = "dutyId") Long dutyId); + DutyMainInfoVo queryDutyInfoV2(@Param(value = "dutyId") Long dutyId); List getDutyData(@Param("list") List deptIdList); List getDutyDataV2(@Param("list") List deptIdList); diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml index c8952ac..de00957 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.xml @@ -42,9 +42,9 @@ where is_deleted = 0 and duty_date = #{dutyDate} and class_id = #{classId} - and DUTY_PERSON_IDS like CONCAT(CONCAT('%', #{dutyPersonIds}), '%') - - and id !=#{id} + and DUTY_PERSON_IDS like CONCAT(CONCAT('%', #{params.dutyPersonIds}), '%') + + and id !=#{params.id} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.java index 4044a52..8603b99 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.java @@ -17,13 +17,13 @@ import java.util.Map; */ public interface OperMaintenanceTaskMapper extends UserDataScopeBaseMapper { - List selectByEmCode(String emCode, List list); + List selectByEmCode(@Param(value = "emCode") String emCode, @Param(value = "list") List list); @InterceptorIgnore(tenantLine = "true") - List getMaintenanceStatisticsByDisposer(Map params); + List getMaintenanceStatisticsByDisposer(@Param(value = "params") Map params); @InterceptorIgnore(tenantLine = "true") - List> getMaintenanceConclusion(Map params); + List> getMaintenanceConclusion(@Param(value = "params") Map params); List selectMaintenanceTask(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("list")List list); } diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.xml b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.xml index 285b93b..9e795df 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.xml +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/mapper/OperMaintenanceTaskMapper.xml @@ -56,15 +56,15 @@ and hop.`IS_DELETED` = 0 and hop.`TYPE_CODE` is not null homt.`is_deleted` = 0 - - and DATE_FORMAT(homt.`DISPOSE_TIME`,'%Y-%m-%d') >= #{startDate} + + and DATE_FORMAT(homt.`DISPOSE_TIME`,'%Y-%m-%d') >= #{params.startDate} - - and DATE_FORMAT(homt.`DISPOSE_TIME`,'%Y-%m-%d') <= #{endDate} + + and DATE_FORMAT(homt.`DISPOSE_TIME`,'%Y-%m-%d') <= #{params.endDate} - + and homt.`CREATE_DEPT` in - + #{item} diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java index 1303961..77abd56 100644 --- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java +++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java @@ -22,7 +22,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { * @param stationType * @return */ - List selectInRefDept(List list, String stationType, List types); + List selectInRefDept(@Param(value = "list") List list,@Param(value = "stationType") String stationType,@Param(value = "types") List types); /** * //所属机构及下属机构 || /个人及下属机构 @@ -33,7 +33,7 @@ public interface StationMapper extends UserDataScopeBaseMapper { */ List selectLikeRefDept(Long deptId, String stationType, List types); - /** + /**. * 所属机构 * * @param deptId diff --git a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java index 7367d77..77505e3 100644 --- a/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java +++ b/hzims-service/ticket/src/main/java/com/hnac/hzims/ticket/workTicket/wrapper/WorkTicketInfoWrapper.java @@ -1,5 +1,6 @@ package com.hnac.hzims.ticket.workTicket.wrapper; +import cn.hutool.core.util.ObjectUtil; import com.hnac.hzims.ticket.constants.DictConstants; import com.hnac.hzims.ticket.workTicket.entity.WorkTicketInfoEntity; import com.hnac.hzims.ticket.workTicket.vo.WorkTicketInfoVO; @@ -24,6 +25,9 @@ public class WorkTicketInfoWrapper extends BaseEntityWrapper