bug修復

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/DemEnforceProjectAllServiceImpl.java

@@ -26,8 +26,8 @@ public class DemEnforceProjectAllServiceImpl extends AbstractCrudService<DemEnfo
     public int enforceProjectAllCount(String typeOneLetter, String typeTwoLetter, Date startTime, Date endTime, String unitId, String qualifiedFlag) {
         LambdaQueryWrapper<DemEnforceProjectAll> queryWrapper = Wrappers.lambdaQuery();
         queryWrapper.eq(DemEnforceProjectAll::getDeleteFlag, 0)
-                .eq(StringUtils.isNotBlank(typeOneLetter), DemEnforceProjectAll::getProjectTypeDescribe1, typeOneLetter)
-                .eq(StringUtils.isNotBlank(typeTwoLetter), DemEnforceProjectAll::getProjectTypeDescribe2, typeTwoLetter)
+                .eq(StringUtils.isNotBlank(typeOneLetter), DemEnforceProjectAll::getProjectBranchType1, typeOneLetter)
+                    .eq(StringUtils.isNotBlank(typeTwoLetter), DemEnforceProjectAll::getProjectBranchType2, typeTwoLetter)
                 .eq(unitId != null && unitId != "", DemEnforceProjectAll::getProjectCompanyId, unitId)
                 .eq(StringUtils.isNotBlank(qualifiedFlag), DemEnforceProjectAll::getProjectResult, qualifiedFlag)
                 .between(startTime != null && endTime != null, DemEnforceProjectAll::getProjectCreateTime, startTime, endTime);