admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
guoshengxiong 2024-06-03 19:45:57 +08:00
parent 582bfa94c4
commit a5db704a76
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/zhgd/xmgl/modules/xz/mapper/xml/XzTaskProgressMapper.xml
View File

@ -176,10 +176,6 @@
AND (p.quality_region_id = #{qualityRegionId} OR p.quality_region_id IN ( SELECT t.id FROM quality_region t AND (p.quality_region_id = #{qualityRegionId} OR p.quality_region_id IN ( SELECT t.id FROM quality_region t
WHERE find_in_set(#{qualityRegionId}, ancestors) )) WHERE find_in_set(#{qualityRegionId}, ancestors) ))
</if> </if>
<if test="enterpriseId != null and enterpriseId != ''">
AND (p.enterprise_id = #{enterpriseId} OR p.enterprise_id IN ( SELECT t.id FROM project_enterprise t WHERE
find_in_set(#{enterpriseId}, ancestors) ))
</if>
<if test="supplierEnterpriseId != null and supplierEnterpriseId != ''"> <if test="supplierEnterpriseId != null and supplierEnterpriseId != ''">
AND (p.enterprise_id = #{supplierEnterpriseId} OR p.enterprise_id IN ( SELECT t.id FROM project_enterprise t AND (p.enterprise_id = #{supplierEnterpriseId} OR p.enterprise_id IN ( SELECT t.id FROM project_enterprise t
WHERE find_in_set(#{supplierEnterpriseId}, ancestors) )) WHERE find_in_set(#{supplierEnterpriseId}, ancestors) ))

5
src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzTaskProgressServiceImpl.java
View File

@ -570,11 +570,6 @@ public class XzTaskProgressServiceImpl extends ServiceImpl<XzTaskProgressMapper,
} else { } else {
vo.setEnterpriseTotalProgress(0D); vo.setEnterpriseTotalProgress(0D);
} }
if (systemUserService.isSupplier()) {
EnterpriseInfo info = xzSupplierQualificationApplyService.getSupplierInfoByUserId(SecurityUtils.getUser().getUserId());
paramMap.put("supplierEnterpriseId", info.getId());
}
CountTaskProgressVo vo1 = baseMapper.getMaxMinProgress(paramMap); CountTaskProgressVo vo1 = baseMapper.getMaxMinProgress(paramMap);
vo.setProjectTotalDayNum(vo1.getProjectTotalDayNum()); vo.setProjectTotalDayNum(vo1.getProjectTotalDayNum());
vo.setProjectSurplusDayNum(vo1.getProjectSurplusDayNum()); vo.setProjectSurplusDayNum(vo1.getProjectSurplusDayNum());