Merge branch 'develop' of ssh://git.mmcuav.cn:8222/iuav/pms into develop

kustomization/overlays/dev/kustomization.yaml

@@ -18,4 +18,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/pms
-  newTag: b2cfb14c1a2e4c9506fd0d349756031fdf00c757
+  newTag: 757f0a2dc9e893e41007e7f05972b846146bb4f9

src/main/java/com/mmc/pms/model/work/dto/WorkServiceDTO.java

@@ -56,4 +56,7 @@ public class WorkServiceDTO implements Serializable {
 
     @ApiModelProperty(value = "评论数量")
     private Integer inspComtAmount;
+
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
 }

src/main/java/com/mmc/pms/service/impl/BackstageTaskServiceImpl.java

@@ -242,6 +242,7 @@ public class BackstageTaskServiceImpl implements BackstageTaskService {
                       .serviceName(item.getServiceName())
                       .companyId(item.getCompanyId())
                       .companyName(companyName)
+                      .sort(item.getSort())
                       .coverPlan(item.getCoverPlan())
                       .serviceIntroduction(item.getServiceIntroduction())
                       .video(item.getVideo())

src/main/resources/mapper/work/BackstageTaskServiceDao.xml

@@ -212,7 +212,7 @@
     <select id="queryPageByLimit" resultType="com.mmc.pms.entity.ServiceDO">
         select
         id, service_name, application_id, industry_id, display_state, cover_plan, share_card, video,
-        service_introduction, create_time, update_time, account_id,company_id
+        service_introduction, create_time, update_time, account_id,company_id,sort
         from service
         <where>
             is_deleted = 0 and display_state = 0
@@ -244,9 +244,10 @@
                 and display_state = #{param.displayState}
             </if>
         </where>
-        order by create_time desc
+        order by sort desc
         limit #{param.pageNo}, #{param.pageSize}
     </select>
+
     <select id="QueryWorkServiceListById" resultType="com.mmc.pms.model.work.dto.ServiceDTO">
         select id,
         service_name,