|
@@ -39,7 +39,7 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
|
|
|
// 设置默认值
|
|
|
setDefaultValue(calculateTimeRecord);
|
|
|
save(calculateTimeRecord);
|
|
|
- return calculateTimeRecord.getId();
|
|
|
+ return null;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -50,7 +50,7 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
|
|
|
* @version V1.0 2021/3/12 12:29 下午
|
|
|
*/
|
|
|
private void setDefaultValue(CalculateTimeRecord calculateTimeRecord) {
|
|
|
- calculateTimeRecord.setCreator(AppContext.getContext().getAccountId());
|
|
|
+// calculateTimeRecord.setCreator(AppContext.getContext().getAccountId());
|
|
|
// todo 其他默认的属性
|
|
|
|
|
|
}
|
|
@@ -80,7 +80,7 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
|
|
|
public void updateCalculateTimeRecord(UpdateCalculateTimeRecordDTO updateCalculateTimeRecordDTO) {
|
|
|
CalculateTimeRecord calculateTimeRecord = getById(updateCalculateTimeRecordDTO.getId());
|
|
|
calculateTimeRecord = ConvertCalculateTimeRecordTool.INSTANCE.convertUpdateDto2Entity(calculateTimeRecord, updateCalculateTimeRecordDTO);
|
|
|
- calculateTimeRecord.setModifier(AppContext.getContext().getAccountId());
|
|
|
+// calculateTimeRecord.setModifier(AppContext.getContext().getAccountId());
|
|
|
updateById(calculateTimeRecord);
|
|
|
}
|
|
|
|
|
@@ -117,7 +117,7 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
|
|
|
// 校验是否可删除
|
|
|
CalculateTimeRecord calculateTimeRecord = checkDeletable(id);
|
|
|
|
|
|
- calculateTimeRecord.setValid(ValidEnum.FALSE.getType());
|
|
|
+// calculateTimeRecord.setValid(ValidEnum.FALSE.getType());
|
|
|
updateById(calculateTimeRecord);
|
|
|
}
|
|
|
|
|
@@ -130,9 +130,9 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
|
|
|
@Override
|
|
|
public List<CalculateTimeRecord> queryCalculateTimeRecordList(QueryCalculateTimeRecordDTO queryCalculateTimeRecordDTO) {
|
|
|
QueryWrapper<CalculateTimeRecord> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(CalculateTimeRecord.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+// queryWrapper.eq(CalculateTimeRecord.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
// 默认按创建时间倒序排序
|
|
|
- queryWrapper.orderBy(true, false, CalculateTimeRecord.PROP_CREATIONTIME);
|
|
|
+// queryWrapper.orderBy(true, false, CalculateTimeRecord.PROP_CREATIONTIME);
|
|
|
|
|
|
if (queryCalculateTimeRecordDTO != null) {
|
|
|
|
|
@@ -164,13 +164,13 @@ public class CalculateTimeRecordServiceImpl extends ServiceImpl<CalculateTimeRec
|
|
|
@Override
|
|
|
public IPage<CalculateTimeRecord> pageQueryCalculateTimeRecord(PageQueryCalculateTimeRecordDTO pageQueryCalculateTimeRecordDTO) {
|
|
|
QueryWrapper<CalculateTimeRecord> queryWrapper = new QueryWrapper<>();
|
|
|
- queryWrapper.eq(CalculateTimeRecord.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
+// queryWrapper.eq(CalculateTimeRecord.PROP_VALID, ValidEnum.TRUE.getType());
|
|
|
// 这里认为pageQueryDTO是经过校验的,肯定包含分页信息
|
|
|
IPage<CalculateTimeRecord> pageParam = new Page<>(pageQueryCalculateTimeRecordDTO.getPage(), pageQueryCalculateTimeRecordDTO.getSize(),true);
|
|
|
// 排序信息
|
|
|
if(CollectionUtils.isEmpty(pageQueryCalculateTimeRecordDTO.getOrders())){
|
|
|
// 默认按创建时间倒序排序
|
|
|
- queryWrapper.orderBy(true, false, CalculateTimeRecord.PROP_CREATIONTIME);
|
|
|
+// queryWrapper.orderBy(true, false, CalculateTimeRecord.PROP_CREATIONTIME);
|
|
|
}else {
|
|
|
List<Sort> orders = pageQueryCalculateTimeRecordDTO.getOrders();
|
|
|
for(Sort sort: orders) {
|