diff --git a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java index 3cae586..1af2c02 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/AssessTeamRatingMapper.java @@ -60,6 +60,9 @@ public interface AssessTeamRatingMapper extends BaseMapper { and t5.task_name like concat('%', #{obj.taskName}::text, '%') + + + and t2.object_user_name like concat('%', #{obj.objectUserName}::text, '%') and t.rectify_last_date =]]> #{obj.dateRangeSo.start} diff --git a/src/main/java/com/gunshi/project/xyt/service/RiskControlInfoService.java b/src/main/java/com/gunshi/project/xyt/service/RiskControlInfoService.java index 7981d45..f78fbe8 100644 --- a/src/main/java/com/gunshi/project/xyt/service/RiskControlInfoService.java +++ b/src/main/java/com/gunshi/project/xyt/service/RiskControlInfoService.java @@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; @@ -38,6 +39,7 @@ public class RiskControlInfoService extends ServiceImpl