Merge branch 'develop'

csf-common/csf-common-model/src/main/java/com/mmc/csf/release/task/vo/TaskServiceDetailVO.java

@@ -34,6 +34,21 @@ public class TaskServiceDetailVO implements Serializable {
     @ApiModelProperty(value = "服务团队详情海报图")
     private String teamPoster;
 
+    @ApiModelProperty(value = "服务亮点")
+    private String lightSpot;
+
+    @ApiModelProperty(value = "行业名称")
+    private String industryName;
+
+    @ApiModelProperty(value = "行业id")
+    private Integer industryId;
+
+    @ApiModelProperty(value = "手射领取数")
+    private Integer fakeNum;
+
+    @ApiModelProperty(value = "内容")
+    private String content;
+
     @ApiModelProperty(value = "评价信息")
     private List<EvaluateInfoVO> evaluateInfo;
     @ApiModelProperty(value = "评价总数量")

kustomization/overlays/dev/kustomization.yaml

@@ -17,4 +17,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/ims
-  newTag: 7436bdc1d6d92feda75d5fbcf35de7b4862c3d7f
+  newTag: e905857c0b67d2893424ea05eb538494e0e9955c

release-service/src/main/java/com/mmc/csf/release/entity/InspectionDO.java

@@ -106,13 +106,18 @@ public class InspectionDO implements Serializable {
      */
     private BigDecimal price;
 
+    private String industryName;
+
+    private Integer industryId;
+
     public TaskServiceVO buildTaskService() {
         return TaskServiceVO.builder().serviceName(name).teamName("浙江科比特创新科技有限公司").price(price).id(id).build();
     }
 
     public TaskServiceDetailVO buildTaskServiceDetailVO(){
-        return TaskServiceDetailVO.builder().serviceName(name).id(id).teamPoster("https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/d755a2ee-ffe4-4c2c-8a8b-afcf447ad2ac.jpg")
-                .pictureUrl(image).videoUrl(video).build();
+        return TaskServiceDetailVO.builder().serviceName(name).id(id)
+                .teamPoster("https://pad-video-x.oss-cn-shenzhen.aliyuncs.com/file/d755a2ee-ffe4-4c2c-8a8b-afcf447ad2ac.jpg")
+                .pictureUrl(image).videoUrl(video).industryId(industryId).fakeNum(fakeNum).content(content).lightSpot(lightSpot).industryName(industryName).build();
     }
 }
 

release-service/src/main/resources/mapper/work/TaskDao.xml

@@ -57,12 +57,22 @@
         LIMIT #{pageNo},#{pageSize}
     </select>
     <select id="selectInspectionById" resultType="com.mmc.csf.release.entity.InspectionDO">
-        select `name`,
-               id,
-               video,
-               image
-        from inspection
-        where id = #{id}
+        SELECT
+            ins.`name`,
+            ins.id,
+            ins.video,
+            ins.image,
+            ins.content,
+            ins.fake_num,
+            ins.light_spot,
+            ind.`name` industryName,
+            ind.id industryId
+        FROM
+            inspection ins
+                INNER JOIN industry_inspection ii ON ins.id = ii.inspection_id
+                INNER JOIN industry ind ON ind.id = ii.industry_id
+        WHERE
+            ins.id = #{id}
     </select>
     <select id="getIndustryAndInspect" resultType="java.lang.Integer">
         select count(*)