Browse Source

新增根据任务id查询交付物详情

recovery
zy_Java 4 years ago
parent
commit
ae325e87a8
  1. 10
      tall/src/main/java/com/ccsens/tall/bean/dto/DeliverDto.java
  2. 309
      tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.java
  3. 1950
      tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.java
  4. 47
      tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java
  5. 9
      tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java
  6. 59
      tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.java
  7. 8
      tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java
  8. 306
      tall/src/main/java/com/ccsens/tall/service/TaskDeliverService.java
  9. 24
      tall/src/main/java/com/ccsens/tall/web/DeliverController.java
  10. 4
      tall/src/main/resources/application.yml
  11. 67
      tall/src/main/resources/mapper_dao/DeliverDao.xml
  12. 659
      tall/src/main/resources/mapper_raw/ProTaskDeliverPostLogMapper.xml

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

@ -8,6 +8,7 @@ import lombok.Setter;
import javax.validation.constraints.Max; import javax.validation.constraints.Max;
import javax.validation.constraints.Min; import javax.validation.constraints.Min;
import javax.validation.constraints.NotNull;
import java.util.List; import java.util.List;
public class DeliverDto { public class DeliverDto {
@ -54,4 +55,13 @@ public class DeliverDto {
@ApiModelProperty("wps文件Id,可以为空") @ApiModelProperty("wps文件Id,可以为空")
private Long wpsFileId; private Long wpsFileId;
} }
@Data
@ApiModel("根据任务id查找输出文档")
public static class FindDocByTask{
@NotNull(message = "请选择任务")
@ApiModelProperty("任务id")
private Long taskId;
}
} }

309
tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLog.java

@ -1,150 +1,161 @@
package com.ccsens.tall.bean.po; package com.ccsens.tall.bean.po;
import java.io.Serializable; import java.io.Serializable;
import java.util.Date; import java.util.Date;
public class ProTaskDeliverPostLog implements Serializable { public class ProTaskDeliverPostLog implements Serializable {
private Long id; private Long id;
private Long deliverId; private Long deliverId;
private Long taskSubTimeId; private Long taskSubTimeId;
private Long fileId; private Long fileId;
private Long userId; private Long userId;
private String version; private String version;
private String description; private String description;
private Long time; private Long time;
private Integer isHistory; private Integer isHistory;
private Date createdAt; private Date createdAt;
private Date updatedAt; private Date updatedAt;
private Byte recStatus; private Byte recStatus;
private static final long serialVersionUID = 1L; private String filesId;
public Long getId() { private static final long serialVersionUID = 1L;
return id;
} public Long getId() {
return id;
public void setId(Long id) { }
this.id = id;
} public void setId(Long id) {
this.id = id;
public Long getDeliverId() { }
return deliverId;
} public Long getDeliverId() {
return deliverId;
public void setDeliverId(Long deliverId) { }
this.deliverId = deliverId;
} public void setDeliverId(Long deliverId) {
this.deliverId = deliverId;
public Long getTaskSubTimeId() { }
return taskSubTimeId;
} public Long getTaskSubTimeId() {
return taskSubTimeId;
public void setTaskSubTimeId(Long taskSubTimeId) { }
this.taskSubTimeId = taskSubTimeId;
} public void setTaskSubTimeId(Long taskSubTimeId) {
this.taskSubTimeId = taskSubTimeId;
public Long getFileId() { }
return fileId;
} public Long getFileId() {
return fileId;
public void setFileId(Long fileId) { }
this.fileId = fileId;
} public void setFileId(Long fileId) {
this.fileId = fileId;
public Long getUserId() { }
return userId;
} public Long getUserId() {
return userId;
public void setUserId(Long userId) { }
this.userId = userId;
} public void setUserId(Long userId) {
this.userId = userId;
public String getVersion() { }
return version;
} public String getVersion() {
return version;
public void setVersion(String version) { }
this.version = version == null ? null : version.trim();
} public void setVersion(String version) {
this.version = version == null ? null : version.trim();
public String getDescription() { }
return description;
} public String getDescription() {
return description;
public void setDescription(String description) { }
this.description = description == null ? null : description.trim();
} public void setDescription(String description) {
this.description = description == null ? null : description.trim();
public Long getTime() { }
return time;
} public Long getTime() {
return time;
public void setTime(Long time) { }
this.time = time;
} public void setTime(Long time) {
this.time = time;
public Integer getIsHistory() { }
return isHistory;
} public Integer getIsHistory() {
return isHistory;
public void setIsHistory(Integer isHistory) { }
this.isHistory = isHistory;
} public void setIsHistory(Integer isHistory) {
this.isHistory = isHistory;
public Date getCreatedAt() { }
return createdAt;
} public Date getCreatedAt() {
return createdAt;
public void setCreatedAt(Date createdAt) { }
this.createdAt = createdAt;
} public void setCreatedAt(Date createdAt) {
this.createdAt = createdAt;
public Date getUpdatedAt() { }
return updatedAt;
} public Date getUpdatedAt() {
return updatedAt;
public void setUpdatedAt(Date updatedAt) { }
this.updatedAt = updatedAt;
} public void setUpdatedAt(Date updatedAt) {
this.updatedAt = updatedAt;
public Byte getRecStatus() { }
return recStatus;
} public Byte getRecStatus() {
return recStatus;
public void setRecStatus(Byte recStatus) { }
this.recStatus = recStatus;
} public void setRecStatus(Byte recStatus) {
this.recStatus = recStatus;
@Override }
public String toString() {
StringBuilder sb = new StringBuilder(); public String getFilesId() {
sb.append(getClass().getSimpleName()); return filesId;
sb.append(" ["); }
sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); public void setFilesId(String filesId) {
sb.append(", deliverId=").append(deliverId); this.filesId = filesId == null ? null : filesId.trim();
sb.append(", taskSubTimeId=").append(taskSubTimeId); }
sb.append(", fileId=").append(fileId);
sb.append(", userId=").append(userId); @Override
sb.append(", version=").append(version); public String toString() {
sb.append(", description=").append(description); StringBuilder sb = new StringBuilder();
sb.append(", time=").append(time); sb.append(getClass().getSimpleName());
sb.append(", isHistory=").append(isHistory); sb.append(" [");
sb.append(", createdAt=").append(createdAt); sb.append("Hash = ").append(hashCode());
sb.append(", updatedAt=").append(updatedAt); sb.append(", id=").append(id);
sb.append(", recStatus=").append(recStatus); sb.append(", deliverId=").append(deliverId);
sb.append("]"); sb.append(", taskSubTimeId=").append(taskSubTimeId);
return sb.toString(); sb.append(", fileId=").append(fileId);
} sb.append(", userId=").append(userId);
sb.append(", version=").append(version);
sb.append(", description=").append(description);
sb.append(", time=").append(time);
sb.append(", isHistory=").append(isHistory);
sb.append(", createdAt=").append(createdAt);
sb.append(", updatedAt=").append(updatedAt);
sb.append(", recStatus=").append(recStatus);
sb.append(", filesId=").append(filesId);
sb.append("]");
return sb.toString();
}
} }

1950
tall/src/main/java/com/ccsens/tall/bean/po/ProTaskDeliverPostLogExample.java

File diff suppressed because it is too large

47
tall/src/main/java/com/ccsens/tall/bean/vo/DeliverVo.java

@ -7,8 +7,12 @@ import lombok.Data;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
/**
* @author
*/
@Data @Data
public class DeliverVo { public class DeliverVo {
@ -37,7 +41,7 @@ public class DeliverVo {
private String description; private String description;
@ApiModelProperty("上传交付物的时间") @ApiModelProperty("上传交付物的时间")
private Long time; private Long time;
@ApiModelProperty("上传交付物的时间") @ApiModelProperty("删除交付物的时间")
private Long deleteTime; private Long deleteTime;
@ApiModelProperty("交付物访问路径") @ApiModelProperty("交付物访问路径")
private String url; private String url;
@ -61,9 +65,9 @@ public class DeliverVo {
@ApiModel @ApiModel
@Data @Data
public static class Checker { public static class Checker {
@ApiModelProperty("检查人") @ApiModelProperty("检查人(角色)")
private Long checkerId; private Long checkerId;
@ApiModelProperty("检查人姓名") @ApiModelProperty("检查人姓名(角色)")
private String checkerName; private String checkerName;
@ApiModelProperty("检查情况 0未检查,1合格,2不合格") @ApiModelProperty("检查情况 0未检查,1合格,2不合格")
private int checkerStatus; private int checkerStatus;
@ -71,6 +75,8 @@ public class DeliverVo {
private int score; private int score;
@ApiModelProperty("检查人备注") @ApiModelProperty("检查人备注")
private String remark; private String remark;
@ApiModelProperty("该用户自身是否是此交付物的检查人")
private Boolean isChecker;
} }
//交付物清单 //交付物清单
@ -148,4 +154,39 @@ public class DeliverVo {
} }
@ApiModel("通过任务id查找输出文档")
@Data
public static class QueryDeliverByTaskId {
@ApiModelProperty("交付物Id")
private Long deliverId;
@ApiModelProperty("交付物名")
private String deliverName;
@ApiModelProperty("上传记录")
private List<DeliverRecode> deliverRecodes;
}
@ApiModel("输出文档的上传记录")
@Data
public static class DeliverRecode {
@ApiModelProperty("交付物上传的记录id")
private Long deliverLogId;
@ApiModelProperty("备注信息")
private String description;
@ApiModelProperty("上传交付物的时间")
private Long time;
//所有文件id
@JsonIgnore
private String filesId;
// @ApiModelProperty("上传者id")
// private Long role;
// @ApiModelProperty("上传者名")
// private List<DRole> role;
@ApiModelProperty("检查状况")
private List<Checker> checkerList;
@ApiModelProperty("文件列表")
private List<FileVo.FilePosition> fileList = new ArrayList<>();
}
} }

9
tall/src/main/java/com/ccsens/tall/persist/dao/TaskDeliverDao.java

@ -24,4 +24,13 @@ public interface TaskDeliverDao extends ProTaskDeliverMapper{
List<WbsVo.DeliverWithExcel> getDeliverAllByProject(@Param("projectId")Long projectId); List<WbsVo.DeliverWithExcel> getDeliverAllByProject(@Param("projectId")Long projectId);
List<WbsVo.SubTime> selectFileInfoByDeliverId(@Param("deliverId")Long deliverId); List<WbsVo.SubTime> selectFileInfoByDeliverId(@Param("deliverId")Long deliverId);
/**
* 通过任务id查询交付物详情
* @param userId userId
* @param subTimeId 分解后的任务id
* @param taskDetailId 任务详情id
* @return 返回交付物详情
*/
List<DeliverVo.QueryDeliverByTaskId> queryDeliverByTaskId(@Param("userId")Long userId, @Param("subTimeId")Long subTimeId, @Param("taskDetailId")Long taskDetailId);
} }

59
tall/src/main/java/com/ccsens/tall/persist/mapper/ProTaskDeliverPostLogMapper.java

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

8
tall/src/main/java/com/ccsens/tall/service/ITaskDeliverService.java

@ -34,4 +34,12 @@ public interface ITaskDeliverService {
void deleteDeliver(Long userId, Long deliverId, Long taskId) throws Exception; void deleteDeliver(Long userId, Long deliverId, Long taskId) throws Exception;
Long isTaskOrSubTime(Long id)throws Exception; Long isTaskOrSubTime(Long id)throws Exception;
/**
* 通过任务id查询输出文档信息
* @param currentUserId userID
* @param taskId 分解后的任务id
* @return 返回输出文档信息
*/
List<DeliverVo.QueryDeliverByTaskId> queryDeliverByTaskId(Long currentUserId, Long taskId);
} }

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

@ -206,74 +206,43 @@ public class TaskDeliverService implements ITaskDeliverService {
if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole){ if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole){
throw new BaseException(CodeEnum.IS_NOT_EXECUTOR); throw new BaseException(CodeEnum.IS_NOT_EXECUTOR);
} }
// //查找以前上传的不为历史信息的文件。改为历史信息
// ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample();
// logExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId).andDeliverIdEqualTo(uploadDeliver.getDeliverId())
// .andUserIdEqualTo(currentUserId).andIsHistoryEqualTo(0);
// List<ProTaskDeliverPostLog> deliverPostLogList = deliverPostLogDao.selectByExample(logExample);
// if (CollectionUtil.isNotEmpty(deliverPostLogList)) {
// for (ProTaskDeliverPostLog deliverPostLog : deliverPostLogList) {
// deliverPostLog.setIsHistory(1);
// deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog);
// }
// }
//将文件信息与交付物绑定,添加记录deliverPostLog //将文件信息与交付物绑定,添加记录deliverPostLog
if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo()) || StrUtil.isNotEmpty(uploadDeliver.getDescription())) { if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo()) || StrUtil.isNotEmpty(uploadDeliver.getDescription())) {
if(CollectionUtil.isEmpty(uploadDeliver.getFileInfo())){ //拼接文件id
ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); StringBuilder filesId = new StringBuilder();
deliverPostLog.setId(snowflake.nextId()); if(CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo())){
deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); for (int i = 0; i < uploadDeliver.getFileInfo().size(); i++) {
deliverPostLog.setTaskSubTimeId(subTimeId); DeliverDto.FileInfo fileInfo = uploadDeliver.getFileInfo().get(i);
deliverPostLog.setUserId(currentUserId); if(i == 0){
deliverPostLog.setDescription(uploadDeliver.getDescription()); filesId.append(fileInfo.getId());
deliverPostLog.setTime(now); }else {
deliverPostLog.setIsHistory(0); filesId.append(",").append(fileInfo.getId());
deliverPostLogDao.insertSelective(deliverPostLog);
//添加交付物检查人表
if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) {
ProTaskDeliverPostLogChecker postLogChecker;
for (Long checkerId : uploadDeliver.getCheckerIdList()) {
postLogChecker = new ProTaskDeliverPostLogChecker();
postLogChecker.setId(snowflake.nextId());
postLogChecker.setDeliverPostLogId(deliverPostLog.getId());
postLogChecker.setCheckerId(checkerId);
postLogCheckerDao.insertSelective(postLogChecker);
} }
} else {
throw new BaseException(CodeEnum.NOT_CHECKER);
} }
}else { }
for (DeliverDto.FileInfo fileInfo : uploadDeliver.getFileInfo()) { ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog();
// SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId()); deliverPostLog.setId(snowflake.nextId());
// if(ObjectUtil.isNull(file)){ deliverPostLog.setDeliverId(uploadDeliver.getDeliverId());
// throw new BaseException(CodeEnum.NOT_DELIVER_FILE); deliverPostLog.setTaskSubTimeId(subTimeId);
// } deliverPostLog.setUserId(currentUserId);
ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog(); deliverPostLog.setDescription(uploadDeliver.getDescription());
deliverPostLog.setId(snowflake.nextId()); deliverPostLog.setTime(now);
deliverPostLog.setDeliverId(uploadDeliver.getDeliverId()); deliverPostLog.setIsHistory(0);
deliverPostLog.setTaskSubTimeId(subTimeId); deliverPostLog.setFilesId(filesId.toString());
deliverPostLog.setFileId(fileInfo.getId()); deliverPostLogDao.insertSelective(deliverPostLog);
deliverPostLog.setUserId(currentUserId); //添加交付物检查人表
deliverPostLog.setDescription(uploadDeliver.getDescription()); if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) {
deliverPostLog.setTime(now); ProTaskDeliverPostLogChecker postLogChecker;
deliverPostLog.setIsHistory(0); for (Long checkerId : uploadDeliver.getCheckerIdList()) {
deliverPostLogDao.insertSelective(deliverPostLog); postLogChecker = new ProTaskDeliverPostLogChecker();
//添加交付物检查人表 postLogChecker.setId(snowflake.nextId());
if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) { postLogChecker.setDeliverPostLogId(deliverPostLog.getId());
ProTaskDeliverPostLogChecker postLogChecker; postLogChecker.setCheckerId(checkerId);
for (Long checkerId : uploadDeliver.getCheckerIdList()) { postLogCheckerDao.insertSelective(postLogChecker);
postLogChecker = new ProTaskDeliverPostLogChecker();
postLogChecker.setId(snowflake.nextId());
postLogChecker.setDeliverPostLogId(deliverPostLog.getId());
postLogChecker.setCheckerId(checkerId);
postLogCheckerDao.insertSelective(postLogChecker);
}
} else {
throw new BaseException(CodeEnum.NOT_CHECKER);
}
//保存wps的文件消息
saveWpsFile(currentUserId, deliverPostLog.getId(), fileInfo);
} }
} else {
throw new BaseException(CodeEnum.NOT_CHECKER);
} }
//修改交付物状态 //修改交付物状态
ProTaskDeliver deliver = new ProTaskDeliver(); ProTaskDeliver deliver = new ProTaskDeliver();
@ -282,8 +251,6 @@ public class TaskDeliverService implements ITaskDeliverService {
taskDeliverDao.updateByPrimaryKeySelective(deliver); taskDeliverDao.updateByPrimaryKeySelective(deliver);
} }
//发送WS信息
//获取所有接收者的id //获取所有接收者的id
List<BaseMessageDto.MessageUser> messageUserList = new ArrayList<>(); List<BaseMessageDto.MessageUser> messageUserList = new ArrayList<>();
BaseMessageDto.MessageUser messageUser; BaseMessageDto.MessageUser messageUser;
@ -344,6 +311,168 @@ public class TaskDeliverService implements ITaskDeliverService {
return deliverInfo; return deliverInfo;
} }
// /**
// * 将文件绑定交付物
// */
// @Override
// public ProjectVo.DeliverInfo addDeliver(Long currentUserId, DeliverDto.UploadDeliver uploadDeliver) throws Exception {
// Long now = System.currentTimeMillis();
// Long subTimeId = isTaskOrSubTime(uploadDeliver.getTaskId());
// if (ObjectUtil.isNull(subTimeId)) {
// throw new BaseException(CodeEnum.NOT_TASK);
// }
// ProjectVo.DeliverInfo deliverInfo = null;
// //查找交付
// ProTaskDeliver taskDeliver = taskDeliverDao.selectByPrimaryKey(uploadDeliver.getDeliverId());
// if (ObjectUtil.isNull(taskDeliver)) {
// throw new BaseException(CodeEnum.NOT_DELIVER);
// }
//
// ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskDeliver.getTaskDetailId());
// ProRole role = proRoleDao.selectByPrimaryKey(taskDetail.getExecutorRole());
// Boolean isBelongRole = proMemberService.userIsBelongRole(currentUserId, role.getId(),null);
// if (!role.getName().equalsIgnoreCase(WebConstant.ROLE_NAME.AllMember.phase) && !isBelongRole){
// throw new BaseException(CodeEnum.IS_NOT_EXECUTOR);
// }
//// //查找以前上传的不为历史信息的文件。改为历史信息
//// ProTaskDeliverPostLogExample logExample = new ProTaskDeliverPostLogExample();
//// logExample.createCriteria().andTaskSubTimeIdEqualTo(subTimeId).andDeliverIdEqualTo(uploadDeliver.getDeliverId())
//// .andUserIdEqualTo(currentUserId).andIsHistoryEqualTo(0);
//// List<ProTaskDeliverPostLog> deliverPostLogList = deliverPostLogDao.selectByExample(logExample);
//// if (CollectionUtil.isNotEmpty(deliverPostLogList)) {
//// for (ProTaskDeliverPostLog deliverPostLog : deliverPostLogList) {
//// deliverPostLog.setIsHistory(1);
//// deliverPostLogDao.updateByPrimaryKeySelective(deliverPostLog);
//// }
//// }
// //将文件信息与交付物绑定,添加记录deliverPostLog
// if (CollectionUtil.isNotEmpty(uploadDeliver.getFileInfo()) || StrUtil.isNotEmpty(uploadDeliver.getDescription())) {
// if(CollectionUtil.isEmpty(uploadDeliver.getFileInfo())){
// ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog();
// deliverPostLog.setId(snowflake.nextId());
// deliverPostLog.setDeliverId(uploadDeliver.getDeliverId());
// deliverPostLog.setTaskSubTimeId(subTimeId);
// deliverPostLog.setUserId(currentUserId);
// deliverPostLog.setDescription(uploadDeliver.getDescription());
// deliverPostLog.setTime(now);
// deliverPostLog.setIsHistory(0);
// deliverPostLogDao.insertSelective(deliverPostLog);
// //添加交付物检查人表
// if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) {
// ProTaskDeliverPostLogChecker postLogChecker;
// for (Long checkerId : uploadDeliver.getCheckerIdList()) {
// postLogChecker = new ProTaskDeliverPostLogChecker();
// postLogChecker.setId(snowflake.nextId());
// postLogChecker.setDeliverPostLogId(deliverPostLog.getId());
// postLogChecker.setCheckerId(checkerId);
// postLogCheckerDao.insertSelective(postLogChecker);
// }
// } else {
// throw new BaseException(CodeEnum.NOT_CHECKER);
// }
// }else {
// for (DeliverDto.FileInfo fileInfo : uploadDeliver.getFileInfo()) {
//// SysCommitedFile file = commitedFileDao.selectByPrimaryKey(fileInfo.getId());
//// if(ObjectUtil.isNull(file)){
//// throw new BaseException(CodeEnum.NOT_DELIVER_FILE);
//// }
// ProTaskDeliverPostLog deliverPostLog = new ProTaskDeliverPostLog();
// deliverPostLog.setId(snowflake.nextId());
// deliverPostLog.setDeliverId(uploadDeliver.getDeliverId());
// deliverPostLog.setTaskSubTimeId(subTimeId);
// deliverPostLog.setFileId(fileInfo.getId());
// deliverPostLog.setUserId(currentUserId);
// deliverPostLog.setDescription(uploadDeliver.getDescription());
// deliverPostLog.setTime(now);
// deliverPostLog.setIsHistory(0);
// deliverPostLogDao.insertSelective(deliverPostLog);
// //添加交付物检查人表
// if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) {
// ProTaskDeliverPostLogChecker postLogChecker;
// for (Long checkerId : uploadDeliver.getCheckerIdList()) {
// postLogChecker = new ProTaskDeliverPostLogChecker();
// postLogChecker.setId(snowflake.nextId());
// postLogChecker.setDeliverPostLogId(deliverPostLog.getId());
// postLogChecker.setCheckerId(checkerId);
// postLogCheckerDao.insertSelective(postLogChecker);
// }
// } else {
// throw new BaseException(CodeEnum.NOT_CHECKER);
// }
// //保存wps的文件消息
// saveWpsFile(currentUserId, deliverPostLog.getId(), fileInfo);
// }
// }
// //修改交付物状态
// ProTaskDeliver deliver = new ProTaskDeliver();
// deliver.setId(uploadDeliver.getDeliverId());
// deliver.setIsUpload(1);
// taskDeliverDao.updateByPrimaryKeySelective(deliver);
// }
//
// //发送WS信息
//
// //获取所有接收者的id
// List<BaseMessageDto.MessageUser> messageUserList = new ArrayList<>();
// BaseMessageDto.MessageUser messageUser;
// HashSet<Long> userIdSet = new HashSet<>();
// HashSet<String> userIdStr = new HashSet<>();
// if (CollectionUtil.isNotEmpty(uploadDeliver.getCheckerIdList())) {
// for (Long postLogCheckerId : uploadDeliver.getCheckerIdList()) {
// userIdSet.addAll(userService.selectUserIdByRoleId(postLogCheckerId));
// }
// }
// // ws 发送消息
// Set<String> userIds = new HashSet<>();
// for (Long userId : userIdSet) {
// messageUser = new BaseMessageDto.MessageUser();
// messageUser.setUserId(userId);
// messageUserList.add(messageUser);
// userIds.add(userId.toString());
// }
// Long roleId;
// if (role.getName().equals(WebConstant.ROLE_NAME.AllMember.phase)) {
// List<ProRole> roleList = proMemberService.selectRolesByUserIdAndProjectId(currentUserId, taskDetail.getProjectId(),null);
// roleId = roleList.get(0).getId();
// } else {
// roleId = taskDetail.getExecutorRole();
// }
//// DeliverMessageWithUploadDto uploadMessage = new DeliverMessageWithUploadDto(taskDetail.getProjectId(),roleId,taskDetail.getId(),
//// taskDeliver.getId(),taskDeliver.getName(),currentUserId,now,uploadDeliver.getFileInfo(),messageUserList);
//// log.info("上传交付物:{}",JacksonUtil.beanToJson(uploadMessage));
// DeliverMessageWithUploadDto.Data data = new DeliverMessageWithUploadDto.Data();
// data.setProjectId(taskDetail.getProjectId());
// data.setDeliverId(taskDeliver.getId());
// data.setDeliverName(taskDeliver.getName());
// data.setRoleId(roleId);
// data.setTaskId(taskDetail.getId());
// data.setUploader(currentUserId);
// data.setUploadTime(now);
// data.setFile(uploadDeliver.getFileInfo());
// DeliverMessageWithUploadDto uploadMessage = new DeliverMessageWithUploadDto();
// uploadMessage.setData(data);
//
// InMessage inMessage = new InMessage();
// inMessage.setToDomain(MessageConstant.DomainType.User);
// inMessage.setTos(userIds);
// inMessage.setData(JacksonUtil.beanToJson(uploadMessage));
// rabbitTemplate.convertAndSend(RabbitMQConfig.MESSAGE_QUEUE_NAME,
// JacksonUtil.beanToJson(inMessage) );
// //用智能助手发送消息
// SysProject project = sysProjectDao.selectByPrimaryKey(taskDetail.getProjectId());
// robotService.addDeliverRobotSend(currentUserId,taskDeliver.getName(),subTimeId, project);
//
// //返回
// List<ProjectVo.DeliverInfo> deliverInfoList = taskDeliverDao.selectByDeliverId(uploadDeliver.getDeliverId());
// if (CollectionUtil.isNotEmpty(deliverInfoList)) {
// deliverInfo = deliverInfoList.get(0);
//// deliverInfo.setUrl(WebConstant.TEST_URL_BASE + deliverInfo.getUrl());
// deliverInfo.setUrl(PropUtil.imgDomain + "/" + deliverInfo.getUrl());
// }
// return deliverInfo;
// }
private void saveWpsFile(Long currentUserId, Long deliverLogId, DeliverDto.FileInfo fileInfo) { private void saveWpsFile(Long currentUserId, Long deliverLogId, DeliverDto.FileInfo fileInfo) {
File file = new File(WebConstant.UPLOAD_PATH_BASE + File.separator + fileInfo.getUrl()); File file = new File(WebConstant.UPLOAD_PATH_BASE + File.separator + fileInfo.getUrl());
if(file.exists()) { if(file.exists()) {
@ -916,4 +1045,51 @@ public class TaskDeliverService implements ITaskDeliverService {
file.delete(); file.delete();
} }
} }
/**
* 根据任务id查询输出文档的信息
*/
@Override
public List<DeliverVo.QueryDeliverByTaskId> queryDeliverByTaskId(Long currentUserId, Long taskId) {
//查询分解后的任务
ProTaskSubTime taskSubTime = taskSubTimeDao.selectByPrimaryKey(taskId);
if(ObjectUtil.isNull(taskSubTime)){
throw new BaseException(CodeEnum.NOT_TASK);
}
//查询任务详情
ProTaskDetail taskDetail = taskDetailDao.selectByPrimaryKey(taskSubTime.getTaskDetailId());
if(ObjectUtil.isNull(taskDetail)){
throw new BaseException(CodeEnum.NOT_TASK);
}
List<DeliverVo.QueryDeliverByTaskId> queryDeliverByTaskIds = taskDeliverDao.queryDeliverByTaskId(currentUserId, taskSubTime.getId(), taskDetail.getId());
if(CollectionUtil.isNotEmpty(queryDeliverByTaskIds)){
queryDeliverByTaskIds.forEach(deliver -> {
if(CollectionUtil.isNotEmpty(deliver.getDeliverRecodes())){
deliver.getDeliverRecodes().forEach(deliverRecode -> {
if(StrUtil.isNotEmpty(deliverRecode.getFilesId())){
try {
//拆分文件id
String[] split = deliverRecode.getFilesId().split(",");
List<String> splits =new ArrayList<>(Arrays.asList(split));
if(split.length != 0){
//获取文件项目的路径
String requestUrl = PropUtil.filedeal;
//通过文件id查询文件信息
String c = RestTemplateUtil.postBody1(requestUrl,splits);
JsonResponse<List<FileVo.FilePosition>> a = JSONObject.parseObject(c,JsonResponse.class);
if(ObjectUtil.isNotNull(a) && ObjectUtil.isNotNull(a.getData())){
List<FileVo.FilePosition> fileList = a.getData();
deliverRecode.setFileList(fileList);
}
}
}catch (Exception e){
log.info("查询文件信息失败:{}", e);
}
}
});
}
});
}
return queryDeliverByTaskIds;
}
} }

24
tall/src/main/java/com/ccsens/tall/web/DeliverController.java

@ -156,4 +156,28 @@ public class DeliverController {
return JsonResponse.newInstance().ok(); return JsonResponse.newInstance().ok();
} }
// @OperateType(value = 8)
// @ApiOperation(value = "修改交付物的备注",notes = "")
// @ApiImplicitParams({
// @ApiImplicitParam(name="deliverId",value = "交付物上传Id",required = true,paramType = "query",dataType="String"),
// @ApiImplicitParam(name="taskId",value = "任务Id",required = true,paramType = "query",dataType="String")
// })
// @RequestMapping(value = "", method = RequestMethod.DELETE, produces = {"application/json;charset=UTF-8"})
// public JsonResponse deleteDeliver(HttpServletRequest request,
// @RequestParam(required = true)Long deliverLogId, Long taskId) throws Exception {
// Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
// deliverService.deleteDeliver(currentUserId,deliverLogId,taskId);
// return JsonResponse.newInstance().ok();
// }
@ApiOperation(value = "通过任务id查看交付物信息",notes = "")
@ApiImplicitParams({
})
@RequestMapping(value = "queryByTaskId", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"})
public JsonResponse<List<DeliverVo.QueryDeliverByTaskId>> queryDeliverByTaskId(HttpServletRequest request,
@Validated @ApiParam @RequestBody DeliverDto.FindDocByTask findDocByTask) throws Exception {
Long currentUserId = Long.valueOf(((Claims) request.getAttribute(WebConstant.REQUEST_KEY_CLAIMS)).getSubject());
List<DeliverVo.QueryDeliverByTaskId> queryDeliverByTaskIds = deliverService.queryDeliverByTaskId(currentUserId,findDocByTask.getTaskId());
return JsonResponse.newInstance().ok(queryDeliverByTaskIds);
}
} }

4
tall/src/main/resources/application.yml

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

67
tall/src/main/resources/mapper_dao/DeliverDao.xml

@ -215,4 +215,71 @@
AND AND
d.id = #{deliverId} d.id = #{deliverId}
</select> </select>
<resultMap id="queryDeliverByTaskId" type="com.ccsens.tall.bean.vo.DeliverVo$QueryDeliverByTaskId">
<id column="deliverId" property="deliverId"/>
<result column="deliverName" property="deliverName"/>
<collection property="deliverRecodes" ofType="com.ccsens.tall.bean.vo.DeliverVo$DeliverRecode">
<id column="deliverLogId" property="deliverLogId"/>
<result column="description" property="description"/>
<result column="time" property="time"/>
<result column="filesId" property="filesId"/>
<collection property="checkerList" ofType="com.ccsens.tall.bean.vo.DeliverVo$Checker">
<id column="checkerId" property="checkerId"/>
<result column="checkerStatus" property="checkerStatus"/>
<result column="score" property="score"/>
<result column="remark" property="remark"/>
<result column="checkerName" property="checkerName"/>
<result column="isChecker" property="isChecker"/>
</collection>
</collection>
</resultMap>
<select id="queryDeliverByTaskId" resultMap="queryDeliverByTaskId">
SELECT
d.id as deliverId,
d.`name` as deliverName,
p.id as deliverLogId,
p.description as description,
p.time as time,
p.files_id as filesId,
pc.checker_id as checkerId,
pc.check_status as checkerStatus,
pc.score as score,
pc.remark as remark,
r.checkerName as checkerName,
r.isChecker as isChecker
from
t_pro_task_deliver d
LEFT JOIN t_pro_task_deliver_post_log p
on d.id = p.deliver_id
and p.task_sub_time_id = #{subTimeId}
and p.rec_status = 0
LEFT JOIN t_pro_task_deliver_post_log_checker pc
on pc.deliver_post_log_id = p.id
and pc.rec_status = 0
LEFT JOIN
(
SELECT
r.id as checkerId,
r.`name` as checkerName,
if(m.user_id = #{userId},TRUE,FALSE) as isChecker
FROM
t_pro_role r,
t_pro_member_role mr,
t_pro_member m
WHERE
r.id = mr.role_id
and mr.member_id = m.id
and r.parent_id != 0
and r.rec_status = 0
and mr.rec_status = 0
and m.rec_status = 0
GROUP BY r.id
) r on r.checkerId = pc.checker_id
WHERE
d.task_detail_id = #{taskDetailId}
and d.rec_status = 0
</select>
</mapper> </mapper>

659
tall/src/main/resources/mapper_raw/ProTaskDeliverPostLogMapper.xml

@ -1,323 +1,338 @@
<?xml version="1.0" encoding="UTF-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"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ccsens.tall.persist.mapper.ProTaskDeliverPostLogMapper"> <mapper namespace="com.ccsens.tall.persist.mapper.ProTaskDeliverPostLogMapper">
<resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProTaskDeliverPostLog"> <resultMap id="BaseResultMap" type="com.ccsens.tall.bean.po.ProTaskDeliverPostLog">
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id" />
<result column="deliver_id" jdbcType="BIGINT" property="deliverId" /> <result column="deliver_id" jdbcType="BIGINT" property="deliverId" />
<result column="task_sub_time_id" jdbcType="BIGINT" property="taskSubTimeId" /> <result column="task_sub_time_id" jdbcType="BIGINT" property="taskSubTimeId" />
<result column="file_id" jdbcType="BIGINT" property="fileId" /> <result column="file_id" jdbcType="BIGINT" property="fileId" />
<result column="user_id" jdbcType="BIGINT" property="userId" /> <result column="user_id" jdbcType="BIGINT" property="userId" />
<result column="version" jdbcType="VARCHAR" property="version" /> <result column="version" jdbcType="VARCHAR" property="version" />
<result column="description" jdbcType="VARCHAR" property="description" /> <result column="description" jdbcType="VARCHAR" property="description" />
<result column="time" jdbcType="BIGINT" property="time" /> <result column="time" jdbcType="BIGINT" property="time" />
<result column="is_history" jdbcType="INTEGER" property="isHistory" /> <result column="is_history" jdbcType="INTEGER" property="isHistory" />
<result column="created_at" jdbcType="TIMESTAMP" property="createdAt" /> <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
<result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" /> <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
<result column="rec_status" jdbcType="TINYINT" property="recStatus" /> <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
</resultMap> <result column="files_id" jdbcType="VARCHAR" property="filesId" />
<sql id="Example_Where_Clause"> </resultMap>
<where> <sql id="Example_Where_Clause">
<foreach collection="oredCriteria" item="criteria" separator="or"> <where>
<if test="criteria.valid"> <foreach collection="oredCriteria" item="criteria" separator="or">
<trim prefix="(" prefixOverrides="and" suffix=")"> <if test="criteria.valid">
<foreach collection="criteria.criteria" item="criterion"> <trim prefix="(" prefixOverrides="and" suffix=")">
<choose> <foreach collection="criteria.criteria" item="criterion">
<when test="criterion.noValue"> <choose>
and ${criterion.condition} <when test="criterion.noValue">
</when> and ${criterion.condition}
<when test="criterion.singleValue"> </when>
and ${criterion.condition} #{criterion.value} <when test="criterion.singleValue">
</when> and ${criterion.condition} #{criterion.value}
<when test="criterion.betweenValue"> </when>
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} <when test="criterion.betweenValue">
</when> and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
<when test="criterion.listValue"> </when>
and ${criterion.condition} <when test="criterion.listValue">
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> and ${criterion.condition}
#{listItem} <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
</foreach> #{listItem}
</when> </foreach>
</choose> </when>
</foreach> </choose>
</trim> </foreach>
</if> </trim>
</foreach> </if>
</where> </foreach>
</sql> </where>
<sql id="Update_By_Example_Where_Clause"> </sql>
<where> <sql id="Update_By_Example_Where_Clause">
<foreach collection="example.oredCriteria" item="criteria" separator="or"> <where>
<if test="criteria.valid"> <foreach collection="example.oredCriteria" item="criteria" separator="or">
<trim prefix="(" prefixOverrides="and" suffix=")"> <if test="criteria.valid">
<foreach collection="criteria.criteria" item="criterion"> <trim prefix="(" prefixOverrides="and" suffix=")">
<choose> <foreach collection="criteria.criteria" item="criterion">
<when test="criterion.noValue"> <choose>
and ${criterion.condition} <when test="criterion.noValue">
</when> and ${criterion.condition}
<when test="criterion.singleValue"> </when>
and ${criterion.condition} #{criterion.value} <when test="criterion.singleValue">
</when> and ${criterion.condition} #{criterion.value}
<when test="criterion.betweenValue"> </when>
and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} <when test="criterion.betweenValue">
</when> and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
<when test="criterion.listValue"> </when>
and ${criterion.condition} <when test="criterion.listValue">
<foreach close=")" collection="criterion.value" item="listItem" open="(" separator=","> and ${criterion.condition}
#{listItem} <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
</foreach> #{listItem}
</when> </foreach>
</choose> </when>
</foreach> </choose>
</trim> </foreach>
</if> </trim>
</foreach> </if>
</where> </foreach>
</sql> </where>
<sql id="Base_Column_List"> </sql>
id, deliver_id, task_sub_time_id, file_id, user_id, version, description, time, is_history, <sql id="Base_Column_List">
created_at, updated_at, rec_status id, deliver_id, task_sub_time_id, file_id, user_id, version, description, time, is_history,
</sql> created_at, updated_at, rec_status, files_id
<select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogExample" resultMap="BaseResultMap"> </sql>
select <select id="selectByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogExample" resultMap="BaseResultMap">
<if test="distinct"> select
distinct <if test="distinct">
</if> distinct
<include refid="Base_Column_List" /> </if>
from t_pro_task_deliver_post_log <include refid="Base_Column_List" />
<if test="_parameter != null"> from t_pro_task_deliver_post_log
<include refid="Example_Where_Clause" /> <if test="_parameter != null">
</if> <include refid="Example_Where_Clause" />
<if test="orderByClause != null"> </if>
order by ${orderByClause} <if test="orderByClause != null">
</if> order by ${orderByClause}
</select> </if>
<select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap"> </select>
select <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
<include refid="Base_Column_List" /> select
from t_pro_task_deliver_post_log <include refid="Base_Column_List" />
where id = #{id,jdbcType=BIGINT} from t_pro_task_deliver_post_log
</select> where id = #{id,jdbcType=BIGINT}
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long"> </select>
delete from t_pro_task_deliver_post_log <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
where id = #{id,jdbcType=BIGINT} delete from t_pro_task_deliver_post_log
</delete> where id = #{id,jdbcType=BIGINT}
<delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogExample"> </delete>
delete from t_pro_task_deliver_post_log <delete id="deleteByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogExample">
<if test="_parameter != null"> delete from t_pro_task_deliver_post_log
<include refid="Example_Where_Clause" /> <if test="_parameter != null">
</if> <include refid="Example_Where_Clause" />
</delete> </if>
<insert id="insert" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLog"> </delete>
insert into t_pro_task_deliver_post_log (id, deliver_id, task_sub_time_id, <insert id="insert" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLog">
file_id, user_id, version, insert into t_pro_task_deliver_post_log (id, deliver_id, task_sub_time_id,
description, time, is_history, file_id, user_id, version,
created_at, updated_at, rec_status description, time, is_history,
) created_at, updated_at, rec_status,
values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{taskSubTimeId,jdbcType=BIGINT}, files_id)
#{fileId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{version,jdbcType=VARCHAR}, values (#{id,jdbcType=BIGINT}, #{deliverId,jdbcType=BIGINT}, #{taskSubTimeId,jdbcType=BIGINT},
#{description,jdbcType=VARCHAR}, #{time,jdbcType=BIGINT}, #{isHistory,jdbcType=INTEGER}, #{fileId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, #{version,jdbcType=VARCHAR},
#{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT} #{description,jdbcType=VARCHAR}, #{time,jdbcType=BIGINT}, #{isHistory,jdbcType=INTEGER},
) #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT},
</insert> #{filesId,jdbcType=VARCHAR})
<insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLog"> </insert>
insert into t_pro_task_deliver_post_log <insert id="insertSelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLog">
<trim prefix="(" suffix=")" suffixOverrides=","> insert into t_pro_task_deliver_post_log
<if test="id != null"> <trim prefix="(" suffix=")" suffixOverrides=",">
id, <if test="id != null">
</if> id,
<if test="deliverId != null"> </if>
deliver_id, <if test="deliverId != null">
</if> deliver_id,
<if test="taskSubTimeId != null"> </if>
task_sub_time_id, <if test="taskSubTimeId != null">
</if> task_sub_time_id,
<if test="fileId != null"> </if>
file_id, <if test="fileId != null">
</if> file_id,
<if test="userId != null"> </if>
user_id, <if test="userId != null">
</if> user_id,
<if test="version != null"> </if>
version, <if test="version != null">
</if> version,
<if test="description != null"> </if>
description, <if test="description != null">
</if> description,
<if test="time != null"> </if>
time, <if test="time != null">
</if> time,
<if test="isHistory != null"> </if>
is_history, <if test="isHistory != null">
</if> is_history,
<if test="createdAt != null"> </if>
created_at, <if test="createdAt != null">
</if> created_at,
<if test="updatedAt != null"> </if>
updated_at, <if test="updatedAt != null">
</if> updated_at,
<if test="recStatus != null"> </if>
rec_status, <if test="recStatus != null">
</if> rec_status,
</trim> </if>
<trim prefix="values (" suffix=")" suffixOverrides=","> <if test="filesId != null">
<if test="id != null"> files_id,
#{id,jdbcType=BIGINT}, </if>
</if> </trim>
<if test="deliverId != null"> <trim prefix="values (" suffix=")" suffixOverrides=",">
#{deliverId,jdbcType=BIGINT}, <if test="id != null">
</if> #{id,jdbcType=BIGINT},
<if test="taskSubTimeId != null"> </if>
#{taskSubTimeId,jdbcType=BIGINT}, <if test="deliverId != null">
</if> #{deliverId,jdbcType=BIGINT},
<if test="fileId != null"> </if>
#{fileId,jdbcType=BIGINT}, <if test="taskSubTimeId != null">
</if> #{taskSubTimeId,jdbcType=BIGINT},
<if test="userId != null"> </if>
#{userId,jdbcType=BIGINT}, <if test="fileId != null">
</if> #{fileId,jdbcType=BIGINT},
<if test="version != null"> </if>
#{version,jdbcType=VARCHAR}, <if test="userId != null">
</if> #{userId,jdbcType=BIGINT},
<if test="description != null"> </if>
#{description,jdbcType=VARCHAR}, <if test="version != null">
</if> #{version,jdbcType=VARCHAR},
<if test="time != null"> </if>
#{time,jdbcType=BIGINT}, <if test="description != null">
</if> #{description,jdbcType=VARCHAR},
<if test="isHistory != null"> </if>
#{isHistory,jdbcType=INTEGER}, <if test="time != null">
</if> #{time,jdbcType=BIGINT},
<if test="createdAt != null"> </if>
#{createdAt,jdbcType=TIMESTAMP}, <if test="isHistory != null">
</if> #{isHistory,jdbcType=INTEGER},
<if test="updatedAt != null"> </if>
#{updatedAt,jdbcType=TIMESTAMP}, <if test="createdAt != null">
</if> #{createdAt,jdbcType=TIMESTAMP},
<if test="recStatus != null"> </if>
#{recStatus,jdbcType=TINYINT}, <if test="updatedAt != null">
</if> #{updatedAt,jdbcType=TIMESTAMP},
</trim> </if>
</insert> <if test="recStatus != null">
<select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogExample" resultType="java.lang.Long"> #{recStatus,jdbcType=TINYINT},
select count(*) from t_pro_task_deliver_post_log </if>
<if test="_parameter != null"> <if test="filesId != null">
<include refid="Example_Where_Clause" /> #{filesId,jdbcType=VARCHAR},
</if> </if>
</select> </trim>
<update id="updateByExampleSelective" parameterType="map"> </insert>
update t_pro_task_deliver_post_log <select id="countByExample" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLogExample" resultType="java.lang.Long">
<set> select count(*) from t_pro_task_deliver_post_log
<if test="record.id != null"> <if test="_parameter != null">
id = #{record.id,jdbcType=BIGINT}, <include refid="Example_Where_Clause" />
</if> </if>
<if test="record.deliverId != null"> </select>
deliver_id = #{record.deliverId,jdbcType=BIGINT}, <update id="updateByExampleSelective" parameterType="map">
</if> update t_pro_task_deliver_post_log
<if test="record.taskSubTimeId != null"> <set>
task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, <if test="record.id != null">
</if> id = #{record.id,jdbcType=BIGINT},
<if test="record.fileId != null"> </if>
file_id = #{record.fileId,jdbcType=BIGINT}, <if test="record.deliverId != null">
</if> deliver_id = #{record.deliverId,jdbcType=BIGINT},
<if test="record.userId != null"> </if>
user_id = #{record.userId,jdbcType=BIGINT}, <if test="record.taskSubTimeId != null">
</if> task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT},
<if test="record.version != null"> </if>
version = #{record.version,jdbcType=VARCHAR}, <if test="record.fileId != null">
</if> file_id = #{record.fileId,jdbcType=BIGINT},
<if test="record.description != null"> </if>
description = #{record.description,jdbcType=VARCHAR}, <if test="record.userId != null">
</if> user_id = #{record.userId,jdbcType=BIGINT},
<if test="record.time != null"> </if>
time = #{record.time,jdbcType=BIGINT}, <if test="record.version != null">
</if> version = #{record.version,jdbcType=VARCHAR},
<if test="record.isHistory != null"> </if>
is_history = #{record.isHistory,jdbcType=INTEGER}, <if test="record.description != null">
</if> description = #{record.description,jdbcType=VARCHAR},
<if test="record.createdAt != null"> </if>
created_at = #{record.createdAt,jdbcType=TIMESTAMP}, <if test="record.time != null">
</if> time = #{record.time,jdbcType=BIGINT},
<if test="record.updatedAt != null"> </if>
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, <if test="record.isHistory != null">
</if> is_history = #{record.isHistory,jdbcType=INTEGER},
<if test="record.recStatus != null"> </if>
rec_status = #{record.recStatus,jdbcType=TINYINT}, <if test="record.createdAt != null">
</if> created_at = #{record.createdAt,jdbcType=TIMESTAMP},
</set> </if>
<if test="_parameter != null"> <if test="record.updatedAt != null">
<include refid="Update_By_Example_Where_Clause" /> updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if> </if>
</update> <if test="record.recStatus != null">
<update id="updateByExample" parameterType="map"> rec_status = #{record.recStatus,jdbcType=TINYINT},
update t_pro_task_deliver_post_log </if>
set id = #{record.id,jdbcType=BIGINT}, <if test="record.filesId != null">
deliver_id = #{record.deliverId,jdbcType=BIGINT}, files_id = #{record.filesId,jdbcType=VARCHAR},
task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT}, </if>
file_id = #{record.fileId,jdbcType=BIGINT}, </set>
user_id = #{record.userId,jdbcType=BIGINT}, <if test="_parameter != null">
version = #{record.version,jdbcType=VARCHAR}, <include refid="Update_By_Example_Where_Clause" />
description = #{record.description,jdbcType=VARCHAR}, </if>
time = #{record.time,jdbcType=BIGINT}, </update>
is_history = #{record.isHistory,jdbcType=INTEGER}, <update id="updateByExample" parameterType="map">
created_at = #{record.createdAt,jdbcType=TIMESTAMP}, update t_pro_task_deliver_post_log
updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, set id = #{record.id,jdbcType=BIGINT},
rec_status = #{record.recStatus,jdbcType=TINYINT} deliver_id = #{record.deliverId,jdbcType=BIGINT},
<if test="_parameter != null"> task_sub_time_id = #{record.taskSubTimeId,jdbcType=BIGINT},
<include refid="Update_By_Example_Where_Clause" /> file_id = #{record.fileId,jdbcType=BIGINT},
</if> user_id = #{record.userId,jdbcType=BIGINT},
</update> version = #{record.version,jdbcType=VARCHAR},
<update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLog"> description = #{record.description,jdbcType=VARCHAR},
update t_pro_task_deliver_post_log time = #{record.time,jdbcType=BIGINT},
<set> is_history = #{record.isHistory,jdbcType=INTEGER},
<if test="deliverId != null"> created_at = #{record.createdAt,jdbcType=TIMESTAMP},
deliver_id = #{deliverId,jdbcType=BIGINT}, updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
</if> rec_status = #{record.recStatus,jdbcType=TINYINT},
<if test="taskSubTimeId != null"> files_id = #{record.filesId,jdbcType=VARCHAR}
task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, <if test="_parameter != null">
</if> <include refid="Update_By_Example_Where_Clause" />
<if test="fileId != null"> </if>
file_id = #{fileId,jdbcType=BIGINT}, </update>
</if> <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLog">
<if test="userId != null"> update t_pro_task_deliver_post_log
user_id = #{userId,jdbcType=BIGINT}, <set>
</if> <if test="deliverId != null">
<if test="version != null"> deliver_id = #{deliverId,jdbcType=BIGINT},
version = #{version,jdbcType=VARCHAR}, </if>
</if> <if test="taskSubTimeId != null">
<if test="description != null"> task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT},
description = #{description,jdbcType=VARCHAR}, </if>
</if> <if test="fileId != null">
<if test="time != null"> file_id = #{fileId,jdbcType=BIGINT},
time = #{time,jdbcType=BIGINT}, </if>
</if> <if test="userId != null">
<if test="isHistory != null"> user_id = #{userId,jdbcType=BIGINT},
is_history = #{isHistory,jdbcType=INTEGER}, </if>
</if> <if test="version != null">
<if test="createdAt != null"> version = #{version,jdbcType=VARCHAR},
created_at = #{createdAt,jdbcType=TIMESTAMP}, </if>
</if> <if test="description != null">
<if test="updatedAt != null"> description = #{description,jdbcType=VARCHAR},
updated_at = #{updatedAt,jdbcType=TIMESTAMP}, </if>
</if> <if test="time != null">
<if test="recStatus != null"> time = #{time,jdbcType=BIGINT},
rec_status = #{recStatus,jdbcType=TINYINT}, </if>
</if> <if test="isHistory != null">
</set> is_history = #{isHistory,jdbcType=INTEGER},
where id = #{id,jdbcType=BIGINT} </if>
</update> <if test="createdAt != null">
<update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLog"> created_at = #{createdAt,jdbcType=TIMESTAMP},
update t_pro_task_deliver_post_log </if>
set deliver_id = #{deliverId,jdbcType=BIGINT}, <if test="updatedAt != null">
task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT}, updated_at = #{updatedAt,jdbcType=TIMESTAMP},
file_id = #{fileId,jdbcType=BIGINT}, </if>
user_id = #{userId,jdbcType=BIGINT}, <if test="recStatus != null">
version = #{version,jdbcType=VARCHAR}, rec_status = #{recStatus,jdbcType=TINYINT},
description = #{description,jdbcType=VARCHAR}, </if>
time = #{time,jdbcType=BIGINT}, <if test="filesId != null">
is_history = #{isHistory,jdbcType=INTEGER}, files_id = #{filesId,jdbcType=VARCHAR},
created_at = #{createdAt,jdbcType=TIMESTAMP}, </if>
updated_at = #{updatedAt,jdbcType=TIMESTAMP}, </set>
rec_status = #{recStatus,jdbcType=TINYINT} where id = #{id,jdbcType=BIGINT}
where id = #{id,jdbcType=BIGINT} </update>
</update> <update id="updateByPrimaryKey" parameterType="com.ccsens.tall.bean.po.ProTaskDeliverPostLog">
update t_pro_task_deliver_post_log
set deliver_id = #{deliverId,jdbcType=BIGINT},
task_sub_time_id = #{taskSubTimeId,jdbcType=BIGINT},
file_id = #{fileId,jdbcType=BIGINT},
user_id = #{userId,jdbcType=BIGINT},
version = #{version,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR},
time = #{time,jdbcType=BIGINT},
is_history = #{isHistory,jdbcType=INTEGER},
created_at = #{createdAt,jdbcType=TIMESTAMP},
updated_at = #{updatedAt,jdbcType=TIMESTAMP},
rec_status = #{recStatus,jdbcType=TINYINT},
files_id = #{filesId,jdbcType=VARCHAR}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper> </mapper>
Loading…
Cancel
Save