feat(smartfactory): 优化查询功能和数据准确性

- 在处理组列表查询中添加删除标记过滤，确保只返回未删除的数据- 修复处理组汇总数据查询中的规格名称获取问题
- 新增根据 ID 获取处理组信息的查询方法

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/dataobject/handlinggroupamountspecifications/HandlingGroupAmountSpecificationsDO.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import lombok.*;
 
 import java.math.BigDecimal;
@@ -18,7 +17,8 @@ import java.util.List;
  * @author 艾楷
  */
 @TableName("sf_handling_group_amount_specifications")
-@KeySequence("sf_handling_group_amount_specifications_seq") // 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
+@KeySequence("sf_handling_group_amount_specifications_seq")
+// 用于 Oracle、PostgreSQL、Kingbase、DB2、H2 数据库的主键自增。如果是 MySQL 等数据库，可不写。
 @Data
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
@@ -40,6 +40,11 @@ public class HandlingGroupAmountSpecificationsDO extends BaseDO {
      * 搬运规格id
      */
     private Long handlingSpecificationsId;
+    /**
+     * 搬运规格名称
+     */
+    @TableField(exist = false)
+    private String handlingSpecificationsName;
     /**
      * 搬运组id
      */

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/handlinggroup/HandlingGroupMapper.java

@@ -50,4 +50,11 @@ public interface HandlingGroupMapper extends BaseMapperX<HandlingGroupDO> {
      * @return
      */
     IPage<HandlingGroupAmountSpecificationsVO> selectPageListByDateStr(@Param("page") Page<Object> page, @Param("vo") HandlingGroupAmountSpecificationsPageReqDTO vo);
+
+    /**
+     *
+     * @param id
+     * @return
+     */
+    HandlingGroupDO getHandlingGroup(@Param("id") Long id);
 }

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/dal/mysql/handlingspecifications/HandlingSpecificationsMapper.java

@@ -44,4 +44,11 @@ public interface HandlingSpecificationsMapper extends BaseMapperX<HandlingSpecif
      * @return
      */
     List<HandlingSpecificationsDO> getHandlingSpecificationsList(@Param("vo") HandlingSpecificationsPageReqVO vo);
+
+    /**
+     *
+     * @param id
+     * @return
+     */
+    HandlingSpecificationsDO getHandlingSpecifications(@Param("id") Long id);
 }

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/handlinggroup/HandlingGroupServiceImpl.java

@@ -51,7 +51,7 @@ public class HandlingGroupServiceImpl extends ServiceImpl<HandlingGroupMapper, H
 
     @Override
     public HandlingGroupDO getHandlingGroup(Long id) {
-        return handlingGroupMapper.selectById(id);
+        return handlingGroupMapper.getHandlingGroup(id);
     }
 
     @Override

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/handlingspecifications/HandlingSpecificationsServiceImpl.java

@@ -64,7 +64,7 @@ public class HandlingSpecificationsServiceImpl extends ServiceImpl<HandlingSpeci
 
     @Override
     public HandlingSpecificationsDO getHandlingSpecifications(Long id) {
-        return handlingSpecificationsMapper.selectById(id);
+        return handlingSpecificationsMapper.getHandlingSpecifications(id);
     }
 
     @Override

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlinggroup/HandlingGroupMapper.xml

@@ -12,11 +12,13 @@
     <select id="selectPageList"
             resultType="cn.iocoder.yudao.module.smartfactory.dal.dataobject.handlinggroup.HandlingGroupDO">
         select
-            a.*,
-            b.short_name as factoryName
+        a.*,
+        b.short_name as factoryName
         from sf_handling_group a
         left join sf_factory_info as b on a.factory_id = b.id
         <where>
+            a.deleted = 0
+            and b.deleted = 0
             <if test="vo.factoryId != null">
                 and a.factory_id = #{vo.factoryId}
             </if>
@@ -26,7 +28,8 @@
         </where>
     </select>
 
-    <resultMap id="handlingSummaryMap" type="cn.iocoder.yudao.module.smartfactory.controller.admin.handlinggroupamountspecifications.vo.HandlingGroupAmountSpecificationsVO">
+    <resultMap id="handlingSummaryMap"
+               type="cn.iocoder.yudao.module.smartfactory.controller.admin.handlinggroupamountspecifications.vo.HandlingGroupAmountSpecificationsVO">
         <!-- 基础字段映射 -->
         <id property="id" column="id"/>
         <result property="factoryId" column="factory_id"/>
@@ -68,16 +71,16 @@
         SUM( a.amount ) AS totalAmount,
         sum( a.total_count ) AS totalNum,
         JSON_ARRAYAGG(
-            JSON_OBJECT(
-            'handlingSpecificationsId', a.handling_specifications_id,
-            'totalCount', a.total_count,
-            'amount', a.amount,
-            'handlingSpecificationsName', (
-                SELECT hs.specifications_name
-                FROM sf_handling_specifications as hs
-                WHERE hs.id = a.handling_specifications_id
-                )
-            )
+        JSON_OBJECT(
+        'handlingSpecificationsId', a.handling_specifications_id,
+        'totalCount', a.total_count,
+        'amount', a.amount,
+        'handlingSpecificationsName', (
+        SELECT hs.specifications_name
+        FROM sf_handling_specifications as hs
+        WHERE hs.id = a.handling_specifications_id
+        )
+        )
         ) AS specificationDetails
         FROM
         sf_handling_group_amount_specifications AS a
@@ -87,7 +90,6 @@
         <where>
             a.deleted = 0
             and b.deleted = 0
-            and c.deleted = 0
             <if test="vo.factoryId != null">
                 and a.factory_id = #{vo.factoryId}
             </if>
@@ -131,4 +133,13 @@
         a.date_str,
         a.handling_group_id
     </select>
+    <select id="getHandlingGroup"
+            resultType="cn.iocoder.yudao.module.smartfactory.dal.dataobject.handlinggroup.HandlingGroupDO">
+        SELECT a.*,
+               b.short_name as factoryName
+        FROM sf_handling_group AS a
+                 left join sf_factory_info as b on a.factory_id = b.id
+        WHERE a.deleted = 0
+          and a.id = #{id}
+    </select>
 </mapper>

zn-module-smartfactory/zn-module-smartfactory-biz/src/main/resources/mapper/handlingspecifications/HandlingSpecificationsMapper.xml

@@ -51,4 +51,18 @@
             </if>
         </where>
     </select>
+    <select id="getHandlingSpecifications"
+            resultType="cn.iocoder.yudao.module.smartfactory.dal.dataobject.handlingspecifications.HandlingSpecificationsDO">
+        select a.*,
+        b.short_name as factoryName
+        from sf_handling_specifications as a
+        left join sf_factory_info as b on a.factory_id = b.id
+        <where>
+            a.deleted = 0
+            and b.deleted = 0
+            <if test="id != null">
+                and a.id = #{id}
+            </if>
+        </where>
+    </select>
 </mapper>