#myatis-plus兼容性mapper注解修改

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<StAlarmRecordEntity> {
 
-	Long insertReturnId(StAlarmRecordEntity record);
+	Long insertReturnId(@Param(value = "record") StAlarmRecordEntity record);
 
-	List<StAlarmRecordVo> selectPageList(IPage page, StAlarmRecordVo vo);
+	List<StAlarmRecordVo> selectPageList(IPage page,@Param(value = "vo") StAlarmRecordVo vo);
 
-	List<StAlarmRecordVo> selectByStAlarmRecordVoList(StAlarmRecordVo vo);
+	List<StAlarmRecordVo> selectByStAlarmRecordVoList(@Param(value = "vo") StAlarmRecordVo vo);
 
 
 

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}
         )
     </insert>
     <select id="selectPageList" resultType="com.hnac.hzims.operational.config.vo.StAlarmRecordVo">
@@ -136,17 +136,17 @@
         FROM
         hy_st_alarm_record a
         where IS_DELETED = 0
-        <if test="status != null">
-            and a.STATUS = #{status}
+        <if test="vo.status != null">
+            and a.STATUS = #{vo.status}
         </if>
-        <if test="phoneRecord != null">
-            and a.phone_record like concat('%',#{phoneRecord},'%')
+        <if test="vo.phoneRecord != null">
+            and a.phone_record like concat('%',#{vo.phoneRecord},'%')
         </if>
-        <if test="processDesc != null">
-            and a.PROCESS_DESC like concat('%',#{processDesc},'%')
+        <if test="vo.processDesc != null">
+            and a.PROCESS_DESC like concat('%',#{vo.processDesc},'%')
         </if>
-        <if test="processor != null">
-            and a.PROCESSOR = #{processor}
+        <if test="vo.processor != null">
+            and a.PROCESSOR = #{vo.processor}
         </if>
         ORDER BY a.CREATE_TIME DESC
     </select>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.java

@@ -57,17 +57,17 @@ public interface OperDefectMapper extends UserDataScopeBaseMapper<OperDefectEnti
 								 @Param("createDept") List<String> createDept);
 
 
-	List<OperDefectEntity> selectDefectList(String emCode,List<String> list);
+	List<OperDefectEntity> selectDefectList(@Param("emCode") String emCode,@Param("list") List<String> list);
 
-	List<OperDefectEntity> selectDefectByEmCodeList(String emCode);
+	List<OperDefectEntity> selectDefectByEmCodeList(@Param("emCode") String emCode);
 
 	@InterceptorIgnore(tenantLine = "true")
-	List<DefectReportsVO> getFaultByFaultCode(Map<String,Object> params);
+	List<DefectReportsVO> getFaultByFaultCode(@Param("params") Map<String,Object> params);
 
 	@InterceptorIgnore(tenantLine = "true")
-	List<Map<String,Object>> getDefectConclusion(Map<String,Object> params);
+	List<Map<String,Object>> getDefectConclusion(@Param("params") Map<String,Object> params);
 
-	Boolean updateDefectInfo(OperDefectEntity entity);
+	Boolean updateDefectInfo(@Param("params") OperDefectEntity entity);
 
 	/**
 	 * 获取某时间段内的缺陷

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperDefectMapper.xml

@@ -160,15 +160,15 @@
         <where>
             hod.`IS_DELETED` =0
             and hop.`FAULT_NAME` is not null
-            <if test="startDate != null">
-                and DATE_FORMAT(hod.`create_time`,'%Y-%m-%d') &gt;= #{startDate}
+            <if test="params.startDate != null">
+                and DATE_FORMAT(hod.`create_time`,'%Y-%m-%d') &gt;= #{params.startDate}
             </if>
-            <if test="endDate != null">
-                and DATE_FORMAT(hod.`create_time`,'%Y-%m-%d') &lt;= #{endDate}
+            <if test="params.endDate != null">
+                and DATE_FORMAT(hod.`create_time`,'%Y-%m-%d') &lt;= #{params.endDate}
             </if>
-            <if test="deptId != null">
+            <if test="params.deptId != null">
                 and hod.`CREATE_DEPT` in
-                <foreach collection="deptId" index="index" item="item" open="(" separator="," close=")">
+                <foreach collection="params.deptId" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -183,15 +183,15 @@
         <where>
             hod.`IS_DELETED` =0
             and hop.`FAULT_NAME` is not null
-            <if test="startDate != null">
-                and DATE_FORMAT(hod.`act_end_time`,'%Y-%m-%d') &gt;= #{startDate}
+            <if test="params.startDate != null">
+                and DATE_FORMAT(hod.`act_end_time`,'%Y-%m-%d') &gt;= #{params.startDate}
             </if>
-            <if test="endDate != null">
-                and DATE_FORMAT(hod.`act_end_time`,'%Y-%m-%d') &lt;= #{endDate}
+            <if test="params.endDate != null">
+                and DATE_FORMAT(hod.`act_end_time`,'%Y-%m-%d') &lt;= #{params.endDate}
             </if>
-            <if test="deptId != null">
+            <if test="params.deptId != null">
                 and hod.`CREATE_DEPT` in
-                <foreach collection="deptId" index="index" item="item" open="(" separator="," close=")">
+                <foreach collection="params.deptId" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -231,22 +231,22 @@
     <update id="updateDefectInfo">
         update hzims_oper_defect
         <set>
-            <if test="actHours != null and actHours != '' ">
-                ACT_HOURS = #{actHours,jdbcType=VARCHAR},
+            <if test="params.actHours != null and params.actHours != '' ">
+                ACT_HOURS = #{params.actHours,jdbcType=VARCHAR},
             </if>
-            <if test="actStartTime != null">
-                ACT_START_TIME = #{actStartTime,jdbcType=DATE},
+            <if test="params.actStartTime != null">
+                ACT_START_TIME = #{params.actStartTime,jdbcType=DATE},
             </if>
-            <if test="actEndTime != null">
-                ACT_END_TIME = #{actEndTime,jdbcType=DATE},
+            <if test="params.actEndTime != null">
+                ACT_END_TIME = #{params.actEndTime,jdbcType=DATE},
             </if>
-            <if test="disposeDesc != null and disposeDesc != '' ">
-                DISPOSE_DESC = #{disposeDesc,jdbcType=VARCHAR},
+            <if test="params.disposeDesc != null and params.disposeDesc != '' ">
+                DISPOSE_DESC = #{params.disposeDesc,jdbcType=VARCHAR},
             </if>
-            <if test="handleStatus != null and handleStatus != '' ">
-                HANDLE_STATUS = #{handleStatus,jdbcType=VARCHAR},
+            <if test="params.handleStatus != null and params.handleStatus != '' ">
+                HANDLE_STATUS = #{params.handleStatus,jdbcType=VARCHAR},
             </if>
         </set>
-        where DEFECT_CODE = #{defectCode,jdbcType=VARCHAR}
+        where DEFECT_CODE = #{params.defectCode,jdbcType=VARCHAR}
     </update>
 </mapper>

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<OperFaultEntity
 
 	String getCurDataBaseName();
 
-	List<FaultVO> listByTenantId(String tenantId);
+	List<FaultVO> listByTenantId(@Param(value = "tenantId") String tenantId);
 }

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.java

@@ -26,7 +26,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper<OperPhenom
 	 * @return
 	 */
 	@UserDataAuth
-	List<OperPhenomenonVO> selectTheDaySunData(String date);
+	List<OperPhenomenonVO> selectTheDaySunData(@Param(value = "date") String date);
 
 	/**
 	 * 获取当天已甄别数据
@@ -34,7 +34,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper<OperPhenom
 	 * @return
 	 */
 	@UserDataAuth
-	List<OperPhenomenonVO> selectTheDayScreenedData(String date);
+	List<OperPhenomenonVO> selectTheDayScreenedData(@Param(value = "date") String date);
 
 	/**
 	 * 获取当天未甄别
@@ -42,7 +42,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper<OperPhenom
 	 * @return
 	 */
 	@UserDataAuth
-	List<OperPhenomenonVO> selectTheDayUnDisposedData(String date);
+	List<OperPhenomenonVO> selectTheDayUnDisposedData(@Param(value = "date") String date);
 
 
 	/**
@@ -51,7 +51,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper<OperPhenom
 	 * @return
 	 */
 	@UserDataAuth
-	List<OperPhenomenonVO> selectTheDayScreenedPhenomenonData(String date);
+	List<OperPhenomenonVO> selectTheDayScreenedPhenomenonData(@Param(value = "date") String date);
 
 
 	/**
@@ -60,7 +60,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper<OperPhenom
 	 * @return
 	 */
 	@UserDataAuth
-	List<MainOperPhenomenonVo> selectTheDayHandleData(String date);
+	List<MainOperPhenomenonVo> selectTheDayHandleData(@Param(value = "date") String date);
 
 	/**
 	 * 获取当天处理中数据
@@ -68,7 +68,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper<OperPhenom
 	 * @return
 	 */
 	@UserDataAuth
-	List<OperPhenomenonEntity> selectTheDaySolvedData(String date);
+	List<OperPhenomenonEntity> selectTheDaySolvedData(@Param(value = "date") String date);
 
 	/**
 	 * 获取当天已定论数据
@@ -76,7 +76,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper<OperPhenom
 	 * @return
 	 */
 	@UserDataAuth
-	List<OperPhenomenonVO> selectTheDayConclusion(String date);
+	List<OperPhenomenonVO> selectTheDayConclusion(@Param(value = "date") String date);
 
 	/**
 	 * 获取个人月报现象小结
@@ -85,7 +85,7 @@ public interface OperPhenomenonMapper extends UserDataScopeBaseMapper<OperPhenom
 	 */
 
 	@InterceptorIgnore(tenantLine = "true")
-	List<Map<String,Object>> getPhenomenonConclusion(Map<String,Object> params);
+	List<Map<String,Object>> getPhenomenonConclusion(@Param(value = "params") Map<String,Object> params);
 
 
 	List<MainOperPhenomenonVo> selectListByStatus(@Param(value = "emCode") String emCode,

hzims-service/operational/src/main/java/com/hnac/hzims/operational/defect/mapper/OperPhenomenonMapper.xml

@@ -53,14 +53,14 @@
         from hzims_oper_phenomenon hop
         <where>
             hop.`IS_DELETED` = 0
-            <if test="startDate != null">
-                and DATE_FORMAT(hop.`CREATE_TIME`,'%Y-%m-%s') &gt;= #{startDate}
+            <if test="params.startDate != null">
+                and DATE_FORMAT(hop.`CREATE_TIME`,'%Y-%m-%s') &gt;= #{params.startDate}
             </if>
-            <if test="endDate != null">
-                and DATE_FORMAT(hop.`CREATE_TIME`,'%Y-%m-%s') &lt;= #{endDate}
+            <if test="params.endDate != null">
+                and DATE_FORMAT(hop.`CREATE_TIME`,'%Y-%m-%s') &lt;= #{params.endDate}
             </if>
             and hop.`CREATE_DEPT` in
-            <foreach collection="deptId" separator="," index="index" close=")" open="(" item="item">
+            <foreach collection="params.deptId" separator="," index="index" close=")" open="(" item="item">
                 #{item}
             </foreach>
         </where>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.java

@@ -22,15 +22,15 @@ public interface ImsDutyClassMapper extends UserDataScopeBaseMapper<ImsDutyClass
 	 * @return
 	 */
 	@UserDataAuth
-	List<ImsDutyClassEntity> getList(ImsDutyClassEntity imsDutyClass);
+	List<ImsDutyClassEntity> getList(@Param(value = "params") ImsDutyClassEntity imsDutyClass);
 
 	@UserDataAuth
 	ImsDutyClassVO getClassTypeId();
 
-	List<ImsDutyClassEntity> selectListByClassTypeId(Long classTypeId);
+	List<ImsDutyClassEntity> selectListByClassTypeId(@Param(value = "classTypeId") Long classTypeId);
 
 
-	Integer selectJoinClassTypeId(List<Long> list);
+	Integer selectJoinClassTypeId(@Param(value = "list") List<Long> list);
 
 	String getClassTypeIds(@Param("createDept") Long createDept,@Param("classTypeId") Long classTypeId);
 

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyClassMapper.xml

@@ -44,17 +44,17 @@
         <include refid="Base_Column_List"/>
         from hz_ims_duty_class
         where IS_DELETED = 0
-        <if test="classTypeId != null">
-            AND CLASS_TYPE_ID = #{classTypeId}
+        <if test="params.classTypeId != null">
+            AND CLASS_TYPE_ID = #{params.classTypeId}
         </if>
-        <if test="className != null">
-            AND CLASS_NAME = #{className}
+        <if test="params.className != null">
+            AND CLASS_NAME = #{params.className}
         </if>
-        <if test="startTime != null">
-            AND START_TIME = #{startTime}
+        <if test="params.startTime != null">
+            AND START_TIME = #{params.startTime}
         </if>
-        <if test="endTime != null">
-            AND END_TIME = #{endTime}
+        <if test="params.endTime != null">
+            AND END_TIME = #{params.endTime}
         </if>
     </select>
     <select id="getClassTypeId" resultType="com.hnac.hzims.operational.duty.vo.ImsDutyClassVO">

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupMapper.java

@@ -20,7 +20,7 @@ public interface ImsDutyGroupMapper extends UserDataScopeBaseMapper<ImsDutyGroup
 	 * @param id
 	 * @return
 	 */
-	int updateManagerIdById(Long id);
+	int updateManagerIdById(@Param("id)") Long id);
 
 	@UserDataAuth
 	List<ImsDutyGroupEntity> selectDutyGroupJoinDutyMain(@Param("startDate") String startDate, @Param("endDate") String endDate);

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.java

@@ -22,32 +22,32 @@ public interface ImsDutyGroupPMapper extends BaseMapper<ImsDutyGroupPEntity> {
 	 * 删除关联信息
 	 * @param groupId
 	 */
-	void deleteByGroupId(Long groupId);
+	void deleteByGroupId(@Param("groupId") Long groupId);
 	/**
 	 * 根据小组信息id查询
 	 * @param groupId
 	 * @return
 	 */
-	List<ImsDutyGroupPEntity> selectByGroupId(Long groupId);
+	List<ImsDutyGroupPEntity> selectByGroupId(@Param("groupId") Long groupId);
 
 	List<ImsDutyGroupPEntity> selectByGroupIds(@Param("groupId") List<Long> groupId);
 
-	void deleteBatch(List<Long> list);
+	void deleteBatch(@Param("list") List<Long> list);
 
-	void insertBatchPersonnel(List<ImsDutyGroupPEntity> list);
+	void insertBatchPersonnel(@Param("list") List<ImsDutyGroupPEntity> list);
 
-	Integer selectPersonIsExist(ImsDutyGroupPEntity imsDutyGroupPEntity);
+	Integer selectPersonIsExist(@Param("params") ImsDutyGroupPEntity imsDutyGroupPEntity);
 
-	List<ImsDutyGroupPVO> selectByGroupIdList(Long groupId);
+	List<ImsDutyGroupPVO> selectByGroupIdList(@Param("groupId") Long groupId);
 
-	String  selectPersonIdsByGroupId(Long groupId);
+	String  selectPersonIdsByGroupId(@Param("groupId")Long groupId);
 
 	@InterceptorIgnore(tenantLine = "true")
-	List<DutyReportVO> getDutyMainStatisticsByClassId(Map<String,Object> params);
+	List<DutyReportVO> getDutyMainStatisticsByClassId(@Param("params") Map<String,Object> params);
 
-	List<Map<String,Object>> getDutyConclusion(Map<String,Object> params);
+	List<Map<String,Object>> getDutyConclusion(@Param("params") Map<String,Object> params);
 
-	DutyPersonalReportVO getPersonalDutyMain(Map<String,Object> params);
+	DutyPersonalReportVO getPersonalDutyMain(@Param("params") Map<String,Object> params);
 
 	/**
 	 * 根据班组Id以及人员Id删除

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyGroupPMapper.xml

@@ -39,7 +39,7 @@
         </foreach>
     </select>
     <select id="selectPersonIsExist" resultType="java.lang.Integer" parameterType="com.hnac.hzims.operational.duty.entity.ImsDutyGroupPEntity">
-        select IFNULL(count(*),0) from hz_ims_duty_group_p where PERSON_ID = #{personId}
+        select IFNULL(count(*),0) from hz_ims_duty_group_p where PERSON_ID = #{params.personId}
     </select>
     <select id="selectByGroupIdList" resultType="com.hnac.hzims.operational.duty.vo.ImsDutyGroupPVO">
         select
@@ -102,15 +102,15 @@
         left join `hz_ims_duty_group` hidg on homt.`DUTY_GROUP_ID` = hidg.`ID`
         <where>
             homt.`is_deleted` = 0
-            <if test="startDate != null">
-                and homt.`DUTY_DATE` &gt;= #{startDate}
+            <if test="params.startDate != null">
+                and homt.`DUTY_DATE` &gt;= #{params.startDate}
             </if>
-            <if test="endDate != null">
-                and homt.`DUTY_DATE` &lt;= #{endDate}
+            <if test="params.endDate != null">
+                and homt.`DUTY_DATE` &lt;= #{params.endDate}
             </if>
-            <if test="deptId != null">
+            <if test="params.deptId != null">
                 and homt.`CREATE_DEPT` in
-                <foreach collection="deptId" index="index" item="item" open="(" separator="," close=")">
+                <foreach collection="params.deptId" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>
@@ -128,15 +128,15 @@
         left join `hz_ims_duty_class` hidc on homt.`CLASS_ID` = hidc.`ID`
         <where>
             homt.`is_deleted` = 0
-            <if test="startDate != null">
-                and homt.`DUTY_DATE` &gt;= #{startDate}
+            <if test="params.startDate != null">
+                and homt.`DUTY_DATE` &gt;= #{params.startDate}
             </if>
-            <if test="endDate != null">
-                and homt.`DUTY_DATE` &lt;= #{endDate}
+            <if test="params.endDate != null">
+                and homt.`DUTY_DATE` &lt;= #{params.endDate}
             </if>
             and homt.`CREATE_DEPT` in
-            <foreach collection="deptId" item="item" index="index" open="(" close=")" separator=",">
-                #{item}
+            <foreach collection="params.deptId" item="item" index="index" open="(" close=")" separator=",">
+                #{params.item}
             </foreach>
         </where>
     </select>
@@ -148,14 +148,14 @@
         from hz_ims_duty_main
         <where>
             IS_DELETED =0
-            <if test="startDate != null">
-                and `DUTY_DATE` &gt;= #{startDate}
+            <if test="params.startDate != null">
+                and `DUTY_DATE` &gt;= #{params.startDate}
             </if>
-            <if test="endDate != null">
-                and `DUTY_DATE` &lt;= #{endDate}
+            <if test="params.endDate != null">
+                and `DUTY_DATE` &lt;= #{params.endDate}
             </if>
-            <if test="userId != null">
-                and `DUTY_PERSON_IDS` like concat ("%", #{userId},"%")
+            <if test="params.userId != null">
+                and `DUTY_PERSON_IDS` like concat ("%", #{params.userId},"%")
             </if>
         </where>
     </select>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/duty/mapper/ImsDutyMainMapper.java

@@ -23,7 +23,7 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper<ImsDutyMainEn
 	 * @return
 	 */
 	@UserDataAuth
-	List<ImsDutyMainEntity> selectByPersonId(Map<String, Object> params);
+	List<ImsDutyMainEntity> selectByPersonId(@Param(value = "params") Map<String, Object> params);
 
 	/**
 	 * 查询所有值班信息(不分页)
@@ -31,31 +31,31 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper<ImsDutyMainEn
 	 * @return
 	 */
 	@UserDataAuth
-	List<ImsSchedulingVo> selectByDateListAll(String  dutyDate,Long personId);
+	List<ImsSchedulingVo> 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<Long> list);
-	void deleteDate(String date);
+	void deleteByUserId(@Param(value = "list") List<Long> list);
+	void deleteDate(@Param(value = "date") String date);
 
 	@UserDataAuth
-	void deleteBatchDate(List<String> list);
+	void deleteBatchDate(@Param(value = "list") List<String> list);
 
 	List<ImsSchedulingVo> selectByDateList(@Param(value = "date")String date,@Param(value = "deptId") Long deptId);
 
-	Integer selectMainJoinGroupId(List<Long> list);
+	Integer selectMainJoinGroupId(@Param(value = "list") List<Long> list);
 
 	List<ImsDutyMainEntity> selectByDateAndDept(@Param(value = "date") String date,@Param(value = "deptId") Long deptId);
 
 
-	List<ImsDutyMainMergeVo> selectDutyMainByDept(List<Long> list);
-	List<ImsDutyMainMergeVo> selectDutyMainByDeptV2(List<Long> list);
+	List<ImsDutyMainMergeVo> selectDutyMainByDept(@Param(value = "list") List<Long> list);
+	List<ImsDutyMainMergeVo> selectDutyMainByDeptV2(@Param(value = "list") List<Long> list);
 
 	List<ImsDutyGroupGenerationVo> selectSchedulingVoByDateList(@Param("startDate") String startDate, @Param("endDate") String endDate);
 
@@ -64,11 +64,11 @@ public interface ImsDutyMainMapper extends UserDataScopeBaseMapper<ImsDutyMainEn
 	@UserDataAuth
 	List<DutyMainInfoVo> 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<DutyInfoVo> getDutyData(@Param("list") List<Long> deptIdList);
 	List<DutyInfoVo> getDutyDataV2(@Param("list") List<Long> deptIdList);

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}), '%')
-        <if test="id != null">
-            and id !=#{id}
+        and DUTY_PERSON_IDS like CONCAT(CONCAT('%', #{params.dutyPersonIds}), '%')
+        <if test="params.id != null">
+            and id !=#{params.id}
         </if>
     </select>
     <delete id="deleteByUserId" >

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<OperMaintenanceTaskEntity> {
 
-	List<OperMaintenanceTaskEntity> selectByEmCode(String emCode, List<String> list);
+	List<OperMaintenanceTaskEntity> selectByEmCode(@Param(value = "emCode") String emCode, @Param(value = "list") List<String> list);
 
 	@InterceptorIgnore(tenantLine = "true")
-	List<MaintenanceReportVO> getMaintenanceStatisticsByDisposer(Map<String,Object> params);
+	List<MaintenanceReportVO> getMaintenanceStatisticsByDisposer(@Param(value = "params") Map<String,Object> params);
 
 	@InterceptorIgnore(tenantLine = "true")
-	List<Map<String,Object>> getMaintenanceConclusion(Map<String,Object> params);
+	List<Map<String,Object>> getMaintenanceConclusion(@Param(value = "params") Map<String,Object> params);
 
 	List<OperMaintenanceTaskEntity> selectMaintenanceTask(@Param("startTime") String startTime, @Param("endTime") String endTime, @Param("list")List<Long> list);
 }

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
         <where>
             homt.`is_deleted` = 0
-            <if test="startDate != null">
-                and DATE_FORMAT(homt.`DISPOSE_TIME`,'%Y-%m-%d') &gt;= #{startDate}
+            <if test="params.startDate != null">
+                and DATE_FORMAT(homt.`DISPOSE_TIME`,'%Y-%m-%d') &gt;= #{params.startDate}
             </if>
-            <if test="endDate != null">
-                and DATE_FORMAT(homt.`DISPOSE_TIME`,'%Y-%m-%d') &lt;= #{endDate}
+            <if test="params.endDate != null">
+                and DATE_FORMAT(homt.`DISPOSE_TIME`,'%Y-%m-%d') &lt;= #{params.endDate}
             </if>
-            <if test="deptId != null">
+            <if test="params.deptId != null">
                 and homt.`CREATE_DEPT` in
-                <foreach collection="deptId" index="index" item="item" open="(" separator="," close=")">
+                <foreach collection="params.deptId" index="index" item="item" open="(" separator="," close=")">
                     #{item}
                 </foreach>
             </if>

hzims-service/operational/src/main/java/com/hnac/hzims/operational/station/mapper/StationMapper.java

@@ -22,7 +22,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 * @param stationType
 	 * @return
 	 */
-	List<StationEntity> selectInRefDept(List<Long> list, String stationType, List<String> types);
+	List<StationEntity> selectInRefDept(@Param(value = "list") List<Long> list,@Param(value = "stationType") String stationType,@Param(value = "types") List<String> types);
 
 	/**
 	 * //所属机构及下属机构 || /个人及下属机构
@@ -33,7 +33,7 @@ public interface StationMapper extends UserDataScopeBaseMapper<StationEntity> {
 	 */
 	List<StationEntity> selectLikeRefDept(Long deptId, String stationType, List<String> types);
 
-	/**
+	/**.
 	 * 所属机构
 	 *
 	 * @param deptId

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<WorkTicketInfoEntit
 
 	@Override
 	public WorkTicketInfoVO entityVO(WorkTicketInfoEntity entity) {
+		if(ObjectUtil.isEmpty(entity)){
+			return new WorkTicketInfoVO();
+		}
 		WorkTicketInfoVO workTicketInfoVO = BeanUtil.copy(entity,WorkTicketInfoVO.class);
 		/*完善负责人、许可人名称*/
 		if(Func.isNotEmpty(workTicketInfoVO.getClassGroupMembersManual())){