20220323不知道改了啥

src/main/java/com/ccsens/defaultwbs/api/DebugController.java

@@ -24,7 +24,7 @@ public class DebugController {
     })
     @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"})
     public JsonResponse debug(HttpServletRequest request) throws Exception {
-
+        //添加打卡信息
         return JsonResponse.newInstance().ok("测试");
     }
 

src/main/java/com/ccsens/defaultwbs/api/DeliverController.java

@@ -87,7 +87,7 @@ public class DeliverController {
     public JsonResponse<DeliverVo.QueryDeliverRecord> queryRecord(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.QueryRecord> params) throws Exception{
         log.info("查看交付物上传记录--{}",params);
         DeliverVo.QueryDeliverRecord queryDeliverRecord = deliverService.queryRecord(params.getParam(), params.getUserId());
-        log.info("交付物上传记录--{}",queryDeliverRecord);
+        log.info("返回交付物上传记录");
         return JsonResponse.newInstance().ok(queryDeliverRecord);
     }
 

src/main/java/com/ccsens/defaultwbs/bean/vo/DeliverVo.java

@@ -26,6 +26,10 @@ public class DeliverVo {
         private List<String> details;
         @ApiModelProperty("提交时间")
         private Long submitTime;
+        @ApiModelProperty("提交人Id")
+        private Long submitMemberId;
+        @ApiModelProperty("提交人名称")
+        private String submitMemberName;
         @ApiModelProperty("检查人列表")
         private List<CheckerInfo> checkerList;
     }
@@ -34,7 +38,7 @@ public class DeliverVo {
     @ApiModel("检查人信息")
     public static class CheckerInfo{
         @ApiModelProperty("检查记录id")
-        private String checkId;
+        private Long checkId;
         @ApiModelProperty("检查人id")
         private Long checkerId;
         @ApiModelProperty("检查人名字")

src/main/resources/application.yml

@@ -1,4 +1,4 @@
 spring:
   profiles:
-    active: prod
+    active: test
-    include: common, util-prod
+    include: common, util-test

src/main/resources/mapper_dao/PluDeliverDao.xml

@@ -7,6 +7,8 @@
         <result column="deliverName" property="deliverName"/>
         <result column="deliverRecordId" property="deliverRecordId"/>
         <result column="submitTime" property="submitTime"/>
+        <result column="submitMemberId" property="submitMemberId"/>
+        <result column="submitMemberName" property="submitMemberName"/>
         <collection property="details" ofType="String">
             <result column="details"/>
         </collection>
@@ -34,10 +36,13 @@
             d.id as deliverId,
             d.`name` as deliverName,
             dr.id as deliverRecordId,
-            dr.submit_time as submitTime
+            dr.submit_time as submitTime,
+            dr.member_id as submitMemberId,
+			m.`name` as submitMemberName
             FROM
             t_plu_deliver d
             LEFT JOIN t_plu_deliver_record dr on d.id = dr.deliver_id and dr.rec_status = 0
+            LEFT JOIN t_pro_member m on dr.member_id = m.id and m.rec_status = 0
             WHERE
             task_sub_id = #{taskId}
             and d.rec_status = 0
@@ -117,7 +122,7 @@
             WHERE
             d.id = #{deliverId}
             and d.rec_status = 0
-            ORDER BY dr.submit_time DESC
+
         )r
         LEFT JOIN
         t_plu_deliver_record_file f on r.deliverRecordId = f.deliver_record_id and f.rec_status = 0
@@ -149,6 +154,7 @@
             ) ch
             GROUP BY ch.checkId
         )clm on r.deliverRecordId = clm.recordId
+    	ORDER BY r.submitTime DESC, clm.checkTime DESC
     </select>
     <select id="queryCheckLog" resultType="com.ccsens.defaultwbs.bean.vo.DeliverVo$CheckerInfo">
         SELECT