#资产mybatis-plus兼容性问题

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpAllocationMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.SpAllocationEntity;
 import com.hnac.hzims.spare.vo.SpAllocationVO;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -18,7 +19,7 @@ import java.util.Map;
 public interface SpAllocationMapper extends UserDataScopeBaseMapper<SpAllocationEntity> {
 
 
-    String selectMaxCode(Map<String,Object> params);
+    String selectMaxCode(@Param(value = "params") Map<String,Object> params);
 
     /**
      * 分页列表
@@ -27,5 +28,5 @@ public interface SpAllocationMapper extends UserDataScopeBaseMapper<SpAllocation
      * @return
      */
 	@UserDataAuth
-    List<SpAllocationVO> selectPageList(IPage<SpAllocationVO> page, Map<String,Object> params);
+    List<SpAllocationVO> selectPageList(IPage<SpAllocationVO> page,@Param(value = "params") Map<String,Object> params);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpAllocationMapper.xml

@@ -23,8 +23,8 @@
         select max(code)
         from wt_sp_allocation
         where DATE_FORMAT(CREATE_TIME, '%Y-%m-%d')  = DATE_FORMAT(NOW(), '%Y-%m-%d')
-        <if test="warehouseId!=null">
-            and OUT_WAREHOUSE_ID = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and OUT_WAREHOUSE_ID = #{params.warehouseId}
         </if>
     </select>
 

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceiveMapper.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.spare.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.SpReceiveEntity;
 import com.hnac.hzims.spare.vo.SpReceiveVO;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface SpReceiveMapper extends UserDataScopeBaseMapper<SpReceiveEntity> {
 
-    String selectMaxCode(Map<String,Object> params);
+    String selectMaxCode(@Param(value = "params") Map<String,Object> params);
     /**
      * 分页列表
      * @param page
@@ -25,5 +25,5 @@ public interface SpReceiveMapper extends UserDataScopeBaseMapper<SpReceiveEntity
      * @return
      */
 	@UserDataAuth
-    List<SpReceiveVO> selectPageList(IPage<SpReceiveVO> page, Map<String,Object> params);
+    List<SpReceiveVO> selectPageList(IPage<SpReceiveVO> page,@Param(value = "params") Map<String,Object> params);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceiveMapper.xml

@@ -24,8 +24,8 @@
         select max(code)
         from wt_sp_receive
         where DATE_FORMAT(CREATE_TIME, '%Y-%m-%d')  = DATE_FORMAT(NOW(), '%Y-%m-%d')
-        <if test="warehouseId!=null">
-            and STORAGE_ROOM = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and STORAGE_ROOM = #{params.warehouseId}
         </if>
     </select>
 

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.spare.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.SpReceivesEntity;
 import com.hnac.hzims.spare.vo.SpReceivesVO;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -17,8 +17,8 @@ import java.util.Map;
  */
 public interface SpReceivesMapper extends UserDataScopeBaseMapper<SpReceivesEntity> {
 
-    String selectMaxCode(Map<String, Object> params);
+    String selectMaxCode(@Param(value = "params") Map<String, Object> params);
 
 	@UserDataAuth
-    List<SpReceivesVO> selectPageList(IPage<SpReceivesVO> page, Map<String, Object> params);
+    List<SpReceivesVO> selectPageList(IPage<SpReceivesVO> page,@Param(value = "params") Map<String, Object> params);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpReceivesMapper.xml

@@ -24,8 +24,8 @@
         select max(code)
         from wt_sp_receives
         where DATE_FORMAT(CREATE_TIME, '%Y-%m-%d')  = DATE_FORMAT(NOW(), '%Y-%m-%d')
-        <if test="warehouseId!=null">
-            and STORAGE_ROOM = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and STORAGE_ROOM = #{params.warehouseId}
         </if>
     </select>
     <select id="selectPageList" resultType="com.hnac.hzims.spare.vo.SpReceivesVO">

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpRecordMapper.java

@@ -2,6 +2,7 @@ package com.hnac.hzims.spare.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.spare.entity.SpRecordEntity;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -15,7 +16,7 @@ public interface SpRecordMapper extends UserDataScopeBaseMapper<SpRecordEntity>
      * @return
      */
 	@UserDataAuth
-    List<SpRecordEntity> selectByBusinessId(Long businessId);
+    List<SpRecordEntity> selectByBusinessId(@Param(value = "businessId") Long businessId);
 
     /**
      * 根据业务id查询数据
@@ -23,7 +24,7 @@ public interface SpRecordMapper extends UserDataScopeBaseMapper<SpRecordEntity>
      * @return
      */
 	@UserDataAuth
-    List<SpRecordEntity> selectList(Map<String,Object> params);
+    List<SpRecordEntity> selectList(@Param(value = "params") Map<String,Object> params);
 
     /**
      * 根据业务id查询入库数据
@@ -31,7 +32,7 @@ public interface SpRecordMapper extends UserDataScopeBaseMapper<SpRecordEntity>
      * @return
      */
 	@UserDataAuth
-    List<SpRecordEntity> selectInList(Map<String,Object> params);
+    List<SpRecordEntity> selectInList(@Param(value = "params") Map<String,Object> params);
 
 	/**
 	 * 根据业务id查询数据
@@ -39,5 +40,5 @@ public interface SpRecordMapper extends UserDataScopeBaseMapper<SpRecordEntity>
 	 * @return
 	 */
 	@UserDataAuth
-	List<SpRecordEntity> selectListAll(Map<String, Object> params);
+	List<SpRecordEntity> selectListAll(@Param(value = "params") Map<String, Object> params);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpRecordMapper.xml

@@ -29,17 +29,17 @@
     <select id="selectList" parameterType="java.util.Map" resultMap="sp_recordResultMap">
         select * from wt_sp_record
         where is_deleted = 0
-        <if test="businessId!=null">
-            and BUSINESS_ID = #{businessId}
+        <if test="params.businessId!=null">
+            and BUSINESS_ID = #{params.businessId}
         </if>
-        <if test="spBasicId!=null">
-            and SP_BASIC_ID = #{spBasicId}
+        <if test="params.spBasicId!=null">
+            and SP_BASIC_ID = #{params.spBasicId}
         </if>
-        <if test="warehouseId!=null">
-            and WAREHOUSE_ID = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and WAREHOUSE_ID = #{params.warehouseId}
         </if>
-        <if test="type!=null">
-            and TYPE = #{type}
+        <if test="params.type!=null">
+            and TYPE = #{params.type}
         </if>
     </select>
 
@@ -47,31 +47,31 @@
         select * from wt_sp_record
         where is_deleted = 0
         and (type = 1 or type = 5)
-        <if test="businessId!=null">
-            and BUSINESS_ID = #{businessId}
+        <if test="params.businessId!=null">
+            and BUSINESS_ID = #{params.businessId}
         </if>
-        <if test="spBasicId!=null">
-            and SP_BASIC_ID = #{spBasicId}
+        <if test="params.spBasicId!=null">
+            and SP_BASIC_ID = #{params.spBasicId}
         </if>
-        <if test="warehouseId!=null">
-            and WAREHOUSE_ID = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and WAREHOUSE_ID = #{params.warehouseId}
         </if>
     </select>
 
     <select id="selectListAll" parameterType="java.util.Map" resultMap="sp_recordResultMap">
         select * from wt_sp_record
         where 1=1
-        <if test="businessId!=null">
-            and BUSINESS_ID = #{businessId}
+        <if test="params.businessId!=null">
+            and BUSINESS_ID = #{params.businessId}
         </if>
-        <if test="spBasicId!=null">
-            and SP_BASIC_ID = #{spBasicId}
+        <if test="params.spBasicId!=null">
+            and SP_BASIC_ID = #{params.spBasicId}
         </if>
-        <if test="warehouseId!=null">
-            and WAREHOUSE_ID = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and WAREHOUSE_ID = #{params.warehouseId}
         </if>
-        <if test="type!=null">
-            and TYPE = #{type}
+        <if test="params.type!=null">
+            and TYPE = #{params.type}
         </if>
     </select>
 

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpTicketRelationMapper.java

@@ -2,6 +2,7 @@ package com.hnac.hzims.spare.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.spare.entity.SpTicketRelationEntity;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -15,12 +16,12 @@ public interface SpTicketRelationMapper extends UserDataScopeBaseMapper<SpTicket
      * @param params
      * @return
      */
-    Integer selectTotal(Map<String,Object> params);
+    Integer selectTotal(@Param(value = "params") Map<String,Object> params);
 
     /**
      * 删除工单与备件关系
      * @param list
      * @return
      */
-    void deleteSpTicketRelation(List<String> list);
+    void deleteSpTicketRelation(@Param(value = "list") List<String> list);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpTicketRelationMapper.xml

@@ -14,8 +14,8 @@
 
     <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Integer">
         select sum(AMOUNT) from wt_sp_ticket_relation
-        where SP_BASIC_ID = #{spBasicId}
-        and ORDER_ID = #{orderId}
+        where SP_BASIC_ID = #{params.spBasicId}
+        and ORDER_ID = #{params.orderId}
     </select>
 
     <delete id="deleteSpTicketRelation" parameterType = "java.util.List">

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseInMapper.java

@@ -1,9 +1,9 @@
 package com.hnac.hzims.spare.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.SpWarehouseInEntity;
 import com.hnac.hzims.spare.vo.SpWarehouseInVO;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -17,7 +17,7 @@ import java.util.Map;
  */
 public interface SpWarehouseInMapper extends UserDataScopeBaseMapper<SpWarehouseInEntity> {
 
-    String selectMaxCode(Map<String,Object> params);
+    String selectMaxCode(@Param(value = "params") Map<String,Object> params);
     /**
      * 分页列表
      * @param page
@@ -25,8 +25,8 @@ public interface SpWarehouseInMapper extends UserDataScopeBaseMapper<SpWarehouse
      * @return
      */
 	@UserDataAuth
-    List<SpWarehouseInVO> selectPageList(IPage<SpWarehouseInVO> page, Map<String,Object> params);
+    List<SpWarehouseInVO> selectPageList(IPage<SpWarehouseInVO> page,@Param(value = "params") Map<String,Object> params);
 
 
-    Integer selectByType(Long spBasicId,Integer type);
+    Integer selectByType(@Param(value = "spBasicId") Long spBasicId,@Param(value = "type") Integer type);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseInMapper.xml

@@ -25,8 +25,8 @@
         select max(code)
         from wt_sp_warehouse_in
         where DATE_FORMAT(CREATE_TIME, '%Y-%m-%d')  = DATE_FORMAT(NOW(), '%Y-%m-%d')
-        <if test="warehouseId!=null">
-            and STORAGE_ROOM = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and STORAGE_ROOM = #{params.warehouseId}
         </if>
     </select>
 

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.java

@@ -3,6 +3,7 @@ package com.hnac.hzims.spare.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.SpWarehouseOutEntity;
 import com.hnac.hzims.spare.vo.SpWarehouseOutVO;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -16,7 +17,7 @@ import java.util.Map;
  */
 public interface SpWarehouseOutMapper extends UserDataScopeBaseMapper<SpWarehouseOutEntity> {
 
-    String selectMaxCode(Map<String,Object> params);
+    String selectMaxCode(@Param(value = "params") Map<String,Object> params);
 
     /**
      * 分页列表
@@ -25,15 +26,15 @@ public interface SpWarehouseOutMapper extends UserDataScopeBaseMapper<SpWarehous
      * @return
      */
 	@UserDataAuth
-    List<SpWarehouseOutVO> selectPageList(IPage<SpWarehouseOutVO> page, Map<String,Object> params);
+    List<SpWarehouseOutVO> selectPageList(IPage<SpWarehouseOutVO> page,@Param(value = "params") Map<String,Object> params);
 
     @UserDataAuth
-    List<SpWarehouseOutVO> selectListByCondition( Map<String,Object> params);
+    List<SpWarehouseOutVO> selectListByCondition(@Param(value = "params") Map<String,Object> params);
 
     /**
      * 根据工单ID查询出库单编码
      * @param ticketId
      * @return
      */
-    String getReceiveCode(Long ticketId);
+    String getReceiveCode(@Param(value = "ticketId") Long ticketId);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/SpWarehouseOutMapper.xml

@@ -25,8 +25,8 @@
         select max(code)
         from wt_sp_warehouse_out
         where DATE_FORMAT(CREATE_TIME, '%Y-%m-%d')  = DATE_FORMAT(NOW(), '%Y-%m-%d')
-        <if test="warehouseId!=null">
-            and STORAGE_ROOM = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and STORAGE_ROOM = #{params.warehouseId}
         </if>
     </select>
 
@@ -93,32 +93,32 @@
         wt_sp_warehouse_out wo
         JOIN wt_sp_warehouse sw ON wo.STORAGE_ROOM = sw.id
         WHERE wo.IS_DELETED = 0
-        <if test="code !=null">
-            and wo.code like  concat('%',#{code},'%')
+        <if test="params.code !=null">
+            and wo.code like  concat('%',#{params.code},'%')
         </if>
-        <if test="type!=null">
-            and wo.type = #{type}
+        <if test="params.type!=null">
+            and wo.type = #{params.type}
         </if>
-        <if test="status!=null">
-            and wo.status = #{status}
+        <if test="params.status!=null">
+            and wo.status = #{params.status}
         </if>
-        <if test="createTime!=null">
-            and wo.CREATE_TIME <![CDATA[ <= ]]> #{createTime}
+        <if test="params.createTime!=null">
+            and wo.CREATE_TIME <![CDATA[ <= ]]> #{params.createTime}
         </if>
-        <if test="startDate!=null">
-            and wo.CREATE_TIME <![CDATA[ >= ]]> #{startDate}
+        <if test="params.startDate!=null">
+            and wo.CREATE_TIME <![CDATA[ >= ]]> #{params.startDate}
         </if>
-        <if test="endDate!=null">
-            and wo.CREATE_TIME <![CDATA[ <= ]]> #{endDate}
+        <if test="params.endDate!=null">
+            and wo.CREATE_TIME <![CDATA[ <= ]]> #{params.endDate}
         </if>
-        <if test="deptList!=null">
+        <if test="params.deptList!=null">
             and sw.AFFILIATED_UNIT in
             <foreach collection="params.deptList" item="item" open="(" close=")" separator="," >
                 #{item}
             </foreach>
         </if>
-        <if test="warehouseId!=null">
-            and wo.STORAGE_ROOM = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and wo.STORAGE_ROOM = #{params.warehouseId}
         </if>
         order by wo.CREATE_TIME desc
     </select>

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.java

@@ -7,7 +7,6 @@ import com.hnac.hzims.spare.vo.WtSpBasicVO;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
-import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -24,14 +23,14 @@ public interface WtSpBasicMapper extends UserDataScopeBaseMapper<WtSpBasicEntity
      * @return
      */
 	@UserDataAuth
-    List<WtSpBasicVO> selectBasicList(Map<String,Object> params);
+    List<WtSpBasicVO> selectBasicList(@Param(value = "params") Map<String,Object> params);
 
     /**
      * 根据备件id查询备件已使用总数量
      * @param params
      * @return
      */
-    Integer selectTotal(Map<String,Object> params);
+    Integer selectTotal(@Param(value = "params") Map<String,Object> params);
 
     /**
      * 查询出库单数据
@@ -39,7 +38,7 @@ public interface WtSpBasicMapper extends UserDataScopeBaseMapper<WtSpBasicEntity
      * @return
      */
 	@UserDataAuth
-    List<SpTemporaryStockDetailEntity> getOutList(Long spBasicId);
+    List<SpTemporaryStockDetailEntity> getOutList(@Param(value = "spBasicId") Long spBasicId);
 
     /**
      * 查询归还单数据
@@ -47,7 +46,7 @@ public interface WtSpBasicMapper extends UserDataScopeBaseMapper<WtSpBasicEntity
      * @return
      */
 	@UserDataAuth
-    List<SpTemporaryStockDetailEntity> getInList(Long spBasicId);
+    List<SpTemporaryStockDetailEntity> getInList(@Param(value = "spBasicId") Long spBasicId);
 
     List<SparePartVO> sparePart(@Param("basicIds") List<Long> basics);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpBasicMapper.xml

@@ -64,8 +64,8 @@
     <select id="selectTotal" parameterType="java.util.Map" resultType="java.lang.Integer">
         select sum(QUANTITY_RECEIVED) from WT_SP_TOOL_BASIC
         where IS_DELETED = 0
-        and SP_BASIC_ID = #{spBasicId}
-        and WAREHOUSE_ID = #{warehouseId}
+        and SP_BASIC_ID = #{params.spBasicId}
+        and WAREHOUSE_ID = #{params.warehouseId}
     </select>
 
     <select id="getOutList" resultType="com.hnac.hzims.spare.entity.SpTemporaryStockDetailEntity">

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpManagementMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.spare.entity.WtSpManagementEntity;
 import com.hnac.hzims.spare.entity.WtSpManagementeExcelEntity;
 import com.hnac.hzims.spare.vo.WtSpManagementVO;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -24,24 +25,24 @@ public interface WtSpManagementMapper extends BaseMapper<WtSpManagementEntity> {
      * @return
      */
 //	@UserDataAuth
-    List<WtSpManagementVO> lazyList(String tenantId, Long parentId, Map<String, Object> param);
+    List<WtSpManagementVO> lazyList(@Param(value = "tenantId") String tenantId, @Param(value = "parentId")  Long parentId,@Param(value = "param") Map<String, Object> param);
     /**
      * @return 备品备件分类列表（下拉框）
      */
 //	@UserDataAuth
-    List<WtSpManagementEntity> selectOptionList(Map<String,Object> params);
+    List<WtSpManagementEntity> selectOptionList(@Param(value = "params") Map<String,Object> params);
 
     /**
      * 查询序列号生成编码
      * @return
      */
-    String getCodeNumber(Long parentId);
+    String getCodeNumber(@Param(value = "parentId") Long parentId);
 
     /**
      * 查询基础信息编码
      * @return
      */
-    String getBasicCodeNumber(Long managementId);
+    String getBasicCodeNumber(@Param(value = "managementId") Long managementId);
 
 
     /**
@@ -49,8 +50,8 @@ public interface WtSpManagementMapper extends BaseMapper<WtSpManagementEntity> {
      * @return
      */
 //	@UserDataAuth
-    List<WtSpManagementeExcelEntity> findAll(String tenantId);
+    List<WtSpManagementeExcelEntity> findAll(@Param(value = "tenantId") String tenantId);
 
 //	@UserDataAuth
-    List<WtSpManagementVO> lazyLists(String tenantId, Long id);
+    List<WtSpManagementVO> lazyLists(@Param(value = "tenantId") String tenantId,@Param(value = "id")  Long id);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpManagementMapper.xml

@@ -63,9 +63,9 @@
         FROM
         WT_SP_MANAGEMENT management
         WHERE management.is_deleted = 0
-        and management.parent_id = #{parentId}
-        <if test="name!=null and name!=''">
-            and name = #{name}
+        and management.parent_id = #{params.parentId}
+        <if test="params.name!=null and params.name!=''">
+            and name = #{params.name}
         </if>
     </select>
 

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpProviderMapper.java

@@ -1,6 +1,5 @@
 package com.hnac.hzims.spare.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.spare.entity.WtSpProviderEntity;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpToolBasicMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.WtSpToolBasicEntity;
 import com.hnac.hzims.spare.vo.WtSpToolBasicVO;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -24,5 +25,5 @@ public interface WtSpToolBasicMapper extends UserDataScopeBaseMapper<WtSpToolBas
      * @return
      */
 	@UserDataAuth
-    List<WtSpToolBasicVO> selectPageList(IPage<WtSpToolBasicVO> page, Map<String,Object> params);
+    List<WtSpToolBasicVO> selectPageList(IPage<WtSpToolBasicVO> page,@Param(value = "params") Map<String,Object> params);
 }

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpTotalMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.spare.entity.WtSpTotalEntity;
 import com.hnac.hzims.spare.vo.StockVo;
 import com.hnac.hzims.spare.vo.WtSpToolVO;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -22,7 +23,7 @@ public interface WtSpTotalMapper extends UserDataScopeBaseMapper<WtSpTotalEntity
 	 * @return
 	 */
 	@UserDataAuth
-	WtSpTotalEntity selectByBasicId(Map<String,Object> params);
+	WtSpTotalEntity selectByBasicId(@Param(value = "params") Map<String,Object> params);
     /**
      * 库存列表
      * @param page
@@ -30,21 +31,21 @@ public interface WtSpTotalMapper extends UserDataScopeBaseMapper<WtSpTotalEntity
      * @return
      */
 	@UserDataAuth
-    List<WtSpToolVO> selectSpToolList(IPage<WtSpToolVO> page, Map<String,Object> params);
+    List<WtSpToolVO> selectSpToolList(IPage<WtSpToolVO> page,@Param(value = "params") Map<String,Object> params);
 
     /**
      * 根据备件ID查询库存数量
      * @param spBasicId
      * @return
      */
-    Integer getListByBasicId(Long spBasicId);
+    Integer getListByBasicId(@Param(value = "spBasicId") Long spBasicId);
 
 	/**
 	 * 根据仓库id查询库存信息
 	 * @return
 	 */
 	@UserDataAuth
-	List<WtSpTotalEntity> selectByWarehouseId(Long warehouseId);
+	List<WtSpTotalEntity> selectByWarehouseId(@Param(value = "warehouseId") Long warehouseId);
 
 	/**
 	 * 获取所有库存记录

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpTotalMapper.xml

@@ -29,10 +29,10 @@
         FROM
             WT_SP_TOTAL
         WHERE
-            SP_BASIC_ID = #{spBasicId}
+            SP_BASIC_ID = #{params.spBasicId}
         and is_deleted = 0
-        <if test="warehouseId!=null">
-            and WAREHOUSE_ID = #{warehouseId}
+        <if test="params.warehouseId!=null">
+            and WAREHOUSE_ID = #{params.warehouseId}
         </if>
     </select>
 

hzims-service/assets/src/main/java/com/hnac/hzims/spare/mapper/WtSpWarehouseMapper.java

@@ -1,7 +1,7 @@
 package com.hnac.hzims.spare.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hnac.hzims.spare.entity.WtSpWarehouseEntity;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.annotation.UserDataAuth;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 
@@ -13,5 +13,6 @@ import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
 public interface WtSpWarehouseMapper extends UserDataScopeBaseMapper<WtSpWarehouseEntity> {
 
 	@UserDataAuth
-    WtSpWarehouseEntity sgetById(Long deptId);
+    WtSpWarehouseEntity sgetById(@Param(value = "deptId") Long deptId);
 }
+

hzims-service/assets/src/main/java/com/hnac/hzims/spare/service/impl/WtSpToolBasicServiceImpl.java

@@ -72,25 +72,6 @@ public class WtSpToolBasicServiceImpl extends ServiceImpl<WtSpToolBasicMapper, W
                     toolBasicVO.setUserName(user.getData().getName());
                 }
             }
-//            Map<String,Object> params = new HashMap<>();
-//            params.put("spBasicId",toolBasicEntity.getSpBasicId());
-//            params.put("warehouseId",toolBasicEntity.getWarehouseId());
-//            Integer result = spBasicService.selectTotal(params);
-//            if(null!=result){
-//                toolBasicVO.setUseAmount(result);
-//            }else{
-//                toolBasicVO.setUseAmount(0);
-//            }
-//            WtSpTotalEntity spTotalEntity = spTotalMapper.selectByBasicId(params);
-//            toolBasicVO.setTotalAmount(spTotalEntity.getStock()+toolBasicVO.getUseAmount());
-//            toolBasicVO.setNotUseAmount(spTotalEntity.getStock().intValue());
-//            toolBasicVO.setWarehouseId(spTotalEntity.getWarehouseId());
-//            WtSpWarehouseEntity warehouseEntity = warehouseMapper.selectById(spTotalEntity.getWarehouseId());
-//            if (null != warehouseEntity) {
-//                toolBasicVO.setWarehouseName(warehouseEntity.getName());
-//                R<String> dept = sysClient.getDeptName(warehouseEntity.getAffiliatedUnit());
-//                //toolBasicVO.setDeptName(dept.getData());
-//            }
             voList.add(toolBasicVO);
         }
         voPages.setRecords(voList);
@@ -149,10 +130,8 @@ public class WtSpToolBasicServiceImpl extends ServiceImpl<WtSpToolBasicMapper, W
                 longList.add(deptList.getData().get(i).getId());
             }
             longList.add(toolBasicVO.getDeptId());
-        }else{
-//            longList = personClient.getShuiChangId(AuthUtil.getDeptId());
         }
-        if(longList.size()>0){
+        if(!longList.isEmpty()){
             params.put("deptList",longList);
         }
         if(null!=toolBasicVO.getWarehouseId()){
@@ -173,11 +152,7 @@ public class WtSpToolBasicServiceImpl extends ServiceImpl<WtSpToolBasicMapper, W
             map.put("spBasicId",entity.getSpBasicId());
             map.put("warehouseId",entity.getWarehouseId());
             Integer res = spBasicService.selectTotal(map);
-            if(null!=result){
-                entity.setUseAmount(res);
-            }else{
-                entity.setUseAmount(0);
-            }
+            entity.setUseAmount(res);
             WtSpTotalEntity spTotalEntity = spTotalMapper.selectByBasicId(map);
             entity.setTotalAmount(spTotalEntity.getStock()+entity.getUseAmount());
             entity.setNotUseAmount(spTotalEntity.getStock().intValue());

hzims-service/equipment/src/main/java/com/hnac/hzims/emParam/controller/ParamController.java

@@ -25,7 +25,7 @@ public class ParamController extends BladeController {
     @GetMapping("/recall")
     @ApiOperation("召回参数")
     @ApiOperationSupport(order = 1)
-    public R<List<ParamTreeVO>> recall(String emCode, String stationCode) {
+    public R<List<ParamTreeVO>> recall(@RequestParam("emCode") String emCode,@RequestParam("stationCode") String stationCode) {
         return R.data(paramService.recall(emCode,stationCode));
     }
 

hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/AlarmApplication.java

@@ -24,10 +24,4 @@ public class AlarmApplication {
     public static void main(String[] args) {
         BladeApplication.run(AlarmConstants.APP_NAME, AlarmApplication.class, args);
     }
-
-//    @Override
-//    protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
-//        return BladeApplication.createSpringApplicationBuilder(builder, AlarmConstants.APP_NAME, AlarmApplication.class);
-//    }
-
 }

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

@@ -4,7 +4,9 @@ package com.hnac.hzims.operational.duty.mapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.hnac.hzims.operational.duty.entity.ImsDutyRecQRRecordEntity;
 import com.hnac.hzims.operational.main.vo.ImsDutyRecQRRecordVo;
+import org.apache.ibatis.annotations.Param;
 import org.springblade.core.datascope.mapper.UserDataScopeBaseMapper;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 
@@ -22,6 +24,6 @@ public interface ImsDutyRecQRRecordMapper extends UserDataScopeBaseMapper<ImsDut
 	 * @return
 	 */
 
-	List<ImsDutyRecQRRecordVo> selectPageList(IPage page,ImsDutyRecQRRecordVo vo);
+	List<ImsDutyRecQRRecordVo> selectPageList(IPage page,@Param(value = "vo") ImsDutyRecQRRecordVo vo);
 
 }