项目进度修改

This commit is contained in:
guoshengxiong 2024-05-30 16:58:25 +08:00
parent cd75081b99
commit d91d0a59df

View File

@ -12,12 +12,14 @@ import com.zhgd.xmgl.modules.xz.mapper.XzTaskProgressTotalMapper;
import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressTotalService; import com.zhgd.xmgl.modules.xz.service.IXzTaskProgressTotalService;
import com.zhgd.xmgl.util.PageUtil; import com.zhgd.xmgl.util.PageUtil;
import com.zhgd.xmgl.util.RefUtil; import com.zhgd.xmgl.util.RefUtil;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Objects;
/** /**
* @Description: 星纵-任务进度总进度 * @Description: 星纵-任务进度总进度
@ -48,6 +50,10 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl<XzTaskProgressTo
private QueryWrapper<XzTaskProgressTotal> getQueryWrapper(HashMap<String, Object> paramMap) { private QueryWrapper<XzTaskProgressTotal> getQueryWrapper(HashMap<String, Object> paramMap) {
String alias = ""; String alias = "";
Integer type = MapUtils.getInteger(paramMap, "type");
if (Objects.equals(type, 1)) {
paramMap.remove("enterpriseId");
}
QueryWrapper<XzTaskProgressTotal> queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressTotal.class, paramMap, alias); QueryWrapper<XzTaskProgressTotal> queryWrapper = QueryGenerator.initPageQueryWrapper(XzTaskProgressTotal.class, paramMap, alias);
queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressTotal::getCreateDate)); queryWrapper.orderByDesc(alias + RefUtil.fieldNameUlc(XzTaskProgressTotal::getCreateDate));
return queryWrapper; return queryWrapper;
@ -65,6 +71,9 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl<XzTaskProgressTo
.orderByDesc(XzTaskProgressTotal::getCreateDate) .orderByDesc(XzTaskProgressTotal::getCreateDate)
.last("limit 1") .last("limit 1")
); );
if (Objects.equals(xzTaskProgressTotal.getType(), 1)) {
xzTaskProgressTotal.setEnterpriseId(null);
}
if (total != null) { if (total != null) {
xzTaskProgressTotal.setChangeBefore(total.getChangeAfter()); xzTaskProgressTotal.setChangeBefore(total.getChangeAfter());
} else { } else {
@ -80,6 +89,9 @@ public class XzTaskProgressTotalServiceImpl extends ServiceImpl<XzTaskProgressTo
if (xzTaskProgressTotal1 == null) { if (xzTaskProgressTotal1 == null) {
throw new OpenAlertException("未找到对应实体"); throw new OpenAlertException("未找到对应实体");
} }
if (Objects.equals(xzTaskProgressTotal.getType(), 1)) {
xzTaskProgressTotal.setEnterpriseId(null);
}
baseMapper.updateById(xzTaskProgressTotal); baseMapper.updateById(xzTaskProgressTotal);
} }