Browse Source

添加签字路径字段

我还能继续跑 6 months ago
parent
commit
df7b701fe0

+ 3 - 0
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/totalscore/vo/TotalScorePageReqVO.java

@@ -21,6 +21,9 @@ public class TotalScorePageReqVO extends PageParam {
     @Schema(description = "总评分")
     private String overallRating;
 
+    @Schema(description = "签名路径")
+    private String signatureUrl;
+
     @Schema(description = "创建时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;

+ 4 - 0
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/totalscore/vo/TotalScoreRespVO.java

@@ -24,6 +24,10 @@ public class TotalScoreRespVO {
     @ExcelProperty("总评分")
     private String overallRating;
 
+    @Schema(description = "签名路径")
+    @ExcelProperty("签名路径")
+    private String signatureUrl;
+
     @Schema(description = "创建时间")
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

+ 2 - 0
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/controller/admin/totalscore/vo/TotalScoreSaveReqVO.java

@@ -18,4 +18,6 @@ public class TotalScoreSaveReqVO {
     @Schema(description = "总评分")
     private String overallRating;
 
+    @Schema(description = "签名路径")
+    private String signatureUrl;
 }

+ 4 - 0
yudao-module-work/yudao-module-work-biz/src/main/java/cn/iocoder/yudao/module/work/dal/dataobject/totalscore/TotalScoreDO.java

@@ -35,5 +35,9 @@ public class TotalScoreDO extends BaseDO {
      * 总评分
      */
     private String overallRating;
+    /**
+     * 签名路径
+     */
+    private String signatureUrl;
 
 }

+ 3 - 3
yudao-module-work/yudao-module-work-biz/src/main/resources/mapper/score/ScoreMapper.xml

@@ -13,17 +13,17 @@
 <!--        select DISTINCT work_id from work_score-->
 <!--    </select>-->
     <select id="getScoreWork" resultType="java.util.Map">
-        select  a.work_id,b.work_name,count(a.work_id) pfrs from work_score a LEFT JOIN work b on a.work_id=b.work_id where a.`status`='1' GROUP BY a.work_id
+        select  a.work_id,b.work_name,count(a.work_id) pfrs from work_score a LEFT JOIN work b on a.work_id=b.work_id where a.`status`='1' and a.deleted='0' GROUP BY a.work_id
 </select>
 
     <!--    <select id="getdfrs" resultType="java.lang.Integer">-->
 <!--        select  count(work_id) from work_score where  work_id='37' and `status`='1' GROUP BY work_id-->
 <!--    </select>-->
     <select id="getxydfrs" resultType="java.lang.String">
-        select user_ids from work_allocation where work_type_id = (select category_id from work  where work_id=#{workId})
+        select user_ids from work_allocation where work_type_id = (select category_id from work  where work_id=#{workId}) and deleted='0'
     </select>
     <select id="getdfxq" resultType="java.lang.Integer">
-        select score from work_score  where `status`='1' and work_id=#{workId}
+        select score from work_score  where `status`='1' and work_id=#{workId} and deleted='0'
     </select>
 
     <!--    <select id="getScoreWork" resultType="java.util.LinkedHashMap">-->