fix(domain): 修复项目任务执行状态判断逻辑

web-app/src/main/java/com/zcloud/domain/command/ProjectTaskScoreInfoAddExe.java

@@ -79,7 +79,12 @@ public class ProjectTaskScoreInfoAddExe {
         }
         Integer code = projectTaskDO.getExecuteStatus();
         if (new Date().compareTo(projectTaskDO.getExecutedStartDate()) >= 0) {
-            code = ProjectTaskExecuteStatusEnum.EXECUTING.getCode();
+            if(new Date().compareTo(projectTaskDO.getExecutedEndDate())>=0){
+                code = ProjectTaskExecuteStatusEnum.FINISHED.getCode();
+            }else{
+                code = ProjectTaskExecuteStatusEnum.EXECUTING.getCode();
+            }
+
         }else{
             code = ProjectTaskExecuteStatusEnum.WAIT_PERFECT.getCode();
         }

web-app/src/main/java/com/zcloud/domain/command/query/DomainDepartmentQueryExe.java

@@ -2,6 +2,7 @@ package com.zcloud.domain.command.query;
 
 import cn.hutool.core.collection.CollUtil;
 import com.alibaba.cola.dto.PageResponse;
+import com.jjb.saas.framework.auth.utils.AuthContext;
 import com.zcloud.domain.command.convertor.DomainDepartmentCoConvertor;
 import com.zcloud.domain.command.convertor.DomainDepartmentUserCoConvertor;
 import com.zcloud.domain.dto.DomainDepartmentPageQry;
@@ -11,6 +12,7 @@ import com.zcloud.domain.dto.clientobject.DomainDepartmentUserCO;
 import com.zcloud.domain.persistence.dataobject.DomainDepartmentDO;
 import com.zcloud.domain.persistence.dataobject.DomainDepartmentUserDO;
 import com.zcloud.domain.persistence.dataobject.ProjectTaskDO;
+import com.zcloud.domain.persistence.repository.CorpInfoRepository;
 import com.zcloud.domain.persistence.repository.DomainDepartmentRepository;
 import com.zcloud.domain.persistence.repository.DomainDepartmentUserRepository;
 import com.zcloud.domain.persistence.repository.ProjectTaskRepository;
@@ -19,6 +21,7 @@ import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -38,6 +41,7 @@ public class DomainDepartmentQueryExe {
     private final DomainDepartmentUserRepository domainDepartmentUserRepository;
     private final DomainDepartmentUserCoConvertor domainDepartmentUserCoConvertor;
     private final ProjectTaskRepository projectTaskRepository;
+    private final CorpInfoRepository corpInfoRepository;
 
     /**
      * 分页
@@ -92,7 +96,13 @@ public class DomainDepartmentQueryExe {
     }
 
     public List<DomainDepartmentCO> listAll() {
-        List<DomainDepartmentDO> domainDepartmentDOList =domainDepartmentRepository.listAll();
+        //如果不是监管端，则不能查看所有
+        Map<String, Object> params = new HashMap<>();
+        corpInfoRepository.isSupper();
+        if(!corpInfoRepository.isSupper()){
+            params.put("corpinfoId", AuthContext.getTenantId());
+        }
+        List<DomainDepartmentDO> domainDepartmentDOList =domainDepartmentRepository.listAll(params);
         List<DomainDepartmentCO> domainDepartmentCOList = domainDepartmentCoConvertor.converDOsToCOs(domainDepartmentDOList);
         return domainDepartmentCOList;
     }

web-infrastructure/src/main/java/com/zcloud/domain/persistence/mapper/DomainDepartmentMapper.java

@@ -26,6 +26,6 @@ public interface DomainDepartmentMapper extends BaseMapper<DomainDepartmentDO> {
 
     IPage<DomainDepartmentDO> listPage(IPage<DomainDepartmentDO> iPage, Map<String, Object> params, String menuPerms);
 
-    List<DomainDepartmentDO> listAll();
+    List<DomainDepartmentDO> listAll(Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/DomainDepartmentRepository.java

@@ -5,7 +5,6 @@ import com.jjb.saas.framework.repository.repo.BaseRepository;
 import com.zcloud.domain.persistence.dataobject.DomainDepartmentDO;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 
@@ -22,6 +21,6 @@ public interface DomainDepartmentRepository extends BaseRepository<DomainDepartm
 
     DomainDepartmentDO getInfoById(Long id);
 
-    List<DomainDepartmentDO> listAll();
+    List<DomainDepartmentDO> listAll(Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/domain/persistence/repository/impl/DomainDepartmentRepositoryImpl.java

@@ -15,7 +15,6 @@ import com.zcloud.gbscommon.utils.Query;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.Map;
 
@@ -60,8 +59,8 @@ public class DomainDepartmentRepositoryImpl extends BaseRepositoryImpl<DomainDep
     }
 
     @Override
-    public List<DomainDepartmentDO> listAll() {
+    public List<DomainDepartmentDO> listAll(Map<String, Object> params) {
-        return domainDepartmentMapper.listAll();
+        return domainDepartmentMapper.listAll(params);
     }
 }
 

web-infrastructure/src/main/resources/mapper/DomainDepartmentMapper.xml

@@ -36,7 +36,11 @@
         from domain_department dd
                  left join department d on dd.master_department_id = d.id
                  left join user u on dd.master_user_id = u.id
-            where dd.delete_enum = 'FALSE'
+                 left join domain_group dg on dd.domain_type = dg.domain_type
+        where dd.delete_enum = 'FALSE'
+            <if test="params.corpinfoId != null ">
+                and dg.corpinfo_id =#{params.corpinfoId}
+            </if>
         order by dd.create_time desc
     </select>
 </mapper>

web-infrastructure/src/main/resources/mapper/DomainGroupMapper.xml

@@ -10,7 +10,7 @@
                d.name                                    as teamdepartmentname,
                u.name                                    as teamusername,
                count(distinct ptg.id) as projectTaskCount,
-               sum(if(ptg.score_status = 2)) as projectTaskFinishedCount
+              SUM(CASE WHEN ptg.score_status = 2 THEN 1 ELSE 0 END) AS projectTaskFinishedCount
         from domain_group dg
                  left join corp_info c on dg.corpinfo_id = c.id and c.delete_enum = 'false'
                  left join department d on dg.team_department_id = d.id and d.delete_enum = 'false'