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

common/src/main/java/com/ccsens/common/bean/vo/CClockingInVo.java

@@ -1,5 +1,6 @@
 package com.ccsens.common.bean.vo;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,6 +29,9 @@ public class CClockingInVo {
         private Long memberId;
         @ApiModelProperty("成员名称")
         private String memberName;
+        @JsonIgnore
+        @ApiModelProperty("成员UserId")
+        private Long memberUserId;
         @ApiModelProperty("早打卡时间")
         private Long morning;
         @ApiModelProperty("早打卡状态")
@@ -40,6 +44,10 @@ public class CClockingInVo {
         private Long checkerId;
         @ApiModelProperty("检查人名字")
         private String checkerName;
+        @ApiModelProperty("打卡人不是不是我(0-否,1-是)")
+        private Byte isMine = 0;
+        @ApiModelProperty("检查人是不是我(0-否,1-是)")
+        private Byte isChecker = 0;
     }
 
     @Data

common/src/main/java/com/ccsens/common/service/ClockingInService.java

@@ -64,23 +64,32 @@ public class ClockingInService implements IClockingInService {
 
         //添加成员信息
         //1.查询全部
+
         List<Long> memberIdList = new ArrayList<>();
+        Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId);
+        memberIdList.add(userOfMemberId);
+        ProMember member = memberDao.selectByPrimaryKey(userOfMemberId);
         if (CollectionUtil.isEmpty(params.getMemberIdList())){
-            Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId);
-            memberIdList.add(userOfMemberId);
-            ProMember member = memberDao.selectByPrimaryKey(userOfMemberId);
             List<CClockingInVo.ClockRecord> clockRecordList =  memberDao.queryMembersOfClock(params.getProjectId(),userOfMemberId);
             memberIdList.addAll(clockRecordList.stream().map(CClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
             for (CClockingInVo.ClockingInInfo clockingInInfo : list) {
                 CClockingInVo.ClockRecord clockRecord = new CClockingInVo.ClockRecord();
                 clockRecord.setMemberId(member.getId());
                 clockRecord.setMemberName(member.getName());
+                clockRecord.setMemberUserId(member.getUserId());
                 clockingInInfo.getRecordList().add(clockRecord);
+                if (member.getUserId().equals(clockRecord.getMemberUserId())) {
+                    clockRecord.setIsMine((byte)1);
+                }
                 for (CClockingInVo.ClockRecord record : clockRecordList) {
                     CClockingInVo.ClockRecord otherClockRecord = new CClockingInVo.ClockRecord();
                     otherClockRecord.setMemberId(record.getMemberId());
                     otherClockRecord.setMemberName(record.getMemberName());
+                    otherClockRecord.setMemberUserId(record.getMemberUserId());
                     clockingInInfo.getRecordList().add(otherClockRecord);
+                    if (member.getUserId().equals(otherClockRecord.getMemberUserId())) {
+                        clockRecord.setIsMine((byte)1);
+                    }
                 }
             }
         }else {
@@ -92,6 +101,9 @@ public class ClockingInService implements IClockingInService {
                     CClockingInVo.ClockRecord filterRecord = new CClockingInVo.ClockRecord();
                     filterRecord.setMemberId(clockRecord.getMemberId());
                     filterRecord.setMemberName(clockRecord.getMemberName());
+                    if (filterRecord.getMemberUserId().equals(userId)) {
+                        filterRecord.setIsMine((byte)1);
+                    }
                     clockingInInfo.getRecordList().add(filterRecord);
                 }
             }
@@ -104,7 +116,19 @@ public class ClockingInService implements IClockingInService {
                 if (format.format(new Date(record.getMorning())).equals(clockingInInfo2.getDateTime())) {
                     for (CClockingInVo.ClockRecord clockRecord : clockingInInfo2.getRecordList()) {
                         if (clockRecord.getMemberId().equals(record.getMemberId())) {
-                            BeanUtil.copyProperties(record,clockRecord);
+
+                            clockRecord.setId(record.getId());
+                            clockRecord.setMemberName(record.getMemberName());
+                            clockRecord.setMemberId(record.getMemberId());
+                            clockRecord.setCheckerName(record.getCheckerName());
+                            clockRecord.setCheckerId(record.getCheckerId());
+                            clockRecord.setMorning(record.getMorning());
+                            clockRecord.setMorningStatus(record.getMorningStatus());
+                            clockRecord.setNight(record.getNight());
+                            clockRecord.setNightStatus(record.getNightStatus());
+                            if (record.getCheckerId().equals(member.getId())) {
+                                clockRecord.setIsChecker((byte)1);
+                            }
                         }
                     }
                 }

common/src/main/resources/mapper_dao/ProMemberDao.xml

@@ -37,7 +37,8 @@
     <select id="queryMembersOfClock" resultType="com.ccsens.common.bean.vo.CClockingInVo$ClockRecord">
         SELECT
             id AS memberId,
-            `name` AS memberName
+            `name` AS memberName,
+            user_id AS memberUserId
         FROM
             t_pro_member
         WHERE
@@ -75,7 +76,8 @@
     <select id="queryMemberByIdList" resultType="com.ccsens.common.bean.vo.CClockingInVo$ClockRecord">
         SELECT
             id AS memberId,
-            `name` AS memberName
+            `name` AS memberName,
+            user_id AS memberUserId
         FROM
             t_pro_member
         WHERE