Merge branch 'pt' of dd.tall.wiki:ccsens_wiki/ccsenscloud into pt

tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java

@@ -20,8 +20,8 @@ public class DeliverDto {
         private Long deliverLogId;
         @ApiModelProperty("任务在此时间段的id")
         private Long taskId;
-        @ApiModelProperty("检查状况")
-        private Boolean checkStatus;
+        @ApiModelProperty("检查状况(0-未检查,1-通过,2-驳回)")
+        private Byte checkStatus;
         @ApiModelProperty("检查人备注")
         private String text;
         @Max(10)

tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java

@@ -761,7 +761,7 @@ public class TaskDeliverService implements ITaskDeliverService {
                     for (ProTaskDeliverPostLogChecker postLogChecker : postLogCheckerList) {
                         if (role.getId().longValue() == postLogChecker.getCheckerId().longValue()) {
                             postLogChecker.setRemark(checkDeliver.getText());
-                            if (checkDeliver.getCheckStatus()) {
+                            if (1 == checkDeliver.getCheckStatus()) {
                                 postLogChecker.setCheckStatus(1);
                                 postLogChecker.setScore(checkDeliver.getScore());
                             } else {
@@ -799,7 +799,7 @@ public class TaskDeliverService implements ITaskDeliverService {
             checkerDtoData.setCheckRoleName(checkRole.getName());
         }
         checkerDtoData.setCheckTime(checkTime);
-        checkerDtoData.setIsChecker(checkDeliver.getCheckStatus());
+        checkerDtoData.setIsChecker(checkDeliver.getCheckStatus()==1?true:false);
         checkerDto.setData(checkerDtoData);
         //接收者
         if(CollectionUtil.isNotEmpty(userIdSet)) {
@@ -820,7 +820,7 @@ public class TaskDeliverService implements ITaskDeliverService {
         //查找成员
         ProMember proMember = iProMemberService.selectByUserId(currentUserId, task.getProjectId());
         //审核状态3为通过4为驳回
-        Byte doType = checkDeliver.getCheckStatus() == true ? (byte) 3 :(byte)4;
+        Byte doType = checkDeliver.getCheckStatus() == 1 ? (byte) 3 :(byte)4;
         //将操作记录添加到历史记录表中
         ProDeliverHistoryRecord historyRecord = new ProDeliverHistoryRecord();
         historyRecord.setId(snowflake.nextId());
@@ -834,7 +834,7 @@ public class TaskDeliverService implements ITaskDeliverService {
         //检查完，返回数据
         DeliverVo.DeliverInfo deliverInfo = selectDeliverInfo(currentUserId, deliver.getId(), checkDeliver.getTaskId(),token);
         //用智能助手发送消息+ws/公众号发送
-        robotService.checkDeliverRobotSend(currentUserId,task,uploadUserId,deliver.getName(),checkDeliver.getCheckStatus());
+        robotService.checkDeliverRobotSend(currentUserId,task,uploadUserId,deliver.getName(),checkDeliver.getCheckStatus()==1?true:false);
         return deliverInfo;
     }