Browse Source

转移交付物和考勤

master
zy_Java 4 years ago
parent
commit
4b817dc75e
  1. 22
      src/main/java/com/ccsens/defaultwbs/api/ClockingInController.java
  2. 22
      src/main/java/com/ccsens/defaultwbs/api/DeliverController.java
  3. 52
      src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithChecker.java
  4. 52
      src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithUpload.java
  5. 30
      src/main/java/com/ccsens/defaultwbs/persist/dao/ProClockingInDao.java
  6. 2
      src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverCheckerDao.java
  7. 22
      src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverDao.java
  8. 19
      src/main/java/com/ccsens/defaultwbs/service/ClockingInService.java
  9. 17
      src/main/java/com/ccsens/defaultwbs/service/DeliverService.java
  10. 50
      src/main/resources/mapper_dao/ProClockingInDao.xml
  11. 2
      src/main/resources/mapper_dao/ProDeliverCheckerDao.xml
  12. 18
      src/main/resources/mapper_dao/ProDeliverDao.xml

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

@ -1,11 +1,11 @@
package com.ccsens.defaultwbs.api;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.common.bean.dto.CClockingInDto;
import com.ccsens.common.bean.dto.CDeliverDto;
import com.ccsens.common.bean.vo.CClockingInVo;
import com.ccsens.common.bean.vo.CDeliverVo;
import com.ccsens.common.service.IClockingInService;
import com.ccsens.defaultwbs.bean.dto.ClockingInDto;
import com.ccsens.defaultwbs.bean.dto.DeliverDto;
import com.ccsens.defaultwbs.bean.vo.ClockingInVo;
import com.ccsens.defaultwbs.bean.vo.DeliverVo;
import com.ccsens.defaultwbs.service.IClockingInService;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.bean.dto.QueryDto;
import io.swagger.annotations.Api;
@ -36,15 +36,15 @@ public class ClockingInController {
@MustLogin
@ApiOperation(value = "查询考勤信息", notes = "")
@RequestMapping(value = "/query", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<CClockingInVo.ClockingInInfo>> queryDeliverOfTask(@ApiParam @Validated @RequestBody QueryDto<CClockingInDto.QueryClockingIn> params) throws Exception{
List<CClockingInVo.ClockingInInfo> clockingInInfos = clockingInService.queryClockingIn(params.getParam(), params.getUserId());
public JsonResponse<List<ClockingInVo.ClockingInInfo>> queryDeliverOfTask(@ApiParam @Validated @RequestBody QueryDto<ClockingInDto.QueryClockingIn> params) throws Exception{
List<ClockingInVo.ClockingInInfo> clockingInInfos = clockingInService.queryClockingIn(params.getParam(), params.getUserId());
return JsonResponse.newInstance().ok(clockingInInfos);
}
@MustLogin
@ApiOperation(value = "打卡", notes = "")
@RequestMapping(value = "/punch", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse punchTheClock(@ApiParam @Validated @RequestBody QueryDto<CClockingInDto.PunchTheClock> params) throws Exception{
public JsonResponse punchTheClock(@ApiParam @Validated @RequestBody QueryDto<ClockingInDto.PunchTheClock> params) throws Exception{
clockingInService.punchTheClock(params.getParam(), params.getUserId());
return JsonResponse.newInstance().ok();
}
@ -52,7 +52,7 @@ public class ClockingInController {
@MustLogin
@ApiOperation(value = "审核打卡", notes = "")
@RequestMapping(value = "/audit", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse auditRecord(@ApiParam @Validated @RequestBody QueryDto<CClockingInDto.Audit> params) throws Exception{
public JsonResponse auditRecord(@ApiParam @Validated @RequestBody QueryDto<ClockingInDto.Audit> params) throws Exception{
clockingInService.auditRecord(params.getParam(), params.getUserId());
return JsonResponse.newInstance().ok();
}
@ -60,8 +60,8 @@ public class ClockingInController {
@MustLogin
@ApiOperation(value = "导出考勤excel", notes = "")
@RequestMapping(value = "/export", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<CClockingInVo.ExcelUrl> export(@ApiParam @Validated @RequestBody QueryDto<CClockingInDto.QueryClockingIn> params) throws Exception{
CClockingInVo.ExcelUrl excelUrl = clockingInService.exportRecord(params.getParam(), params.getUserId());
public JsonResponse<ClockingInVo.ExcelUrl> export(@ApiParam @Validated @RequestBody QueryDto<ClockingInDto.QueryClockingIn> params) throws Exception{
ClockingInVo.ExcelUrl excelUrl = clockingInService.exportRecord(params.getParam(), params.getUserId());
return JsonResponse.newInstance().ok(excelUrl);
}
}

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

@ -1,10 +1,10 @@
package com.ccsens.defaultwbs.api;
import com.ccsens.cloudutil.annotation.MustLogin;
import com.ccsens.common.bean.dto.CDeliverDto;
import com.ccsens.defaultwbs.bean.dto.DeliverDto;
import com.ccsens.common.bean.dto.CPluginDto;
import com.ccsens.common.bean.vo.CDeliverVo;
import com.ccsens.common.service.IDeliverService;
import com.ccsens.defaultwbs.bean.vo.DeliverVo;
import com.ccsens.defaultwbs.service.IDeliverService;
import com.ccsens.util.JsonResponse;
import com.ccsens.util.bean.dto.QueryDto;
import com.github.pagehelper.PageInfo;
@ -37,15 +37,15 @@ public class DeliverController {
@MustLogin
@ApiOperation(value = "查询所有成员", notes = "")
@RequestMapping(value = "/queryChecker", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<CDeliverVo.Checker>> queryChecker(@ApiParam @Validated @RequestBody QueryDto<CDeliverDto.QueryChecker> params) throws Exception{
List<CDeliverVo.Checker> checkers = deliverService.queryChecker(params.getParam(), params.getUserId());
public JsonResponse<List<DeliverVo.Checker>> queryChecker(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.QueryChecker> params) throws Exception{
List<DeliverVo.Checker> checkers = deliverService.queryChecker(params.getParam(), params.getUserId());
return JsonResponse.newInstance().ok(checkers);
}
@MustLogin
@ApiOperation(value = "提交交付物", notes = "")
@RequestMapping(value = "/save", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse saveDeliver(@ApiParam @Validated @RequestBody QueryDto<CDeliverDto.SaveDeliver> params) throws Exception{
public JsonResponse saveDeliver(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.SaveDeliver> params) throws Exception{
deliverService.saveDeliver(params.getParam(),params.getUserId());
return JsonResponse.newInstance().ok();
}
@ -53,15 +53,15 @@ public class DeliverController {
@MustLogin
@ApiOperation(value = "查询任务的交付物历史记录", notes = "")
@RequestMapping(value = "/queryDeliverOfTask", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<CDeliverVo.DeliverOfTask>> queryDeliverOfTask(@ApiParam @Validated @RequestBody QueryDto<CDeliverDto.QueryDeliverOfTask> params) throws Exception{
List<CDeliverVo.DeliverOfTask> deliverOfTask = deliverService.queryDeliverOfTask(params.getParam(), params.getUserId());
public JsonResponse<List<DeliverVo.DeliverOfTask>> queryDeliverOfTask(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.QueryDeliverOfTask> params) throws Exception{
List<DeliverVo.DeliverOfTask> deliverOfTask = deliverService.queryDeliverOfTask(params.getParam(), params.getUserId());
return JsonResponse.newInstance().ok(deliverOfTask);
}
@MustLogin
@ApiOperation(value = "检查交付物", notes = "")
@RequestMapping(value = "/checkDeliver", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse checkDeliver(@ApiParam @Validated @RequestBody QueryDto<CDeliverDto.CheckDeliver> params) throws Exception{
public JsonResponse checkDeliver(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.CheckDeliver> params) throws Exception{
deliverService.checkDeliver(params.getParam(),params.getUserId());
return JsonResponse.newInstance().ok();
}
@ -69,8 +69,8 @@ public class DeliverController {
@MustLogin
@ApiOperation(value = "查询项目的交付物历史记录", notes = "")
@RequestMapping(value = "/queryDeliverOfProject", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<PageInfo<CDeliverVo.DeliverOfProject>> queryDeliverOfProject(@ApiParam @Validated @RequestBody QueryDto<CDeliverDto.QueryDeliverOfProject> params) throws Exception{
PageInfo<CDeliverVo.DeliverOfTask> deliverOfProject = deliverService.queryDeliverOfProject(params.getParam(), params.getUserId());
public JsonResponse<PageInfo<DeliverVo.DeliverOfProject>> queryDeliverOfProject(@ApiParam @Validated @RequestBody QueryDto<DeliverDto.QueryDeliverOfProject> params) throws Exception{
PageInfo<DeliverVo.DeliverOfTask> deliverOfProject = deliverService.queryDeliverOfProject(params.getParam(), params.getUserId());
return JsonResponse.newInstance().ok(deliverOfProject);
}
}

52
src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithChecker.java

@ -0,0 +1,52 @@
package com.ccsens.defaultwbs.bean.message;
import com.ccsens.common.util.Constant;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
/**
* @author
*/
@Data
public class DeliverMessageWithChecker {
private String type = Constant.MessageType.CHECKER_DELIVER;
private String event;
public DeliverMessageWithChecker() {
}
private Data data;
@Setter
@Getter
public static class Data{
//任务分解id
Long taskId;
//任务详情id
Long taskDetailId;
//交付物id
Long deliverId;
//角色id(上传的任务所属的角色id)
Long roleId;
//检查人id(memberId)
Long memberId;
//检查人名字(成员名)
String memberName;
}
public DeliverMessageWithChecker(Long taskId, Long taskDetailId, Long deliverId, Long roleId, Long memberId, String memberName){
this();
Data d = new Data();
d.setTaskId(taskId);
d.setTaskDetailId(taskDetailId);
d.setDeliverId(deliverId);
d.setRoleId(roleId);
d.setMemberId(memberId);
d.setMemberName(memberName);
setData(d);
}
}

52
src/main/java/com/ccsens/defaultwbs/bean/message/DeliverMessageWithUpload.java

@ -0,0 +1,52 @@
package com.ccsens.defaultwbs.bean.message;
import com.ccsens.common.util.Constant;
import lombok.Data;
import lombok.Getter;
import lombok.Setter;
/**
* @author
*/
@Data
public class DeliverMessageWithUpload {
private String type = Constant.MessageType.UPLOAD_DELIVER;
private String event;
public DeliverMessageWithUpload() {
}
private Data data;
@Setter
@Getter
public static class Data{
//任务分解id
Long taskId;
//任务详情id
Long taskDetailId;
//交付物id
Long deliverId;
//角色id(上传的任务所属的角色id)
Long roleId;
//上传者/检查者 id(memberId)
Long memberId;
//上传者/检查者 名字(成员名)
String memberName;
}
public DeliverMessageWithUpload(Long taskId, Long taskDetailId, Long deliverId, Long roleId, Long memberId, String memberName){
this();
Data d = new Data();
d.setTaskId(taskId);
d.setTaskDetailId(taskDetailId);
d.setDeliverId(deliverId);
d.setRoleId(roleId);
d.setMemberId(memberId);
d.setMemberName(memberName);
setData(d);
}
}

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

@ -1,8 +1,9 @@
package com.ccsens.defaultwbs.persist.dao;
import com.ccsens.common.bean.po.ProClockingIn;
import com.ccsens.common.bean.vo.CClockingInVo;
import com.ccsens.common.persist.mapper.ProClockingInMapper;
import com.ccsens.defaultwbs.bean.po.ProClockingIn;
import com.ccsens.defaultwbs.bean.vo.ClockingInVo;
import com.ccsens.defaultwbs.bean.vo.DeliverVo;
import com.ccsens.defaultwbs.persist.mapper.ProClockingInMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
@ -19,7 +20,7 @@ public interface ProClockingInDao extends ProClockingInMapper {
* @param memberIdList 成员id列表
* @return 打卡记录列表
*/
List<CClockingInVo.ClockRecord> queryByMemberId(@Param("memberIdList") List<Long> memberIdList);
List<ClockingInVo.ClockRecord> queryByMemberId(@Param("memberIdList") List<Long> memberIdList);
/**
* 查询该成员今天是否有打卡记录
@ -34,5 +35,24 @@ public interface ProClockingInDao extends ProClockingInMapper {
* @param memberId 打卡人id
* @return 上一次检查人的信息
*/
CClockingInVo.LastChecker queryLastChecker(@Param("memberId") Long memberId);
ClockingInVo.LastChecker queryLastChecker(@Param("memberId") Long memberId);
/**
* 查询需要打卡的成员,排除当前登录用户
* @param projectId 项目id
* @param userOfMemberId 当前登录人的成员id
* @param roleId 角色id
* @return 打卡记录
*/
List<ClockingInVo.ClockRecord> queryMembersOfClock(@Param("projectId") Long projectId,@Param("userId") Long userOfMemberId,@Param("roleId") Long roleId);
/**
* 通过成员idList查询成员信息
* @param memberIdList 成员idList
* @param roleId 角色id
* @return 成员信息
*/
List<ClockingInVo.ClockRecord> queryMemberByIdList(@Param("memberIdList") List<Long> memberIdList,@Param("roleId") Long roleId);
}

2
src/main/java/com/ccsens/defaultwbs/persist/dao/ProDeliverCheckerDao.java

@ -1,6 +1,6 @@
package com.ccsens.defaultwbs.persist.dao;
import com.ccsens.common.persist.mapper.ProDeliverCheckerMapper;
import com.ccsens.defaultwbs.persist.mapper.ProDeliverCheckerMapper;
import org.springframework.stereotype.Repository;
@Repository

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

@ -1,8 +1,11 @@
package com.ccsens.defaultwbs.persist.dao;
import com.ccsens.common.bean.dto.CDeliverDto;
import com.ccsens.common.bean.vo.CDeliverVo;
import com.ccsens.common.persist.mapper.ProDeliverMapper;
import com.ccsens.defaultwbs.bean.dto.DeliverDto;
import com.ccsens.defaultwbs.bean.dto.DeliverDto;
import com.ccsens.defaultwbs.bean.vo.DeliverVo;
import com.ccsens.defaultwbs.bean.vo.DeliverVo;
import com.ccsens.defaultwbs.persist.mapper.ProDeliverMapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@ -15,12 +18,21 @@ public interface ProDeliverDao extends ProDeliverMapper {
* @param params 任务id
* @return 交付物记录列表
*/
List<CDeliverVo.DeliverOfTask> queryDeliverOfTask(CDeliverDto.QueryDeliverOfTask params);
List<DeliverVo.DeliverOfTask> queryDeliverOfTask(DeliverDto.QueryDeliverOfTask params);
/**
* 查询项目下的所有任务交付记录
* @param params 项目id
* @return 所有项目及交付物
*/
List<CDeliverVo.DeliverOfTask> queryDeliverOfProject(CDeliverDto.QueryDeliverOfProject params);
List<DeliverVo.DeliverOfTask> queryDeliverOfProject(DeliverDto.QueryDeliverOfProject params);
/**
* 查询所有检查人
* @param projectId 项目id
* @return 检查人列表
*/
List<DeliverVo.Checker> queryChecker(@Param("projectId") Long projectId);
}

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

@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.common.bean.po.ProMember;
import com.ccsens.common.bean.vo.CClockingInVo;
import com.ccsens.common.persist.dao.ProMemberDao;
import com.ccsens.common.util.CommonCodeError;
import com.ccsens.defaultwbs.bean.dto.ClockingInDto;
@ -79,8 +78,8 @@ public class ClockingInService implements IClockingInService {
memberIdList.add(userOfMemberId);
ProMember member = memberDao.queryMemberOfRole(userOfMemberId,params.getRoleId());
if (CollectionUtil.isEmpty(params.getMemberIdList())){
List<com.ccsens.common.bean.vo.CClockingInVo.ClockRecord> clockRecordList = memberDao.queryMembersOfClock(params.getProjectId(),userOfMemberId,params.getRoleId());
memberIdList.addAll(clockRecordList.stream().map(CClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMembersOfClock(params.getProjectId(),userOfMemberId,params.getRoleId());
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();
@ -92,7 +91,7 @@ public class ClockingInService implements IClockingInService {
clockRecord.setIsMine((byte)1);
}
}
for (CClockingInVo.ClockRecord record : clockRecordList) {
for (ClockingInVo.ClockRecord record : clockRecordList) {
ClockingInVo.ClockRecord otherClockRecord = new ClockingInVo.ClockRecord();
otherClockRecord.setMemberId(record.getMemberId());
otherClockRecord.setMemberName(record.getMemberName());
@ -105,11 +104,11 @@ public class ClockingInService implements IClockingInService {
}
}else {
//2.筛选成员
List<CClockingInVo.ClockRecord> clockRecordList = memberDao.queryMemberByIdList(params.getMemberIdList(),params.getRoleId());
List<ClockingInVo.ClockRecord> clockRecordList = clockingInDao.queryMemberByIdList(params.getMemberIdList(),params.getRoleId());
if (CollectionUtil.isNotEmpty(clockRecordList)) {
memberIdList.addAll(clockRecordList.stream().map(CClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
memberIdList.addAll(clockRecordList.stream().map(ClockingInVo.ClockRecord::getMemberId).collect(Collectors.toList()));
for (ClockingInVo.ClockingInInfo clockingInInfo : list) {
for (CClockingInVo.ClockRecord clockRecord : clockRecordList) {
for (ClockingInVo.ClockRecord clockRecord : clockRecordList) {
ClockingInVo.ClockRecord filterRecord = new ClockingInVo.ClockRecord();
filterRecord.setMemberId(clockRecord.getMemberId());
filterRecord.setMemberName(clockRecord.getMemberName());
@ -126,9 +125,9 @@ public class ClockingInService implements IClockingInService {
//查询所有成员打卡记录
if (CollectionUtil.isNotEmpty(memberIdList)) {
List<CClockingInVo.ClockRecord> clockRecords = clockingInDao.queryByMemberId(memberIdList);
List<ClockingInVo.ClockRecord> clockRecords = clockingInDao.queryByMemberId(memberIdList);
for (ClockingInVo.ClockingInInfo clockingInInfo2 : list) {
for (CClockingInVo.ClockRecord record : clockRecords) {
for (ClockingInVo.ClockRecord record : clockRecords) {
if (format.format(new Date(record.getMorning())).equals(clockingInInfo2.getDateTime()) || format.format(new Date(record.getNight())).equals(clockingInInfo2.getDateTime())) {
for (ClockingInVo.ClockRecord clockRecord : clockingInInfo2.getRecordList()) {
if (clockRecord.getMemberId().equals(record.getMemberId())) {
@ -157,7 +156,7 @@ public class ClockingInService implements IClockingInService {
for (ClockingInVo.ClockingInInfo clockingInInfo : collect) {
if (clockingInInfo.getDateTime().equals(format.format(new Date(System.currentTimeMillis())))) {
for (ClockingInVo.ClockRecord clockRecord : clockingInInfo.getRecordList()) {
CClockingInVo.LastChecker lastChecker = clockingInDao.queryLastChecker(clockRecord.getMemberId());
ClockingInVo.LastChecker lastChecker = clockingInDao.queryLastChecker(clockRecord.getMemberId());
if (ObjectUtil.isNotNull(lastChecker)) {
clockRecord.setLastCheckerId(lastChecker.getLastCheckerId());
clockRecord.setLastCheckerName(lastChecker.getLastCheckerName());

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

@ -3,21 +3,22 @@ package com.ccsens.defaultwbs.service;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.lang.Snowflake;
import cn.hutool.core.util.ObjectUtil;
import com.ccsens.common.persist.dao.*;
import com.ccsens.common.util.CommonCodeError;
import com.ccsens.defaultwbs.bean.dto.DeliverDto;
import com.ccsens.defaultwbs.bean.message.DeliverMessageWithChecker;
import com.ccsens.defaultwbs.bean.message.DeliverMessageWithUpload;
import com.ccsens.defaultwbs.bean.po.ProDeliver;
import com.ccsens.defaultwbs.bean.po.ProDeliverChecker;
import com.ccsens.defaultwbs.bean.po.ProMember;
import com.ccsens.defaultwbs.bean.po.ProTaskSub;
import com.ccsens.common.bean.po.ProMember;
import com.ccsens.common.bean.po.ProTaskSub;
import com.ccsens.defaultwbs.bean.vo.DeliverVo;
import com.ccsens.defaultwbs.bean.vo.CMemberVo;
import com.ccsens.defaultwbs.bean.vo.CProjectVo;
import com.ccsens.common.bean.vo.CMemberVo;
import com.ccsens.common.bean.vo.CProjectVo;
import com.ccsens.defaultwbs.persist.dao.*;
import com.ccsens.defaultwbs.util.CommonCodeError;
import com.ccsens.util.JacksonUtil;
import com.ccsens.util.bean.message.defaultwbs.InMessage;
import com.ccsens.util.bean.message.defaultwbs.MessageConstant;
import com.ccsens.util.bean.message.common.InMessage;
import com.ccsens.util.bean.message.common.MessageConstant;
import com.ccsens.util.config.RabbitMQConfig;
import com.ccsens.util.exception.BaseException;
import com.github.pagehelper.PageHelper;
@ -64,7 +65,7 @@ public class DeliverService implements IDeliverService {
@Override
public List<DeliverVo.Checker> queryChecker(DeliverDto.QueryChecker params, Long userId) {
return memberDao.queryChecker(params.getProjectId());
return deliverDao.queryChecker(params.getProjectId());
}

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

@ -1,8 +1,8 @@
<?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.common.persist.dao.ProClockingInDao">
<mapper namespace="com.ccsens.defaultwbs.persist.dao.ProClockingInDao">
<select id="queryByMemberId" resultType="com.ccsens.common.bean.vo.CClockingInVo$ClockRecord">
<select id="queryByMemberId" resultType="com.ccsens.defaultwbs.bean.vo.ClockingInVo$ClockRecord">
SELECT
c.id AS id,
c.member_id,
@ -25,7 +25,7 @@
</foreach>
</select>
<select id="queryHaveData" resultType="com.ccsens.common.bean.po.ProClockingIn">
<select id="queryHaveData" resultType="com.ccsens.defaultwbs.bean.po.ProClockingIn">
SELECT
id,
member_id,
@ -47,7 +47,7 @@
LIMIT 1
</select>
<select id="queryLastChecker" resultType="com.ccsens.common.bean.vo.CClockingInVo$LastChecker">
<select id="queryLastChecker" resultType="com.ccsens.defaultwbs.bean.vo.ClockingInVo$LastChecker">
SELECT
checker_id AS lastCheckerId,
m.`name` AS lastCheckerName
@ -63,4 +63,46 @@
LIMIT 1
</select>
<select id="queryMembersOfClock" resultType="com.ccsens.defaultwbs.bean.vo.ClockingInVo$ClockRecord">
SELECT
m.id AS memberId,
m.`name` AS memberName,
m.user_id AS memberUserId
FROM
t_pro_member AS m
LEFT JOIN t_pro_role_member AS rm ON m.id = rm.member_id
WHERE
m.rec_status = 0 AND rm.rec_status = 0
AND m.project_id = #{projectId}
AND rm.role_id = #{roleId}
AND m.id != #{userId}
</select>
<select id="queryChecker" resultType="com.ccsens.defaultwbs.bean.vo.DeliverVo$Checker">
SELECT
id AS memberId,
`name`
FROM
t_pro_member
WHERE
rec_status = 0
AND project_id = #{projectId}
</select>
<select id="queryMemberByIdList" resultType="com.ccsens.defaultwbs.bean.vo.ClockingInVo$ClockRecord">
SELECT
m.id AS memberId,
m.`name` AS memberName,
m.user_id AS memberUserId
FROM
t_pro_member AS m
LEFT JOIN t_pro_role_member AS rm ON m.id = rm.member_id
WHERE
m.rec_status = 0 AND rm.rec_status = 0
AND rm.role_id = #{roleId}
AND m.id IN
<foreach collection="memberIdList" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</select>
</mapper>

2
src/main/resources/mapper_dao/ProDeliverCheckerDao.xml

@ -1,5 +1,5 @@
<?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.common.persist.dao.ProDeliverCheckerDao">
<mapper namespace="com.ccsens.defaultwbs.persist.dao.ProDeliverCheckerDao">
</mapper>

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

@ -1,14 +1,14 @@
<?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.common.persist.dao.ProDeliverDao">
<mapper namespace="com.ccsens.defaultwbs.persist.dao.ProDeliverDao">
<resultMap id="deliverOfTask" type="com.ccsens.common.bean.vo.CDeliverVo$DeliverOfTask">
<resultMap id="deliverOfTask" type="com.ccsens.defaultwbs.bean.vo.DeliverVo$DeliverOfTask">
<result column="id" property="id"/>
<result column="name" property="name"/>
<result column="taskName" property="taskName"/>
<result column="time" property="time"/>
<result column="content" property="content"/>
<collection property="checkerList" ofType="com.ccsens.common.bean.vo.CDeliverVo$CheckerInfo">
<collection property="checkerList" ofType="com.ccsens.defaultwbs.bean.vo.DeliverVo$CheckerInfo">
<result column="checkId" property="checkId"/>
<result column="checkerName" property="checkerName"/>
<result column="checkerId" property="checkerId"/>
@ -72,4 +72,16 @@
ORDER BY d.time DESC
</select>
<select id="queryChecker" resultType="com.ccsens.defaultwbs.bean.vo.DeliverVo$Checker">
SELECT
id AS memberId,
`name`
FROM
t_pro_member
WHERE
rec_status = 0
AND project_id = #{projectId}
</select>
</mapper>
Loading…
Cancel
Save