Browse Source

看板1.6

master
Jinyuanyuan 5 months ago
parent
commit
82a62f305e
  1. 12
      huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml
  2. 18
      huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

12
huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml

@ -181,6 +181,9 @@ order by create_date desc
<if test="info.stage!=null and info.stage!=''">
and u.stage &gt;= #{info.stage}
</if>
<if test="info.type!=null and info.type!=''">
and type = #{info.type}
</if>
</where>
order by u.create_date desc
</select>
@ -271,6 +274,9 @@ order by create_date desc
<if test="info.superLeader!=null and info.superLeader!=''">
and super_leader = #{info.superLeader}
</if>
<if test="info.type!=null and info.type!=''">
and type = #{info.type}
</if>
</where>
group by duty_workplace,admin_division,workplace_properties,super_leader
order by ${orderBy} ${orderDir}
@ -309,6 +315,9 @@ order by create_date desc
<if test="info.superLeader!=null and info.superLeader!=''">
and super_leader = #{info.superLeader}
</if>
<if test="info.type!=null and info.type!=''">
and type = #{info.type}
</if>
</where>
order by ${orderBy} ${orderDir}
</select>
@ -321,6 +330,9 @@ order by create_date desc
and project_name like #{tempStr}
</if>
</where>
<if test="info.type!=null and info.type!=''">
and type = #{info.type}
</if>
group by ${condition}
</select>
<select id="getNumByType" resultMap="NumByTypeMap">

18
huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java

@ -901,8 +901,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
@Override
public IPage<DimensionPageResponse> getDimensionPage(HuzhouProjectinfo projectInfo, Integer pageNo, Integer pageSize, String orderBy, String orderDir) {
Page page = new Page(pageNo, pageSize);
// //只要入库项目
// projectInfo.setType("2");
//只要入库项目
projectInfo.setType("2");
ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
IPage<DimensionPageOV> pageSorted = projectinfoMapper.getDimensionPageSorted(page, projectInfoAuthSelect, orderBy, orderDir);
@ -942,8 +942,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
@Override
public IPage<ProjectPageResponse> getProjectPage(HuzhouProjectinfo projectInfo, Integer pageNo, Integer pageSize, String orderBy, String orderDir) {
Page page = new Page(pageNo, pageSize);
// //只要入库项目
// projectInfo.setType("2");
//只要入库项目
projectInfo.setType("2");
ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
IPage<ProjectPageOV> pageSorted = projectinfoMapper.getProjectPageSorted(page, projectInfoAuthSelect, orderBy, orderDir);
@ -980,6 +980,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
@Override
public CountByConditionOV countByCondition(String condition) {
HuzhouProjectinfo projectInfo = new HuzhouProjectinfo();
//只要入库项目
projectInfo.setType("2");
ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
List<String> allProjectIds = projectinfoOVList.stream().map(x -> x.getId()).collect(Collectors.toList());
@ -1032,8 +1034,12 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
@Override
public CountBoardOV showCountBoard() {
HuzhouProjectinfo projectInfo = new HuzhouProjectinfo();
//只要入库项目
ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo);
List<HuzhouProjectinfoOV> projectinfoOVList = projectinfoMapper.getProjectAndChildInfoPageList(projectInfoAuthSelect);
List<HuzhouProjectinfoOV> rkList = projectinfoOVList.stream().filter(x -> x.getType().equals("2")).collect(Collectors.toList());
List<String> rkIds = rkList.stream().map(x -> x.getId()).collect(Collectors.toList());
List<String> projectIds = projectinfoOVList.stream().map(x -> x.getId()).collect(Collectors.toList());
//项目数量统计by type
Map<String, NumByTypeOV> numByType = projectinfoMapper.getNumByType(projectInfoAuthSelect).stream()
@ -1045,8 +1051,8 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM
rkNum=numByType.get("2").getNum();
CountBoardOV result = CountBoardOV.builder().total(String.valueOf(total)).ptNum(String.valueOf(ptNum)).rkNum(String.valueOf(rkNum)).build();
//项目总进度
TotalProgressOV totalProgress = this.countNumByPlan(projectIds);
String projectProgress = this.getProgress(projectIds).getProjectProgress();
TotalProgressOV totalProgress = this.countNumByPlan(rkIds);
String projectProgress = this.getProgress(rkIds).getProjectProgress();
totalProgress.setProgress(projectProgress);
////各种类资金总额和执行率
NewFundOV totalFund = this.getFund(projectIds);

Loading…
Cancel
Save