备品备件问题需求开发 - 卡片备品备件统计API开发

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WlSpareEquipmentController.java

@@ -230,12 +230,12 @@ public class WlSpareEquipmentController extends BaseController {
 
     @RequestMapping(value = "/countSpareEquip", method = RequestMethod.GET)
     @TycloudOperation(ApiLevel = UserType.AGENCY)
-    @ApiOperation(httpMethod = "GET", value = "卡片数量统计", notes = "卡片数量统计")
-    public ResponseModel<Map<String, Object>> countSpareEquip(@RequestParam(required = false) String bizOrgCode) {
+    @ApiOperation(httpMethod = "GET", value = "卡片 - 根据装备定义分组数量统计", notes = "卡片 - 根据装备定义分组数量统计")
+    public ResponseModel<List<Map<String, Object>>> countSpareEquip(@RequestParam(required = false) String bizOrgCode) {
         if (StrUtil.isEmpty(bizOrgCode)) {
             bizOrgCode = getSelectedOrgInfo().getPersonIdentity().getCompanyBizOrgCode();
         }
-        Map<String, Object> resultMap = wlSpareEquipmentService.countSpareEquip(bizOrgCode);
+        List<Map<String, Object>> resultMap = wlSpareEquipmentService.countSpareEquip(bizOrgCode);
         return CommonResponseUtil.success(resultMap);
     }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/WlSpareEquipmentMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.equipmanage.common.entity.WlSpareEquipment;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
 import java.util.Map;
 
 public interface WlSpareEquipmentMapper extends BaseMapper<WlSpareEquipment> {
@@ -14,6 +15,6 @@ public interface WlSpareEquipmentMapper extends BaseMapper<WlSpareEquipment> {
                                       @Param("hierarchy") int hierarchy,
                                       @Param("codeHead") String codeHead);
 
-    Map<String, Object> countSpareEquip(@Param("bizOrgCode") String bizOrgCode);
+    List<Map<String, Object>> countSpareEquip(@Param("bizOrgCode") String bizOrgCode);
 
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/WlSpareEquipmentService.java

@@ -31,5 +31,5 @@ public interface WlSpareEquipmentService {
 
     List<EquipmentCategory> getEquipmentTypeAndCount(String bizOrgCode);
 
-    Map<String, Object> countSpareEquip(String bizOrgCode);
+    List<Map<String, Object>> countSpareEquip(String bizOrgCode);
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WlSpareEquipmentServiceImpl.java

@@ -323,7 +323,7 @@ public class WlSpareEquipmentServiceImpl extends ServiceImpl<WlSpareEquipmentMap
     }
 
     @Override
-    public Map<String, Object> countSpareEquip(String bizOrgCode) {
+    public List<Map<String, Object>> countSpareEquip(String bizOrgCode) {
         return wlSpareEquipmentMapper.countSpareEquip(bizOrgCode);
     }
 }

amos-boot-system-equip/src/main/resources/mapper/WlSpareEquipmentMapper.xml

@@ -33,7 +33,10 @@
 
 <select id="countSpareEquip" resultType="java.util.Map">
     select
-        sum(stock_num) AS spareEquipNum
+        equip_model_name as equipModelName,
+        equip_model_id as equipModelId,
+        equip_model_code as equipModelId,
+        sum( stock_num ) AS spareEquipNum
     FROM
         wl_spare_equipment
     <where>
@@ -42,5 +45,7 @@
             AND `biz_org_code` LIKE concat(#{bizOrgCode}, '%')
         </if>
     </where>
+    GROUP BY
+        equip_model_id
     </select>
 </mapper>