Browse Source

20211224打卡相关接口修改

master
zy_Java 4 years ago
parent
commit
78c6b9a7ea
  1. 2
      src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java
  2. 4
      src/main/java/com/ccsens/defaultwbs/bean/dto/ClockingInDto.java
  3. 276
      src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingIn.java
  4. 1740
      src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingInExample.java
  5. 4
      src/main/java/com/ccsens/defaultwbs/bean/vo/ClockingInVo.java
  6. 6
      src/main/java/com/ccsens/defaultwbs/persist/dao/ProClockingInDao.java
  7. 3
      src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverDao.java
  8. 58
      src/main/java/com/ccsens/defaultwbs/persist/mapper/ProClockingInMapper.java
  9. 92
      src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java
  10. 9
      src/main/java/com/ccsens/defaultwbs/service/DeliverService.java
  11. 4
      src/main/resources/application.yml
  12. 2
      src/main/resources/druid-dev.yml
  13. 64
      src/main/resources/mapper_dao/ProClockingInDao.xml
  14. 5
      src/main/resources/mapper_dao/ProDeliverDao.xml
  15. 612
      src/main/resources/mapper_raw/ProClockingInMapper.xml
  16. 4
      src/main/resources/mbg.xml

2
src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java

@ -37,7 +37,7 @@ public class ClockingInController {
public JsonResponse<List<ClockingInVo.ClockingInInfo>> queryDeliverOfTask(@ApiParam @Validated @RequestBody QueryDto<ClockingInDto.QueryClockingIn> params) throws Exception{
log.info("查询打卡信息:{}",params);
List<ClockingInVo.ClockingInInfo> clockingInInfos = clockingInService.queryClockingIn(params.getParam(), params.getUserId());
log.info("查询-打卡信息返回:{}",clockingInInfos);
log.info("查询-打卡信息成功");
return JsonResponse.newInstance().ok(clockingInInfos);
}

4
src/main/java/com/ccsens/defaultwbs/bean/dto/ClockingInDto.java

@ -35,9 +35,11 @@ public class ClockingInDto {
public static class PunchTheClock{
@ApiModelProperty("记录id(没有则不传)")
private Long id;
@JsonFormat(pattern = "yyyy-MM-dd")
@NotNull(message = "打卡时间不能为空")
@ApiModelProperty("打卡日期")
private Long dateTime;
@ApiModelProperty("打卡原因")
private String remark;
@NotNull(message = "成员id不能为空")
@ApiModelProperty("考勤信息中的成员id")
private Long memberId;

276
src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingIn.java

@ -1,128 +1,150 @@
package com.ccsens.defaultwbs.bean.po;
import java.io.Serializable;
import java.util.Date;
public class ProClockingIn implements Serializable {
private Long id;
private Long memberId;
private Long checkerId;
private Long morning;
private Byte morningStatus;
private Long night;
private Byte nightStatus;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getMemberId() {
return memberId;
}
public void setMemberId(Long memberId) {
this.memberId = memberId;
}
public Long getCheckerId() {
return checkerId;
}
public void setCheckerId(Long checkerId) {
this.checkerId = checkerId;
}
public Long getMorning() {
return morning;
}
public void setMorning(Long morning) {
this.morning = morning;
}
public Byte getMorningStatus() {
return morningStatus;
}
public void setMorningStatus(Byte morningStatus) {
this.morningStatus = morningStatus;
}
public Long getNight() {
return night;
}
public void setNight(Long night) {
this.night = night;
}
public Byte getNightStatus() {
return nightStatus;
}
public void setNightStatus(Byte nightStatus) {
this.nightStatus = nightStatus;
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", memberId=").append(memberId);
sb.append(", checkerId=").append(checkerId);
sb.append(", morning=").append(morning);
sb.append(", morningStatus=").append(morningStatus);
sb.append(", night=").append(night);
sb.append(", nightStatus=").append(nightStatus);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append("]");
return sb.toString();
}
package com.ccsens.defaultwbs.bean.po;
import java.io.Serializable;
import java.util.Date;
public class ProClockingIn implements Serializable {
private Long id;
private Long memberId;
private Long checkerId;
private Long morning;
private Byte morningStatus;
private Long night;
private Byte nightStatus;
private Date createdAt;
private Date updatedAt;
private Byte recStatus;
private String morningRemark;
private String nightRemark;
private static final long serialVersionUID = 1L;
public Long getId() {
return id;
}
public void setId(Long id) {
this.id = id;
}
public Long getMemberId() {
return memberId;
}
public void setMemberId(Long memberId) {
this.memberId = memberId;
}
public Long getCheckerId() {
return checkerId;
}
public void setCheckerId(Long checkerId) {
this.checkerId = checkerId;
}
public Long getMorning() {
return morning;
}
public void setMorning(Long morning) {
this.morning = morning;
}
public Byte getMorningStatus() {
return morningStatus;
}
public void setMorningStatus(Byte morningStatus) {
this.morningStatus = morningStatus;
}
public Long getNight() {
return night;
}
public void setNight(Long night) {
this.night = night;
}
public Byte getNightStatus() {
return nightStatus;
}
public void setNightStatus(Byte nightStatus) {
this.nightStatus = nightStatus;
}
public Date getCreatedAt() {
return createdAt;
}
public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
}
public Date getUpdatedAt() {
return updatedAt;
}
public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
}
public Byte getRecStatus() {
return recStatus;
}
public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
}
public String getMorningRemark() {
return morningRemark;
}
public void setMorningRemark(String morningRemark) {
this.morningRemark = morningRemark == null ? null : morningRemark.trim();
}
public String getNightRemark() {
return nightRemark;
}
public void setNightRemark(String nightRemark) {
this.nightRemark = nightRemark == null ? null : nightRemark.trim();
}
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append(getClass().getSimpleName());
sb.append(" [");
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id);
sb.append(", memberId=").append(memberId);
sb.append(", checkerId=").append(checkerId);
sb.append(", morning=").append(morning);
sb.append(", morningStatus=").append(morningStatus);
sb.append(", night=").append(night);
sb.append(", nightStatus=").append(nightStatus);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append(", morningRemark=").append(morningRemark);
sb.append(", nightRemark=").append(nightRemark);
sb.append("]");
return sb.toString();
}
}

1740
src/main/java/com/ccsens/defaultwbs/bean/po/ProClockingInExample.java

File diff suppressed because it is too large

4
src/main/java/com/ccsens/defaultwbs/bean/vo/ClockingInVo.java

@ -41,10 +41,14 @@ public class ClockingInVo {
private Long morning;
@ApiModelProperty("早打卡状态")
private Byte morningStatus;
@ApiModelProperty("早打卡原因")
private String morningRemark;
@ApiModelProperty("晚打卡时间")
private Long night;
@ApiModelProperty("晚打卡状态")
private Byte nightStatus;
@ApiModelProperty("晚打卡原因")
private String nightRemark;
@ApiModelProperty("检查人id")
private Long checkerId;
@ApiModelProperty("检查人名字")

6
src/main/java/com/ccsens/defaultwbs/persist/dao/ProClockingInDao.java

@ -21,7 +21,7 @@ public interface ProClockingInDao extends ProClockingInMapper {
* @param memberIdList 成员id列表
* @return 打卡记录列表
*/
List<ClockingInVo.ClockRecord> queryByMemberId(@Param("memberIdList") List<Long> memberIdList);
List<ClockingInVo.ClockRecord> queryByMemberId(@Param("memberIdList") List<Long> memberIdList, @Param("startTime") Long startTime, @Param("endTime") Long endTime);
/**
* 查询该成员今天是否有打卡记录
@ -41,11 +41,11 @@ public interface ProClockingInDao extends ProClockingInMapper {
/**
* 查询需要打卡的成员,排除当前登录用户
* @param projectId 项目id
* @param userOfMemberId 当前登录人的成员id
* @param mineId 当前登录人的成员id
* @param roleId 角色id
* @return 打卡记录
*/
List<ClockingInVo.ClockRecord> queryMembersOfClock(@Param("projectId") Long projectId,@Param("userId") Long userOfMemberId,@Param("roleId") Long roleId);
List<ClockingInVo.ClockRecord> queryMembersOfClock(@Param("projectId") Long projectId,@Param("mineId") Long mineId,@Param("roleId") Long roleId,@Param("memberIdList") List<Long> memberIdList);
/**
* 通过成员idList查询成员信息

3
src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverDao.java

@ -31,8 +31,9 @@ public interface ProDeliverDao extends ProDeliverMapper {
/**
* 查询所有检查人
* @param projectId 项目id
* @param userId userId
* @return 检查人列表
*/
List<DeliverVo.Checker> queryChecker(@Param("projectId") Long projectId);
List<DeliverVo.Checker> queryChecker(@Param("projectId") Long projectId,@Param("userId") Long userId);
}

58
src/main/java/com/ccsens/defaultwbs/persist/mapper/ProClockingInMapper.java

@ -1,30 +1,30 @@
package com.ccsens.defaultwbs.persist.mapper;
import com.ccsens.defaultwbs.bean.po.ProClockingIn;
import com.ccsens.defaultwbs.bean.po.ProClockingInExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ProClockingInMapper {
long countByExample(ProClockingInExample example);
int deleteByExample(ProClockingInExample example);
int deleteByPrimaryKey(Long id);
int insert(ProClockingIn record);
int insertSelective(ProClockingIn record);
List<ProClockingIn> selectByExample(ProClockingInExample example);
ProClockingIn selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") ProClockingIn record, @Param("example") ProClockingInExample example);
int updateByExample(@Param("record") ProClockingIn record, @Param("example") ProClockingInExample example);
int updateByPrimaryKeySelective(ProClockingIn record);
int updateByPrimaryKey(ProClockingIn record);
package com.ccsens.defaultwbs.persist.mapper;
import com.ccsens.defaultwbs.bean.po.ProClockingIn;
import com.ccsens.defaultwbs.bean.po.ProClockingInExample;
import java.util.List;
import org.apache.ibatis.annotations.Param;
public interface ProClockingInMapper {
long countByExample(ProClockingInExample example);
int deleteByExample(ProClockingInExample example);
int deleteByPrimaryKey(Long id);
int insert(ProClockingIn record);
int insertSelective(ProClockingIn record);
List<ProClockingIn> selectByExample(ProClockingInExample example);
ProClockingIn selectByPrimaryKey(Long id);
int updateByExampleSelective(@Param("record") ProClockingIn record, @Param("example") ProClockingInExample example);
int updateByExample(@Param("record") ProClockingIn record, @Param("example") ProClockingInExample example);
int updateByPrimaryKeySelective(ProClockingIn record);
int updateByPrimaryKey(ProClockingIn record);
}

92
src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java

@ -19,6 +19,7 @@ import com.ccsens.defaultwbs.util.DefaultCodeError;
import com.ccsens.util.PoiUtil;
import com.ccsens.util.PropUtil;
import com.ccsens.util.exception.BaseException;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.ss.usermodel.Workbook;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@ -80,51 +81,59 @@ public class ClockingInService implements IClockingInService {
//1.查询全部
List<Long> memberIdList = new ArrayList<>();
Long userOfMemberId = memberDao.findUserOfMemberId(params.getProjectId(), userId);
memberIdList.add(userOfMemberId);
ProMember member = memberDao.queryMemberOfRole(userOfMemberId, params.getRoleId());
// memberIdList.add(userOfMemberId);
// ProMember member = memberDao.queryMemberOfRole(userOfMemberId, params.getRoleId());
List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMembersOfClock(params.getProjectId(), userOfMemberId, params.getRoleId(),params.getMemberIdList());
if (CollectionUtil.isEmpty(params.getMemberIdList())) {
List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMembersOfClock(params.getProjectId(), userOfMemberId, params.getRoleId());
memberIdList.addAll(clockRecordList.stream().map(ClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
// memberIdList.addAll(clockRecordList.stream().map(ClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
for (ClockingInVo.ClockingInInfo clockingInInfo : list) {
if (ObjectUtil.isNotNull(member)) {
ClockingInVo.ClockRecord clockRecord = new ClockingInVo.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);
}
}
// if (ObjectUtil.isNotNull(member)) {
// ClockingInVo.ClockRecord clockRecord = new ClockingInVo.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 (ClockingInVo.ClockRecord record : clockRecordList) {
ClockingInVo.ClockRecord otherClockRecord = new ClockingInVo.ClockRecord();
otherClockRecord.setMemberId(record.getMemberId());
otherClockRecord.setMemberName(record.getMemberName());
otherClockRecord.setMemberUserId(record.getMemberUserId());
otherClockRecord.setIsMine(record.getIsMine());
clockingInInfo.getRecordList().add(otherClockRecord);
if (ObjectUtil.isNotNull(member)) {
if (member.getUserId().equals(otherClockRecord.getMemberUserId())) {
record.setIsMine((byte) 1);
}
}
//添加成员id
memberIdList.add(record.getMemberId());
// if (ObjectUtil.isNotNull(member)) {
// if (member.getUserId().equals(otherClockRecord.getMemberUserId())) {
// record.setIsMine((byte) 1);
// }
// }
//
}
}
} else {
//2.筛选成员
List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMemberByIdList(params.getMemberIdList(), params.getRoleId());
// List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMemberByIdList(params.getMemberIdList(), params.getRoleId());
// List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMembersOfClock(params.getProjectId(), userOfMemberId, params.getRoleId(),params.getMemberIdList());
if (CollectionUtil.isNotEmpty(clockRecordList)) {
memberIdList.addAll(clockRecordList.stream().map(ClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
// memberIdList.addAll(clockRecordList.stream().map(ClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
for (ClockingInVo.ClockingInInfo clockingInInfo : list) {
for (ClockingInVo.ClockRecord clockRecord : clockRecordList) {
ClockingInVo.ClockRecord filterRecord = new ClockingInVo.ClockRecord();
filterRecord.setMemberId(clockRecord.getMemberId());
filterRecord.setMemberName(clockRecord.getMemberName());
filterRecord.setMemberUserId(clockRecord.getMemberUserId());
if (filterRecord.getMemberUserId().equals(userId)) {
filterRecord.setIsMine((byte) 1);
}
filterRecord.setIsMine(clockRecord.getIsMine());
// if (filterRecord.getMemberUserId().equals(userId)) {
// filterRecord.setIsMine((byte) 1);
// }
clockingInInfo.getRecordList().add(filterRecord);
//添加成员id
memberIdList.add(clockRecord.getMemberId());
}
}
}
@ -133,7 +142,7 @@ public class ClockingInService implements IClockingInService {
//查询所有成员打卡记录
if (CollectionUtil.isNotEmpty(memberIdList)) {
List<ClockingInVo.ClockRecord> clockRecords = clockingInDao.queryByMemberId(memberIdList);
List<ClockingInVo.ClockRecord> clockRecords = clockingInDao.queryByMemberId(memberIdList,params.getStartTime(),params.getEndTime());
for (ClockingInVo.ClockingInInfo clockingInInfo2 : list) {
for (ClockingInVo.ClockRecord record : clockRecords) {
if (format.format(new Date(record.getMorning())).equals(clockingInInfo2.getDateTime()) || format.format(new Date(record.getNight())).equals(clockingInInfo2.getDateTime())) {
@ -149,8 +158,8 @@ public class ClockingInService implements IClockingInService {
clockRecord.setMorningStatus(record.getMorningStatus());
clockRecord.setNight(record.getNight());
clockRecord.setNightStatus(record.getNightStatus());
if (ObjectUtil.isNotNull(member)) {
if (record.getCheckerId().equals(member.getId())) {
if (ObjectUtil.isNotNull(userOfMemberId)) {
if (record.getCheckerId().equals(userOfMemberId)) {
clockRecord.setIsChecker((byte) 1);
}
}
@ -185,22 +194,29 @@ public class ClockingInService implements IClockingInService {
throw new BaseException(CommonCodeError.MEMBER_NOT_MINE);
}
//验证打卡日期是否是今天
DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
String format = df.format(new Date());
log.info("获取今天的日期:{}", format);
if (!format.equalsIgnoreCase(df.format(new Date(params.getDateTime())))) {
// DateFormat df = new SimpleDateFormat("yyyy-MM-dd");
// String format = df.format(new Date());
// log.info("获取今天的日期:{}", format);
// if (!format.equalsIgnoreCase(df.format(new Date(params.getDateTime())))) {
// throw new BaseException(CommonCodeError.DATE_ERROR);
// }
Date date = new Date();
if (date.getTime() < params.getDateTime()) {
log.info("系统时间:{}---打卡时间:{}",date.getTime(),params.getDateTime());
throw new BaseException(CommonCodeError.DATE_ERROR);
}
//判断是否有打卡记录
ProClockingIn proClockingIn = clockingInDao.queryHaveData(params.getMemberId(), System.currentTimeMillis());
ProClockingIn proClockingIn = clockingInDao.queryHaveData(params.getMemberId(), params.getDateTime());
if (ObjectUtil.isNotNull(proClockingIn)) {
//如果有记录则查找记录并修改
if (params.getClockType() == 0 && proClockingIn.getMorningStatus() == 0) {
proClockingIn.setMorning(System.currentTimeMillis());
proClockingIn.setMorning(params.getDateTime());
proClockingIn.setMorningStatus((byte) 1);
proClockingIn.setMorningRemark(params.getRemark());
} else if (params.getClockType() == 1 && proClockingIn.getNightStatus() == 0) {
proClockingIn.setNight(System.currentTimeMillis());
proClockingIn.setNight(params.getDateTime());
proClockingIn.setNightStatus((byte) 1);
proClockingIn.setNightRemark(params.getRemark());
}
proClockingIn.setCheckerId(params.getCheckerId());
clockingInDao.updateByPrimaryKeySelective(proClockingIn);
@ -211,11 +227,13 @@ public class ClockingInService implements IClockingInService {
newClockingIn.setMemberId(params.getMemberId());
newClockingIn.setCheckerId(params.getCheckerId());
if (params.getClockType() == 0) {
newClockingIn.setMorning(System.currentTimeMillis());
newClockingIn.setMorning(params.getDateTime());
newClockingIn.setMorningStatus((byte) 1);
newClockingIn.setMorningRemark(params.getRemark());
} else if (params.getClockType() == 1) {
newClockingIn.setNight(System.currentTimeMillis());
newClockingIn.setNight(params.getDateTime());
newClockingIn.setNightStatus((byte) 1);
newClockingIn.setNightRemark(params.getRemark());
}
clockingInDao.insertSelective(newClockingIn);
}

9
src/main/java/com/ccsens/defaultwbs/service/DeliverService.java

@ -65,13 +65,8 @@ public class DeliverService implements IDeliverService {
@Override
public List<DeliverVo.Checker> queryChecker(DeliverDto.QueryChecker params, Long userId) {
List<DeliverVo.Checker> checkers = deliverDao.queryChecker(params.getProjectId());
for (DeliverVo.Checker checker : checkers) {
if (checker.getUserId().equals(userId)){
checker.setIsMine((byte)1);
}
}
return checkers;
return deliverDao.queryChecker(params.getProjectId(),userId);
}

4
src/main/resources/application.yml

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

2
src/main/resources/druid-dev.yml

@ -29,7 +29,7 @@ spring:
testWhileIdle: true
timeBetweenEvictionRunsMillis: 60000
url: jdbc:mysql://49.233.89.188:3306/defaultwbs?useUnicode=true&characterEncoding=UTF-8
# url: jdbc:mysql://www.tall.wiki/defaultwbs?useUnicode=true&characterEncoding=UTF-8&serverTimezone=Asia/Shanghai&autoReconnect=true
username: root
validationQuery: SELECT 1 FROM DUAL
# env: CCSENS_GAME
env: CCSENS_TALL

64
src/main/resources/mapper_dao/ProClockingInDao.xml

@ -11,18 +11,36 @@
m2.`name` AS checkerName,
c.morning,
c.morning_status,
c.morning_remark,
c.night,
c.night_status
c.night_status,
c.night_remark,
if(morning != 0,FROM_UNIXTIME(morning / 1000, '%Y-%m-%d'),FROM_UNIXTIME(night / 1000, '%Y-%m-%d')) as `day`
FROM
t_pro_clocking_in AS c
LEFT JOIN t_pro_member AS m ON m.id = c.member_id
LEFT JOIN t_pro_member AS m2 ON m2.id = c.checker_id
LEFT JOIN t_pro_member AS m ON m.id = c.member_id and m.rec_status = 0
LEFT JOIN t_pro_member AS m2 ON m2.id = c.checker_id and m2.rec_status = 0
WHERE
c.rec_status = 0
c.rec_status = 0
and
(
(
morning != 0
and morning &gt;= #{startTime}
and morning &lt;= #{endTime}
)
or
(
night != 0
and night &gt;= #{startTime}
and night &lt;= #{endTime}
)
)
AND member_id IN
<foreach collection="memberIdList" item="item" open="(" separator="," close=")">
#{item}
</foreach>
GROUP BY member_id, `day`
</select>
<select id="queryHaveData" resultType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
@ -40,11 +58,21 @@
WHERE
rec_status = 0
AND member_id = #{memberId}
AND DATE_FORMAT(created_at, '%Y-%m-%d') = FROM_UNIXTIME(
#{time} / 1000,
'%Y-%m-%d'
and
(
(
morning != 0
and
FROM_UNIXTIME(morning / 1000, '%Y-%m-%d') = FROM_UNIXTIME(#{time} / 1000, '%Y-%m-%d')
)
or
(
night != 0
and
FROM_UNIXTIME(night / 1000, '%Y-%m-%d') = FROM_UNIXTIME(#{time} / 1000, '%Y-%m-%d')
)
)
LIMIT 1
LIMIT 1
</select>
<select id="queryLastChecker" resultType="com.ccsens.defaultwbs.bean.vo.ClockingInVo$LastChecker">
@ -67,15 +95,22 @@
SELECT
m.id AS memberId,
m.`name` AS memberName,
m.user_id AS memberUserId
m.user_id AS memberUserId,
if(m.id = #{mineId},1,0) as isMine
FROM
t_pro_member AS m
LEFT JOIN t_pro_role_member AS rm ON m.id = rm.member_id
LEFT JOIN t_pro_role_member AS rm ON m.id = rm.member_id and rm.rec_status = 0
WHERE
m.rec_status = 0 AND rm.rec_status = 0
AND m.project_id = #{projectId}
AND rm.role_id = #{roleId}
AND m.id != #{userId}
m.rec_status = 0
AND m.project_id = #{projectId}
AND rm.role_id = #{roleId}
<if test="memberIdList != null and memberIdList.size != 0">
AND m.id IN
<foreach collection="memberIdList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
ORDER BY isMine desc
</select>
<select id="queryChecker" resultType="com.ccsens.defaultwbs.bean.vo.DeliverVo$Checker">
@ -103,6 +138,7 @@
<foreach collection="memberIdList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</select>
<resultMap id="queryMemberRecord" type="com.ccsens.defaultwbs.bean.vo.ClockingInVo$ClockMember">

5
src/main/resources/mapper_dao/ProDeliverDao.xml

@ -74,10 +74,11 @@
<select id="queryChecker" resultType="com.ccsens.defaultwbs.bean.vo.DeliverVo$Checker">
SELECT
SELECT
id AS memberId,
`name`,
user_id
user_id,
if(user_id = #{userId},1,0) as isMine
FROM
t_pro_member
WHERE

612
src/main/resources/mapper_raw/ProClockingInMapper.xml

@ -1,291 +1,323 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.defaultwbs.persist.mapper.ProClockingInMapper">
<resultMap id="BaseResultMap" type="com.ccsens.defaultwbs.bean.po.ProClockingIn">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="member_id" jdbcType="BIGINT" property="memberId" />
<result column="checker_id" jdbcType="BIGINT" property="checkerId" />
<result column="morning" jdbcType="BIGINT" property="morning" />
<result column="morning_status" jdbcType="TINYINT" property="morningStatus" />
<result column="night" jdbcType="BIGINT" property="night" />
<result column="night_status" jdbcType="TINYINT" property="nightStatus" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, member_id, checker_id, morning, morning_status, night, night_status, created_at,
updated_at, rec_status
</sql>
<select id="selectByExample" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingInExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_pro_clocking_in
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from t_pro_clocking_in
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_pro_clocking_in
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingInExample">
delete from t_pro_clocking_in
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
insert into t_pro_clocking_in (id, member_id, checker_id,
morning, morning_status, night,
night_status, created_at, updated_at,
rec_status)
values (#{id,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT},
#{morning,jdbcType=BIGINT}, #{morningStatus,jdbcType=TINYINT}, #{night,jdbcType=BIGINT},
#{nightStatus,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
#{recStatus,jdbcType=TINYINT})
</insert>
<insert id="insertSelective" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
insert into t_pro_clocking_in
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="memberId != null">
member_id,
</if>
<if test="checkerId != null">
checker_id,
</if>
<if test="morning != null">
morning,
</if>
<if test="morningStatus != null">
morning_status,
</if>
<if test="night != null">
night,
</if>
<if test="nightStatus != null">
night_status,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="memberId != null">
#{memberId,jdbcType=BIGINT},
</if>
<if test="checkerId != null">
#{checkerId,jdbcType=BIGINT},
</if>
<if test="morning != null">
#{morning,jdbcType=BIGINT},
</if>
<if test="morningStatus != null">
#{morningStatus,jdbcType=TINYINT},
</if>
<if test="night != null">
#{night,jdbcType=BIGINT},
</if>
<if test="nightStatus != null">
#{nightStatus,jdbcType=TINYINT},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingInExample" resultType="java.lang.Long">
select count(*) from t_pro_clocking_in
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_pro_clocking_in
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.memberId != null">
member_id = #{record.memberId,jdbcType=BIGINT},
</if>
<if test="record.checkerId != null">
checker_id = #{record.checkerId,jdbcType=BIGINT},
</if>
<if test="record.morning != null">
morning = #{record.morning,jdbcType=BIGINT},
</if>
<if test="record.morningStatus != null">
morning_status = #{record.morningStatus,jdbcType=TINYINT},
</if>
<if test="record.night != null">
night = #{record.night,jdbcType=BIGINT},
</if>
<if test="record.nightStatus != null">
night_status = #{record.nightStatus,jdbcType=TINYINT},
</if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
<if test="record.updatedAt != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update t_pro_clocking_in
set id = #{record.id,jdbcType=BIGINT},
member_id = #{record.memberId,jdbcType=BIGINT},
checker_id = #{record.checkerId,jdbcType=BIGINT},
morning = #{record.morning,jdbcType=BIGINT},
morning_status = #{record.morningStatus,jdbcType=TINYINT},
night = #{record.night,jdbcType=BIGINT},
night_status = #{record.nightStatus,jdbcType=TINYINT},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
update t_pro_clocking_in
<set>
<if test="memberId != null">
member_id = #{memberId,jdbcType=BIGINT},
</if>
<if test="checkerId != null">
checker_id = #{checkerId,jdbcType=BIGINT},
</if>
<if test="morning != null">
morning = #{morning,jdbcType=BIGINT},
</if>
<if test="morningStatus != null">
morning_status = #{morningStatus,jdbcType=TINYINT},
</if>
<if test="night != null">
night = #{night,jdbcType=BIGINT},
</if>
<if test="nightStatus != null">
night_status = #{nightStatus,jdbcType=TINYINT},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
update t_pro_clocking_in
set member_id = #{memberId,jdbcType=BIGINT},
checker_id = #{checkerId,jdbcType=BIGINT},
morning = #{morning,jdbcType=BIGINT},
morning_status = #{morningStatus,jdbcType=TINYINT},
night = #{night,jdbcType=BIGINT},
night_status = #{nightStatus,jdbcType=TINYINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT}
where id = #{id,jdbcType=BIGINT}
</update>
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.defaultwbs.persist.mapper.ProClockingInMapper">
<resultMap id="BaseResultMap" type="com.ccsens.defaultwbs.bean.po.ProClockingIn">
<id column="id" jdbcType="BIGINT" property="id" />
<result column="member_id" jdbcType="BIGINT" property="memberId" />
<result column="checker_id" jdbcType="BIGINT" property="checkerId" />
<result column="morning" jdbcType="BIGINT" property="morning" />
<result column="morning_status" jdbcType="TINYINT" property="morningStatus" />
<result column="night" jdbcType="BIGINT" property="night" />
<result column="night_status" jdbcType="TINYINT" property="nightStatus" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" />
<result column="morning_remark" jdbcType="VARCHAR" property="morningRemark" />
<result column="night_remark" jdbcType="VARCHAR" property="nightRemark" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
<foreach collection="oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Update_By_Example_Where_Clause">
<where>
<foreach collection="example.oredCriteria" item="criteria" separator="or">
<if test="criteria.valid">
<trim prefix="(" prefixOverrides="and" suffix=")">
<foreach collection="criteria.criteria" item="criterion">
<choose>
<when test="criterion.noValue">
and ${criterion.condition}
</when>
<when test="criterion.singleValue">
and ${criterion.condition} #{criterion.value}
</when>
<when test="criterion.betweenValue">
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
</when>
<when test="criterion.listValue">
and ${criterion.condition}
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
#{listItem}
</foreach>
</when>
</choose>
</foreach>
</trim>
</if>
</foreach>
</where>
</sql>
<sql id="Base_Column_List">
id, member_id, checker_id, morning, morning_status, night, night_status, created_at,
updated_at, rec_status, morning_remark, night_remark
</sql>
<select id="selectByExample" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingInExample" resultMap="BaseResultMap">
select
<if test="distinct">
distinct
</if>
<include refid="Base_Column_List" />
from t_pro_clocking_in
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
<if test="orderByClause != null">
order by ${orderByClause}
</if>
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from t_pro_clocking_in
where id = #{id,jdbcType=BIGINT}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from t_pro_clocking_in
where id = #{id,jdbcType=BIGINT}
</delete>
<delete id="deleteByExample" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingInExample">
delete from t_pro_clocking_in
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</delete>
<insert id="insert" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
insert into t_pro_clocking_in (id, member_id, checker_id,
morning, morning_status, night,
night_status, created_at, updated_at,
rec_status, morning_remark, night_remark
)
values (#{id,jdbcType=BIGINT}, #{memberId,jdbcType=BIGINT}, #{checkerId,jdbcType=BIGINT},
#{morning,jdbcType=BIGINT}, #{morningStatus,jdbcType=TINYINT}, #{night,jdbcType=BIGINT},
#{nightStatus,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP},
#{recStatus,jdbcType=TINYINT}, #{morningRemark,jdbcType=VARCHAR}, #{nightRemark,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
insert into t_pro_clocking_in
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="memberId != null">
member_id,
</if>
<if test="checkerId != null">
checker_id,
</if>
<if test="morning != null">
morning,
</if>
<if test="morningStatus != null">
morning_status,
</if>
<if test="night != null">
night,
</if>
<if test="nightStatus != null">
night_status,
</if>
<if test="createdAt != null">
created_at,
</if>
<if test="updatedAt != null">
updated_at,
</if>
<if test="recStatus != null">
rec_status,
</if>
<if test="morningRemark != null">
morning_remark,
</if>
<if test="nightRemark != null">
night_remark,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="memberId != null">
#{memberId,jdbcType=BIGINT},
</if>
<if test="checkerId != null">
#{checkerId,jdbcType=BIGINT},
</if>
<if test="morning != null">
#{morning,jdbcType=BIGINT},
</if>
<if test="morningStatus != null">
#{morningStatus,jdbcType=TINYINT},
</if>
<if test="night != null">
#{night,jdbcType=BIGINT},
</if>
<if test="nightStatus != null">
#{nightStatus,jdbcType=TINYINT},
</if>
<if test="createdAt != null">
#{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
#{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
#{recStatus,jdbcType=TINYINT},
</if>
<if test="morningRemark != null">
#{morningRemark,jdbcType=VARCHAR},
</if>
<if test="nightRemark != null">
#{nightRemark,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingInExample" resultType="java.lang.Long">
select count(*) from t_pro_clocking_in
<if test="_parameter != null">
<include refid="Example_Where_Clause" />
</if>
</select>
<update id="updateByExampleSelective" parameterType="map">
update t_pro_clocking_in
<set>
<if test="record.id != null">
id = #{record.id,jdbcType=BIGINT},
</if>
<if test="record.memberId != null">
member_id = #{record.memberId,jdbcType=BIGINT},
</if>
<if test="record.checkerId != null">
checker_id = #{record.checkerId,jdbcType=BIGINT},
</if>
<if test="record.morning != null">
morning = #{record.morning,jdbcType=BIGINT},
</if>
<if test="record.morningStatus != null">
morning_status = #{record.morningStatus,jdbcType=TINYINT},
</if>
<if test="record.night != null">
night = #{record.night,jdbcType=BIGINT},
</if>
<if test="record.nightStatus != null">
night_status = #{record.nightStatus,jdbcType=TINYINT},
</if>
<if test="record.createdAt != null">
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</if>
<if test="record.updatedAt != null">
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="record.recStatus != null">
rec_status = #{record.recStatus,jdbcType=TINYINT},
</if>
<if test="record.morningRemark != null">
morning_remark = #{record.morningRemark,jdbcType=VARCHAR},
</if>
<if test="record.nightRemark != null">
night_remark = #{record.nightRemark,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByExample" parameterType="map">
update t_pro_clocking_in
set id = #{record.id,jdbcType=BIGINT},
member_id = #{record.memberId,jdbcType=BIGINT},
checker_id = #{record.checkerId,jdbcType=BIGINT},
morning = #{record.morning,jdbcType=BIGINT},
morning_status = #{record.morningStatus,jdbcType=TINYINT},
night = #{record.night,jdbcType=BIGINT},
night_status = #{record.nightStatus,jdbcType=TINYINT},
created_at = #{record.createdAt,jdbcType=TIMESTAMP},
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
rec_status = #{record.recStatus,jdbcType=TINYINT},
morning_remark = #{record.morningRemark,jdbcType=VARCHAR},
night_remark = #{record.nightRemark,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
</update>
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
update t_pro_clocking_in
<set>
<if test="memberId != null">
member_id = #{memberId,jdbcType=BIGINT},
</if>
<if test="checkerId != null">
checker_id = #{checkerId,jdbcType=BIGINT},
</if>
<if test="morning != null">
morning = #{morning,jdbcType=BIGINT},
</if>
<if test="morningStatus != null">
morning_status = #{morningStatus,jdbcType=TINYINT},
</if>
<if test="night != null">
night = #{night,jdbcType=BIGINT},
</if>
<if test="nightStatus != null">
night_status = #{nightStatus,jdbcType=TINYINT},
</if>
<if test="createdAt != null">
created_at = #{createdAt,jdbcType=TIMESTAMP},
</if>
<if test="updatedAt != null">
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
</if>
<if test="recStatus != null">
rec_status = #{recStatus,jdbcType=TINYINT},
</if>
<if test="morningRemark != null">
morning_remark = #{morningRemark,jdbcType=VARCHAR},
</if>
<if test="nightRemark != null">
night_remark = #{nightRemark,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
<update id="updateByPrimaryKey" parameterType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
update t_pro_clocking_in
set member_id = #{memberId,jdbcType=BIGINT},
checker_id = #{checkerId,jdbcType=BIGINT},
morning = #{morning,jdbcType=BIGINT},
morning_status = #{morningStatus,jdbcType=TINYINT},
night = #{night,jdbcType=BIGINT},
night_status = #{nightStatus,jdbcType=TINYINT},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT},
morning_remark = #{morningRemark,jdbcType=VARCHAR},
night_remark = #{nightRemark,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>

4
src/main/resources/mbg.xml

@ -80,9 +80,9 @@
<!-- <table tableName="t_pro_member_stakeholder" domainObjectName="ProMemberStakeholder"></table>-->
<!-- <table tableName="t_pro_deliver" domainObjectName="ProDeliver"></table>-->
<!-- <table tableName="t_pro_deliver_checker" domainObjectName="ProDeliverChecker"></table>-->
<!-- <table tableName="t_pro_clocking_in" domainObjectName="ProClockingIn"></table>-->
<table tableName="t_pro_clocking_in" domainObjectName="ProClockingIn"></table>
<!-- <table tableName="t_sys_holidays" domainObjectName="SysHolidays"></table>-->
<table tableName="t_pro_member_salary" domainObjectName="ProMemberSalary"></table>
<!-- <table tableName="t_pro_member_salary" domainObjectName="ProMemberSalary"></table>-->
<!-- 有些表的字段需要指定java类型
<table schema="" tableName="">

Loading…
Cancel
Save