1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/entity/ProdProcedure.java

@@ -16,13 +16,15 @@ import lombok.experimental.Accessors;
  * </p>
  *
  * @author Seyason
- * @since 2023-07-02
+ * @since 2024-03-19
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 public class ProdProcedure extends Model<ProdProcedure> {
 
+    private static final long serialVersionUID=1L;
+
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 
@@ -74,8 +76,16 @@ public class ProdProcedure extends Model<ProdProcedure> {
     @TableField("product_name")
     private String productName;
 
+    /**
+     * 排序
+     */
+    @TableField("seq")
+    private Integer seq;
+
+
     @Override
     protected Serializable pkVal() {
         return this.id;
     }
+
 }

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ProdProcedureServiceImpl.java

@@ -154,7 +154,7 @@ public class ProdProcedureServiceImpl extends ServiceImpl<ProdProcedureMapper, P
                         .select("DISTINCT version_number")
                         .lambda()
                         .eq(productId != null, ProdProcedure::getProductId, productId)
-                        .eq(user.getCompanyId()!=null,ProdProcedure::getCompanyId,user.getCompanyId())
+                        .eq(user.getCompanyId()!=null,ProdProcedure::getCompanyId,user.getCompanyId()).orderByAsc(ProdProcedure::getSeq)
 
         );
         List<String> versionList = procedureVersions.stream().map(prodProcedure -> prodProcedure.getVersionNumber()).collect(Collectors.toList());

fhKeeper/formulahousekeeper/management-workshop/src/main/resources/mapper/ProdProcedureMapper.xml

@@ -5,16 +5,20 @@
     <!-- 通用查询映射结果 -->
     <resultMap id="BaseResultMap" type="com.management.platform.entity.ProdProcedure">
         <id column="id" property="id" />
-        <result column="prod_id" property="prodId" />
-        <result column="procedure_id" property="procedureId" />
-        <result column="proced_type" property="procedType" />
-        <result column="price" property="price" />
+        <result column="name" property="name" />
+        <result column="company_id" property="companyId" />
+        <result column="product_id" property="productId" />
+        <result column="unit_price" property="unitPrice" />
         <result column="check_type" property="checkType" />
+        <result column="working_time" property="workingTime" />
+        <result column="version_number" property="versionNumber" />
+        <result column="product_name" property="productName" />
+        <result column="seq" property="seq" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, prod_id, procedure_id, proced_type, price, check_type
+        id, name, company_id, product_id, unit_price, check_type, working_time, version_number, product_name, seq
     </sql>
 
 </mapper>